Add some missing dependencies and recreate the notexi patch

3 files changed, 31 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba07f10d9b80..5be6c1595247 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vice-gnomeui-devel
 	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
 	pkgver = 3.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://vice-emu.sourceforge.net
 	install = vice-gnomeui-devel.install
 	arch = i686
@@ -12,6 +12,7 @@ pkgbase = vice-gnomeui-devel
 	makedepends = xorg-mkfontdir
 	makedepends = autoconf
 	makedepends = xa
+	makedepends = python
 	depends = libpulse
 	depends = giflib
 	depends = vte3
@@ -21,6 +22,7 @@ pkgbase = vice-gnomeui-devel
 	depends = libieee1284
 	depends = portaudio
 	depends = pciutils
+	depends = glew
 	provides = vice
 	conflicts = vice
 	options = !makeflags
@@ -29,11 +31,13 @@ pkgbase = vice-gnomeui-devel
 	source = vice.desktop
 	source = no-fc-cache-no-lib64.patch
 	source = zlib-1.2.7.patch
+	source = notexi.patch
 	sha512sums = 3d42e7bbe15ec6efac918d11e354052048dac8efdeedc64bb724cb8aaf2dd8ec7a2fc176ddbc93722ce7c680f06d3966efc10587c24e9643238315ded025c4b8
 	sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
 	sha512sums = f26a9fe5e429268f0ab7d571db48f9c126ea289563758c7442989bb07cef026bf2a5a1e7b7a882362a70407930797de6dfd9af4db8297d6afa5bed5d79fe6164
 	sha512sums = 6cc0e6f029750ead84f292dce9879f11b243266cf3787f96347cdd2d1193a74992c3dd63171af79d7f376d983e11a5dfc9327f27e2190de70f008ab81d4d93bb
 	sha512sums = b996c044ff6a7b43a1b6ba2fd3f57ce68d4474902764e8b3f5d9c64e3730e6120e16d6d86b6c5e27513fac7b5d9449afcaf67e4c3014f2f535627648550f56aa
+	sha512sums = 33e544bbce2e559e71e9e8624af2a7ac00bd3578cc8f7aa5ef167f3fe5f6b000dd97306e85d49a8601f88bc1afa427f2143fcb0f339ced223b35f7468ac09e16
 
 pkgname = vice-gnomeui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index ed63435f9ac6..f8474661f139 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
 pkgver=3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://vice-emu.sourceforge.net'
-depends=('libpulse' 'giflib' 'vte3' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils')
-makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf' 'xa')
+depends=('libpulse' 'giflib' 'vte3' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils' 'glew')
+makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf' 'xa' 'python')
 options=('!makeflags')
 install=$pkgname.install
 provides=("$_pkgname")
@@ -30,6 +30,7 @@ source=(
   "$_pkgname.desktop"
   'no-fc-cache-no-lib64.patch'
   'zlib-1.2.7.patch'
+  'notexi.patch'
 )
 
 sha512sums=(
@@ -38,6 +39,7 @@ sha512sums=(
   'f26a9fe5e429268f0ab7d571db48f9c126ea289563758c7442989bb07cef026bf2a5a1e7b7a882362a70407930797de6dfd9af4db8297d6afa5bed5d79fe6164'
   '6cc0e6f029750ead84f292dce9879f11b243266cf3787f96347cdd2d1193a74992c3dd63171af79d7f376d983e11a5dfc9327f27e2190de70f008ab81d4d93bb'
   'b996c044ff6a7b43a1b6ba2fd3f57ce68d4474902764e8b3f5d9c64e3730e6120e16d6d86b6c5e27513fac7b5d9449afcaf67e4c3014f2f535627648550f56aa'
+  '33e544bbce2e559e71e9e8624af2a7ac00bd3578cc8f7aa5ef167f3fe5f6b000dd97306e85d49a8601f88bc1afa427f2143fcb0f339ced223b35f7468ac09e16'
 )
 
 prepare() {
@@ -45,6 +47,7 @@ prepare() {
   cd $_pkgname-$pkgver
   patch -Np1 -i ../no-fc-cache-no-lib64.patch
   patch -Np1 -i ../zlib-1.2.7.patch
+  patch -Np1 -i ../notexi.patch
 
   # Convert MS-DOS linebreaks to Unix style ones
   printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...'
diff --git a/notexi.patch b/notexi.patch
new file mode 100644
index 000000000000..913d4cdf7840
--- /dev/null
+++ b/notexi.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 11e696e..61a7531 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -63,15 +63,6 @@ $(builddir)/vice.txt:	.vice-texi-charset-ok
+ 	$(srcdir)/fixdox.sh txt <vicetmp.txt | LC_ALL=C sed 's/ \+$$//' >$(builddir)/vice.txt
+ 	rm -f vicetmp.txt
+ 
+-if BUILD_PDF
+-VICE_DOX += vice.pdf
+-$(builddir)/vice.pdf:	.vice-texi-charset-ok
+-	LC_ALL=C sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
+-	LC_ALL=C $(TEXI2DVI) -I $(srcdir) -q --clean --pdf "--texinfo=@set $(PLATFORM_DOX_FLAGS) " -o $(builddir)/vice.pdf vicepdf.texi
+-	rm -f vicepdf.texi
+-endif
+-
+-
+ # This doesn't appear to delete vice.pdf, vice.chm, vice.guide etc added
+ # in this Makefile with VICE_DOX += FOO, perhaps just some ordinary `rm -f`
+ # would do better? -- Compyx