diff options
| -rw-r--r-- | x11-wm/metacity/Makefile | 8 | ||||
| -rw-r--r-- | x11-wm/metacity/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/metacity/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11-wm/metacity/files/patch-src_core_delete.c | 10 | ||||
| -rw-r--r-- | x11-wm/metacity/pkg-plist | 22 |
5 files changed, 17 insertions, 38 deletions
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index e1a7f2066..d77b6e7b3 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,7 +3,7 @@ # $MCom$ PORTNAME= metacity -PORTVERSION= 2.34.13 +PORTVERSION= 3.12.0 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -16,14 +16,14 @@ BUILD_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \ gsettings-desktop-schemas>=3.3.0:${PORTSDIR}/devel/gsettings-desktop-schemas LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libgtop-2.0.so:${PORTSDIR}/devel/libgtop \ - libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra + libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 RUN_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \ gsettings-desktop-schemas>=3.3.0:${PORTSDIR}/devel/gsettings-desktop-schemas USE_XORG= x11 xcomposite xdamage xrender xcursor xinerama xext xrandr -USES= libtool:keepla gettext gmake pathfix pkgconfig tar:xz +USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gtk20 intlhack libxml2:build +USE_GNOME= gnomeprefix gtk30 intlhack libxml2:build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 16fd9f8dd..aeb606467 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/metacity-2.34.13.tar.xz) = 8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075 -SIZE (gnome3/metacity-2.34.13.tar.xz) = 1660136 +SHA256 (gnome3/metacity-3.12.0.tar.xz) = a9ac5a3decd14fe6068efb5b5358bb4dffd0380ce2d605cb65424d843c3ed9dd +SIZE (gnome3/metacity-3.12.0.tar.xz) = 1607632 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure deleted file mode 100644 index 5ae975a06..000000000 --- a/x11-wm/metacity/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2011-04-05 20:58:36.000000000 +0200 -+++ configure 2011-04-05 20:59:24.000000000 +0200 -@@ -18286,7 +18286,7 @@ - " - - METACITY_MINOR_VERSION=34 --if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then -+if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then - stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2)) - echo "This is the UNSTABLE branch of metacity" - echo -n "Use 2.$stable_version.x for stable " diff --git a/x11-wm/metacity/files/patch-src_core_delete.c b/x11-wm/metacity/files/patch-src_core_delete.c deleted file mode 100644 index c72b0f60a..000000000 --- a/x11-wm/metacity/files/patch-src_core_delete.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/delete.c.orig 2010-01-30 18:56:27.000000000 -0500 -+++ src/core/delete.c 2010-01-30 18:56:53.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "workspace.h" - - #include <sys/types.h> -+#include <sys/wait.h> - #include <signal.h> - #include <unistd.h> - #include <errno.h> diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index de0fdcca8..27b42eee6 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -2,18 +2,18 @@ bin/metacity bin/metacity-message bin/metacity-theme-viewer bin/metacity-window-demo -include/metacity-1/metacity-private/boxes.h -include/metacity-1/metacity-private/common.h -include/metacity-1/metacity-private/gradient.h -include/metacity-1/metacity-private/preview-widget.h -include/metacity-1/metacity-private/theme-parser.h -include/metacity-1/metacity-private/theme.h -include/metacity-1/metacity-private/util.h +include/metacity/metacity-private/boxes.h +include/metacity/metacity-private/common.h +include/metacity/metacity-private/gradient.h +include/metacity/metacity-private/preview-widget.h +include/metacity/metacity-private/theme-parser.h +include/metacity/metacity-private/theme.h +include/metacity/metacity-private/util.h lib/libmetacity-private.a lib/libmetacity-private.la lib/libmetacity-private.so -lib/libmetacity-private.so.0 -lib/libmetacity-private.so.0.0.0 +lib/libmetacity-private.so.1 +lib/libmetacity-private.so.1.0.0 libdata/pkgconfig/libmetacity-private.pc man/man1/metacity-message.1.gz man/man1/metacity-theme-viewer.1.gz @@ -244,8 +244,6 @@ share/themes/Simple/metacity-1/minimize.png @dirrmtry share/help @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% -@dirrm include/metacity-1/metacity-private -@dirrm include/metacity-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yo/LC_MESSAGES @@ -298,3 +296,5 @@ share/themes/Simple/metacity-1/minimize.png @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm include/metacity/metacity-private +@dirrm include/metacity |