[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#906026: marked as done (lightdm-gtk-greeter: Switch to Ayatana Indicators)

Your message dated Wed, 04 Nov 2020 21:10:11 +0100
with message-id <42c56f89874ffb8ab3e542da9301b65394a67e8c.camel@debian.org>
and subject line Re: Bug#906026: Switch to Ayatana Indicators
has caused the Debian Bug report #906026,
regarding lightdm-gtk-greeter: Switch to Ayatana Indicators
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
906026: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906026
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: lightdm-gtk-greeter
Version: 2.0.5-1
Tags: patch
Severity: wishlist
User: pkg-ayatana-devel@lists.alioth.debian.org
Usertags: ayatanaindicators
X-Debbugs-Cc: smd.seandavis@gmail.com, robert.ancell@canonical.com


Dear maintainers of the LightDM GTK Greeter,
please find attached a .debdiff that switches Indicator support in LightDM GTK Greeter to Ayatana Indicators. 

A small team is currently driving forward the development of a project
called Ayatana Indicators. This project has been derived from the
Indicator approach we have seen in Ubuntu now for a while.

Unfortunately, the Ubuntu Indicators are limited to the Ubuntu
distribution, only. With Ayatana Indicators, we are currently
undertaking an effort to make Indicators more portable and usable on
all Linux and non-Linux-but-*nix desktops.
The attached .debdiff provides the required changes to switch over to Ayatana Indicators (quoting myself from debian/changelog): 

```
lightdm-gtk-greeter (2.0.5-1.1) UNRELEASED; urgency=medium

  * Non-maintainer upload.

  * debian/patches:
+ Add ayatana-indicators.patch. Build against Ayatana Indicators rather than 
      deprecated Ubuntu Indicators.
  * debian/rules:
    + Use autogen.sh for autotools reconfiguration.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 13 Aug 2018 12:57:34 +0200 

```
Please consider applying my changes to the package. I have Cc:ed Robert Ancell and Sean Davis, two of the upstream maintainers. 

Thanks for your time!

Mike


--

DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
mobile: +49 (1520) 1976 148
landline: +49 (4354) 8390 139

GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22  0782 9AF4 6B30 2577 1B31
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de


diff -Nru lightdm-gtk-greeter-2.0.5/debian/changelog lightdm-gtk-greeter-2.0.5/debian/changelog
--- lightdm-gtk-greeter-2.0.5/debian/changelog	2018-05-21 15:54:11.000000000 +0200
+++ lightdm-gtk-greeter-2.0.5/debian/changelog	2018-08-13 12:57:34.000000000 +0200
@@ -1,3 +1,15 @@
+lightdm-gtk-greeter (2.0.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+
+  * debian/patches:
+    + Add ayatana-indicators.patch. Build against Ayatana Indicators rather than
+      deprecated Ubuntu Indicators.
+  * debian/rules:
+    + Use autogen.sh for autotools reconfiguration.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 13 Aug 2018 12:57:34 +0200
+
 lightdm-gtk-greeter (2.0.5-1) unstable; urgency=medium
 
   * debian/control: fix URI for Vcs-*
diff -Nru lightdm-gtk-greeter-2.0.5/debian/control lightdm-gtk-greeter-2.0.5/debian/control
--- lightdm-gtk-greeter-2.0.5/debian/control	2018-05-21 15:52:34.000000000 +0200
+++ lightdm-gtk-greeter-2.0.5/debian/control	2018-08-13 12:27:14.000000000 +0200
@@ -9,7 +9,7 @@
                exo-utils,
                intltool,
                libgtk-3-dev,
-               libindicator3-dev,
+               libayatana-indicator3-dev,
                liblightdm-gobject-dev (>= 1.3.5),
                pkg-config
 Standards-Version: 4.1.2
diff -Nru lightdm-gtk-greeter-2.0.5/debian/patches/ayatana-indicators.patch lightdm-gtk-greeter-2.0.5/debian/patches/ayatana-indicators.patch
--- lightdm-gtk-greeter-2.0.5/debian/patches/ayatana-indicators.patch	1970-01-01 01:00:00.000000000 +0100
+++ lightdm-gtk-greeter-2.0.5/debian/patches/ayatana-indicators.patch	2018-08-13 12:57:34.000000000 +0200
@@ -0,0 +1,107 @@
+Description: Build against Ayatana Indicators (rather than deprecated Ubuntu Indicators)
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,15 +57,16 @@
+ dnl Optional dependencies
+ dnl ###########################################################################
+ 
+-INDICATOR_REQUIRED_VERSION=0.3.92
+-INDICATOR_PKG=indicator3-0.4
+-IDO_PKG=libido3-0.1
++INDICATOR_REQUIRED_VERSION=0.6.0
++INDICATOR_PKG=ayatana-indicator3-0.4
++IDO_REQUIRED_VERSION=0.4.0
++IDO_PKG=libayatana-ido3-0.4
+ 
+ dnl ###########################################################################
+ 
+ AC_ARG_ENABLE([libindicator],
+-    AC_HELP_STRING([--enable-libindicator], [Enable libindicator support])
+-    AC_HELP_STRING([--disable-libindicator], [Disable libindicator support]),
++    AC_HELP_STRING([--enable-libindicator], [Enable libayatana-indicator support])
++    AC_HELP_STRING([--disable-libindicator], [Disable libayatana-indicator support]),
+             [], [enable_libindicator=yes])
+ 
+ AS_IF([test "x$enable_libindicator" = "xyes"], [
+@@ -74,14 +75,14 @@
+             have_libindicator=yes
+             INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR_PKG`
+             AC_SUBST(INDICATORDIR)
+-            UNITY_INDICATORDIR="${prefix}/share/unity/indicators"
+-            AC_SUBST(UNITY_INDICATORDIR)
++            AYATANA_INDICATORDIR="${prefix}/share/ayatana/indicators"
++            AC_SUBST(AYATANA_INDICATORDIR)
+             AC_DEFINE([HAVE_LIBINDICATOR], [1], [Define if "$INDICATOR_PKG" is present])
+ 
+             CPPFLAGS_OLD="$CPPFLAGS"
+             CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKG}`
+-            AC_CHECK_HEADER([libindicator/indicator-ng.h],
+-                [AC_DEFINE([HAVE_LIBINDICATOR_NG], [], [Define if "libindicator/indicator-ng.h" is present])],
++            AC_CHECK_HEADER([libayatana-indicator/indicator-ng.h],
++                [AC_DEFINE([HAVE_LIBINDICATOR_NG], [], [Define if "libayatana-indicator/indicator-ng.h" is present])],
+                 [], [-])
+             CPPFLAGS="$CPPFLAGS_OLD"
+         ])
+@@ -97,13 +98,13 @@
+ dnl ###########################################################################
+ 
+ AC_ARG_ENABLE([libido],
+-    AC_HELP_STRING([--enable-libido], [Enable libido support])
+-    AC_HELP_STRING([--disable-libido], [Disable libido support]),
++    AC_HELP_STRING([--enable-libido], [Enable libayatana-ido support])
++    AC_HELP_STRING([--disable-libido], [Disable libayatana-ido support]),
+             [], [enable_libido=yes])
+ 
+ AS_IF([test "x$enable_libido" = "xyes" && test "x$have_libindicator" = "xyes"], [
+     AS_IF([$PKG_CONFIG --exists "$IDO_PKG" >/dev/null 2>&1], [
+-        PKG_CHECK_MODULES([LIBIDO], [$IDO_PKG >= 13.10], [
++        PKG_CHECK_MODULES([LIBIDO], [$IDO_PKG >= $IDO_REQUIRED_VERSION], [
+             AC_DEFINE([HAVE_LIBIDO], [1], [Define if "$IDO_PKG" is present])
+         ])
+     ], [
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -39,7 +39,7 @@
+ 	-DGREETER_DATA_DIR=\""$(datadir)/lightdm-gtk-greeter"\" \
+ 	-DCONFIG_FILE=\""$(sysconfdir)/lightdm/lightdm-gtk-greeter.conf"\" \
+ 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
+-	-DUNITY_INDICATOR_DIR=\""$(UNITY_INDICATORDIR)"\" \
++	-DAYATANA_INDICATOR_DIR=\""$(AYATANA_INDICATORDIR)"\" \
+ 	$(WARN_CFLAGS)
+ 
+ lightdm_gtk_greeter_CFLAGS = \
+--- a/src/lightdm-gtk-greeter.c
++++ b/src/lightdm-gtk-greeter.c
+@@ -35,15 +35,15 @@
+ #include <glib/gslist.h>
+ 
+ #ifdef HAVE_LIBINDICATOR
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ #ifdef HAVE_LIBINDICATOR_NG
+-#include <libindicator/indicator-ng.h>
++#include <libayatana-indicator/indicator-ng.h>
+ #endif
+ #endif
+ 
+ #ifdef HAVE_LIBIDO
+ /* Some indicators need ido library */
+-#include <libido/libido.h>
++#include <libayatana-ido/libayatana-ido.h>
+ #endif
+ 
+ #ifdef HAVE_LIBXKLAVIER
+@@ -1590,9 +1590,9 @@
+         else
+         {   /* service file */
+             if (strchr (names[i], '.'))
+-                path = g_strdup_printf ("%s/%s", UNITY_INDICATOR_DIR, names[i]);
++                path = g_strdup_printf ("%s/%s", AYATANA_INDICATOR_DIR, names[i]);
+             else
+-                path = g_strdup_printf ("%s/com.canonical.indicator.%s", UNITY_INDICATOR_DIR, names[i]);
++                path = g_strdup_printf ("%s/org.ayatana.indicator.%s", AYATANA_INDICATOR_DIR, names[i]);
+             io = INDICATOR_OBJECT (indicator_ng_new_for_profile (path, "desktop_greeter", NULL));
+         }
+         #endif
diff -Nru lightdm-gtk-greeter-2.0.5/debian/patches/series lightdm-gtk-greeter-2.0.5/debian/patches/series
--- lightdm-gtk-greeter-2.0.5/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ lightdm-gtk-greeter-2.0.5/debian/patches/series	2018-08-13 11:22:13.000000000 +0200
@@ -0,0 +1 @@
+ayatana-indicators.patch
diff -Nru lightdm-gtk-greeter-2.0.5/debian/rules lightdm-gtk-greeter-2.0.5/debian/rules
--- lightdm-gtk-greeter-2.0.5/debian/rules	2018-05-21 15:52:34.000000000 +0200
+++ lightdm-gtk-greeter-2.0.5/debian/rules	2018-08-13 12:57:34.000000000 +0200
@@ -4,7 +4,8 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	NOCONFIGURE=1 ./autogen.sh
+	dh_auto_configure $(DHFLAGS) -- \
 		--disable-silent-rules \
 		--enable-kill-on-sigterm \
 		--disable-Werror \
@@ -14,4 +15,4 @@
 	dh_install debian/01_debian.conf usr/share/lightdm/lightdm-gtk-greeter.conf.d/
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --without autoreconf

Attachment: pgp4Q3JQ0GKsU.pgp
Description: Digitale PGP-Signatur


--- End Message ---
--- Begin Message --- 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Version: 2.0.8-2

On Sun, 2020-03-01 at 17:24 +0100, Yves-Alexis Perez wrote:
> On Thu, 2020-02-13 at 13:11 +0100, Andreas Henriksson wrote:
> > Control: severity -1 serious
> > 
> > Hello XFCE Maintainers,
> > 
> > I'm bumping the severity of this bug report because the libindicators
> > package in RC buggy and likely not going to make it for bullseye,
> > plus the fact that this bug report has been open with patch for >1.5
> > years now! Apparently it needs some extra visibility or likely an NMU.
> > 
> > 
> Hi Andreas and Mike,
> 
> rather than a patch on the bug, would you be able to provide a merge request
> against the package on Salsa (
> https://salsa.debian.org/xfce-extras-team/lightdm-gtk-greeter)? I think it'd
> be easier for me to reply there.
> 
So I fumbled the changelog but this should be ok with 2.0.8-2.

Regards,
- -- 
Yves-Alexis
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEE8vi34Qgfo83x35gF3rYcyPpXRFsFAl+jCqMACgkQ3rYcyPpX
RFua9Af/YnwLMTT4SXw+ZR6OlpWi/c2h0Y3ARNyQNDnpkXNmiBbr1Jz2u4E7SNmY
MopwfXxsJuN3fncHuRRF69e4dNvYQKav33Ev0KEL5dTDMYngfNXDRZsoZqd3LaIY
x75k1uNJmhm5UnlC0HKlLktNUkH/tdApOm0ZVYlPfG1xMHRyp3Im423+Tx/Dgui5
oF8AwP9SUJSI35p2B+mazPSZlW9rf+yutwoRWJNYjHQkvUxxhtCZoIdTSsSf4pgp
lkYPCsg3NnFf6awQMuUqQAPFQiFJk17XU6DDGdoa0witeQPh28u/5gylWnW7ldzl
LKiYn3o2cNhrWj7ERfimXbl42FNbCg==
=msS+
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: