From 152bf4e70be7b3deaf0125f39dc0df9609c13b87 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 23 Oct 2021 03:03:37 +0200 Subject: debian/*: Re-enable / uncomment GTK+ 2.0 support. --- debian/control | 120 ++++++++++++++--------------- debian/libayatana-appindicator-dev.install | 1 - debian/libayatana-appindicator-doc.install | 2 +- debian/libayatana-appindicator1.symbols | 10 +++ debian/rules | 27 +++---- 5 files changed, 83 insertions(+), 77 deletions(-) diff --git a/debian/control b/debian/control index f2281bc..2124a4d 100644 --- a/debian/control +++ b/debian/control @@ -39,45 +39,45 @@ Homepage: https://github.com/AyatanaIndicators/libayatana-appindicator Vcs-Git: https://github.com/AyatanaIndicators/libayatana-appindicator Vcs-Browser: https://github.com/AyatanaIndicators/libayatana-appindicator -#Package: libayatana-appindicator1 -#Architecture: any -#Depends: ${shlibs:Depends}, -# ${misc:Depends}, -#Description: Ayatana Application Indicators (GTK-2+ version) -# A library and indicator to take menus from applications and place them in -# the panel. -# . -# This package contains shared libraries to be used by applications compiled -# against GTK-2+. +Package: libayatana-appindicator1 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Description: Ayatana Application Indicators (GTK-2+ version) + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains shared libraries to be used by applications compiled + against GTK-2+. -#Package: gir1.2-ayatanaappindicator-0.1 -#Section: introspection -#Architecture: any -#Depends: ${misc:Depends}, -# ${gir:Depends}, -#Description: Typelib files for libayatana-appindicator1 (GTK-2+ version) -# A library and indicator to take menus from applications and place them in -# the panel. -# . -# This package can be used by other packages using the GIRepository format -# to generate dynamic bindings (GTK-2+ version). +Package: gir1.2-ayatanaappindicator-0.1 +Section: introspection +Architecture: any +Depends: ${misc:Depends}, + ${gir:Depends}, +Description: Typelib files for libayatana-appindicator1 (GTK-2+ version) + A library and indicator to take menus from applications and place them in + the panel. + . + This package can be used by other packages using the GIRepository format + to generate dynamic bindings (GTK-2+ version). -#Package: libayatana-appindicator-dev -#Section: libdevel -#Architecture: any -#Depends: ${shlibs:Depends}, -# ${misc:Depends}, -# libgtk2.0-dev, -# gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}), -# libdbusmenu-glib-dev (>= 0.1.8), -# libdbus-glib-1-dev (>= 0.76), -# libayatana-appindicator1 (= ${binary:Version}), -#Description: Ayatana Application Indicators (development files, GTK-2+ version) -# A library and indicator to take menus from applications and place them in -# the panel. -# . -# This package contains files that are needed to build applications -# (GTK-2+ version). +Package: libayatana-appindicator-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-dev, + gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}), + libdbusmenu-glib-dev (>= 0.1.8), + libdbus-glib-1-dev (>= 0.76), + libayatana-appindicator1 (= ${binary:Version}), +Description: Ayatana Application Indicators (development files, GTK-2+ version) + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains files that are needed to build applications + (GTK-2+ version). Package: libayatana-appindicator-doc Section: doc @@ -129,30 +129,30 @@ Description: Typelib files for libayatana-appindicator3-1 (GTK-3+ version) This package can be used by other packages using the GIRepository format to generate dynamic bindings (GTK-3+ version). -#Package: libayatana-appindicator0.1-cil -#Section: cli-mono -#Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 -#Depends: ${shlibs:Depends}, -# ${misc:Depends}, -# ${cli:Depends}, -#Description: CLI bindings for libayatana-appindicator -# This package provides the appindicator-sharp assembly that allows CLI (.NET) -# programs to take menus from applications and place them in the panel. -# . -# This package contains assemblies to be used by GTK-2+ Mono applications. +Package: libayatana-appindicator0.1-cil +Section: cli-mono +Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, +Description: CLI bindings for libayatana-appindicator + This package provides the appindicator-sharp assembly that allows CLI (.NET) + programs to take menus from applications and place them in the panel. + . + This package contains assemblies to be used by GTK-2+ Mono applications. -#Package: libayatana-appindicator0.1-cil-dev -#Section: cli-mono -#Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 -#Depends: ${shlibs:Depends}, -# ${misc:Depends}, -# ${cli:Depends}, -# libayatana-appindicator0.1-cil (= ${binary:Version}), -#Description: Ayatana Application Indicators for Mono (GTK-2+ variant) -# A library and indicator to take menus from applications and place them in -# the panel. -# . -# This package contains files that are needed to build Mono applications. +Package: libayatana-appindicator0.1-cil-dev +Section: cli-mono +Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, + libayatana-appindicator0.1-cil (= ${binary:Version}), +Description: Ayatana Application Indicators for Mono (GTK-2+ variant) + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains files that are needed to build Mono applications. Package: libayatana-appindicator3-0.1-cil Section: cli-mono diff --git a/debian/libayatana-appindicator-dev.install b/debian/libayatana-appindicator-dev.install index 763a667..371055d 100644 --- a/debian/libayatana-appindicator-dev.install +++ b/debian/libayatana-appindicator-dev.install @@ -2,4 +2,3 @@ usr/include/libayatana-appindicator-0.1/* usr/lib/*/libayatana-appindicator.so usr/lib/*/pkgconfig/ayatana-appindicator-0.1.pc usr/share/gir-1.0/AyatanaAppIndicator-0.1.gir -usr/share/vala/vapi/ayatana-appindicator-0.1.vapi diff --git a/debian/libayatana-appindicator-doc.install b/debian/libayatana-appindicator-doc.install index f454912..b0e75e4 100644 --- a/debian/libayatana-appindicator-doc.install +++ b/debian/libayatana-appindicator-doc.install @@ -1 +1 @@ -usr/share/gtk-doc/html/libayatana-appindicator/* +usr/share/gtk-doc/html/libayatana-appindicator3/* diff --git a/debian/libayatana-appindicator1.symbols b/debian/libayatana-appindicator1.symbols index 6ffb9c7..d0aab6f 100644 --- a/debian/libayatana-appindicator1.symbols +++ b/debian/libayatana-appindicator1.symbols @@ -1,4 +1,14 @@ libayatana-appindicator.so.1 libayatana-appindicator1 #MINVER# + _application_service_marshal_VOID__BOOLEAN_STRING_OBJECT@Base 0.5.90 + _application_service_marshal_VOID__INT_INT@Base 0.5.90 + _application_service_marshal_VOID__INT_STRING@Base 0.5.90 + _application_service_marshal_VOID__INT_STRING_STRING@Base 0.5.90 + _application_service_marshal_VOID__INT_UINT@Base 0.5.90 + _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING@Base 0.5.90 + _application_service_marshal_VOID__STRING_STRING@Base 0.5.90 + _generate_id@Base 0.5.90 + _notification_item@Base 0.5.90 + _notification_watcher@Base 0.5.90 app_indicator_build_menu_from_desktop@Base 0.2.91 app_indicator_category_get_type@Base 0.2.91 app_indicator_get_attention_icon@Base 0.2.91 diff --git a/debian/rules b/debian/rules index 69d331c..83ff536 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,7 @@ include /usr/share/dpkg/architecture.mk -#FLAVORS = gtk2 gtk3 -FLAVORS = gtk3 +FLAVOURS = gtk3 gtk2 export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 @@ -18,9 +17,8 @@ ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel armhf i386 mipsel ppc64el s39 else dh_extra_args = ,cli endif -#CONFIGURE_FLAGS_gtk2 = -DENABLE_GTK2=ON -DENABLE_GTK_DOC=ON -#CONFIGURE_FLAGS_gtk3 = -DENABLE_GTK3=ON -DENABLE_GTK_DOC=ON -CONFIGURE_FLAGS_gtk3 = +CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DENABLE_GTKDOC=OFF +CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DENABLE_GTKDOC=ON export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 @@ -29,17 +27,17 @@ CFLAGS += -fPIC %: dh $@ --with gir$(dh_extra_args) -override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) +override_dh_auto_configure: $(FLAVOURS:%=doconfigure-%) doconfigure-%: dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS) -override_dh_auto_build: $(FLAVORS:%=dobuild-%) +override_dh_auto_build: $(FLAVOURS:%=dobuild-%) dobuild-%: dh_auto_build --builddirectory=build/$* -override_dh_auto_install: $(FLAVORS:%=doinstall-%) +override_dh_auto_install: $(FLAVOURS:%=doinstall-%) doinstall-%: dh_auto_install --builddirectory=build/$* --destdir=debian/tmp/$* @@ -49,9 +47,9 @@ override_dh_install: find debian/tmp -name \*.a -exec rm {} \; rm -rf debian/tmp/*/usr/lib/mono rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps - #dh_install -plibayatana-appindicator1 --fail-missing --sourcedir=debian/tmp/gtk2 - #dh_install -pgir1.2-ayatanaappindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2 - #dh_install -plibayatana-appindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibayatana-appindicator1 --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -pgir1.2-ayatanaappindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibayatana-appindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 dh_install -plibayatana-appindicator-doc --fail-missing --sourcedir=debian/tmp/gtk3 dh_install -plibayatana-appindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3 dh_install -plibayatana-appindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3 @@ -59,11 +57,10 @@ override_dh_install: if echo amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 | grep -q $(DEB_HOST_ARCH); then \ dh_install -plibayatana-appindicator3-0.1-cil --fail-missing --sourcedir=debian/tmp/gtk3; \ dh_install -plibayatana-appindicator3-0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk3; \ + dh_install -plibayatana-appindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2; \ + dh_install -plibayatana-appindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2; \ fi - # these belong into above if clause, once GTK-2+ builds are possible again... - # dh_install -plibayatana-appindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2; \ - # dh_install -plibayatana-appindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2; \ - + override_dh_auto_test: mkdir -p $(CURDIR)/debian/tmphome-gtk3/.local/share mkdir -p $(CURDIR)/debian/tmphome-gtk3/.cache -- cgit v1.2.3