diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0105-spelling_errors.patch | 13 | ||||
| -rw-r--r-- | debian/patches/0700-ayatana-appindicator.patch | 77 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
5 files changed, 100 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4568cc9..7d98bd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ gnome-pie (0.7.1-2) UNRELEASED; urgency=medium * New debian/patches/0100-fix-ftbfs_vala_0_42.patch to fix FTBFS - with vala 0.42. + with vala 0.42 (Closes: #907943). + * Switch to Ayatana AppIndicator (Closes: #907551): + - New debian/patches/0700-ayatana-appindicator.patch. + - debian/control: + + Switch build depends from libappindicator3-dev to + libayatana-appindicator3-dev. + Thanks to Mike Gabriel <mike.gabriel@das-netzwerkteam.de>. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. - debian/control: - + Bump minimum debhelper version to >= 11. + + Bump minimum debhelper version to >= 11. * Declare compliance with Debian Policy 4.2.1 (No changes needed). * New debian/patches/0105-spelling_errors.patch to fix spelling errors. * debian/control: diff --git a/debian/control b/debian/control index ffd9e1e..db9684f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: debhelper (>= 11), cmake, - libappindicator3-dev, + libayatana-appindicator3-dev, libarchive-dev, libcairo2-dev, libgee-0.8-dev (>= 0.10), diff --git a/debian/patches/0105-spelling_errors.patch b/debian/patches/0105-spelling_errors.patch index d197a4e..3fefbb5 100644 --- a/debian/patches/0105-spelling_errors.patch +++ b/debian/patches/0105-spelling_errors.patch @@ -575,3 +575,16 @@ Index: trunk/src/gui/preferencesWindow.vala result = Gtk.MessageType.ERROR; } a.close(); +Index: trunk/src/themes/theme.vala +=================================================================== +--- trunk.orig/src/themes/theme.vala ++++ trunk/src/themes/theme.vala +@@ -173,7 +173,7 @@ public class Theme : GLib.Object { + dialog.destroy(); + + } else { +- var message = _("An error occured while exporting the theme \"%s\"! Please check the console output.").printf(this.name); ++ var message = _("An error occurred while exporting the theme \"%s\"! Please check the console output.").printf(this.name); + var dialog = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, + Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, message); + dialog.run(); diff --git a/debian/patches/0700-ayatana-appindicator.patch b/debian/patches/0700-ayatana-appindicator.patch new file mode 100644 index 0000000..d8a9905 --- /dev/null +++ b/debian/patches/0700-ayatana-appindicator.patch @@ -0,0 +1,77 @@ +Description: Switch to Ayatana AppIndicator +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907551 +Forwarded: not-needed +Last-Update: 2018-09-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,7 @@ + find_package(PkgConfig) + + pkg_check_modules(GTK3 REQUIRED gtk+-3.0) +-pkg_check_modules(INDICATOR3 appindicator3-0.1) ++pkg_check_modules(INDICATOR3 ayatana-appindicator3-0.1) + pkg_check_modules(WNCK REQUIRED libwnck-3.0) + pkg_check_modules(BAMF libbamf3) + pkg_check_modules(GIO REQUIRED gio-unix-2.0) +@@ -75,11 +75,7 @@ + pkg_check_modules(GMENU REQUIRED libgnome-menu) + endif (${GMENU3_FOUND}) + +-# notify application of presence of libappindicator +-if (${INDICATOR_FOUND}) +- LIST(APPEND CFLAGS -DHAVE_APPINDICATOR) +- LIST(APPEND VALA_DEFINES --define HAVE_APPINDICATOR) +-endif (${INDICATOR_FOUND}) ++# notify application of presence of libayatana-appindicator + if (${INDICATOR3_FOUND}) + LIST(APPEND CFLAGS -DHAVE_APPINDICATOR) + LIST(APPEND VALA_DEFINES --define HAVE_APPINDICATOR) +@@ -97,7 +93,6 @@ + ${GTK3_LIBRARIES} + ${CAIRO_LIBRARIES} + ${GEE_LIBRARIES} +- ${INDICATOR_LIBRARIES} + ${INDICATOR3_LIBRARIES} + ${XML_LIBRARIES} + ${XTST_LIBRARIES} +@@ -117,7 +112,6 @@ + ${GTK3_LIBRARY_DIRS} + ${CAIRO_LIBRARY_DIRS} + ${GEE_LIBRARY_DIRS} +- ${INDICATOR_LIBRARY_DIRS} + ${INDICATOR3_LIBRARY_DIRS} + ${XML_LIBRARY_DIRS} + ${XTST_LIBRARY_DIRS} +@@ -134,7 +128,6 @@ + ${GTK3_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ${GEE_INCLUDE_DIRS} +- ${INDICATOR_INCLUDE_DIRS} + ${INDICATOR3_INCLUDE_DIRS} + ${XML_INCLUDE_DIRS} + ${XTST_INCLUDE_DIRS} +@@ -166,12 +159,8 @@ + libarchive + ) + +-if (${INDICATOR_FOUND}) +- LIST(APPEND VALA_PKGS appindicator-0.1) +-endif (${INDICATOR_FOUND}) +- + if (${INDICATOR3_FOUND}) +- LIST(APPEND VALA_PKGS appindicator3-0.1) ++ LIST(APPEND VALA_PKGS ayatana-appindicator3-0.1) + endif (${INDICATOR3_FOUND}) + + if (${GMENU3_FOUND}) +@@ -210,7 +199,6 @@ + message( " GTK3_LIBRARIES = ${GTK3_LIBRARIES}" ) + message( " CAIRO_LIBRARIES = ${CAIRO_LIBRARIES}" ) + message( " GEE_LIBRARIES = ${GEE_LIBRARIES}" ) +-message( " INDICATOR_LIBRARIES = ${INDICATOR_LIBRARIES}" ) + message( " INDICATOR3_LIBRARIES = ${INDICATOR3_LIBRARIES}" ) + message( " XML_LIBRARIES = ${XML_LIBRARIES}" ) + message( " XTST_LIBRARIES = ${XTST_LIBRARIES}" ) diff --git a/debian/patches/series b/debian/patches/series index bf9f7e0..5d085d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ #0500_bamf3-vapi.patch +0700-ayatana-appindicator.patch 0105-spelling_errors.patch 0100-fix-ftbfs_vala_0_42.patch |