diff --git a/programming/library/libappindicator/actions.py b/programming/library/libappindicator/actions.py
index 62179a13b7..01eeee94cf 100644
--- a/programming/library/libappindicator/actions.py
+++ b/programming/library/libappindicator/actions.py
@@ -4,20 +4,40 @@
# Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
-from pisi.actionsapi import autotools, pisitools, get
+from pisi.actionsapi import autotools, pisitools, shelltools, get
def setup():
- pisitools.dosed("src/Makefile.am", "-Werror", "")
- autotools.autoreconf("-fiv")
- autotools.configure("--with-gtk=3 --disable-static")
+ #shelltools.export("PYTHON", "/usr/bin/python3")
+ shelltools.copytree("../libappindicator-%s" % (get.srcVERSION().replace("_", "~")), "../libappindicator-%s-gtk3" % get.srcVERSION())
+
+ pisitools.dosed("src/Makefile.am", "-Werror", "")
+ autotools.autoreconf("-fiv")
+ autotools.configure("--with-gtk=2 \
+ --enable-introspection=no \
+ --disable-static")
+
+ pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
+
+ shelltools.cd("../libappindicator-%s-gtk3" % get.srcVERSION())
+ pisitools.dosed("src/Makefile.am", "-Werror", "")
+ autotools.autoreconf("-fiv")
+ autotools.configure("--with-gtk=3 \
+ --disable-static")
+
+ pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
- pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
def build():
- autotools.make()
+ autotools.make()
+
+ shelltools.cd("../libappindicator-%s-gtk3" % get.srcVERSION())
+ autotools.make()
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- pisitools.dodoc("AUTHORS", "ChangeLog")
+ shelltools.cd("../libappindicator-%s-gtk3" % get.srcVERSION())
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+
+ pisitools.dodoc("AUTHORS", "ChangeLog")
diff --git a/programming/library/libappindicator/files/incompatible_pointer_build_fix.patch b/programming/library/libappindicator/files/incompatible_pointer_build_fix.patch
new file mode 100644
index 0000000000..50678be8cd
--- /dev/null
+++ b/programming/library/libappindicator/files/incompatible_pointer_build_fix.patch
@@ -0,0 +1,12 @@
+diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c
+--- libappindicator-12.10.0/src/app-indicator.c.build_fix 2018-04-10 14:43:57.134400594 +0200
++++ libappindicator-12.10.0/src/app-indicator.c 2018-04-10 14:45:34.655448722 +0200
+@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
+
+ g_return_if_fail (GTK_IS_WIDGET (menuitem));
+
+- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
++ priv->sec_activate_target = g_object_ref(menuitem);
+ priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+ g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
+ }
diff --git a/programming/library/libappindicator/files/nopython.patch b/programming/library/libappindicator/files/nopython.patch
new file mode 100644
index 0000000000..713676a9ba
--- /dev/null
+++ b/programming/library/libappindicator/files/nopython.patch
@@ -0,0 +1,59 @@
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index d1f6d73..dccca6c 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -3,7 +3,6 @@ SUBDIRS = \
+ vala
+ else
+ SUBDIRS = \
+- python \
+ vala
+ endif
+
+diff --git a/configure.ac b/configure.ac
+index ee03390..4713b22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
+ with_localinstall="no"
+ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
+
+-###########################
+-# Python
+-###########################
+-
+-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)])
+-
+-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)
+-
+ #########################
+ # Check if build tests
+ #########################
+@@ -239,8 +212,6 @@ src/Makefile
+ src/appindicator-0.1.pc
+ src/appindicator3-0.1.pc
+ bindings/Makefile
+-bindings/python/Makefile
+-bindings/python/appindicator.override
+ bindings/vala/Makefile
+ bindings/vala/examples/Makefile
+ tests/Makefile
diff --git a/programming/library/libappindicator/pspec.xml b/programming/library/libappindicator/pspec.xml
index 87085f5fb9..b6da70a4aa 100644
--- a/programming/library/libappindicator/pspec.xml
+++ b/programming/library/libappindicator/pspec.xml
@@ -21,16 +21,18 @@
gtk3-devel
python-devel
python3-devel
- python-gtk-devel
+
libdbusmenu-gtk3
libdbusmenu-devel
libindicator-devel
- python-pygobject-devel
- python-pygobject3-devel
+ libindicator-gtk2-devel
+
+ python3-pygobject3-devel
gobject-introspection-devel
-
+ incompatible_pointer_build_fix.patch
+ nopython.patch
@@ -54,7 +56,7 @@
-
+
libappindicator-devel
libappindicator
@@ -69,6 +71,30 @@
+
+ libappindicator-gtk2
+
+ gtk2
+ libindicator-gtk2
+ libdbusmenu-gtk
+
+
+ /usr/lib/libappindicator.so*
+
+
+
+
+ libappindicator-gtk2-devel
+
+ libappindicator-gtk2
+ gtk2-devel
+
+
+ /usr/lib/pkgconfig/appindicator-0.1.pc
+ /usr/include/libappindicator-0.1/libappindicator
+
+
+
libappindicator-docs
@@ -80,6 +106,13 @@
+
+ 2021-07-04
+ 12.10.0
+ Rebuild.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2021-01-28
12.10.0