Date: Sun, 29 May 2016 01:20:29 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416076 - in head/graphics/geeqie: . files Message-ID: <201605290120.u4T1KTjI086842@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun May 29 01:20:28 2016 New Revision: 416076 URL: https://svnweb.freebsd.org/changeset/ports/416076 Log: - Update to 1.2.3 - Add LICENSE - Switch to USES=localbase - Regenerate patches with `make makepatch` - Add upstream patch for Cogl >= 1.18 - Fix WWW: PR: 209152 Submitted by: olivierd Added: head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw - copied, changed from r416075, head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw head/graphics/geeqie/files/patch-src_renderer-clutter.c (contents, props changed) head/graphics/geeqie/files/patch-src_view__file_icon.c (contents, props changed) Deleted: head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw Modified: head/graphics/geeqie/Makefile head/graphics/geeqie/distinfo head/graphics/geeqie/pkg-descr Modified: head/graphics/geeqie/Makefile ============================================================================== --- head/graphics/geeqie/Makefile Sun May 29 00:24:29 2016 (r416075) +++ head/graphics/geeqie/Makefile Sun May 29 01:20:28 2016 (r416076) @@ -2,32 +2,27 @@ # $FreeBSD$ PORTNAME= geeqie -PORTVERSION= 1.1 -PORTREVISION= 4 +PORTVERSION= 1.2.3 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= http://www.geeqie.org/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libpng.so:graphics/png -USES= gettext gmake pkgconfig desktop-file-utils -USE_GNOME= gtk20 intltool +USES= autoreconf gettext gmake jpeg localbase pkgconfig \ + desktop-file-utils tar:xz lua:51 +USE_GNOME= gtk30 intltool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --docdir="${DOCSDIR}" \ - --htmldir="${DOCSDIR}/html" \ - --with-htmldir="${DOCSDIR}/html" \ - --with-readmedir="${DOCSDIR}" - -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= ${CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ARGS+= top_builddir="${WRKSRC}" +CONFIGURE_ARGS= --with-readmedir="${DOCSDIR}" PORTDOCS= * -OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS DOCS +OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS TIFF DOCS OPTIONS_DEFAULT=EXIV2 LCMS EXIV2_DESC= Metadata editing LCMS_DESC= Color adjusting @@ -37,23 +32,25 @@ GPS_DESC= GPS map support via libchampla EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CONFIGURE_ENABLE= exiv2 -LCMS_LIB_DEPENDS= liblcms.so:graphics/lcms +LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_CONFIGURE_ENABLE= lcms LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc -GPS_LIB_DEPENDS= libchamplain-0.8.so:graphics/libchamplain08 -GPS_CONFIGURE_ENABLE= gps +GPS_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \ + libclutter-gtk-1.0.so:graphics/clutter-gtk3 +GPS_CONFIGURE_ENABLE= gps clutter + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CONFIGURE_ENABLE= tiff post-patch: - @${REINPLACE_CMD} -e 's|champlain-0\.4|champlain-0.8|g; \ - s|champlain-gtk-0\.4|champlain-gtk-0.8|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/main.c - @${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop + @${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop.in + @${REINPLACE_CMD} -e '/readme_DATA/ s|COPYING||' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's|lua5.1|lua-5.1|' ${WRKSRC}/configure.in # I cannot get gnome-doc-tool working properly: Outputs gibberish @${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \ - ${WRKSRC}/Makefile.in + ${WRKSRC}/Makefile.am .include <bsd.port.mk> Modified: head/graphics/geeqie/distinfo ============================================================================== --- head/graphics/geeqie/distinfo Sun May 29 00:24:29 2016 (r416075) +++ head/graphics/geeqie/distinfo Sun May 29 01:20:28 2016 (r416076) @@ -1,2 +1,2 @@ -SHA256 (geeqie-1.1.tar.gz) = 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf -SIZE (geeqie-1.1.tar.gz) = 1966211 +SHA256 (geeqie-1.2.3.tar.xz) = 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 +SIZE (geeqie-1.2.3.tar.xz) = 1129804 Copied and modified: head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw (from r416075, head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw) ============================================================================== --- head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw Sun May 29 00:24:29 2016 (r416075, copy source) +++ head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw Sun May 29 01:20:28 2016 (r416076) @@ -1,6 +1,6 @@ ---- plugins/ufraw/geeqie-ufraw.orig 2010-02-18 00:21:15.000000000 +0300 -+++ plugins/ufraw/geeqie-ufraw 2010-05-22 17:06:21.000000000 +0400 -@@ -37,7 +37,7 @@ +--- plugins/ufraw/geeqie-ufraw.orig 2016-03-07 10:21:06 UTC ++++ plugins/ufraw/geeqie-ufraw +@@ -37,7 +37,7 @@ add_xmp_from_sidecar () basename=${input%.*} dirname=${basename%/*} @@ -9,7 +9,7 @@ [ -f "$xmp" ] || return 1 output=`get_output_from_id "$idfile"` -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ raw_file_not_processed () rawfile=$1 basename=${rawfile%.*} dirname=${basename%/*} @@ -18,7 +18,7 @@ [ -z "$outfiles" ] # return true if no possible output file exists # raw+jpeg pair created by the camera is considered processed, -@@ -136,12 +136,12 @@ +@@ -136,12 +136,12 @@ process_tree () { list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1 Added: head/graphics/geeqie/files/patch-src_renderer-clutter.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/geeqie/files/patch-src_renderer-clutter.c Sun May 29 01:20:28 2016 (r416076) @@ -0,0 +1,30 @@ +From 411ef45d8fbda079d51abeba997017e9508fa7a7 Mon Sep 17 00:00:00 2001 +From: Colin Clark <cclark@mcb.net> +Date: Tue, 29 Mar 2016 18:18:05 +0100 +Subject: [PATCH 1/1] Update for new cogl version + +Parameters for cogl_texture_3d_new_from_data have changed. + +--- src/renderer-clutter.c.orig 2016-03-07 10:21:06 UTC ++++ src/renderer-clutter.c +@@ -234,7 +234,19 @@ static void rc_prepare_post_process_lut( + g_object_unref(tmp_pixbuf); + + DEBUG_0("%s clut upload start", get_exec_time()); +-#if CLUTTER_CHECK_VERSION(1,10,0) ++#if COGL_VERSION_CHECK(1,18,2) ++ { ++ CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ()); ++ ++ tex3d = cogl_texture_3d_new_from_data(ctx, ++ CLUT_SIZE, CLUT_SIZE, CLUT_SIZE, ++ COGL_PIXEL_FORMAT_RGB_888, ++ CLUT_SIZE * 3, ++ CLUT_SIZE * CLUT_SIZE * 3, ++ clut, ++ NULL); ++ } ++#elif COGL_VERSION_CHECK(1,10,4) + { + CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ()); + Added: head/graphics/geeqie/files/patch-src_view__file_icon.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/geeqie/files/patch-src_view__file_icon.c Sun May 29 01:20:28 2016 (r416076) @@ -0,0 +1,18 @@ +--- ./src/view_file_icon.c.orig 2016-05-28 21:43:05 UTC ++++ ./src/view_file_icon.c +@@ -379,6 +379,7 @@ static void vficon_mark_toggled_cb(GtkCe + + static void tip_show(ViewFile *vf) + { ++ return; // or crash + GtkWidget *label; + gint x, y; + +@@ -460,6 +461,7 @@ static void tip_unschedule(ViewFile *vf) + + static void tip_update(ViewFile *vf, IconData *id) + { ++ return; // or crash + if (VFICON(vf)->tip_window) + { + gint x, y; Modified: head/graphics/geeqie/pkg-descr ============================================================================== --- head/graphics/geeqie/pkg-descr Sun May 29 00:24:29 2016 (r416075) +++ head/graphics/geeqie/pkg-descr Sun May 29 01:20:28 2016 (r416076) @@ -12,4 +12,4 @@ History contact gqview author and the only maintainer. Geeqie projects goal is to move the development forward and also integrate the existing patches. -WWW: http://geeqie.sourceforge.net/ +WWW: http://www.geeqie.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605290120.u4T1KTjI086842>