cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to metacity-2.34.3.

Browse Source
This commit is contained in:
ajacoutot 2012-03-29 06:52:10 +00:00
parent 91d07b4680
commit 96a2f6c771
4 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
x11/gnome/metacity/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.76 2011/11/04 09:56:29 jasper Exp $
# $OpenBSD: Makefile,v 1.77 2012/03/29 06:52:10 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= lightweight window manager
GNOME_PROJECT= metacity
GNOME_VERSION= 2.34.1
REVISION= 7
GNOME_VERSION= 2.34.3
SHARED_LIBS += metacity-private 1.0 # .0.0
@ -18,19 +17,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xxf86vm atk-1.0 c cairo canberra canberra-gtk dbus-1
WANTLIB += dbus-glib-1 drm expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 gtop-2.0 kvm ltdl m ogg pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs startup-notification-1 vorbis vorbisfile
WANTLIB += xcb xcb-aux xcb-render xcb-shm z stdc++
WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 c cairo canberra canberra-gtk drm expat ffi
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
WANTLIB += gtop-2.0 kvm ltdl m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs startup-notification-1
WANTLIB += stdc++ vorbis vorbisfile xcb xcb-aux xcb-render xcb-shm
WANTLIB += z
MODULES= devel/gettext \
x11/gnome \
devel/gconf2
devel/dconf
LIB_DEPENDS= devel/startup-notification \
audio/libcanberra,-gtk \
@ -41,7 +40,6 @@ RUN_DEPENDS= x11/gnome/zenity \
fonts/cantarell-fonts
MODGNOME_TOOLS= yelp
SEPARATE_BUILD= concurrent
MODGNOME_DESKTOP_FILE= Yes
MODGCONF2_SCHEMAS_DIR= metacity

10
x11/gnome/metacity/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/metacity-2.34.1.tar.xz) = 1QXi15Nr2bEaP0hHCmFnZw==
RMD160 (gnome/metacity-2.34.1.tar.xz) = YxYdKX1iAaT7y8Y58k5zqiAmmwc=
SHA1 (gnome/metacity-2.34.1.tar.xz) = xvDzHiaRp5pSlI2dN44HLZzuKJ4=
SHA256 (gnome/metacity-2.34.1.tar.xz) = 8UTLQ5JcoA2OqsEpoU3zJgxUoyMktc0KTXiw/X/xAoo=
SIZE (gnome/metacity-2.34.1.tar.xz) = 1918056
MD5 (gnome/metacity-2.34.3.tar.xz) = Sxn6W7wU3GaRCL1GYGsb0Q==
RMD160 (gnome/metacity-2.34.3.tar.xz) = EUGKfDRL267SSXjj+avvqvDP/CQ=
SHA1 (gnome/metacity-2.34.3.tar.xz) = v/Cu8XWmoy0Oog5SU72e1gLbhJ0=
SHA256 (gnome/metacity-2.34.3.tar.xz) = rqwlSLYqmDdftcgy7iarTLbVnw3Zbtzvtfe+8kFlduc=
SIZE (gnome/metacity-2.34.3.tar.xz) = 1668396

15
x11/gnome/metacity/patches/patch-src_core_prefs_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_core_prefs_c,v 1.3 2011/05/27 14:27:10 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651257
--- src/core/prefs.c.orig Fri May 27 16:13:11 2011
+++ src/core/prefs.c Fri May 27 16:12:47 2011
@@ -584,7 +584,7 @@ handle_preference_init_int (void)
&error);
cleanup_error (&error);
- if (value < cursor->minimum || value > cursor->maximum)
+ if (value && (value < cursor->minimum || value > cursor->maximum))
{
meta_warning (_("%d stored in GConf key %s is out of range %d to %d\n"),
value, cursor->key, cursor->minimum, cursor->maximum);

12
x11/gnome/metacity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2011/10/13 14:08:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.31 2012/03/29 06:52:10 ajacoutot Exp $
@pkgpath x11/gnome/metacity,gtk2
@bin bin/metacity
@bin bin/metacity-message
@ -21,16 +21,16 @@ lib/pkgconfig/libmetacity-private.pc
@man man/man1/metacity-theme-viewer.1
@man man/man1/metacity-window-demo.1
@man man/man1/metacity.1
share/GConf/gsettings/metacity-schemas.convert
share/applications/metacity.desktop
share/doc/metacity/
share/doc/metacity/README
share/doc/metacity/metacity-theme.dtd
share/doc/metacity/theme-format.txt
share/glib-2.0/schemas/org.gnome.metacity.gschema.xml
share/gnome-control-center/
share/gnome-control-center/keybindings/
share/gnome-control-center/keybindings/50-metacity-launchers.xml
share/gnome-control-center/keybindings/50-metacity-navigation.xml
share/gnome-control-center/keybindings/50-metacity-screenshot.xml
share/gnome-control-center/keybindings/50-metacity-system.xml
share/gnome-control-center/keybindings/50-metacity-windows.xml
share/gnome/help/creating-metacity-themes/
@ -143,10 +143,6 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
share/metacity/
share/metacity/icons/
share/metacity/icons/metacity-window-demo.png
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/metacity.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
share/themes/AgingGorilla/
share/themes/AgingGorilla/metacity-1/
share/themes/AgingGorilla/metacity-1/active-button.png
@ -262,5 +258,7 @@ share/themes/Simple/metacity-1/maximize.png
share/themes/Simple/metacity-1/maximized.png
share/themes/Simple/metacity-1/metacity-theme-1.xml
share/themes/Simple/metacity-1/minimize.png
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database