summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2020-10-17 15:17:09 +0000
committerTim Biermann <tbier@posteo.de>2020-10-17 15:17:09 +0000
commit045770a3ed41b57fa85ebd35bd65a47363bd8f07 (patch)
tree626256bb376aa8c50b9886c2b1f8d8acd57be5f6
parent43b8f744ced9a953c8b7b31a1799c11a68835fad (diff)
downloadcontrib-045770a3ed41b57fa85ebd35bd65a47363bd8f07.tar.gz
contrib-045770a3ed41b57fa85ebd35bd65a47363bd8f07.tar.xz
libappindicator-python: dropped
-rw-r--r--libappindicator-python/.footprint15
-rw-r--r--libappindicator-python/.signature14
-rw-r--r--libappindicator-python/0001-Glib.Timeout-fix.patch24
-rw-r--r--libappindicator-python/0002-Fix-mono-nunit-pkgconfig-name.patch25
-rw-r--r--libappindicator-python/0003-Fix-Mono-assemblies-directory.patch39
-rw-r--r--libappindicator-python/Pkgfile44
-rw-r--r--libappindicator-python/badfunction.patch12
-rw-r--r--libappindicator-python/conditional-py-bindings.patch72
-rw-r--r--libappindicator-python/disable-mono.patch21
-rw-r--r--libappindicator-python/gtk3.patch9
-rw-r--r--libappindicator-python/improved-plasma-support.patch27
-rw-r--r--libappindicator-python/vala-inherit.patch14
12 files changed, 0 insertions, 316 deletions
diff --git a/libappindicator-python/.footprint b/libappindicator-python/.footprint
deleted file mode 100644
index a177f439a..000000000
--- a/libappindicator-python/.footprint
+++ /dev/null
@@ -1,15 +0,0 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/lib/
-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/
--rw-r--r-- root/root usr/lib/python2.7/site-packages/appindicator/__init__.py
--rw-r--r-- root/root usr/lib/python2.7/site-packages/appindicator/__init__.pyc
--rw-r--r-- root/root usr/lib/python2.7/site-packages/appindicator/__init__.pyo
--rwxr-xr-x root/root usr/lib/python2.7/site-packages/appindicator/_appindicator.la
--rwxr-xr-x root/root usr/lib/python2.7/site-packages/appindicator/_appindicator.so
-drwxr-xr-x root/root usr/share/
-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/
--rw-r--r-- root/root usr/share/pygtk/2.0/defs/appindicator.defs
diff --git a/libappindicator-python/.signature b/libappindicator-python/.signature
deleted file mode 100644
index 6b17aa6b9..000000000
--- a/libappindicator-python/.signature
+++ /dev/null
@@ -1,14 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33CFm3bOhfjpX9JmAIcibM2nT4LQFqq5IOaLUDJej3/+yPl7tl62Fi/rWoeif6AgTkgB/wBURI3OgfKQXhaLWwg=
-SHA256 (Pkgfile) = fc43739e01bdecd5189fdd86d1119956c6cc65928ec200201b86a8b00cf2828e
-SHA256 (.footprint) = df265289dc5c5cfa3f497527df063af0ab1717599825961f54e5336d7e4b41de
-SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e
-SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80
-SHA256 (0002-Fix-mono-nunit-pkgconfig-name.patch) = d60af265af61cf429158267b391c377adb8ee8a24f0cef72c3f10f202cec6c6f
-SHA256 (0003-Fix-Mono-assemblies-directory.patch) = d923cab3e2704758ce4d41c356e2822234f291f202fce6c3db12daec46f1e8ac
-SHA256 (badfunction.patch) = f4959649db01aada1fe303e2a3de1eac0b303955d69129f84a492771d600c808
-SHA256 (conditional-py-bindings.patch) = 40dc073f3825ff53ae16e3e37411bde2b70a9d9b89f8e8c85885e779b32d7260
-SHA256 (disable-mono.patch) = 3ec51b8923a65d8d71374977206239dd511a1775a60e3d72ca9f2b3b8f136ab8
-SHA256 (gtk3.patch) = 39fc14496fa491c933f224c6a977a23343d0daeebd93911f3538c29f1bf69407
-SHA256 (improved-plasma-support.patch) = c199e075fef864eb9a24845986f5486ee3a4cc30f9209b417eaa005cf5dc98a4
-SHA256 (vala-inherit.patch) = 77635b7b5bc0686577a191e0ac78dcfba79f5e5695b6b72cae7c412e59bc736d
diff --git a/libappindicator-python/0001-Glib.Timeout-fix.patch b/libappindicator-python/0001-Glib.Timeout-fix.patch
deleted file mode 100644
index 27744c411..000000000
--- a/libappindicator-python/0001-Glib.Timeout-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f949448c898b2428e146d18e0821fa242a7099f6 Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Tue, 7 Oct 2014 17:21:42 -0400
-Subject: [PATCH 1/3] Glib.Timeout fix
-
----
- example/simple-client-vala.vala | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/example/simple-client-vala.vala b/example/simple-client-vala.vala
-index f8cd874..6d8d71b 100644
---- a/example/simple-client-vala.vala
-+++ b/example/simple-client-vala.vala
-@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-+using GLib;
- using Gtk;
- using AppIndicator;
-
---
-2.1.2
-
diff --git a/libappindicator-python/0002-Fix-mono-nunit-pkgconfig-name.patch b/libappindicator-python/0002-Fix-mono-nunit-pkgconfig-name.patch
deleted file mode 100644
index 0398698e3..000000000
--- a/libappindicator-python/0002-Fix-mono-nunit-pkgconfig-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 72de73f8d90fa54b884086dddf3b06a1d14b9e59 Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Tue, 7 Oct 2014 17:22:16 -0400
-Subject: [PATCH 2/3] Fix mono-nunit pkgconfig name
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d131c9e..c8e480f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_ARG_ENABLE([mono-test],
- [enable_mono_test=auto])
-
- if test x"$enable_mono_test" != x"no" ; then
-- PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7,
-+ PKG_CHECK_MODULES(NUNIT, mono-nunit >= 2.4.7,
- [have_nunit=yes],
- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit,
- [have_nunit=yes],
---
-2.1.2
-
diff --git a/libappindicator-python/0003-Fix-Mono-assemblies-directory.patch b/libappindicator-python/0003-Fix-Mono-assemblies-directory.patch
deleted file mode 100644
index 42bfacc94..000000000
--- a/libappindicator-python/0003-Fix-Mono-assemblies-directory.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c31b285b856fdf4a131baab5e0a2397a375ac24f Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Tue, 7 Oct 2014 17:23:43 -0400
-Subject: [PATCH 3/3] Fix Mono assemblies directory
-
----
- bindings/mono/Makefile.am | 2 +-
- bindings/mono/appindicator-sharp-0.1.pc.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
-index 6f8e8a9..e1bd6e5 100644
---- a/bindings/mono/Makefile.am
-+++ b/bindings/mono/Makefile.am
-@@ -31,7 +31,7 @@ TARGET = \
- $(DLLPOLICY1) \
- $(POLICY1).config
-
--assemblydir = $(libdir)/cli/appindicator-sharp-0.1
-+assemblydir = $(libdir)/appindicator-sharp-0.1
- assembly_DATA = $(TARGET)
-
- CLEANFILES = \
-diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in
-index f63c01e..ca09a6d 100644
---- a/bindings/mono/appindicator-sharp-0.1.pc.in
-+++ b/bindings/mono/appindicator-sharp-0.1.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
-+assemblies_dir=${prefix}/lib/appindicator-sharp-0.1
-
- Name: appindicator-sharp
- Description: application indicators for .NET
---
-2.1.2
-
diff --git a/libappindicator-python/Pkgfile b/libappindicator-python/Pkgfile
deleted file mode 100644
index 84ffec111..000000000
--- a/libappindicator-python/Pkgfile
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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: libappindicator-gtk2 python pygtk
-
-name=libappindicator-python
-version=16.10
-release=2
-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)
-
-build() {
- cd libappindicator-$version
- # The next 3 patches shamelessly pinched from Arch
- 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 -i $SRC/improved-plasma-support.patch
-
- # Patch pinched from Gentoo
- patch -p1 -i $SRC/conditional-py-bindings.patch
-
- # Removed a function which had no declaration
- 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} \
- --with-gtk=2
- sed -e 's/DIST_SUBDIRS = vala python mono/DIST_SUBDIRS = vala python/g' \
- -e 's/am__append_2 = mono//g' \
- -i bindings/Makefile
- make
- make DESTDIR=$PKG -j1 -C bindings/python install
-}
diff --git a/libappindicator-python/badfunction.patch b/libappindicator-python/badfunction.patch
deleted file mode 100644
index 21a7fa502..000000000
--- a/libappindicator-python/badfunction.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/app-indicator.c b/src/app-indicator.c
---- a/src/app-indicator.c 2017-10-23 07:03:29.000000000 +0000
-+++ b/src/app-indicator.c 2017-10-23 13:08:25.530191393 +0000
-@@ -2577,7 +2577,7 @@
-
- g_return_if_fail(priv->shorties != NULL);
-
-- indicator_desktop_shortcuts_nick_exec_with_context(priv->shorties, nick, NULL);
-+// indicator_desktop_shortcuts_nick_exec_with_context(priv->shorties, nick, NULL);
-
- return;
- }
diff --git a/libappindicator-python/conditional-py-bindings.patch b/libappindicator-python/conditional-py-bindings.patch
deleted file mode 100644
index c916d9ba2..000000000
--- a/libappindicator-python/conditional-py-bindings.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200
-+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200
-@@ -3,8 +3,10 @@
- vala
- else
- SUBDIRS = \
-- python \
- vala
-+if HAS_PYTHON
-+SUBDIRS += python
-+endif
- endif
-
- if HAS_MONO
---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200
-+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200
-@@ -188,25 +188,37 @@
- PYGTK_REQUIRED=2.14.0
- PYGOBJECT_REQUIRED=0.22
-
--AM_PATH_PYTHON(2.3.5)
--AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+AC_ARG_ENABLE([python],
-+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),,
-+ [enable_python=yes])
-
--PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
-+if test x"$with_gtk" = x"3" ; then
-+ enable_python=no
-+fi
-+
-+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no")
-+
-+if test x"$enable_python" != x"no" ; then
-+ AM_PATH_PYTHON(2.3.5)
-+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+
-+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
- [
- pygtk-2.0 >= $PYGTK_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- ])
-
--AC_MSG_CHECKING(for pygtk defs)
--PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
--AC_SUBST(PYGTK_DEFSDIR)
--AC_MSG_RESULT($PYGTK_DEFSDIR)
--
--AC_MSG_CHECKING(for pygtk codegen)
--PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
--AC_SUBST(PYGTK_CODEGEN)
--AC_MSG_RESULT($PYGTK_CODEGEN)
-+ AC_MSG_CHECKING(for pygtk defs)
-+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-+ AC_SUBST(PYGTK_DEFSDIR)
-+ AC_MSG_RESULT($PYGTK_DEFSDIR)
-+
-+ AC_MSG_CHECKING(for pygtk codegen)
-+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-+ AC_SUBST(PYGTK_CODEGEN)
-+ AC_MSG_RESULT($PYGTK_CODEGEN)
-+fi
-
- #########################
- # Check if build tests
-@@ -278,4 +290,5 @@
- Tests: $enable_tests
- Mono tests: $have_nunit
- gcov: $use_gcov
-+ Python: $enable_python
- ])
diff --git a/libappindicator-python/disable-mono.patch b/libappindicator-python/disable-mono.patch
deleted file mode 100644
index a8da053aa..000000000
--- a/libappindicator-python/disable-mono.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2017-10-23 14:05:48.291548000 +0000
-+++ b/configure.ac 2017-10-23 15:37:41.434800880 +0000
-@@ -104,7 +104,7 @@
- # Check for Mono support
- ###########################
-
--MONO_REQUIRED_VERSION=1.0
-+MONO_REQUIRED_VERSION=9999
- PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
- AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"])
-
-@@ -143,7 +143,7 @@
- AC_SUBST(GENERATED_SOURCES)
-
- GLIB_SHARP_REQ_VERSION=2.12.1
--GTK_SHARP_REQ_VERSION=2.12
-+GTK_SHARP_REQ_VERSION=9999
- PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false)
-
- PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false)
diff --git a/libappindicator-python/gtk3.patch b/libappindicator-python/gtk3.patch
deleted file mode 100644
index 068af900f..000000000
--- a/libappindicator-python/gtk3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur a/autogen.sh b/autogen.sh
---- a/autogen.sh 2017-10-23 08:03:29.000000000 +0100
-+++ b/autogen.sh 2017-10-23 10:26:05.918283577 +0100
-@@ -10,4 +10,4 @@
- gtkdocize || exit 1
- USE_GNOME2_MACROS=1 \
- USE_COMMON_DOC_BUILD=yes \
--gnome-autogen.sh --enable-gtk-doc $@
-+gnome-autogen.sh --enable-gtk-doc --with-gtk=3 $@
diff --git a/libappindicator-python/improved-plasma-support.patch b/libappindicator-python/improved-plasma-support.patch
deleted file mode 100644
index f41a18652..000000000
--- a/libappindicator-python/improved-plasma-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a/src/app-indicator.c b/src/app-indicator.c
---- a/src/app-indicator.c 2017-10-23 07:03:29.000000000 +0000
-+++ b/src/app-indicator.c 2017-10-23 13:25:03.332259298 +0000
-@@ -1178,7 +1178,8 @@
- delta = ABS(delta);
- g_signal_emit(app, signals[SCROLL_EVENT], 0, delta, direction);
-
-- } else if (g_strcmp0(method, "SecondaryActivate") == 0 ||
-+ } else if (g_strcmp0(method, "Activate") == 0 ||
-+ g_strcmp0(method, "SecondaryActivate") == 0 ||
- g_strcmp0(method, "XAyatanaSecondaryActivate") == 0) {
- GtkWidget *menuitem = priv->sec_activate_target;
-
-diff -Naur a/src/notification-item.xml b/src/notification-item.xml
---- a/src/notification-item.xml 2017-10-23 07:03:29.000000000 +0000
-+++ b/src/notification-item.xml 2017-10-23 13:24:48.252258271 +0000
-@@ -20,6 +20,10 @@
- <property name="XAyatanaOrderingIndex" type="u" access="read" />
-
- <!-- Methods -->
-+ <method name="Activate">
-+ <arg type="i" name="x" direction="in" />
-+ <arg type="i" name="y" direction="in" />
-+ </method>
- <method name="Scroll">
- <arg type="i" name="delta" direction="in" />
- <arg type="s" name="orientation" direction="in" />
diff --git a/libappindicator-python/vala-inherit.patch b/libappindicator-python/vala-inherit.patch
deleted file mode 100644
index e71cb690c..000000000
--- a/libappindicator-python/vala-inherit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
-=== modified file 'bindings/vala/appindicator-0.1-custom.vala'
---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000
-+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000
-@@ -23,7 +23,7 @@
- */
-
- namespace AppIndicator {
-- [CCode (type_check_function = "IS_APP_INDICATOR")]
-+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")]
- public class Indicator : GLib.Object {
- }
- }
-

Generated by cgit