WANTLIB fixes for GNOME3

2011-06-16 Thread Amit Kulkarni
Hi,

While experiencing repeated builds using dpb for epiphany, desktop, 
icon-theme, found that WANTLIB needs to be synced.I checked others in 
gnome3 folder and found the same problem.

And remmebering that Nigel had posted something similar a few days 
ago.
http://marc.info/?l=openbsd-portsm=130796814517820w=2

These patches are similar. lib-depends-check is asking for X11-xcb so I 
put it in there. all of them remove xcb-atom and xcb-event from WANTLIB. 
Some complain about ICE and SM.

I am cc'ing to ports@ because I think that these WANTLIB might be present 
elsewhere if anybody has time to look. Nigel posted in eog for GNOME2, and 
it is present in eog for GNOME3 also.

Thanks,
amit



Index: Makefile
===
RCS file: /cvs/ports/x11/gnome3/x11/gnome/nautilus/Makefile,v
retrieving revision 1.5
diff -u Makefile
--- Makefile16 Jun 2011 12:50:49 -  1.5
+++ Makefile16 Jun 2011 19:44:10 -
@@ -18,7 +18,7 @@
 GNOME_PROJECT= nautilus
 GNOME_VERSION= 3.0.2
 
-REVISION=  1
+REVISION=  2
 
 SHARED_LIBS +=  nautilus-extension   3.0  # 5.0
 
@@ -39,7 +39,7 @@
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gobject-2.0
 WANTLIB += gthread-2.0 gtk-3 m notify pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += startup-notification-1 xcb xcb-atom xcb-aux xcb-event
+WANTLIB += startup-notification-1 xcb xcb-aux
 WANTLIB += xcb-render xcb-shm xml2 z X11-xcb
 
 MODULES=   devel/gettext \


Index: Makefile
===
RCS file: /cvs/ports/x11/gnome3/x11/gnome/settings-daemon/Makefile,v
retrieving revision 1.5
diff -u Makefile
--- Makefile28 May 2011 08:15:53 -  1.5
+++ Makefile16 Jun 2011 19:44:30 -
@@ -7,7 +7,7 @@
 GNOME_PROJECT= gnome-settings-daemon
 GNOME_VERSION= 3.0.2
 
-REVISION=  0
+REVISION=  1
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=  Yes
@@ -25,7 +25,7 @@
 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += plc4 plds4 png polkit-gobject-1 pthread pthread-stubs
 WANTLIB += smime3 softokn3 sqlite3 ssl ssl3 startup-notification-1
-WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xkbfile
+WANTLIB += xcb X11-xcb xcb-aux xcb-render xcb-shm xkbfile
 WANTLIB += xklavier xml2 z X11-xcb
 
 MODULES=   devel/gettext \
Index: Makefile
===
RCS file: /cvs/ports/x11/gnome3/x11/gnome/panel/Makefile,v
retrieving revision 1.8
diff -u Makefile
--- Makefile8 Jun 2011 18:15:41 -   1.8
+++ Makefile16 Jun 2011 19:44:44 -
@@ -7,7 +7,7 @@
 GNOME_PROJECT= gnome-panel
 GNOME_VERSION= 3.0.2
 
-REVISION=  3
+REVISION=  4
 
 SHARED_LIBS=   panel-applet-40.0 # 0.0
 
@@ -31,8 +31,8 @@
 WANTLIB += nss3 nssutil3 pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
 WANTLIB += rsvg-2 smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3
-WANTLIB += startup-notification-1 telepathy-glib wnck-3 xcb xcb-atom
-WANTLIB += xcb-aux xcb-event xcb-render xcb-shm xml2 z
+WANTLIB += startup-notification-1 telepathy-glib wnck-3 xcb X11-xcb
+WANTLIB += xcb-aux xcb-render xcb-shm xml2 z
 
 MODULES=   devel/dconf \
devel/gconf2 \
Index: Makefile
===
RCS file: /cvs/ports/x11/gnome3/x11/gnome/controlcenter/Makefile,v
retrieving revision 1.1.1.1
diff -u Makefile
--- Makefile16 Jun 2011 10:07:57 -  1.1.1.1
+++ Makefile16 Jun 2011 19:45:00 -
@@ -6,6 +6,7 @@
 
 GNOME_PROJECT= gnome-control-center
 GNOME_VERSION= 3.0.2
+REVISION=  1
 
 SHARED_LIBS +=  gnome-control-center  0.0 # 1.0
 
@@ -26,7 +27,7 @@
 WANTLIB += gssapi gthread-2.0 gtk-3 gtop-2.0 krb5 kvm m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png polkit-gobject-1
 WANTLIB += pthread pthread-stubs ssl startup-notification-1 upower-glib
-WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xkbfile
+WANTLIB += xcb xcb-aux xcb-render xcb-shm xkbfile
 WANTLIB += xklavier xml2 z
 
 MODULES=   devel/gettext \
Index: Makefile
===
RCS file: /cvs/ports/x11/gnome3/x11/gnome/eog/Makefile,v
retrieving revision 1.5
diff -u Makefile
--- Makefile8 Jun 2011 18:15:41 -   1.5
+++ Makefile16 Jun 2011 19:45:15 -
@@ -7,7 +7,7 @@
 GNOME_PROJECT= eog
 GNOME_VERSION= 3.0.2
 
-REVISION=  1
+REVISION=  2
 
 CATEGORIES=graphics
 
@@ -17,7 +17,7 @@
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender 

Re: WANTLIB fixes for GNOME3

