aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--math/pantheon-calculator/Makefile4
-rw-r--r--x11-toolkits/granite/Makefile6
-rw-r--r--x11-toolkits/granite/distinfo6
-rw-r--r--x11-toolkits/granite/files/patch-lib_Widgets_ContractorView.vala14
-rw-r--r--x11-toolkits/granite/files/patch-lib__Widgets__AboutDialog.vala29
-rw-r--r--x11-toolkits/granite/pkg-plist4
-rw-r--r--x11/pantheon-terminal/Makefile11
7 files changed, 18 insertions, 56 deletions
diff --git a/math/pantheon-calculator/Makefile b/math/pantheon-calculator/Makefile
index 8b1c4206122f..2e2f2aaca702 100644
--- a/math/pantheon-calculator/Makefile
+++ b/math/pantheon-calculator/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pantheon-calculator
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://launchpadlibrarian.net/303135059/ \
https://launchpad.net/${PORTNAME}/0.4-loki/${PORTVERSION}/+download/
@@ -12,10 +13,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple calculator written in Vala
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgranite.so:x11-toolkits/granite \
- libgee-0.8.so:devel/libgee
+ libgee-0.8.so:devel/libgee
USES= cmake:outsource pkgconfig gettext tar:xz
USE_GNOME= glib20 gtk30 cairo gdkpixbuf2 intltool
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 2a292b6c6c70..3ea400508c6a 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -3,10 +3,8 @@
#
PORTNAME= granite
-PORTVERSION= 0.4.0.1
+DISTVERSION= 0.5
CATEGORIES= x11-toolkits
-MASTER_SITES= https://launchpadlibrarian.net/277504431/ \
- https://launchpad.net/${PORTNAME}/0.4/loki-beta2/+download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Extensions of GTK+3 toolkit
@@ -19,6 +17,8 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee
RUN_DEPENDS= contractor:sysutils/contractor
USES= cmake gettext pkgconfig tar:xz
+USE_GITHUB= yes
+GH_ACCOUNT= elementary
USE_GNOME= glib20 gtk30 cairo introspection:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/granite/distinfo b/x11-toolkits/granite/distinfo
index 5017583e30e3..45d47d6fa583 100644
--- a/x11-toolkits/granite/distinfo
+++ b/x11-toolkits/granite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470682638
-SHA256 (granite-0.4.0.1.tar.xz) = 95a142a8befeedc35a089d638e759b657905508dc3007036d6c1fa3efe94c4dd
-SIZE (granite-0.4.0.1.tar.xz) = 292688
+TIMESTAMP = 1521380734
+SHA256 (elementary-granite-0.5_GH0.tar.gz) = cc4905ae70fddeba3d2ded44bb642be77d419aa090251a7ab24c155b8616be06
+SIZE (elementary-granite-0.5_GH0.tar.gz) = 365015
diff --git a/x11-toolkits/granite/files/patch-lib_Widgets_ContractorView.vala b/x11-toolkits/granite/files/patch-lib_Widgets_ContractorView.vala
deleted file mode 100644
index fe20ed144c0f..000000000000
--- a/x11-toolkits/granite/files/patch-lib_Widgets_ContractorView.vala
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/Widgets/ContractorView.vala.orig 2016-08-06 23:51:23 UTC
-+++ lib/Widgets/ContractorView.vala
-@@ -181,7 +181,11 @@ public class Granite.Widgets.ContractorView : TreeView
- string text = value.get_string ();
-
- if (text[3:text.index_of ("</b>")] in names) {
-+#if VALA_0_36
-+ list.remove (ref it);
-+#else
- list.remove (it);
-+#endif
- blacklisted_pos += cur_pos;
- }
- if (!check)
diff --git a/x11-toolkits/granite/files/patch-lib__Widgets__AboutDialog.vala b/x11-toolkits/granite/files/patch-lib__Widgets__AboutDialog.vala
deleted file mode 100644
index 1966dfcc0da7..000000000000
--- a/x11-toolkits/granite/files/patch-lib__Widgets__AboutDialog.vala
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./lib/Widgets/AboutDialog.vala.orig 2014-05-25 19:42:24.000000000 +0000
-+++ ./lib/Widgets/AboutDialog.vala 2014-07-27 13:06:32.000000000 +0000
-@@ -65,7 +65,7 @@
-
- private Button help_button;
- private Button translate_button;
-- private Button bug_button;
-+ private LinkButton bug_button;
-
- private Granite.Drawing.BufferSurface buffer;
-
-@@ -128,15 +128,8 @@
- action_area.pack_start (translate_button, false, false, 0);
-
- /* bug button */
-- bug_button = new Button.with_label (_("Report a Problem"));
-- bug_button.clicked.connect (() => {
-- try {
-- GLib.Process.spawn_command_line_async ("apport-bug %i".printf (Posix.getpid ()));
-- } catch (Error e) {
-- warning ("Could Not Launch 'apport-bug'.");
-- activate_link (bug);
-- }
-- });
-+ string _uri = "https://bugs.freebsd.org/bugzilla/enter_bug.cgi";
-+ bug_button = new LinkButton.with_label (_uri, _("Report a Problem"));
- action_area.pack_start (bug_button, false, false, 0);
-
- action_area.reorder_child (bug_button, 0);
diff --git a/x11-toolkits/granite/pkg-plist b/x11-toolkits/granite/pkg-plist
index 2a0c7b2211c4..6681e76fe427 100644
--- a/x11-toolkits/granite/pkg-plist
+++ b/x11-toolkits/granite/pkg-plist
@@ -3,8 +3,8 @@ include/granite/granite.h
include/granite/widgets-utils.h
lib/girepository-1.0/Granite-1.0.typelib
lib/libgranite.so
-lib/libgranite.so.3
-lib/libgranite.so.3.0.1
+lib/libgranite.so.4
+lib/libgranite.so.4.0
libdata/pkgconfig/granite.pc
share/applications/granite-demo.desktop
share/gir-1.0/Granite-1.0.gir
diff --git a/x11/pantheon-terminal/Makefile b/x11/pantheon-terminal/Makefile
index 8059986d6c48..33313f551587 100644
--- a/x11/pantheon-terminal/Makefile
+++ b/x11/pantheon-terminal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pantheon-terminal
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= amdmi3@FreeBSD.org
@@ -11,17 +12,19 @@ COMMENT= Lightweight, beautiful, and simple terminal from Elementary OS
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libgranite.so:x11-toolkits/granite
+LIB_DEPENDS= libgee-0.8.so:devel/libgee \
+ libgnutls.so:security/gnutls \
+ libgranite.so:x11-toolkits/granite \
+ libpcre2-8.so:devel/pcre2
BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= dbus-send:devel/dbus
+USES= cmake:outsource desktop-file-utils gettext pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= elementary
GH_PROJECT= terminal
-
-USES= cmake desktop-file-utils gettext pkgconfig
CMAKE_ARGS= -DGSETTINGS_COMPILE:BOOL=NO
-USE_GNOME= glib20 gtk30 intltool vte3
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool vte3
GLIB_SCHEMAS= org.pantheon.terminal.gschema.xml
PORTDOCS= AUTHORS README.md