libappindicator rebuild
This commit is contained in:
Rmys
GitHub
@@ -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")
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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
|
||||
@@ -21,16 +21,18 @@
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
<Dependency>python-devel</Dependency>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
<Dependency>python-gtk-devel</Dependency>
|
||||
<!-- <Dependency>python-gtk-devel</Dependency> -->
|
||||
<Dependency>libdbusmenu-gtk3</Dependency>
|
||||
<Dependency>libdbusmenu-devel</Dependency>
|
||||
<Dependency>libindicator-devel</Dependency>
|
||||
<Dependency>python-pygobject-devel</Dependency>
|
||||
<Dependency>python-pygobject3-devel</Dependency>
|
||||
<Dependency>libindicator-gtk2-devel</Dependency>
|
||||
<!-- <Dependency>python-pygobject-devel</Dependency> -->
|
||||
<Dependency>python3-pygobject3-devel</Dependency>
|
||||
<Dependency>gobject-introspection-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">missing.patch</Patch> -->
|
||||
<Patch level="1">incompatible_pointer_build_fix.patch</Patch>
|
||||
<Patch level="1">nopython.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -54,7 +56,7 @@
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Package>
|
||||
<Name>libappindicator-devel</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libappindicator</Dependency>
|
||||
@@ -69,6 +71,30 @@
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libappindicator-gtk2</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>gtk2</Dependency>
|
||||
<Dependency>libindicator-gtk2</Dependency>
|
||||
<Dependency>libdbusmenu-gtk</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libappindicator.so*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libappindicator-gtk2-devel</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libappindicator-gtk2</Dependency>
|
||||
<Dependency>gtk2-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/pkgconfig/appindicator-0.1.pc</Path>
|
||||
<Path fileType="header">/usr/include/libappindicator-0.1/libappindicator</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libappindicator-docs</Name>
|
||||
<RuntimeDependencies>
|
||||
@@ -80,6 +106,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="2">
|
||||
<Date>2021-07-04</Date>
|
||||
<Version>12.10.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-01-28</Date>
|
||||
<Version>12.10.0</Version>
|
||||
|
||||
Reference in New Issue
Block a user