svn commit: r355716 - in head/x11-toolkits/granite: . files
Olivier Duchateau
olivierd at FreeBSD.org
Thu May 29 17:26:44 UTC 2014
Author: olivierd
Date: Thu May 29 17:26:42 2014
New Revision: 355716
URL: http://svnweb.freebsd.org/changeset/ports/355716
QAT: https://qat.redports.org/buildarchive/r355716/
Log:
- Use CCode attribute for setproctitle() function, bug #1324424 [1]
- Add new dependency, sysutils/contractor
- Fix pkg-plist
- Bump PORTREVISION
[1] https://bugs.launchpad.net/granite/+bug/1324424
Added:
head/x11-toolkits/granite/files/patch-lib__Application.vala (contents, props changed)
Modified:
head/x11-toolkits/granite/Makefile
head/x11-toolkits/granite/distinfo
head/x11-toolkits/granite/files/patch-CMakeLists.txt
head/x11-toolkits/granite/pkg-plist
Modified: head/x11-toolkits/granite/Makefile
==============================================================================
--- head/x11-toolkits/granite/Makefile Thu May 29 17:11:38 2014 (r355715)
+++ head/x11-toolkits/granite/Makefile Thu May 29 17:26:42 2014 (r355716)
@@ -4,9 +4,11 @@
PORTNAME= granite
PORTVERSION= 0.2.3.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= https://launchpadlibrarian.net/169958088/ \
https://launchpad.net/${PORTNAME}/0.2/${PORTVERSION}/+download/
+DIST_SUBDIR= eos
MAINTAINER= olivierd at FreeBSD.org
COMMENT= Extensions of Gtk+ toolkit
@@ -15,6 +17,7 @@ LICENSE= GPLv3
BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
LIB_DEPENDS= libgee-0.8.so:${PORTSDIR}/devel/libgee
+RUN_DEPENDS= contractor:${PORTSDIR}/sysutils/contractor
USE_GCC= yes
USES= cmake pkgconfig gettext tar:tgz
Modified: head/x11-toolkits/granite/distinfo
==============================================================================
--- head/x11-toolkits/granite/distinfo Thu May 29 17:11:38 2014 (r355715)
+++ head/x11-toolkits/granite/distinfo Thu May 29 17:26:42 2014 (r355716)
@@ -1,2 +1,2 @@
-SHA256 (granite-0.2.3.1.tgz) = 56f05338bb7967f0b912d35bf780a3ddd68b517e1939371a14a5f79581a8f80d
-SIZE (granite-0.2.3.1.tgz) = 152607
+SHA256 (eos/granite-0.2.3.1.tgz) = 56f05338bb7967f0b912d35bf780a3ddd68b517e1939371a14a5f79581a8f80d
+SIZE (eos/granite-0.2.3.1.tgz) = 152607
Modified: head/x11-toolkits/granite/files/patch-CMakeLists.txt
==============================================================================
--- head/x11-toolkits/granite/files/patch-CMakeLists.txt Thu May 29 17:11:38 2014 (r355715)
+++ head/x11-toolkits/granite/files/patch-CMakeLists.txt Thu May 29 17:26:42 2014 (r355716)
@@ -1,5 +1,5 @@
---- ./CMakeLists.txt.orig 2013-12-15 12:43:00.000000000 +0000
-+++ ./CMakeLists.txt 2013-12-26 19:54:31.000000000 +0000
+--- ./CMakeLists.txt.orig 2014-03-18 20:51:49.000000000 +0000
++++ ./CMakeLists.txt 2014-05-29 09:36:44.000000000 +0000
@@ -24,12 +24,28 @@
include (CPack)
add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
@@ -29,7 +29,7 @@
#
# Packages in PKG_DEPS are used with the vala compiler and other related tools (not versioned.)
# Packages in PKG_DEPS_CHECK are used with PKG-Config and for linking, etc. They can contain versions.
-@@ -42,19 +58,18 @@
+@@ -42,31 +58,37 @@
gtk+-3.0
gio-unix-2.0
posix
@@ -52,11 +52,25 @@
pkg_check_modules (DEPS REQUIRED ${PKG_DEPS_CHECK})
set (VALAC_OPTIONS
-@@ -66,7 +81,6 @@
+ --thread
+ --target-glib=2.32)
+
+-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
++if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=LINUX)
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
++ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=DragonFly)
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=FreeBSD)
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=NetBSD)
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
++ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=OpenBSD)
endif ()
add_subdirectory (lib)
-add_subdirectory (demo)
- add_subdirectory (doc)
+-add_subdirectory (doc)
++#add_subdirectory (doc)
add_subdirectory (po)
add_subdirectory (icons)
Added: head/x11-toolkits/granite/files/patch-lib__Application.vala
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/granite/files/patch-lib__Application.vala Thu May 29 17:26:42 2014 (r355716)
@@ -0,0 +1,24 @@
+--- ./lib/Application.vala.orig 2014-03-18 20:51:49.000000000 +0000
++++ ./lib/Application.vala 2014-05-29 09:42:26.000000000 +0000
+@@ -69,6 +69,8 @@
+ public Application () {
+ #if LINUX
+ prctl (15, exec_name, 0, 0, 0);
++#elif DragonFly || FreeBSD || NetBSD || OpenBSD
++ setproctitle (exec_name);
+ #endif
+ Environment.set_prgname (exec_name);
+
+@@ -90,6 +92,12 @@
+ #if LINUX
+ [CCode (cheader_filename = "sys/prctl.h", cname = "prctl")]
+ protected extern static int prctl (int option, string arg2, ulong arg3, ulong arg4, ulong arg5);
++#elif DragonFly || FreeBSD
++ [CCode (cheader_filename = "unistd.h", cname = "setproctitle")]
++ protected extern static void setproctitle (string fmt, ...);
++#elif NetBSD || OpenBSD
++ [CCode (cheader_filename = "stdlib.h", cname = "setproctitle")]
++ protected extern static void setproctitle (string fmt, ...);
+ #endif
+
+ /**
Modified: head/x11-toolkits/granite/pkg-plist
==============================================================================
--- head/x11-toolkits/granite/pkg-plist Thu May 29 17:11:38 2014 (r355715)
+++ head/x11-toolkits/granite/pkg-plist Thu May 29 17:26:42 2014 (r355716)
@@ -71,8 +71,6 @@ share/locale/zh_CN/LC_MESSAGES/granite.m
share/locale/zh_TW/LC_MESSAGES/granite.mo
share/vala/vapi/granite.deps
share/vala/vapi/granite.vapi
- at dirrmtry share/vala/vapi
- at dirrmtry share/vala
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
More information about the svn-ports-all
mailing list