2011-06-16 Thread Antoine Jacoutot
On Thu, 16 Jun 2011, Amit Kulkarni wrote:

 Hi,
 
 While experiencing repeated builds using dpb for epiphany, desktop, 
 icon-theme, found that WANTLIB needs to be synced.I checked others in 
 gnome3 folder and found the same problem.
 
 And remmebering that Nigel had posted something similar a few days 
 ago.
 http://marc.info/?l=openbsd-portsm=130796814517820w=2
 
 These patches are similar. lib-depends-check is asking for X11-xcb so I 
 put it in there. all of them remove xcb-atom and xcb-event from WANTLIB. 
 Some complain about ICE and SM.
 
 I am cc'ing to ports@ because I think that these WANTLIB might be present 
 elsewhere if anybody has time to look. Nigel posted in eog for GNOME2, and 
 it is present in eog for GNOME3 also.

x11/gnome3 is not to be touched for now. The merge from gnome3 to the 
main ports tree is not schedule before September and lots of things will 
be modified until then.


 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnome3/x11/gnome/nautilus/Makefile,v
 retrieving revision 1.5
 diff -u Makefile
 --- Makefile  16 Jun 2011 12:50:49 -  1.5
 +++ Makefile  16 Jun 2011 19:44:10 -
 @@ -18,7 +18,7 @@
  GNOME_PROJECT=   nautilus
  GNOME_VERSION=   3.0.2
  
 -REVISION=1
 +REVISION=2
  
  SHARED_LIBS +=  nautilus-extension   3.0  # 5.0
  
 @@ -39,7 +39,7 @@
  WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gobject-2.0
  WANTLIB += gthread-2.0 gtk-3 m notify pango-1.0 pangocairo-1.0
  WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
 -WANTLIB += startup-notification-1 xcb xcb-atom xcb-aux xcb-event
 +WANTLIB += startup-notification-1 xcb xcb-aux
  WANTLIB += xcb-render xcb-shm xml2 z X11-xcb
  
  MODULES= devel/gettext \
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnome3/x11/gnome/settings-daemon/Makefile,v
 retrieving revision 1.5
 diff -u Makefile
 --- Makefile  28 May 2011 08:15:53 -  1.5
 +++ Makefile  16 Jun 2011 19:44:30 -
 @@ -7,7 +7,7 @@
  GNOME_PROJECT=   gnome-settings-daemon
  GNOME_VERSION=   3.0.2
  
 -REVISION=0
 +REVISION=1
  
  # GPLv3
  PERMIT_PACKAGE_CDROM=Yes
 @@ -25,7 +25,7 @@
  WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
  WANTLIB += plc4 plds4 png polkit-gobject-1 pthread pthread-stubs
  WANTLIB += smime3 softokn3 sqlite3 ssl ssl3 startup-notification-1
 -WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xkbfile
 +WANTLIB += xcb X11-xcb xcb-aux xcb-render xcb-shm xkbfile
  WANTLIB += xklavier xml2 z X11-xcb
  
  MODULES= devel/gettext \
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnome3/x11/gnome/panel/Makefile,v
 retrieving revision 1.8
 diff -u Makefile
 --- Makefile  8 Jun 2011 18:15:41 -   1.8
 +++ Makefile  16 Jun 2011 19:44:44 -
 @@ -7,7 +7,7 @@
  GNOME_PROJECT=   gnome-panel
  GNOME_VERSION=   3.0.2
  
 -REVISION=3
 +REVISION=4
  
  SHARED_LIBS= panel-applet-40.0 # 0.0
  
 @@ -31,8 +31,8 @@
  WANTLIB += nss3 nssutil3 pango-1.0 pangocairo-1.0 pangoft2-1.0
  WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
  WANTLIB += rsvg-2 smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3
 -WANTLIB += startup-notification-1 telepathy-glib wnck-3 xcb xcb-atom
 -WANTLIB += xcb-aux xcb-event xcb-render xcb-shm xml2 z
 +WANTLIB += startup-notification-1 telepathy-glib wnck-3 xcb X11-xcb
 +WANTLIB += xcb-aux xcb-render xcb-shm xml2 z
  
  MODULES= devel/dconf \
   devel/gconf2 \
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnome3/x11/gnome/controlcenter/Makefile,v
 retrieving revision 1.1.1.1
 diff -u Makefile
 --- Makefile  16 Jun 2011 10:07:57 -  1.1.1.1
 +++ Makefile  16 Jun 2011 19:45:00 -
 @@ -6,6 +6,7 @@
  
  GNOME_PROJECT=   gnome-control-center
  GNOME_VERSION=   3.0.2
 +REVISION=1
  
  SHARED_LIBS +=  gnome-control-center  0.0 # 1.0
  
 @@ -26,7 +27,7 @@
  WANTLIB += gssapi gthread-2.0 gtk-3 gtop-2.0 krb5 kvm m pango-1.0
  WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png polkit-gobject-1
  WANTLIB += pthread pthread-stubs ssl startup-notification-1 upower-glib
 -WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xkbfile
 +WANTLIB += xcb xcb-aux xcb-render xcb-shm xkbfile
  WANTLIB += xklavier xml2 z
  
  MODULES= devel/gettext \
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnome3/x11/gnome/eog/Makefile,v
 retrieving revision 1.5
 diff -u Makefile
 --- Makefile  8 Jun 2011 18:15:41 -   1.5
 +++ Makefile  16 Jun 2011 19:45:15 -
 @@ -7,7 +7,7 @@
  GNOME_PROJECT=   eog
  GNOME_VERSION=