diff --git a/0001_Fix_mono_dir.patch b/0001_Fix_mono_dir.patch index b7c82c4..2b0e1d5 100644 --- a/0001_Fix_mono_dir.patch +++ b/0001_Fix_mono_dir.patch @@ -5,7 +5,7 @@ diff -Nru libappindicator-0.4.92.orig/bindings/mono/appindicator-sharp-0.1.pc.in prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ --assemblies_dir=${libdir}/cli/appindicator-sharp-0.1 +-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1 +assemblies_dir=${libdir}/appindicator-sharp-0.1 Name: appindicator-sharp diff --git a/incompatible_pointer_build_fix.patch b/incompatible_pointer_build_fix.patch deleted file mode 100644 index 50678be..0000000 --- a/incompatible_pointer_build_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/libappindicator-12.10.0.tar.gz b/libappindicator-12.10.0.tar.gz deleted file mode 100644 index 0affab8..0000000 Binary files a/libappindicator-12.10.0.tar.gz and /dev/null differ diff --git a/libappindicator-add-patch-to-modify-build-err.patch b/libappindicator-add-patch-to-modify-build-err.patch deleted file mode 100644 index 4816e31..0000000 --- a/libappindicator-add-patch-to-modify-build-err.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurN libappindicator-12.10.0/src/Makefile.am libappindicator-12.10.0-mod/src/Makefile.am ---- libappindicator-12.10.0/src/Makefile.am 2012-07-11 19:28:34.415113869 +0200 -+++ libappindicator-12.10.0-mod/src/Makefile.am 2019-12-24 13:38:57.015051155 +0100 -@@ -76,7 +76,7 @@ - libappindicator_la_CFLAGS = \ - $(LIBRARY_CFLAGS) \ - $(COVERAGE_CFLAGS) \ -- -Wall -Werror \ -+ -Wall -Wno-deprecated-declarations \ - -DG_LOG_DOMAIN=\"libappindicator\" - - libappindicator_la_LIBADD = \ diff --git a/libappindicator.spec b/libappindicator.spec index ecb264f..062659d 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -1,14 +1,11 @@ Name: libappindicator -Version: 12.10.0 -Release: 27 +Version: 12.10.1 +Release: 1 Summary: The library of application indicators License: LGPL-3.0 and LGPL-2.1+ and GPL-3.0+ URL: https://launchpad.net/libappindicator -Source0: https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz +Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/%{name}/%{version}+20.10.20200706.1-0ubuntu1/%{name}_%{version}+20.10.20200706.1.orig.tar.gz Patch0001: 0001_Fix_mono_dir.patch -Patch0002: incompatible_pointer_build_fix.patch -Patch0003: libappindicator-add-patch-to-modify-build-err.patch -Patch0004: nopython.patch BuildRequires: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel @@ -45,8 +42,10 @@ This package contains the documentation for the appindicator and appindicator-gtk3 libraries. %prep -%autosetup -p1 -sed -i "s#gmcs#mcs#g" configure.ac +%setup -q -c +%patch00001 -p1 + +sed -i "s#mono-csc#mcs#g" configure.ac sed -i 's/--nogtkinit//' docs/reference/Makefile.am gtkdocize --copy cp -f gtk-doc.make gtk-doc.local.make @@ -56,7 +55,7 @@ autoreconf -vif %global _configure ../configure mkdir build-gtk2 build-gtk3 pushd build-gtk2 -export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations" +export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations -Wno-error" %configure --with-gtk=2 --enable-gtk-doc --disable-static make -j1 V=1 popd @@ -90,16 +89,12 @@ find %{buildroot} -type f -name '*.la' -delete %files %doc AUTHORS README COPYING COPYING.LGPL.2.1 %{_libdir}/libappindicator.so.* -%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib %files devel %dir %{_includedir}/libappindicator-0.1/ %dir %{_includedir}/libappindicator-0.1/libappindicator/ %{_includedir}/libappindicator-0.1/libappindicator/*.h %{_libdir}/libappindicator.so %{_libdir}/pkgconfig/appindicator-0.1.pc -%{_datadir}/gir-1.0/AppIndicator-0.1.gir -%{_datadir}/vala/vapi/appindicator-0.1.vapi -%{_datadir}/vala/vapi/appindicator-0.1.deps %files gtk3 %doc AUTHORS README COPYING COPYING.LGPL.2.1 %{_libdir}/libappindicator3.so.* @@ -117,6 +112,9 @@ find %{buildroot} -type f -name '*.la' -delete %doc %{_datadir}/gtk-doc/html/libappindicator/ %changelog +* Wed Sep 6 2023 liyanan - 12.10.1-1 +- Upgrade to version 12.10.1 + * Wed Jan 20 2021 Ge Wang - 12.10.0-27 - Modify license information. diff --git a/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz b/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz new file mode 100644 index 0000000..06780bd Binary files /dev/null and b/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz differ diff --git a/nopython.patch b/nopython.patch deleted file mode 100644 index 713676a..0000000 --- a/nopython.patch +++ /dev/null @@ -1,59 +0,0 @@ -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