Date: Sun, 10 Nov 2013 16:21:25 +0100 (CET) From: Guido Falsi <madpilot@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: acieroid@awesom.eu, alexander.4mail@gmail.com Subject: ports/183842: x11-toolkits/girara update to 0.1.8, graphics/zathura mogration to gtk3, staging Message-ID: <3dHf7n4R3GzP8@micro.madpilot.net> Resent-Message-ID: <201311101530.rAAFU0f3074740@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183842 >Category: ports >Synopsis: x11-toolkits/girara update to 0.1.8, graphics/zathura mogration to gtk3, staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 10 15:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 9.2-STABLE amd64 >Organization: none >Environment: System: FreeBSD micro.madpilot.net 9.2-STABLE FreeBSD 9.2-STABLE #22 r255995: Wed Oct 2 22:15:55 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64 >Description: Hi, I'm going to update the x11-toolkits/girara port to version 0.1.8. With this version girara migrated to gtk 3.0 as a default, so I will have to modify all dependent ports to follow suit. While here I have made a few more changes to update the ports: - Update x11-toolkits/girara to 0.1.8 - Update graphics/zathura to 0.2.5 - Update graphics/zathura-djvu to 0.2.3 - Convert to new LIB_DEPENDS format - Make ports use gtk 3.0 - For zathura, don't make man page installation depend on DOCS, DOCS is for extra documetation, man pages should always be installed if available. - Removed some uneeded patches. Can you as maintainers of graphics/zathura and graphics/zathura-djvu approve thesse changes? Thank you in advance. >How-To-Repeat: >Fix: Index: graphics/zathura/Makefile =================================================================== --- graphics/zathura/Makefile (revision 333403) +++ graphics/zathura/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zathura -PORTVERSION= 0.2.2 +PORTVERSION= 0.2.5 CATEGORIES= graphics print MASTER_SITES= http://pwmt.org/projects/zathura/download/ @@ -9,32 +9,26 @@ MAINTAINER= acieroid@awesom.eu COMMENT= Customizable lightweight pdf viewer -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - girara-gtk2:${PORTSDIR}/x11-toolkits/girara +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libgirara-gtk3.so:${PORTSDIR}/x11-toolkits/girara +BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils -USE_GNOME= glib20 gtk20 +USE_GNOME= glib20 gtk30 USES= gmake pkgconfig -MAKE_ENV= SFLAGS="${STRIP}" +MAKE_ENV= SFLAGS="${STRIP}" \ + RSTTOMAN=${LOCALBASE}/bin/rst2man -OPTIONS_DEFINE= DOCS NLS SQLITE +OPTIONS_DEFINE= NLS SQLITE -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSQLITE} -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 MAKE_ENV+= WITH_SQLITE=1 .else MAKE_ENV+= WITH_SQLITE=0 .endif -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils -MAN1+= zathura.1 -MAN5+= zathurarc.5 -MAKE_ENV+= RSTTOMAN=${LOCALBASE}/bin/rst2man -.endif - .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" @@ -48,12 +42,6 @@ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\ ${WRKSRC}/config.mk -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's|install-manpages$$||'\ - ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|RSTTOMAN ?= /usr/bin/rst2man|RSTTOMAN ?= ""|'\ - ${WRKSRC}/config.mk -.endif .if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/-C po/d'\ ${WRKSRC}/Makefile @@ -66,9 +54,6 @@ ${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \ ${WRKSRC}/config.h \ ${WRKSRC}/zathurarc.5.rst - (cd ${WRKSRC}; ${RM} -f ${MAN1} ${MAN5}) + (cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5) -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Index: graphics/zathura/distinfo =================================================================== --- graphics/zathura/distinfo (revision 333403) +++ graphics/zathura/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9 -SIZE (zathura-0.2.2.tar.gz) = 108240 +SHA256 (zathura-0.2.5.tar.gz) = d901805efa7e18575008e97187a406adc6ac911b493f0e0dfaa69f453ac089d3 +SIZE (zathura-0.2.5.tar.gz) = 133895 Index: graphics/zathura/files/patch-render.c =================================================================== --- graphics/zathura/files/patch-render.c (revision 333403) +++ graphics/zathura/files/patch-render.c (working copy) @@ -1,36 +0,0 @@ ---- render.c.orig 2013-01-22 17:23:39.000000000 +0100 -+++ render.c 2013-01-22 17:23:03.000000000 +0100 -@@ -19,7 +19,7 @@ - - struct render_thread_s { - GThreadPool* pool; /**< Pool of threads */ -- GMutex mutex; /**< Render lock */ -+ GStaticMutex mutex; /**< Render lock */ - bool about_to_close; /**< Render thread is to be freed */ - }; - -@@ -51,7 +51,7 @@ - - render_thread->about_to_close = false; - g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura); -- g_mutex_init(&render_thread->mutex); -+ g_static_mutex_init(&render_thread->mutex); - - return render_thread; - -@@ -328,7 +328,7 @@ - return; - } - -- g_mutex_lock(&render_thread->mutex); -+ g_static_mutex_lock(&render_thread->mutex); - } - - void -@@ -338,5 +338,5 @@ - return; - } - -- g_mutex_unlock(&render_thread->mutex); -+ g_static_mutex_unlock(&render_thread->mutex); - } Index: graphics/zathura/pkg-plist =================================================================== --- graphics/zathura/pkg-plist (revision 333403) +++ graphics/zathura/pkg-plist (working copy) @@ -7,16 +7,24 @@ include/zathura/types.h include/zathura/version.h libdata/pkgconfig/zathura.pc +man/man1/zathura.1.gz +man/man5/zathurarc.5.gz share/applications/zathura.desktop +%%NLS%%share/locale/ca/LC_MESSAGES/zathura.mo %%NLS%%share/locale/cs/LC_MESSAGES/zathura.mo %%NLS%%share/locale/de/LC_MESSAGES/zathura.mo +%%NLS%%share/locale/el/LC_MESSAGES/zathura.mo %%NLS%%share/locale/eo/LC_MESSAGES/zathura.mo %%NLS%%share/locale/es/LC_MESSAGES/zathura.mo %%NLS%%share/locale/es_CL/LC_MESSAGES/zathura.mo %%NLS%%share/locale/et/LC_MESSAGES/zathura.mo %%NLS%%share/locale/fr/LC_MESSAGES/zathura.mo +%%NLS%%share/locale/he/LC_MESSAGES/zathura.mo +%%NLS%%share/locale/hr/LC_MESSAGES/zathura.mo +%%NLS%%share/locale/id_ID/LC_MESSAGES/zathura.mo %%NLS%%share/locale/it/LC_MESSAGES/zathura.mo %%NLS%%share/locale/pl/LC_MESSAGES/zathura.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/zathura.mo %%NLS%%share/locale/ru/LC_MESSAGES/zathura.mo %%NLS%%share/locale/ta_IN/LC_MESSAGES/zathura.mo %%NLS%%share/locale/tr/LC_MESSAGES/zathura.mo @@ -24,6 +32,8 @@ @dirrm include/zathura @dirrmtry share/locale/es_CL/LC_MESSAGES @dirrmtry share/locale/es_CL +@dirrmtry share/locale/id_ID/LC_MESSAGES +@dirrmtry share/locale/id_ID @dirrmtry share/locale/ta_IN/LC_MESSAGES @dirrmtry share/locale/ta_IN @dirrmtry share/locale/uk_UA/LC_MESSAGES Index: graphics/zathura-djvu/Makefile =================================================================== --- graphics/zathura-djvu/Makefile (revision 333403) +++ graphics/zathura-djvu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zathura-djvu -PORTVERSION= 0.2.2 +PORTVERSION= 0.2.3 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ @@ -9,15 +9,15 @@ MAINTAINER= alexander.4mail@gmail.com COMMENT= The zathura-djvu plugin adds DjVu support to zathura -LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura -USE_GNOME= glib20 gtk20 -USES= gmake pkgconfig +USE_GNOME= glib20 gtk30 +USES= desktop-file-utils gmake pkgconfig -PLIST_FILES= lib/zathura/djvu.so +PLIST_FILES= lib/zathura/djvu.so \ + share/applications/zathura-djvu.desktop PLIST_DIRSTRY= lib/zathura -NO_STAGE= yes .include <bsd.port.mk> Index: graphics/zathura-djvu/distinfo =================================================================== --- graphics/zathura-djvu/distinfo (revision 333403) +++ graphics/zathura-djvu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (zathura-djvu-0.2.2.tar.gz) = 9c0accf68be79df63f16337b7cef66bfb199f4ff296ae5a1bc8de220f1af2691 -SIZE (zathura-djvu-0.2.2.tar.gz) = 10473 +SHA256 (zathura-djvu-0.2.3.tar.gz) = c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89 +SIZE (zathura-djvu-0.2.3.tar.gz) = 11181 Index: graphics/zathura-djvu/files/patch-config.mk =================================================================== --- graphics/zathura-djvu/files/patch-config.mk (revision 333403) +++ graphics/zathura-djvu/files/patch-config.mk (working copy) @@ -1,22 +0,0 @@ ---- config.mk.orig 2012-06-09 23:37:36.000000000 +0200 -+++ config.mk 2012-08-20 18:26:30.000000000 +0200 -@@ -11,7 +11,7 @@ - - # paths - PREFIX ?= /usr --LIBDIR ?= ${PREFIX}/lib -+LIBDIR = ${PREFIX}/lib - - # libs - CAIRO_INC ?= $(shell pkg-config --cflags cairo) -@@ -27,10 +27,7 @@ - GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2) - - ZATHURA_INC ?= $(shell pkg-config --cflags zathura) --PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) --ifeq (,${PLUGINDIR}) - PLUGINDIR = ${LIBDIR}/zathura --endif - - INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} - LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} Index: graphics/zathura-pdf-poppler/Makefile =================================================================== --- graphics/zathura-pdf-poppler/Makefile (revision 333403) +++ graphics/zathura-pdf-poppler/Makefile (working copy) @@ -13,7 +13,7 @@ BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura -USE_GNOME= glib20 gtk20 +USE_GNOME= glib20 gtk30 USES= desktop-file-utils gmake pkgconfig PLIST_FILES= lib/zathura/pdf.so \ Index: graphics/zathura-pdf-poppler/files/patch-config.mk =================================================================== --- graphics/zathura-pdf-poppler/files/patch-config.mk (revision 333403) +++ graphics/zathura-pdf-poppler/files/patch-config.mk (working copy) @@ -1,22 +0,0 @@ ---- config.mk.orig 2013-05-12 23:21:06.000000000 +0200 -+++ config.mk 2013-06-21 13:16:15.646661467 +0200 -@@ -12,7 +12,7 @@ - - # paths - PREFIX ?= /usr --LIBDIR ?= ${PREFIX}/lib -+LIBDIR = ${PREFIX}/lib - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -@@ -26,10 +26,7 @@ - GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION}) - - ZATHURA_INC ?= $(shell pkg-config --cflags zathura) --PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) --ifeq (,${PLUGINDIR}) - PLUGINDIR = ${LIBDIR}/zathura --endif - - INCS = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC} - LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB} Index: x11-toolkits/girara/Makefile =================================================================== --- x11-toolkits/girara/Makefile (revision 333403) +++ x11-toolkits/girara/Makefile (working copy) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= girara -PORTVERSION= 0.1.7 +PORTVERSION= 0.1.8 CATEGORIES= x11-toolkits graphics MASTER_SITES= http://pwmt.org/projects/girara/download/ MAINTAINER= madpilot@FreeBSD.org -COMMENT= GTK2 Interface Library for Zathura PDF Viewer +COMMENT= GTK3 Interface Library for Zathura PDF Viewer -USE_GNOME= glib20 gtk20 +USE_GNOME= glib20 gtk30 USES= compiler:c11 gmake pkgconfig USE_LDCONFIG= yes LIBDIR= ${PREFIX}/lib Index: x11-toolkits/girara/distinfo =================================================================== --- x11-toolkits/girara/distinfo (revision 333403) +++ x11-toolkits/girara/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (girara-0.1.7.tar.gz) = 2374b8951d1276638dfca9f6d7570ce12313c8af482426a9a057a0227ea01c8e -SIZE (girara-0.1.7.tar.gz) = 82277 +SHA256 (girara-0.1.8.tar.gz) = 4861274fe93e7e6a8878a14eaac45868b351c58cf12b680ebaa4e5d42fec2d33 +SIZE (girara-0.1.8.tar.gz) = 82671 Index: x11-toolkits/girara/pkg-plist =================================================================== --- x11-toolkits/girara/pkg-plist (revision 333403) +++ x11-toolkits/girara/pkg-plist (working copy) @@ -15,20 +15,20 @@ include/girara/types.h include/girara/utils.h include/girara/version.h -lib/libgirara-gtk2.a -lib/libgirara-gtk2.so -lib/libgirara-gtk2.so.1 -lib/libgirara-gtk2.so.1.1 -libdata/pkgconfig/girara-gtk2.pc -%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk2-1.mo -%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk2-1.mo +lib/libgirara-gtk3.a +lib/libgirara-gtk3.so +lib/libgirara-gtk3.so.1 +lib/libgirara-gtk3.so.1.1 +libdata/pkgconfig/girara-gtk3.pc +%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk3-1.mo +%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk3-1.mo @dirrm include/girara >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3dHf7n4R3GzP8>