summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-04-19 19:03:59 +0800
committergusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-04-19 19:03:59 +0800
commit73e562c18a8467dbe43e50bba9bc46ec8802555c (patch)
tree0a65733ca0d07bfcbb02ff83efabd229464e92f9
parentc9a04712d8e0acdc680e399eacd62277eab2de84 (diff)
downloadmarcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar.gz
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar.bz2
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar.lz
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar.xz
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.tar.zst
marcuscom-ports-73e562c18a8467dbe43e50bba9bc46ec8802555c.zip
Add a simple patch to fix a bogus character in a source file. While
here do some cosmetic changes to the makefile. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19552 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/cinnamon/Makefile15
-rw-r--r--x11/cinnamon/files/patch-src_cinnamon-global.c13
2 files changed, 20 insertions, 8 deletions
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 60cf32aef..81a3aab31 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -4,7 +4,7 @@
PORTNAME= cinnamon
PORTVERSION= 2.0.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -38,25 +38,24 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
WRKSRC= ${WRKDIR}/Cinnamon-${PORTVERSION}
-USE_XORG= x11 xfixes sm
USES= gettext gmake pathfix pkgconfig shebangfix
-# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX}
-SHEBANG_FILES= files/usr/bin/cinnamon2d
-USE_AUTOTOOLS= libtool autoconf automake
USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 gnomemenus3 \
gnomeprefix gtk30 intlhack introspection:build
+# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
+SHEBANG_FILES= files/usr/bin/cinnamon2d
+USE_AUTOTOOLS= libtool autoconf automake
+USE_XORG= x11 xfixes sm
USE_GSTREAMER= theora vp8 ogg
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PYTHON= yes
-
-GLIB_SCHEMAS= org.cinnamon.gschema.xml
-
CONFIGURE_ARGS+=--enable-compile-warnings=no \
--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
CPPFLAGS+= -I${LOCALASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+GLIB_SCHEMAS= org.cinnamon.gschema.xml
+
OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
diff --git a/x11/cinnamon/files/patch-src_cinnamon-global.c b/x11/cinnamon/files/patch-src_cinnamon-global.c
new file mode 100644
index 000000000..1ab1605c6
--- /dev/null
+++ b/x11/cinnamon/files/patch-src_cinnamon-global.c
@@ -0,0 +1,13 @@
+--- src/cinnamon-global.c.orig 2014-04-04 09:39:11.488900078 +0000
++++ src/cinnamon-global.c 2014-04-04 09:39:20.117899806 +0000
+@@ -477,8 +477,8 @@
+ G_PARAM_READABLE));
+ }
+
+-/**•
+- * _cinnamon_global_init: (skip)•
++/**
++ * _cinnamon_global_init: (skip)
+ * @first_property_name: the name of the first property
+ * @...: the value of the first property, followed optionally by more
+ * name/value pairs, followed by %NULL