commit ccbcdf28d4d232040c957e6a91c475351617b842 Author: Tim Biermann <tbier@posteo.de> Date: Mon Aug 26 12:05:04 2019 +0000 libappindicator-gtk2: fix build with newer pygtk port diff --git a/libappindicator-gtk2/.footprint b/libappindicator-gtk2/.footprint index e146d04f..6071f7c4 100644 --- a/libappindicator-gtk2/.footprint +++ b/libappindicator-gtk2/.footprint @@ -13,12 +13,6 @@ lrwxrwxrwx root/root usr/lib/libappindicator.so.1 -> libappindicator.so.1.0.0 -rwxr-xr-x root/root usr/lib/libappindicator.so.1.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/appindicator-0.1.pc -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/appindicator/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/gir-1.0/ -rw-r--r-- root/root usr/share/gir-1.0/AppIndicator-0.1.gir -drwxr-xr-x root/root usr/share/pygtk/ -drwxr-xr-x root/root usr/share/pygtk/2.0/ -drwxr-xr-x root/root usr/share/pygtk/2.0/defs/ diff --git a/libappindicator-gtk2/.signature b/libappindicator-gtk2/.signature index 44fa2a33..387d420b 100644 --- a/libappindicator-gtk2/.signature +++ b/libappindicator-gtk2/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33VMWKSfK21opKe11eFd98KtCIIYwo/89bR48IhTQJQjzWfdQEGBcym17sqjs9mFwxcL5d1KwoOfISNiIco8+g8= -SHA256 (Pkgfile) = 1dfe0ed5c5d647ba4eac8244f223415beeb0367a26cb98304bca7f7a1037fe21 -SHA256 (.footprint) = a7f96e1e56d42c96e31d2b439eb5f04d64bc5127a7c7bdc5842457df8ad97531 +RWSagIOpLGJF3ypQ69qb3NyjW0b7r5nrXFvtfbJ/ZLBq370Sq3aDnMlZxVzuivcHbv2bMfcvD4f+vPb5A82Awqa8U1opniZxwAw= +SHA256 (Pkgfile) = 2674731f13aaa31ecb7d5760fc9d38b84e98c6d93f0b05359ba0a4e268ac5e3e +SHA256 (.footprint) = ae26513dd8bf53e0928bbfa47053d65c98101041f85472ece7108bd08b804302 SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 SHA256 (0002-Fix-mono-nunit-pkgconfig-name.patch) = d60af265af61cf429158267b391c377adb8ee8a24f0cef72c3f10f202cec6c6f diff --git a/libappindicator-gtk2/Pkgfile b/libappindicator-gtk2/Pkgfile index 2a71cddb..2e61222f 100644 --- a/libappindicator-gtk2/Pkgfile +++ b/libappindicator-gtk2/Pkgfile @@ -1,40 +1,44 @@ # Description: Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray # URL: https://launchpad.net/libappindicator # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: dbus-glib p5-xml-libxml libdbusmenu-gtk2 libindicator-gtk2 pygtk +# Depends on: dbus-glib p5-xml-libxml libdbusmenu-gtk2 libindicator-gtk2 name=libappindicator-gtk2 version=16.10 -release=1 +release=3 source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz -0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch conditional-py-bindings.patch disable-mono.patch gtk3.patch improved-plasma-support.patch vala-inherit.patch) + 0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch + 0003-Fix-Mono-assemblies-directory.patch badfunction.patch + conditional-py-bindings.patch disable-mono.patch gtk3.patch + improved-plasma-support.patch vala-inherit.patch) build() { cd libappindicator-$version # The next 3 patches shamelessly pinched from Arch - patch -p1 --verbose < ../0001-Glib.Timeout-fix.patch - patch -p1 --verbose < ../0002-Fix-mono-nunit-pkgconfig-name.patch - patch -p1 --verbose < ../0003-Fix-Mono-assemblies-directory.patch + patch -p1 -i $SRC/0001-Glib.Timeout-fix.patch + patch -p1 -i $SRC/0002-Fix-mono-nunit-pkgconfig-name.patch + patch -p1 -i $SRC/0003-Fix-Mono-assemblies-directory.patch # This one is also from Arch(ish), but had to be recreated best it could - patch -p1 --verbose < ../improved-plasma-support.patch + patch -p1 -i $SRC/improved-plasma-support.patch # Patch pinched from Gentoo - patch -p1 --verbose < ../conditional-py-bindings.patch + patch -p1 -i $SRC/conditional-py-bindings.patch # Removed a function which had no declaration - patch -p1 --verbose < ../badfunction.patch + patch -p1 -i $SRC/badfunction.patch sed -i -e 's/ -Werror//' src/Makefile.am NOCONFIGURE=1 ./autogen.sh - export CSC='/usr/bin/mcs' CXXFLAGS="$CXXFLAGS -std=c++11" \ ./configure --prefix=/usr \ --localstatedir=/var \ - --disable-{gtk-doc-html,mono-test,static,tests} \ + --disable-{gtk-doc-html,python,mono-test,static,tests} \ --with-gtk=2 + sed -e 's/DIST_SUBDIRS = vala python mono/DIST_SUBDIRS = vala/g' \ + -e 's/am__append_1 = python//g' \ + -e 's/am__append_2 = mono//g' \ + -i bindings/Makefile make make DESTDIR=$PKG -j1 install - make DESTDIR=$PKG -C bindings/mono -j1 uninstall || true # if you haven't got mono installed, it will fail - make DESTDIR=$PKG -C bindings/python -j1 uninstall || true }