Date: Thu, 29 Nov 2007 23:51:41 +0300 (MSK) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: infofarmer@FreeBSD.org Subject: ports/118335: [PATCH] deskutils/fbreader: Update to 0.8.8; add GTK2 UI option Message-ID: <200711292051.lATKpfaT028283@darklight.org.ru> Resent-Message-ID: <200711292100.lATL06bT002439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118335 >Category: ports >Synopsis: [PATCH] deskutils/fbreader: Update to 0.8.8; add GTK2 UI option >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: Thu Nov 29 21:00:06 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 8.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD darklight.org.ru 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Wed Nov 28 17:45:25 MSK 2007 >Description: - Update to 0.8.8 - Use OPTIONS allowing to select GTK2 or QT4 toolkits for UI Port maintainer (infofarmer@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- fbreader-0.8.8.patch begins here --- diff -ruN --exclude=CVS /usr/ports/deskutils/fbreader.orig/Makefile /usr/ports/deskutils/fbreader/Makefile --- /usr/ports/deskutils/fbreader.orig/Makefile 2007-11-29 15:16:52.000000000 +0300 +++ /usr/ports/deskutils/fbreader/Makefile 2007-11-29 23:37:15.000000000 +0300 @@ -7,7 +7,7 @@ PORTNAME= fbreader DISTVERSIONPREFIX= sources- -DISTVERSION= 0.8.7 +DISTVERSION= 0.8.8 CATEGORIES= deskutils MASTER_SITES= http://www.fbreader.org/ CENKES EXTRACT_SUFX= .tgz @@ -15,27 +15,52 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Powerful e-book reader -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - enca.5:${PORTSDIR}/converters/enca +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_LDCONFIG= yes -USE_QT_VER= 4 -QT_COMPONENTS= gui corelib moc USE_GMAKE= yes +USE_QT_VER= 4 +QT_COMPONENTS= +WANT_GNOME= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat -MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=qt4 TARGET_STATUS=release \ - ROOTDIR=${WRKSRC} EXTERNALINCLUDE="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS}" INSTALLDIR="${PREFIX}" LIBDIR=${PREFIX}/lib \ +MAKE_ENV+= TARGET_ARCH=desktop TARGET_STATUS=release \ + ROOTDIR=${WRKSRC} LDFLAGS="${LDFLAGS}" \ + INSTALLDIR="${PREFIX}" LIBDIR=${PREFIX}/lib \ BUILD_SHARED_LIBRARY=yes LD="${CXX}" MAKE_ARGS+= MAKE=gmake LIBDIR=${PREFIX}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} INSTALL_TARGET= do_install +OPTIONS= GTK2 "Build with GTK2 UI" off \ + QT4 "Build with QT4 UI" on + +.include <bsd.port.pre.mk> + +.if defined(WITH_GTK2) +.if defined(WITH_QT4) +BROKEN= Select only one UI toolkit +.else +USE_GNOME= gtk20 +PKGNAMESUFFIX= -gtk2 +MAKE_ENV+= UI_TYPE=gtk +PLIST_SUB+= GTK2="" QT4="@comment " +.endif +.elif defined(WITH_QT4) +QT_COMPONENTS= gui corelib moc +PKGNAMESUFFIX= -qt4 +MAKE_ENV+= UI_TYPE=qt4 +PLIST_SUB+= GTK2="@comment " QT4="" +.else +BROKEN= You need to select UI toolkit +.endif + post-patch: @${REINPLACE_CMD} -e '/^LDFLAGS/s|=|+=|' ${WRKSRC}/makefiles/arch/*mk @${REINPLACE_CMD} -e 's|-ldl||;/CORE_LIBS/s|$$| -liconv|'\ ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile + @${REINPLACE_CMD} -e 's|libpng |libpng12 |'\ + ${WRKSRC}/makefiles/arch/desktop.mk @${REINPLACE_CMD} -e '/TARGET =/s|\.so\..*|.so.0|;s|$$[(]LIBDIR[)]|${PREFIX}/lib|'\ ${WRKSRC}/zlibrary/[ct]*/Makefile @${FIND} ${WRKSRC} -name Makefile -or -name \*.mk -or -name rules|\ @@ -46,4 +71,4 @@ # fuzpath: FBReader zlibrary libzl -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/deskutils/fbreader.orig/distinfo /usr/ports/deskutils/fbreader/distinfo --- /usr/ports/deskutils/fbreader.orig/distinfo 2007-11-29 15:16:52.000000000 +0300 +++ /usr/ports/deskutils/fbreader/distinfo 2007-11-29 23:13:45.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (fbreader-sources-0.8.7.tgz) = 35094324cfc869d4dcedc430bc9637cc -SHA256 (fbreader-sources-0.8.7.tgz) = 4b55e274a9b42552f5394387558a9248a0df2e02118d300d9cfee909f7a3458b -SIZE (fbreader-sources-0.8.7.tgz) = 905243 +MD5 (fbreader-sources-0.8.8.tgz) = 9cecbce9990c71a8c3c331c27eaa4f79 +SHA256 (fbreader-sources-0.8.8.tgz) = c0852cf64a82d0ffecc0d1d67f36140b0ce45bf92e156836a2aa7d4ebf16dc69 +SIZE (fbreader-sources-0.8.8.tgz) = 1164080 diff -ruN --exclude=CVS /usr/ports/deskutils/fbreader.orig/pkg-plist /usr/ports/deskutils/fbreader/pkg-plist --- /usr/ports/deskutils/fbreader.orig/pkg-plist 2007-11-29 15:16:52.000000000 +0300 +++ /usr/ports/deskutils/fbreader/pkg-plist 2007-11-29 23:23:46.000000000 +0300 @@ -1,7 +1,8 @@ bin/FBReader lib/libzlcore.so.0 lib/libzltext.so.0 -lib/zlibrary/ui/zlui-qt4.so +%%GTK2%%lib/zlibrary/ui/zlui-gtk.so +%%QT4%%lib/zlibrary/ui/zlui-qt4.so share/FBReader/default/config.xml share/FBReader/default/external.xml share/FBReader/default/keymap.xml @@ -11,10 +12,12 @@ share/FBReader/formats/xhtml/xhtml-special.ent share/FBReader/formats/xhtml/xhtml-symbol.ent share/FBReader/help/MiniHelp.en.fb2 +share/FBReader/help/MiniHelp.fi.fb2 share/FBReader/help/MiniHelp.fr.fb2 share/FBReader/help/MiniHelp.ru.fb2 share/FBReader/help/MiniHelp.uk.fb2 share/FBReader/resources/en.xml +share/FBReader/resources/fi.xml share/FBReader/resources/fr.xml share/FBReader/resources/ru.xml share/FBReader/resources/uk.xml @@ -74,8 +77,11 @@ share/zlibrary/encodings/windows-1251 share/zlibrary/encodings/windows-1252 share/zlibrary/hyphenationPatterns.zip -share/zlibrary/keynames-qt4.xml +share/zlibrary/languagePatterns.zip +%%GTK2%%share/zlibrary/keynames-gtk.xml +%%QT4%%share/zlibrary/keynames-qt4.xml share/zlibrary/resources/en.xml +share/zlibrary/resources/fi.xml share/zlibrary/resources/fr.xml share/zlibrary/resources/ru.xml share/zlibrary/resources/uk.xml --- fbreader-0.8.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711292051.lATKpfaT028283>