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-ports&m=130796814517820&w=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 -0000 1.5
> +++ Makefile 16 Jun 2011 19:44:10 -0000
> @@ -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 -0000 1.5
> +++ Makefile 16 Jun 2011 19:44:30 -0000
> @@ -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 -0000 1.8
> +++ Makefile 16 Jun 2011 19:44:44 -0000
> @@ -7,7 +7,7 @@
> GNOME_PROJECT= gnome-panel
> GNOME_VERSION= 3.0.2
>
> -REVISION= 3
> +REVISION= 4
>
> SHARED_LIBS= panel-applet-4 0.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 -0000 1.1.1.1
> +++ Makefile 16 Jun 2011 19:45:00 -0000
> @@ -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 -0000 1.5
> +++ Makefile 16 Jun 2011 19:45:15 -0000
> @@ -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 Xxf86vm atk-1.0
> WANTLIB += c cairo cairo-gobject croco-0.6 dbus-1 dbus-glib-1
> WANTLIB += drm execinfo exempi exif expat ffi fontconfig freetype gdk-3
> @@ -25,7 +25,7 @@
> WANTLIB += gnome-desktop-3 gobject-2.0 gthread-2.0 gtk-3 jpeg
> WANTLIB += lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre peas-1.0
> WANTLIB += peas-gtk-1.0 pixman-1 png pthread pthread-stubs rsvg-2
> -WANTLIB += startup-notification-1 xcb xcb-atom xcb-aux xcb-event
> +WANTLIB += startup-notification-1 xcb xcb-aux X11-xcb
> WANTLIB += xcb-render xcb-shm xml2 z
>
> MODULES= devel/dconf \
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome3/www/epiphany/Makefile,v
> retrieving revision 1.4
> diff -u Makefile
> --- Makefile 28 May 2011 08:15:53 -0000 1.4
> +++ Makefile 16 Jun 2011 19:45:43 -0000
> @@ -12,7 +12,7 @@
> GNOME_PROJECT= epiphany
> GNOME_VERSION= 3.0.3
>
> -REVISION= 4
> +REVISION= 5
>
> M= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
> SUBST_VARS= M
> @@ -41,7 +41,7 @@
> WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
> WANTLIB += png pthread pthread-stubs seed-gtk3 soup-2.4 soup-gnome-2.4
> WANTLIB += sqlite3 startup-notification-1 stdc++ webkitgtk-3.0
> -WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xml2
> +WANTLIB += xcb X11-xcb xcb-aux xcb-render xcb-shm xml2
> WANTLIB += xslt z
>
> BUILD_DEPENDS= ${RUN_DEPENDS}
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome3/x11/gnome/screensaver/Makefile,v
> retrieving revision 1.3
> diff -u Makefile
> --- Makefile 13 Jun 2011 05:24:32 -0000 1.3
> +++ Makefile 16 Jun 2011 19:56:53 -0000
> @@ -5,7 +5,7 @@
> GNOME_PROJECT= gnome-screensaver
> GNOME_VERSION= 3.0.0
>
> -REVISION= 1
> +REVISION= 2
>
> # GPLv3
> PERMIT_PACKAGE_CDROM= Yes
> @@ -21,7 +21,7 @@
> WANTLIB += gnomekbd gnomekbdui gobject-2.0 gthread-2.0 gtk-3 m
> WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
> WANTLIB += png pthread pthread-stubs startup-notification-1 xcb
> -WANTLIB += xcb-atom xcb-aux xcb-event xcb-render xcb-shm xkbfile
> +WANTLIB += xcb-aux xcb-render xcb-shm xkbfile
> WANTLIB += xklavier xml2 z
>
> MODULES= devel/gettext \
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome3/x11/gnome/system-monitor/Makefile,v
> retrieving revision 1.3
> diff -u Makefile
> --- Makefile 14 Jun 2011 21:56:13 -0000 1.3
> +++ Makefile 16 Jun 2011 20:02:02 -0000
> @@ -5,7 +5,7 @@
> GNOME_PROJECT= gnome-system-monitor
> GNOME_VERSION= 3.0.1
>
> -REVISION= 1
> +REVISION= 2
>
> CATEGORIES= sysutils
>
> @@ -15,7 +15,7 @@
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> -WANTLIB += GL ICE SM X11 XRes Xau Xcomposite Xcursor Xdamage Xdmcp
> +WANTLIB += GL X11 XRes Xau Xcomposite Xcursor Xdamage Xdmcp
> WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
> WANTLIB += atkmm-1.6 c cairo cairo-gobject cairomm-1.0 croco-0.6
> WANTLIB += drm execinfo expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
> @@ -23,8 +23,8 @@
> WANTLIB += gobject-2.0 gthread-2.0 gtk-3 gtkmm-3.0 gtop-2.0 kvm
> WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
> WANTLIB += pcre pixman-1 png pthread pthread-stubs rsvg-2 sigc-2.0
> -WANTLIB += startup-notification-1 stdc++ wnck-3 xcb xcb-atom xcb-aux
> -WANTLIB += xcb-event xcb-render xcb-shm xml2 z
> +WANTLIB += startup-notification-1 stdc++ wnck-3 xcb X11-xcb xcb-aux
> +WANTLIB += xcb-render xcb-shm xml2 z
>
> MODULES= devel/dconf \
> devel/gettext \
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome3/x11/gnome/nautilus-open-terminal/Makefile,v
> retrieving revision 1.1.1.1
> diff -u Makefile
> --- Makefile 30 May 2011 18:32:29 -0000 1.1.1.1
> +++ Makefile 16 Jun 2011 20:04:04 -0000
> @@ -7,6 +7,7 @@
>
> GNOME_PROJECT= nautilus-open-terminal
> GNOME_VERSION= 0.19
> +REVISION= 1
>
> CATEGORIES= sysutils
>
> @@ -16,14 +17,14 @@
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> -WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
> +WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage
> WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
> WANTLIB += atk-1.0 cairo cairo-gobject drm execinfo expat fontconfig
> WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
> WANTLIB += gnome-desktop-3 gobject-2.0 gthread-2.0 gtk-3 m nautilus-extension
> WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
> -WANTLIB += png pthread-stubs startup-notification-1 xcb xcb-atom
> -WANTLIB += xcb-aux xcb-event xcb-render xcb-shm z
> +WANTLIB += png pthread-stubs startup-notification-1 xcb X11-xcb
> +WANTLIB += xcb-aux xcb-render xcb-shm z
>
> MODULES= devel/gconf2 \
> devel/gettext \
>
--
Antoine
