Revision: 147334 https://trac.macports.org/changeset/147334 Author: devans@macports.org Date: 2016-04-01 15:45:31 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: gitg, update to version 3.20.0, dependencies, license, add +quartz variant, use gnome stable livecheck. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gitg/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/gnome/gitg/files/patch-autogen.sh.diff Removed Paths: ------------- users/devans/GNOME-3/stable/dports/gnome/gitg/files/gitg-commit-view-c.diff Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/gitg/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/gitg ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/gnome/gitg:119981-140899 /users/devans/GNOME-3/unstable/dports/gnome/gitg:122645-125934 + /trunk/dports/gnome/gitg:119981-140899 /users/devans/GNOME-3/unstable/dports/gnome/gitg:122645-125934,141712-147190 Modified: users/devans/GNOME-3/stable/dports/gnome/gitg/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gitg/Portfile 2016-04-01 22:42:04 UTC (rev 147333) +++ users/devans/GNOME-3/stable/dports/gnome/gitg/Portfile 2016-04-01 22:45:31 UTC (rev 147334) @@ -2,23 +2,22 @@ # $Id$ PortSystem 1.0 +PortGroup active_variants 1.1 +PortGroup gobject_introspection 1.0 name gitg -# version 3.17.1+ requires webkit2gtk-3.0 or webkit2gtk-4.0 -# upstream trunk working to remove webkit dependency in next stable version -version 0.2.7 -revision 3 -license GPL-2 +version 3.20.0 +license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description GNOME git repository viewer. long_description gitg is a fast git repository browser. It currently features: \ - * Loading large repositories very fast \ - * Show/browse repository history \ - * Show highlighted revision diff \ - * Browse file tree of a revision and export by drag and drop \ - * Search in the revision history on subject, author or hash \ - * Switch between history view of branches easily \ - * Commit view providing per hunk stage/unstage and commit + \n * Loading large repositories very fast \ + \n * Show/browse repository history \ + \n * Show highlighted revision diff \ + \n * Browse file tree of a revision and export by drag and drop \ + \n * Search in the revision history on subject, author or hash \ + \n * Switch between history view of branches easily \ + \n * Commit view providing per hunk stage/unstage and commit maintainers juanrgar devans openmaintainer categories gnome devel @@ -28,8 +27,8 @@ use_xz yes -checksums rmd160 0344a5935ee9b2186533dbef01f5a4174b16a0e1 \ - sha256 c07fc4fc6cef31a06f0b9daa2ed23a5d0f6cb0a10a728324970675fc7001d095 +checksums rmd160 316386c79909b615a3ac7be27a5b093d612a3524 \ + sha256 1f09f61208349d003f228e51dc9709bd3426960f5585c0e38197bd02b51f3346 depends_build port:pkgconfig \ port:intltool \ @@ -39,15 +38,22 @@ port:libtool depends_lib port:desktop-file-utils \ + port:gsettings-desktop-schemas \ port:gtk3 \ port:gtksourceview3 \ - port:gsettings-desktop-schemas \ - port:dbus + port:gtkspell3 \ + port:libgee \ + port:libgit2-glib \ + port:libpeas \ + port:libsoup \ + port:libsecret depends_run port:gnome-themes-standard -patchfiles gitg-commit-view-c.diff +gobject_introspection yes +patchfiles patch-autogen.sh.diff + # reconfigure using upstream autogen.sh for intltool 0.51 compatibility configure.cmd ./autogen.sh @@ -56,11 +62,18 @@ --disable-schemas-compile \ --disable-silent-rules +variant quartz {} + +if {[variant_isset quartz]} { + require_active_variants gtk3 quartz +} else { + require_active_variants gtk3 x11 +} + post-activate { system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } -# disable livecheck until webkit2-gtk3 requirement can be met -livecheck.type none +livecheck.type gnome Deleted: users/devans/GNOME-3/stable/dports/gnome/gitg/files/gitg-commit-view-c.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gitg/files/gitg-commit-view-c.diff 2016-04-01 22:42:04 UTC (rev 147333) +++ users/devans/GNOME-3/stable/dports/gnome/gitg/files/gitg-commit-view-c.diff 2016-04-01 22:45:31 UTC (rev 147334) @@ -1,55 +0,0 @@ ---- gitg/gitg-commit-view.c.orig 2013-12-26 12:38:16.000000000 +0100 -+++ gitg/gitg-commit-view.c 2013-12-26 13:04:58.000000000 +0100 -@@ -1668,29 +1668,29 @@ - gchar *foreground = NULL; - gboolean foreground_set = FALSE; - -- if (style) -- { -- g_object_get (style, -- "line-background", -- &background, -- "line-background-set", -- &background_set, -- "foreground", -- &foreground, -- "foreground-set", -- &foreground_set, -- NULL); -- -- if (!background_set) -- { -- g_object_get (style, -- "background", -- &background, -- "background-set", -- &background_set, -- NULL); -- } -- } -+// if (style) -+// { -+// g_object_get (style, -+// "line-background", -+// &background, -+// "line-background-set", -+// &background_set, -+// "foreground", -+// &foreground, -+// "foreground-set", -+// &foreground_set, -+// NULL); -+// -+// if (!background_set) -+// { -+// g_object_get (style, -+// "background", -+// &background, -+// "background-set", -+// &background_set, -+// NULL); -+// } -+// } - - if (background_set) - { Copied: users/devans/GNOME-3/stable/dports/gnome/gitg/files/patch-autogen.sh.diff (from rev 146938, users/devans/GNOME-3/unstable/dports/gnome/gitg/files/patch-autogen.sh.diff) =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gitg/files/patch-autogen.sh.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gitg/files/patch-autogen.sh.diff 2016-04-01 22:45:31 UTC (rev 147334) @@ -0,0 +1,20 @@ +--- autogen.sh.orig 2015-08-10 20:16:26.000000000 -0700 ++++ autogen.sh 2015-08-10 20:16:52.000000000 -0700 +@@ -24,12 +24,12 @@ + exit 1 + fi + +-git submodule update --init --recursive ++#git submodule update --init --recursive + +-if [ $? != 0 ]; then +- echo "*** Failed to download submodules. Maybe you have a bad connection or a submodule was not forked?" +- exit 1 +-fi ++#if [ $? != 0 ]; then ++# echo "*** Failed to download submodules. Maybe you have a bad connection or a submodule was not forked?" ++# exit 1 ++#fi + + autopoint --force + AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose