Re: pkg/45239: x11/startup-notification fails to find x11_xcb when using native X.Org

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,gls%NetBSD.org@localhost
Subject: Re: pkg/45239: x11/startup-notification fails to find x11_xcb when using native X.Org
From: Robert Elz <kre%munnari.OZ.AU@localhost>
Date: Thu, 2 Feb 2012 11:00:10 +0000 (UTC)
The following reply was made to PR pkg/45239; it has been noted by GNATS.

From: Robert Elz <kre%munnari.OZ.AU@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/45239: x11/startup-notification fails to find x11_xcb when 
using native X.Org
Date: Thu, 02 Feb 2012 17:57:22 +0700

     Date:        Sat,  5 Nov 2011 14:30:05 +0000 (UTC)
     From:        David Holland <dholland-pbugs%NetBSD.org@localhost>
     Message-ID:  <20111105143005.553BD63B8DB%www.NetBSD.org@localhost>
 
   |  It would be nice to get xcb into -5's native X, but it's not trivial...
 
 Whether or not that's a good idea, it doesn't actually solve the problem
 as there's nothing that can be done that way for people using 5.0 or 5.1
 (or the forthcoming 5.1.2) which are the most recent actual releases.
 Having something newer in 5.2 might be a good thing, but pkgsrc is supposed
 to still support the last 2 actual NetBSD major releases (that's 4.0 and
 5.0 right now), so a fix that works for them (in pkgsrc) is needed.
 
 I sent a patch/fix to tech-pkg back in November, but it was ignored
 (not even a comment on it I don't think), so after seeing yet another
 cry for help, I thought I should send it to gnats too, so the necessary
 patch is appended here.
 
 See http://mail-index.netbsd.org/tech-pkg/2011/11/09/msg007933.html
 (the message to tech-pkg from Nov 9 last year) for the full explanation
 of all of this.
 
 kre
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #      startup-notification/buildlink3.mk
 #      startup-notification010/DESCR
 #      startup-notification010/Makefile
 #      startup-notification010/PLIST
 #      startup-notification010/distinfo
 #      startup-notification010/patches
 #      startup-notification010/patches/patch-aa
 #      startup-notification010/patches/patch-ab
 #
 echo x - startup-notification/buildlink3.mk
 sed 's/^X//' >startup-notification/buildlink3.mk << 
'END-of-startup-notification/buildlink3.mk'
 X# $NetBSD: buildlink3.mk,v 1.11 2009/11/08 18:59:56 jakllsch Exp $
 X
 XBUILDLINK_TREE+=      startup-notification
 X
 X.if !defined(STARTUP_NOTIFICATION_BUILDLINK3_MK)
 XSTARTUP_NOTIFICATION_BUILDLINK3_MK:=
 X
 XBUILDLINK_API_DEPENDS.startup-notification+=  startup-notification>=0.5
 XBUILDLINK_ABI_DEPENDS.startup-notification+=  startup-notification>=0.8nb1
 X
 X.include "../../mk/bsd.fast.prefs.mk"
 X.if ${X11_TYPE} == "modular"
 XBUILDLINK_PKGSRCDIR.startup-notification?=    ../../x11/startup-notification
 X.else
 X.if ${OPSYS} == "NetBSD"
 X.if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*)
 XBUILDLINK_PKGSRCDIR.startup-notification?=    ../../x11/startup-notification
 X.else
 XBUILDLINK_PKGSRCDIR.startup-notification?=    
../../x11/startup-notification010
 X.endif
 X.else #!NetBSD
 XBUILDLINK_PKGSRCDIR.startup-notification?=    ../../x11/startup-notification
 X.endif
 X.endif
 X
 X.include "../../x11/libSM/buildlink3.mk"
 X.include "../../x11/libX11/buildlink3.mk"
 X.include "../../x11/libxcb/buildlink3.mk"
 X.include "../../x11/xcb-util/buildlink3.mk"
 X.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
 X
 XBUILDLINK_TREE+=      -startup-notification
 END-of-startup-notification/buildlink3.mk
 echo x - startup-notification010/DESCR
 sed 's/^X//' >startup-notification010/DESCR << 
'END-of-startup-notification010/DESCR'
 Xstartup-notification provides mechanisms allowing a desktop environment to
 Xtrack application startup, to provide user feedback and other features.
 X
 XThis is an older version to allow compatability with native X11 in
 XNetBSD 5 and earlier (pre xcb).
 END-of-startup-notification010/DESCR
 echo x - startup-notification010/Makefile
 sed 's/^X//' >startup-notification010/Makefile << 
'END-of-startup-notification010/Makefile'
 X# $NetBSD$
 X
 XDISTNAME=             startup-notification-0.10
 XCATEGORIES=           x11
 XMASTER_SITES=         
http://www.freedesktop.org/software/startup-notification/releases/
 XPKGREVISION=          1
 X
 XMAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 XHOMEPAGE=             
http://www.freedesktop.org/wiki/Software/startup-notification
 XCOMMENT=              X11 application startup notification library
 XLICENSE=              mit AND gnu-lgpl-v2.1
 X
 XPKG_INSTALLATION_TYPES=       overwrite pkgviews
 XPKG_DESTDIR_SUPPORT=  user-destdir
 X
 XUSE_TOOLS+=           pkg-config
 XGNU_CONFIGURE=                yes
 XUSE_LIBTOOL=          yes
 X
 XPKGCONFIG_OVERRIDE=   libstartup-notification-1.0.pc.in
 X
 XDOCDIR=                       ${PREFIX}/share/doc/startup-notification
 XINSTALLATION_DIRS+=   ${DOCDIR}
 X
 Xpost-install:
 X      cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING ChangeLog NEWS \
 X              doc/startup-notification.txt ${DESTDIR}${DOCDIR}
 X
 XBUILDLINK_DEPMETHOD.libXt?=   build
 X
 X.include "../../x11/libSM/buildlink3.mk"
 X.include "../../x11/libX11/buildlink3.mk"
 X.include "../../x11/libXt/buildlink3.mk"
 X.include "../../x11/libxcb/buildlink3.mk"
 X.include "../../x11/xcb-util/buildlink3.mk"
 X.include "../../mk/bsd.pkg.mk"
 END-of-startup-notification010/Makefile
 echo x - startup-notification010/PLIST
 sed 's/^X//' >startup-notification010/PLIST << 
'END-of-startup-notification010/PLIST'
 X@comment $NetBS$
 Xinclude/startup-notification-1.0/libsn/sn-common.h
 Xinclude/startup-notification-1.0/libsn/sn-launchee.h
 Xinclude/startup-notification-1.0/libsn/sn-launcher.h
 Xinclude/startup-notification-1.0/libsn/sn-monitor.h
 Xinclude/startup-notification-1.0/libsn/sn-util.h
 Xinclude/startup-notification-1.0/libsn/sn.h
 Xlib/libstartup-notification-1.la
 Xlib/pkgconfig/libstartup-notification-1.0.pc
 Xshare/doc/startup-notification/AUTHORS
 Xshare/doc/startup-notification/COPYING
 Xshare/doc/startup-notification/ChangeLog
 Xshare/doc/startup-notification/NEWS
 Xshare/doc/startup-notification/startup-notification.txt
 END-of-startup-notification010/PLIST
 echo x - startup-notification010/distinfo
 sed 's/^X//' >startup-notification010/distinfo << 
'END-of-startup-notification010/distinfo'
 X$NetBSD$
 X
 XSHA1 (startup-notification-0.10.tar.gz) = 
670c5e44f59e3844e2ca0c67730ba9ca5f5228fc
 XRMD160 (startup-notification-0.10.tar.gz) = 
