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

Update to metacity-2.28.0

Browse Source 
Work started by jasper@ and finished by yours trully because ze slacker is
sleeping...
This commit is contained in:
ajacoutot 2009-10-12 00:31:36 +00:00
parent 97a23f9701
commit 1cecc9a233
5 changed files with 81 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
x11/gnome/metacity/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.39 2009/08/11 08:39:39 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.40 2009/10/12 00:31:36 ajacoutot Exp $
COMMENT= lightweight window manager COMMENT= lightweight window manager
GNOME_PROJECT= metacity GNOME_PROJECT= metacity
GNOME_VERSION= 2.24.0 GNOME_VERSION= 2.28.0
PKGNAME= ${DISTNAME}p6
SHARED_LIBS += metacity-private 0.0 # .0.0 SHARED_LIBS += metacity-private 1.0 # .0.0
CATEGORIES= x11
CATEGORIES= x11
# GPLv2 # GPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
@ -14,27 +15,31 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \ WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo
dbus-1 dbus-glib-1 expat fontconfig freetype gio-2.0 \ WANTLIB += dbus-1 dbus-glib-1 execinfo expat fontconfig freetype
glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 ltdl m ogg pango-1.0
png pthread z pthread-stubs xcb WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs vorbis vorbisfile xcb xcb-atom xcb-aux
WANTLIB += xcb-event z
MODULES= devel/gettext \ MODULES= devel/gettext \
x11/gnome \ x11/gnome \
devel/gconf2 devel/gconf2
LIB_DEPENDS= startup-notification-1::devel/startup-notification \ LIB_DEPENDS= startup-notification-1::devel/startup-notification \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 canberra-gtk,canberra::audio/libcanberra
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::x11/gnome/zenity
SEPARATE_BUILD= concurrent SEPARATE_BUILD= concurrent
USE_X11= Yes USE_X11= Yes
DESKTOP_FILES= Yes DESKTOP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= metacity MODGCONF2_SCHEMAS_DIR= metacity
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/metacity ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/metacity

10
x11/gnome/metacity/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/metacity-2.24.0.tar.bz2) = 1Kp4LV9xtsQlFLI5aEpKow== MD5 (gnome/metacity-2.28.0.tar.bz2) = nYfjkM+ZeZePIpCuvEH4Ow==
RMD160 (gnome/metacity-2.24.0.tar.bz2) = dYwm4WP9yE3O4eOGq4y+/DjN16U= RMD160 (gnome/metacity-2.28.0.tar.bz2) = DuwZAPrYdgS8UxdX0Oh40tqMuJ0=
SHA1 (gnome/metacity-2.24.0.tar.bz2) = Cy4343JJjiamkm+7aOllVsbbZJc= SHA1 (gnome/metacity-2.28.0.tar.bz2) = 1k3IYawA//xQO/ms3HBbZ7dy13I=
SHA256 (gnome/metacity-2.24.0.tar.bz2) = kO7Qo2quMC21KvEiIMTPhjyczOvSMwFRBPLYjLF+wHY= SHA256 (gnome/metacity-2.28.0.tar.bz2) = BiFVOm8h/PQMXcTHkHtXRcbYU+a3Y3u0W4Y+w59ZVUU=
SIZE (gnome/metacity-2.24.0.tar.bz2) = 2160557 SIZE (gnome/metacity-2.28.0.tar.bz2) = 2288241

12
x11/gnome/metacity/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.3 2009/10/12 00:31:36 ajacoutot Exp $
--- configure.orig Mon Oct 12 02:13:33 2009
+++ configure Mon Oct 12 02:13:43 2009
@@ -15689,7 +15689,7 @@ fi
# Warnings are there for a reason
if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -Werror -ansi"
+ CFLAGS="$CFLAGS -Wall -ansi"
fi
# Use gnome-doc-utils:

