Index: head/x11-toolkits/granite/Makefile =================================================================== --- head/x11-toolkits/granite/Makefile (revision 395623) +++ head/x11-toolkits/granite/Makefile (revision 395624) @@ -1,28 +1,28 @@ # Created by: Olivier Duchateau # $FreeBSD$ # PORTNAME= granite -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= x11-toolkits -MASTER_SITES= https://launchpadlibrarian.net/176306383/ \ - https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION:R}/+download/ +MASTER_SITES= https://launchpadlibrarian.net/215905441/ \ + https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ MAINTAINER= olivierd@FreeBSD.org -COMMENT= Extensions of Gtk+ toolkit +COMMENT= Extensions of GTK3 toolkit LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING 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 +USES= cmake gettext pkgconfig tar:xz USE_GNOME= glib20 gtk30 introspection:build INSTALLS_ICONS= yes USE_LDCONFIG= yes + +CFLAGS+= -Wno-return-type .include Index: head/x11-toolkits/granite/distinfo =================================================================== --- head/x11-toolkits/granite/distinfo (revision 395623) +++ head/x11-toolkits/granite/distinfo (revision 395624) @@ -1,2 +1,2 @@ -SHA256 (granite-0.3.0.tar.gz) = df950dd79749213971d50316c68edadf1fb3c2151cb7d63f6a6b9edf12084ad1 -SIZE (granite-0.3.0.tar.gz) = 285072 +SHA256 (granite-0.3.1.tar.xz) = 8ec1d61f9aba75f1b3a745e721288b0dfb34cb11d1307be80cef7b0571c2dec6 +SIZE (granite-0.3.1.tar.xz) = 277640 Index: head/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala =================================================================== --- head/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala (revision 395623) +++ head/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala (nonexistent) @@ -1,31 +0,0 @@ ---- lib/Widgets/DynamicNotebook.vala.orig 2014-05-25 21:42:24.000000000 +0200 -+++ lib/Widgets/DynamicNotebook.vala 2015-08-02 23:42:37.151406000 +0200 -@@ -658,10 +658,19 @@ - /** - * The text shown in the add button tooltip - */ -+#if VALA_0_26 -+ public string add_button_tooltip { -+ get { _add_button_tooltip = add_button.tooltip_text; return _add_button_tooltip; } -+ set { add_button.tooltip_text = value; } -+ } -+ // Use temporary field to avoid breaking API this can be dropped while preparing for 0.4 -+ string _add_button_tooltip; -+#else - public string add_button_tooltip { - get { return add_button.tooltip_text; } - set { add_button.tooltip_text = value; } - } -+#endif - - public Tab current { - get { return tabs.nth_data (notebook.get_current_page ()); } -@@ -918,7 +927,7 @@ - notebook.create_window.connect (on_create_window); - } - -- ~Notebook () { -+ ~DynamicNotebook () { - notebook.switch_page.disconnect (on_switch_page); - notebook.page_added.disconnect (on_page_added); - notebook.page_removed.disconnect (on_page_removed); Property changes on: head/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala =================================================================== --- head/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala (revision 395623) +++ head/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala (nonexistent) @@ -1,20 +0,0 @@ ---- lib/Widgets/ContractorView.vala.orig 2015-08-02 23:43:12.064726000 +0200 -+++ lib/Widgets/ContractorView.vala 2015-08-02 23:43:58.610804000 +0200 -@@ -35,7 +35,7 @@ - public delegate void ContractCallback (); - private Gee.HashMap outsiders; - private int[] blacklisted_pos; -- private ListStore list; -+ private Gtk.ListStore list; - - private struct DelegateWrapper { unowned ContractCallback method; } - -@@ -73,7 +73,7 @@ - */ - public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) { - /* Setup the ListStore */ -- list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string)); -+ list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string)); - outsiders = new Gee.HashMap (); - this.model = list; - Property changes on: head/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: head/x11-toolkits/granite/files/patch-CMakeLists.txt =================================================================== --- head/x11-toolkits/granite/files/patch-CMakeLists.txt (revision 395623) +++ head/x11-toolkits/granite/files/patch-CMakeLists.txt (revision 395624) @@ -1,26 +1,19 @@ ---- ./CMakeLists.txt.orig 2014-05-25 19:42:24.000000000 +0000 -+++ ./CMakeLists.txt 2014-07-27 10:49:39.000000000 +0000 -@@ -61,12 +61,18 @@ - --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) +--- CMakeLists.txt.orig 2015-08-30 10:13:06 UTC ++++ CMakeLists.txt +@@ -66,7 +66,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" + elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") + set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=DRAGON_FLY) + elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +- set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=FFREE_BSD) ++ set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=FREE_BSD) + elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=NET_BSD) + elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +@@ -74,7 +74,5 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Op endif () add_subdirectory (lib) -add_subdirectory (demo) -add_subdirectory (doc) add_subdirectory (po) --add_subdirectory (icons) -\ No newline at end of file -+add_subdirectory (icons) + add_subdirectory (icons) Index: head/x11-toolkits/granite/files/patch-lib_Widgets_DatePicker.vala =================================================================== --- head/x11-toolkits/granite/files/patch-lib_Widgets_DatePicker.vala (nonexistent) +++ head/x11-toolkits/granite/files/patch-lib_Widgets_DatePicker.vala (revision 395624) @@ -0,0 +1,11 @@ +--- lib/Widgets/DatePicker.vala.orig 2015-08-30 10:13:06 UTC ++++ lib/Widgets/DatePicker.vala +@@ -77,7 +77,7 @@ namespace Granite.Widgets { + // Entry properties + can_focus = false; + editable = false; // user can't edit the entry directly +- secondary_icon_gicon = new ThemedIcon.with_default_fallbacks ("office-calendar-symbolic"); ++ secondary_icon_gicon = new ThemedIcon.with_default_fallbacks ("x-office-calendar-symbolic"); + + dropdown.add_events (EventMask.FOCUS_CHANGE_MASK); + dropdown.add (calendar); Property changes on: head/x11-toolkits/granite/files/patch-lib_Widgets_DatePicker.vala ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/granite/files/patch-lib__Application.vala =================================================================== --- head/x11-toolkits/granite/files/patch-lib__Application.vala (revision 395623) +++ head/x11-toolkits/granite/files/patch-lib__Application.vala (revision 395624) @@ -1,24 +1,15 @@ ---- ./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); +--- lib/Application.vala.orig 2015-08-30 10:13:06 UTC ++++ lib/Application.vala +@@ -157,7 +157,11 @@ namespace Granite { + message ("Kernel version: %s", (string) un.release); + Logger.DisplayLevel = LogLevel.WARN; -@@ -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 +- Intl.bindtextdomain (exec_name, build_data_dir + "/locale"); ++ Intl.setlocale (LocaleCategory.ALL, ""); ++ string langpack_dir = Path.build_path (Path.DIR_SEPARATOR_S, build_data_dir, "locale"); ++ Intl.bindtextdomain (exec_name, langpack_dir); ++ Intl.bind_textdomain_codeset (exec_name, "UTF-8"); ++ Intl.textdomain (exec_name); - /** + add_actions (); + Index: head/x11-toolkits/granite/pkg-plist =================================================================== --- head/x11-toolkits/granite/pkg-plist (revision 395623) +++ head/x11-toolkits/granite/pkg-plist (revision 395624) @@ -1,77 +1,79 @@ include/granite/granite.h include/granite/widgets-utils.h lib/girepository-1.0/Granite-1.0.typelib lib/libgranite.so -lib/libgranite.so.2 -lib/libgranite.so.2.0.1 +lib/libgranite.so.3 +lib/libgranite.so.3.0.1 libdata/pkgconfig/granite.pc share/gir-1.0/Granite-1.0.gir -share/icons/hicolor/16x16/actions/application-menu.svg share/icons/hicolor/16x16/actions/appointment.svg -share/icons/hicolor/22x22/actions/application-menu.svg -share/icons/hicolor/24x24/actions/application-menu.svg +share/icons/hicolor/16x16/actions/open-menu.svg +share/icons/hicolor/22x22/actions/open-menu.svg share/icons/hicolor/24x24/actions/appointment.svg -share/icons/hicolor/32x32/actions/application-menu.svg -share/icons/hicolor/48x48/actions/application-menu.svg -share/icons/hicolor/scalable/actions/application-menu-symbolic.svg +share/icons/hicolor/24x24/actions/open-menu.svg +share/icons/hicolor/32x32/actions/open-menu.svg +share/icons/hicolor/48x48/actions/open-menu.svg +share/icons/hicolor/scalable/actions/open-menu-symbolic.svg share/locale/af/LC_MESSAGES/granite.mo share/locale/am/LC_MESSAGES/granite.mo share/locale/ar/LC_MESSAGES/granite.mo share/locale/be/LC_MESSAGES/granite.mo share/locale/bg/LC_MESSAGES/granite.mo share/locale/bs/LC_MESSAGES/granite.mo share/locale/ca/LC_MESSAGES/granite.mo share/locale/cs/LC_MESSAGES/granite.mo share/locale/da/LC_MESSAGES/granite.mo share/locale/de/LC_MESSAGES/granite.mo share/locale/el/LC_MESSAGES/granite.mo share/locale/en_AU/LC_MESSAGES/granite.mo share/locale/en_CA/LC_MESSAGES/granite.mo share/locale/en_GB/LC_MESSAGES/granite.mo share/locale/eo/LC_MESSAGES/granite.mo share/locale/es/LC_MESSAGES/granite.mo share/locale/et/LC_MESSAGES/granite.mo share/locale/eu/LC_MESSAGES/granite.mo share/locale/fa/LC_MESSAGES/granite.mo share/locale/fi/LC_MESSAGES/granite.mo share/locale/fr/LC_MESSAGES/granite.mo share/locale/fr_CA/LC_MESSAGES/granite.mo share/locale/fy/LC_MESSAGES/granite.mo share/locale/gl/LC_MESSAGES/granite.mo share/locale/he/LC_MESSAGES/granite.mo share/locale/hi/LC_MESSAGES/granite.mo share/locale/hr/LC_MESSAGES/granite.mo share/locale/hu/LC_MESSAGES/granite.mo +share/locale/hy/LC_MESSAGES/granite.mo share/locale/id/LC_MESSAGES/granite.mo share/locale/it/LC_MESSAGES/granite.mo share/locale/ja/LC_MESSAGES/granite.mo share/locale/ko/LC_MESSAGES/granite.mo share/locale/lb/LC_MESSAGES/granite.mo share/locale/lt/LC_MESSAGES/granite.mo share/locale/lv/LC_MESSAGES/granite.mo share/locale/ms/LC_MESSAGES/granite.mo +share/locale/my/LC_MESSAGES/granite.mo share/locale/nb/LC_MESSAGES/granite.mo share/locale/nl/LC_MESSAGES/granite.mo share/locale/nn/LC_MESSAGES/granite.mo share/locale/pl/LC_MESSAGES/granite.mo share/locale/pt/LC_MESSAGES/granite.mo share/locale/pt_BR/LC_MESSAGES/granite.mo share/locale/ro/LC_MESSAGES/granite.mo share/locale/ru/LC_MESSAGES/granite.mo share/locale/rue/LC_MESSAGES/granite.mo share/locale/sk/LC_MESSAGES/granite.mo share/locale/sl/LC_MESSAGES/granite.mo share/locale/sma/LC_MESSAGES/granite.mo share/locale/sq/LC_MESSAGES/granite.mo share/locale/sr/LC_MESSAGES/granite.mo share/locale/sv/LC_MESSAGES/granite.mo share/locale/ta/LC_MESSAGES/granite.mo share/locale/te/LC_MESSAGES/granite.mo share/locale/tr/LC_MESSAGES/granite.mo share/locale/ug/LC_MESSAGES/granite.mo share/locale/uk/LC_MESSAGES/granite.mo share/locale/vi/LC_MESSAGES/granite.mo share/locale/zh_CN/LC_MESSAGES/granite.mo share/locale/zh_TW/LC_MESSAGES/granite.mo share/vala/vapi/granite.deps share/vala/vapi/granite.vapi