de905634db3263d24b69ae42887111b7ff95b3ba
 XSize (startup-notification-0.10.tar.gz) = 328787 bytes
 XSHA1 (patch-aa) = 71748b823916667c59af680371d31b03f56a2177
 XSHA1 (patch-ab) = ec8c08bb3ce2cf0db23d6949e95ccf88c149d1cc
 END-of-startup-notification010/distinfo
 echo c - startup-notification010/patches
 mkdir -p startup-notification010/patches > /dev/null 2>&1
 echo x - startup-notification010/patches/patch-aa
 sed 's/^X//' >startup-notification010/patches/patch-aa << 
'END-of-startup-notification010/patches/patch-aa'
 X$NetBSD$
 X
 X--- libsn/sn-monitor.c        2009-04-03 17:57:27.000000000 +0700
 X+++ libsn/sn-monitor.c        2011-05-05 16:34:34.000000000 +0700
 X@@ -66,7 +66,8 @@
 X   Time timestamp;
 X 
 X   char *binary_name;
 X-  char *icon_name;  
 X+  char *icon_name;
 X+  char *application_id;
 X 
 X   unsigned int completed : 1;
 X   unsigned int canceled : 1;
 X@@ -269,7 +270,8 @@
 X       sn_free (sequence->wmclass);
 X       sn_free (sequence->binary_name);
 X       sn_free (sequence->icon_name);
 X-      
 X+      sn_free (sequence->application_id);
 X+
 X       sn_display_unref (sequence->display);
 X       sn_free (sequence);
 X     }
 X@@ -337,6 +339,12 @@
 X   return sequence->icon_name;
 X }
 X 
 X+const char*
 X+sn_startup_sequence_get_application_id (SnStartupSequence *sequence)
 X+{
 X+  return sequence->application_id;
 X+}
 X+
 X int
 X sn_startup_sequence_get_screen (SnStartupSequence *sequence)
 X {
 X@@ -805,10 +813,18 @@
 X                   changed = TRUE;
 X                 }
 X             }
 X+          else if (strcmp (names[i], "APPLICATION_ID") == 0)
 X+            {
 X+              if (sequence->application_id == NULL)
 X+                {
 X+                  sequence->application_id = sn_internal_strdup (values[i]);
 X+                  changed = TRUE;
 X+                }
 X+            }
 X           else if (strcmp (names[i], "DESKTOP") == 0)
 X             {
 X               int workspace;
 X-              
 X+
 X               workspace = sn_internal_string_to_ulong (values[i]);
 X 
 X               sequence->workspace = workspace;
 END-of-startup-notification010/patches/patch-aa
 echo x - startup-notification010/patches/patch-ab
 sed 's/^X//' >startup-notification010/patches/patch-ab << 
'END-of-startup-notification010/patches/patch-ab'
 X$NetBSD$
 X
 X--- libsn/sn-monitor.h        2009-04-03 17:11:34.000000000 +0700
 X+++ libsn/sn-monitor.h        2010-03-26 20:35:05.000000000 +0700
 X@@ -73,6 +73,7 @@
 X const char* sn_startup_sequence_get_wmclass               (SnStartupSequence 
*sequence);
 X const char* sn_startup_sequence_get_binary_name           (SnStartupSequence 
*sequence);
 X const char* sn_startup_sequence_get_icon_name             (SnStartupSequence 
*sequence);
 X+const char* sn_startup_sequence_get_application_id        (SnStartupSequence 
*sequence);
 X int         sn_startup_sequence_get_screen                (SnStartupSequence 
*sequence);
 X 
 X void        sn_startup_sequence_get_initiated_time        (SnStartupSequence 
*sequence,
 END-of-startup-notification010/patches/patch-ab
 exit
Prev by Date: Re: pkg/45722 (More Net::Layer support modules missing from pkgsrc)
Next by Date: PR/45725 CVS commit: pkgsrc/lang/ghc
Previous by Thread: Re: pkg/45239: x11/startup-notification fails to find x11_xcb when using native X.Org
Next by Thread: Re: pkg/45239: x11/startup-notification fails to find x11_xcb when using native X.Org
Indexes:
Home | Main Index | Thread Index | Old Index