15
x11/gnome/metacity/patches/patch-src_core_main_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_core_main_c,v 1.1 2009/10/12 00:31:36 ajacoutot Exp $
--- src/core/main.c.orig Sun Oct 11 15:07:07 2009
+++ src/core/main.c Sun Oct 11 15:07:43 2009
@@ -58,7 +58,11 @@
#include <stdlib.h>
#include <sys/types.h>
+#if defined(__OpenBSD__)
+#include <sys/wait.h>
+#else
#include <wait.h>
+#endif /* __OpenBSD__ */
#include <stdio.h>
#include <string.h>
#include <signal.h>

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2009/06/07 10:26:08 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.19 2009/10/12 00:31:36 ajacoutot Exp $
%%SHARED%% %%SHARED%%
@bin bin/metacity @bin bin/metacity
@bin bin/metacity-message @bin bin/metacity-message
@ -15,9 +15,8 @@ include/metacity-1/metacity-private/theme.h
include/metacity-1/metacity-private/util.h include/metacity-1/metacity-private/util.h
lib/libmetacity-private.a lib/libmetacity-private.a
lib/libmetacity-private.la lib/libmetacity-private.la
lib/pkgconfig/
lib/pkgconfig/libmetacity-private.pc lib/pkgconfig/libmetacity-private.pc
@bin libexec/metacity-dialog @man man/man1/metacity-message.1
@man man/man1/metacity-theme-viewer.1 @man man/man1/metacity-theme-viewer.1
@man man/man1/metacity-window-demo.1 @man man/man1/metacity-window-demo.1
@man man/man1/metacity.1 @man man/man1/metacity.1
@ -26,72 +25,50 @@ share/doc/metacity/
share/doc/metacity/README share/doc/metacity/README
share/doc/metacity/metacity-theme.dtd share/doc/metacity/metacity-theme.dtd
share/doc/metacity/theme-format.txt share/doc/metacity/theme-format.txt
share/gnome/
share/gnome-control-center/ share/gnome-control-center/
share/gnome-control-center/keybindings/ share/gnome-control-center/keybindings/
share/gnome-control-center/keybindings/50-metacity-desktop-key.xml share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
share/gnome-control-center/keybindings/50-metacity-key.xml share/gnome-control-center/keybindings/50-metacity-key.xml
share/gnome/help/creating-metacity-themes/
share/gnome/help/creating-metacity-themes/C/
share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
share/gnome/wm-properties/ share/gnome/wm-properties/
share/gnome/wm-properties/metacity-wm.desktop share/gnome/wm-properties/metacity-wm.desktop
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/metacity.mo share/locale/am/LC_MESSAGES/metacity.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/metacity.mo share/locale/as/LC_MESSAGES/metacity.mo
share/locale/az/ share/locale/ast/LC_MESSAGES/metacity.mo
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/metacity.mo share/locale/az/LC_MESSAGES/metacity.mo
share/locale/be/LC_MESSAGES/metacity.mo share/locale/be/LC_MESSAGES/metacity.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/metacity.mo share/locale/be@latin/LC_MESSAGES/metacity.mo
share/locale/bg/LC_MESSAGES/metacity.mo share/locale/bg/LC_MESSAGES/metacity.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/metacity.mo share/locale/bn/LC_MESSAGES/metacity.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/metacity.mo share/locale/bn_IN/LC_MESSAGES/metacity.mo
share/locale/bs/ share/locale/br/LC_MESSAGES/metacity.mo
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/metacity.mo share/locale/bs/LC_MESSAGES/metacity.mo
share/locale/ca/LC_MESSAGES/metacity.mo share/locale/ca/LC_MESSAGES/metacity.mo
share/locale/ca@valencia/LC_MESSAGES/metacity.mo
share/locale/cs/LC_MESSAGES/metacity.mo share/locale/cs/LC_MESSAGES/metacity.mo
share/locale/cy/
share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/metacity.mo share/locale/cy/LC_MESSAGES/metacity.mo
share/locale/da/LC_MESSAGES/metacity.mo share/locale/da/LC_MESSAGES/metacity.mo
share/locale/de/LC_MESSAGES/metacity.mo share/locale/de/LC_MESSAGES/metacity.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/metacity.mo share/locale/dz/LC_MESSAGES/metacity.mo
share/locale/el/LC_MESSAGES/metacity.mo share/locale/el/LC_MESSAGES/metacity.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/metacity.mo share/locale/en_CA/LC_MESSAGES/metacity.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/metacity.mo share/locale/en_GB/LC_MESSAGES/metacity.mo
share/locale/es/LC_MESSAGES/metacity.mo share/locale/es/LC_MESSAGES/metacity.mo
share/locale/et/LC_MESSAGES/metacity.mo share/locale/et/LC_MESSAGES/metacity.mo
share/locale/eu/LC_MESSAGES/metacity.mo share/locale/eu/LC_MESSAGES/metacity.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/metacity.mo share/locale/fa/LC_MESSAGES/metacity.mo
share/locale/fi/LC_MESSAGES/metacity.mo share/locale/fi/LC_MESSAGES/metacity.mo
share/locale/fr/LC_MESSAGES/metacity.mo share/locale/fr/LC_MESSAGES/metacity.mo
share/locale/ga/LC_MESSAGES/metacity.mo share/locale/ga/LC_MESSAGES/metacity.mo
share/locale/gl/LC_MESSAGES/metacity.mo share/locale/gl/LC_MESSAGES/metacity.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/metacity.mo share/locale/gu/LC_MESSAGES/metacity.mo
share/locale/ha/
share/locale/ha/LC_MESSAGES/
share/locale/ha/LC_MESSAGES/metacity.mo
share/locale/he/LC_MESSAGES/metacity.mo share/locale/he/LC_MESSAGES/metacity.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/metacity.mo share/locale/hi/LC_MESSAGES/metacity.mo
share/locale/hr/LC_MESSAGES/metacity.mo share/locale/hr/LC_MESSAGES/metacity.mo
share/locale/hu/LC_MESSAGES/metacity.mo share/locale/hu/LC_MESSAGES/metacity.mo
@ -99,84 +76,48 @@ share/locale/hy/
share/locale/hy/LC_MESSAGES/ share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/metacity.mo share/locale/hy/LC_MESSAGES/metacity.mo
share/locale/id/LC_MESSAGES/metacity.mo share/locale/id/LC_MESSAGES/metacity.mo
share/locale/is/ share/locale/ig/
share/locale/is/LC_MESSAGES/ share/locale/ig/LC_MESSAGES/
share/locale/ig/LC_MESSAGES/metacity.mo
share/locale/is/LC_MESSAGES/metacity.mo share/locale/is/LC_MESSAGES/metacity.mo
share/locale/it/LC_MESSAGES/metacity.mo share/locale/it/LC_MESSAGES/metacity.mo
share/locale/ja/LC_MESSAGES/metacity.mo share/locale/ja/LC_MESSAGES/metacity.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/metacity.mo share/locale/ka/LC_MESSAGES/metacity.mo
share/locale/kn/
share/locale/kn/LC_MESSAGES/
share/locale/kn/LC_MESSAGES/metacity.mo share/locale/kn/LC_MESSAGES/metacity.mo
share/locale/ko/LC_MESSAGES/metacity.mo share/locale/ko/LC_MESSAGES/metacity.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/metacity.mo share/locale/ku/LC_MESSAGES/metacity.mo
share/locale/lt/ share/locale/la/LC_MESSAGES/metacity.mo
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/metacity.mo share/locale/lt/LC_MESSAGES/metacity.mo
share/locale/lv/LC_MESSAGES/metacity.mo share/locale/lv/LC_MESSAGES/metacity.mo
share/locale/mg/ share/locale/mai/LC_MESSAGES/metacity.mo
share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/metacity.mo share/locale/mg/LC_MESSAGES/metacity.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/metacity.mo share/locale/mk/LC_MESSAGES/metacity.mo
share/locale/ml/
share/locale/ml/LC_MESSAGES/
share/locale/ml/LC_MESSAGES/metacity.mo share/locale/ml/LC_MESSAGES/metacity.mo
share/locale/mn/
share/locale/mn/LC_MESSAGES/
share/locale/mn/LC_MESSAGES/metacity.mo share/locale/mn/LC_MESSAGES/metacity.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/metacity.mo share/locale/mr/LC_MESSAGES/metacity.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/metacity.mo share/locale/ms/LC_MESSAGES/metacity.mo
share/locale/nb/LC_MESSAGES/metacity.mo share/locale/nb/LC_MESSAGES/metacity.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/metacity.mo share/locale/ne/LC_MESSAGES/metacity.mo
share/locale/nl/LC_MESSAGES/metacity.mo share/locale/nl/LC_MESSAGES/metacity.mo
share/locale/nn/LC_MESSAGES/metacity.mo share/locale/nn/LC_MESSAGES/metacity.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/metacity.mo share/locale/oc/LC_MESSAGES/metacity.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/metacity.mo share/locale/or/LC_MESSAGES/metacity.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/metacity.mo share/locale/pa/LC_MESSAGES/metacity.mo
share/locale/pl/LC_MESSAGES/metacity.mo share/locale/pl/LC_MESSAGES/metacity.mo
share/locale/pt/LC_MESSAGES/metacity.mo share/locale/pt/LC_MESSAGES/metacity.mo
share/locale/pt_BR/LC_MESSAGES/metacity.mo share/locale/pt_BR/LC_MESSAGES/metacity.mo
share/locale/ro/LC_MESSAGES/metacity.mo share/locale/ro/LC_MESSAGES/metacity.mo
share/locale/ru/LC_MESSAGES/metacity.mo share/locale/ru/LC_MESSAGES/metacity.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/metacity.mo share/locale/rw/LC_MESSAGES/metacity.mo
share/locale/si/
share/locale/si/LC_MESSAGES/
share/locale/si/LC_MESSAGES/metacity.mo share/locale/si/LC_MESSAGES/metacity.mo
share/locale/sk/LC_MESSAGES/metacity.mo share/locale/sk/LC_MESSAGES/metacity.mo
share/locale/sl/LC_MESSAGES/metacity.mo share/locale/sl/LC_MESSAGES/metacity.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/metacity.mo share/locale/sq/LC_MESSAGES/metacity.mo
share/locale/sr/LC_MESSAGES/metacity.mo share/locale/sr/LC_MESSAGES/metacity.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/metacity.mo share/locale/sr@latin/LC_MESSAGES/metacity.mo
share/locale/sv/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/metacity.mo share/locale/ta/LC_MESSAGES/metacity.mo
share/locale/th/ share/locale/te/LC_MESSAGES/metacity.mo
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/metacity.mo share/locale/th/LC_MESSAGES/metacity.mo
share/locale/tk/ share/locale/tk/
share/locale/tk/LC_MESSAGES/ share/locale/tk/LC_MESSAGES/
@ -184,12 +125,11 @@ share/locale/tk/LC_MESSAGES/metacity.mo
share/locale/tr/LC_MESSAGES/metacity.mo share/locale/tr/LC_MESSAGES/metacity.mo
share/locale/uk/LC_MESSAGES/metacity.mo share/locale/uk/LC_MESSAGES/metacity.mo
share/locale/vi/LC_MESSAGES/metacity.mo share/locale/vi/LC_MESSAGES/metacity.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/metacity.mo share/locale/wa/LC_MESSAGES/metacity.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/metacity.mo share/locale/xh/LC_MESSAGES/metacity.mo
share/locale/yo/
share/locale/yo/LC_MESSAGES/
share/locale/yo/LC_MESSAGES/metacity.mo
share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo
share/locale/zh_HK/LC_MESSAGES/metacity.mo share/locale/zh_HK/LC_MESSAGES/metacity.mo
share/locale/zh_TW/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo