FreeBSD Bugzilla – Attachment 151547 Details for
Bug 196302
[MAINTAINER] www/qupzilla: Update to 1.8.5, Create separate Qt4 and Qt5 variants
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
cleaned up patch for 1.8.5 update and port split
www_qupzilla.patch (text/plain), 4.77 KB, created by
Matthew Rezny
on 2015-01-13 10:59:24 UTC
(
hide
)
Description:
cleaned up patch for 1.8.5 update and port split
Filename:
MIME Type:
Creator:
Matthew Rezny
Created:
2015-01-13 10:59:24 UTC
Size:
4.77 KB
patch
obsolete
>Index: MOVED >=================================================================== >--- MOVED (revision 375688) >+++ MOVED (working copy) >@@ -7349,3 +7349,4 @@ > x11-fm/pbi-thumbnailer||2014-12-27|Has expired: Broken for more than 6 months > games/secretmaryochronicles||2014-12-27|Has expired: does not run, cegui 0.8 support still in development > multimedia/ffmpeg24|multimedia/ffmpeg25|2014-12-27|ffmpeg upstream now points to 2.5.x series >+www/qupzilla|www/qupzilla-qt4|2014-12-27|Rename to make room for www/qupzilla-qt5 >Index: www/Makefile >=================================================================== >--- www/Makefile (revision 375688) >+++ www/Makefile (working copy) >@@ -1717,7 +1717,8 @@ > SUBDIR += qdecoder > SUBDIR += qooxdoo > SUBDIR += quickie >- SUBDIR += qupzilla >+ SUBDIR += qupzilla-qt4 >+ SUBDIR += qupzilla-qt5 > SUBDIR += radicale > SUBDIR += red5 > SUBDIR += redaxo >Index: www/qupzilla-qt4/Makefile >=================================================================== >--- www/qupzilla-qt4/Makefile (revision 375688) >+++ www/qupzilla-qt4/Makefile (working copy) >@@ -1,10 +1,12 @@ > # $FreeBSD$ > > PORTNAME= qupzilla >-PORTVERSION= 1.8.3 >+PORTVERSION= 1.8.5 > CATEGORIES= www > MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ > DISTNAME= QupZilla-${PORTVERSION} >+PKGNAMESUFFIX= -qt4 >+CONFLICTS= ${PORTNAME}-qt5* > > MAINTAINER= matthew@reztek.cz > COMMENT= Web browser based on WebKit engine and Qt Framework >@@ -14,8 +16,8 @@ > LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell > > USES= desktop-file-utils execinfo pkgconfig qmake tar:xz >-USE_QT4= corelib gui moc_build rcc_build uic_build webkit \ >- xml script sql network imageformats_run linguist_build >+USE_QT4= corelib gui imageformats_run network script sql webkit xml \ >+ linguist_build moc_build rcc_build uic_build > CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ > USE_LDCONFIG= yes > INSTALLS_ICONS= yes >Index: www/qupzilla-qt4/distinfo >=================================================================== >--- www/qupzilla-qt4/distinfo (revision 375688) >+++ www/qupzilla-qt4/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be >-SIZE (QupZilla-1.8.3.tar.xz) = 3093840 >+SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c >+SIZE (QupZilla-1.8.5.tar.xz) = 3096640 >Index: www/qupzilla-qt5/Makefile >=================================================================== >--- www/qupzilla-qt5/Makefile (revision 375498) >+++ www/qupzilla-qt5/Makefile (working copy) >@@ -1,10 +1,12 @@ > # $FreeBSD$ > > PORTNAME= qupzilla >-PORTVERSION= 1.8.3 >+PORTVERSION= 1.8.5 > CATEGORIES= www > MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ > DISTNAME= QupZilla-${PORTVERSION} >+PKGNAMESUFFIX= -qt5 >+CONFLICTS= ${PORTNAME}-qt4* > > MAINTAINER= matthew@reztek.cz > COMMENT= Web browser based on WebKit engine and Qt Framework >@@ -14,26 +16,35 @@ > LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell > > USES= desktop-file-utils execinfo pkgconfig qmake tar:xz >-USE_QT4= corelib gui moc_build rcc_build uic_build webkit \ >- xml script sql network imageformats_run linguist_build >+USE_QT5= core gui imageformats_run network script sql webkit xml \ >+ buildtools_build linguisttools_build > CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ > USE_LDCONFIG= yes > INSTALLS_ICONS= yes > PLIST_SUB= VERSION=${PORTVERSION} > >-OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING KWALLET >+OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING # KWALLET > OPTIONS_DEFAULT=DBUS > OPTIONS_SUB= yes > >-DBUS_USE= QT4=dbus >+DBUS_USE= QT5=dbus > DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" > > GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring > GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true" > >-KWALLET_USE= KDE4=kdelibs >-KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true" >+# KWallet integration requires KF5 which is not yet in ports >+#KWALLET_USE= KDE5=kdelibs >+#KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true" >+PLIST_SUB+= KWALLET="@comment " > >+.include <bsd.port.options.mk> >+ >+# work around for build failure in test plugin (single source file target) >+.if ${PORT_OPTIONS:MDEBUG} >+MAKE_JOBS_UNSAFE=1 >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ > ${WRKSRC}/tests/autotests/qztoolstest.cpp \ >Index: www/qupzilla-qt5/distinfo >=================================================================== >--- www/qupzilla-qt5/distinfo (revision 375498) >+++ www/qupzilla-qt5/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be >-SIZE (QupZilla-1.8.3.tar.xz) = 3093840 >+SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c >+SIZE (QupZilla-1.8.5.tar.xz) = 3096640
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 196302
:
150994
|
151547
|
151765
|
151782