Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -157,6 +157,7 @@ SUBDIR += eventum SUBDIR += extjs SUBDIR += fabio + SUBDIR += falkon SUBDIR += fancybox SUBDIR += faup SUBDIR += fcgi Index: www/falkon/Makefile =================================================================== --- www/falkon/Makefile +++ www/falkon/Makefile @@ -1,61 +1,27 @@ # $FreeBSD$ -PORTNAME= qupzilla -PORTVERSION= 1.8.9 -PORTREVISION= 3 +PORTNAME= falkon +DISTVERSION= 2.1.99.20180114 CATEGORIES= www -MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ -PKGNAMESUFFIX= -qt5 -DISTNAME= QupZilla-${PORTVERSION} -MAINTAINER= rezny@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= Web browser based on WebKit engine and Qt Framework LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell +USES= cmake:outsource desktop-file-utils kde:5 ssl +USE_KDE= wallet +USE_QT5= core dbus gui location network printsupport qml quick \ + sql webchannel webengine widgets x11extras \ + buildtools_build qmake_build +USE_XORG= xcb -CONFLICTS_INSTALL= ${PORTNAME}-qt4* - -USES= desktop-file-utils pkgconfig qmake ssl tar:xz -USE_QT5= core concurrent gui network printsupport script sql webkit \ - widgets x11extras xml imageformats_run sql-sqlite3_run \ - buildtools_build linguisttools_build -USE_XORG= x11 -USE_GL= gl -CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ USE_LDCONFIG= yes -INSTALLS_ICONS= yes -PLIST_SUB= VERSION=${PORTVERSION} +USE_GITHUB= yes +GH_ACCOUNT= KDE +GH_TAGNAME= 087c983 -OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING KWALLET -OPTIONS_DEFAULT=DBUS -OPTIONS_SUB= yes - -DBUS_USE= QT5=dbus -DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" - -GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring -GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true" - -KWALLET_USES= kde:5 -KWALLET_USE= KDE=wallet -KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true" - -.include - -# work around for build failure in test plugin (single source file target) -.if ${PORT_OPTIONS:MDEBUG} -MAKE_JOBS_UNSAFE= yes -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ - ${WRKSRC}/tests/autotests/qztoolstest.cpp \ - ${WRKSRC}/src/lib/plugins/qtwebkit/spellcheck/speller.cpp - @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ - ${WRKSRC}/src/install.pri \ - ${WRKSRC}/src/defines.pri \ - ${WRKSRC}/src/lib/plugins/plugins.cpp +CONFLICTS_INSTALL= qupzilla-qt[45]* .include Index: www/falkon/distinfo =================================================================== --- www/falkon/distinfo +++ www/falkon/distinfo @@ -1,2 +1,3 @@ -SHA256 (QupZilla-1.8.9.tar.xz) = 620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac -SIZE (QupZilla-1.8.9.tar.xz) = 3004644 +TIMESTAMP = 1515926591 +SHA256 (KDE-falkon-2.1.99.20180114-087c983_GH0.tar.gz) = c17b81b0b77561b385f35d53693e57ec3bdf01db4a3624b8e1ef8d0740d96b12 +SIZE (KDE-falkon-2.1.99.20180114-087c983_GH0.tar.gz) = 3491794 Index: www/falkon/pkg-descr =================================================================== --- www/falkon/pkg-descr +++ www/falkon/pkg-descr @@ -1,19 +1,21 @@ -QupZilla is a new and very fast QtWebKit browser. It aims to be a lightweight +Falkon was orignially known as Qupzila. + +Falkon is a new and very fast QtWebEngine browser. It aims to be a lightweight web browser available through all major platforms. This project has been -originally started only for educational purposes. But from its start, QupZilla +originally started only for educational purposes. But from its start, Falkon has grown into a feature-rich browser. -QupZilla has all standard functions you expect from a web browser. It includes +Falkon has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a builtin AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL Manager. -QupZilla's main aim is to be a very fast and very stable QtWebKit browser +Falkon's main aim is to be a very fast and very stable QtWebKit browser available to everyone. There are already a lot of QtWebKit browsers available, but they are either bound to the KDE environment (rekonq), are not actively developed or very unstable and miss important features. But there is missing a -multiplatform, modern and actively developed browser. QupZilla is trying to +multiplatform, modern and actively developed browser. Falkon is trying to fill this gap by providing a very stable browsing experience. -WWW: http://www.qupzilla.com/ +WWW: https://github.com/KDE/falkon Index: www/falkon/pkg-plist =================================================================== --- www/falkon/pkg-plist +++ www/falkon/pkg-plist @@ -1,119 +1,17 @@ -bin/qupzilla -lib/libQupZilla.so -lib/libQupZilla.so.1 -lib/libQupZilla.so.1.8 -lib/libQupZilla.so.%%VERSION%% -lib/qupzilla/libAccessKeysNavigation.so -lib/qupzilla/libAutoScroll.so -lib/qupzilla/libFlashCookieManager.so -%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so -lib/qupzilla/libGreaseMonkey.so -%%KWALLET%%lib/qupzilla/libKWalletPasswords.so -lib/qupzilla/libMouseGestures.so -lib/qupzilla/libPIM.so -lib/qupzilla/libStatusBarIcons.so -lib/qupzilla/libTabManager.so -%%DEBUG%%lib/qupzilla/libTestPlugin.so -share/appdata/qupzilla.appdata.xml -share/applications/qupzilla.desktop -share/bash-completion/completions/qupzilla -share/icons/hicolor/128x128/apps/qupzilla.png -share/icons/hicolor/16x16/apps/qupzilla.png -share/icons/hicolor/256x256/apps/qupzilla.png -share/icons/hicolor/32x32/apps/qupzilla.png -share/icons/hicolor/48x48/apps/qupzilla.png -share/icons/hicolor/64x64/apps/qupzilla.png -share/pixmaps/qupzilla.png -%%DATADIR%%/locale/ar_SA.qm -%%DATADIR%%/locale/bg_BG.qm -%%DATADIR%%/locale/ca_ES.qm -%%DATADIR%%/locale/cs_CZ.qm -%%DATADIR%%/locale/da_DK.qm -%%DATADIR%%/locale/de_DE.qm -%%DATADIR%%/locale/el_GR.qm -%%DATADIR%%/locale/es_ES.qm -%%DATADIR%%/locale/es_MX.qm -%%DATADIR%%/locale/es_VE.qm -%%DATADIR%%/locale/eu_ES.qm -%%DATADIR%%/locale/fa_IR.qm -%%DATADIR%%/locale/fi_FI.qm -%%DATADIR%%/locale/fr_FR.qm -%%DATADIR%%/locale/gl_ES.qm -%%DATADIR%%/locale/he_IL.qm -%%DATADIR%%/locale/hr_HR.qm -%%DATADIR%%/locale/hu_HU.qm -%%DATADIR%%/locale/id_ID.qm -%%DATADIR%%/locale/it_IT.qm -%%DATADIR%%/locale/ja_JP.qm -%%DATADIR%%/locale/ka_GE.qm -%%DATADIR%%/locale/lg.qm -%%DATADIR%%/locale/lt.qm -%%DATADIR%%/locale/lv_LV.qm -%%DATADIR%%/locale/nl_NL.qm -%%DATADIR%%/locale/nqo.qm -%%DATADIR%%/locale/pl_PL.qm -%%DATADIR%%/locale/pt_BR.qm -%%DATADIR%%/locale/pt_PT.qm -%%DATADIR%%/locale/qt_ca.qm -%%DATADIR%%/locale/qt_el.qm -%%DATADIR%%/locale/qt_nl.qm -%%DATADIR%%/locale/qt_sr.qm -%%DATADIR%%/locale/qt_sr@ijekavian.qm -%%DATADIR%%/locale/qt_sr@ijekavianlatin.qm -%%DATADIR%%/locale/qt_sr@latin.qm -%%DATADIR%%/locale/ro_RO.qm -%%DATADIR%%/locale/ru_RU.qm -%%DATADIR%%/locale/sk_SK.qm -%%DATADIR%%/locale/sr.qm -%%DATADIR%%/locale/sr@ijekavian.qm -%%DATADIR%%/locale/sr@ijekavianlatin.qm -%%DATADIR%%/locale/sr@latin.qm -%%DATADIR%%/locale/sv_SE.qm -%%DATADIR%%/locale/tr_TR.qm -%%DATADIR%%/locale/uk_UA.qm -%%DATADIR%%/locale/uz@Latn.qm -%%DATADIR%%/locale/zh_CN.qm -%%DATADIR%%/locale/zh_TW.qm -%%DATADIR%%/themes/breathe/images/add.png -%%DATADIR%%/themes/breathe/images/find.png -%%DATADIR%%/themes/breathe/images/flash.png -%%DATADIR%%/themes/breathe/images/flashstart.png -%%DATADIR%%/themes/breathe/images/goto.png -%%DATADIR%%/themes/breathe/images/home.png -%%DATADIR%%/themes/breathe/images/library-bg.png -%%DATADIR%%/themes/breathe/images/lineedit-bg.png -%%DATADIR%%/themes/breathe/images/login.png -%%DATADIR%%/themes/breathe/images/menu.png -%%DATADIR%%/themes/breathe/images/navigation-dropdown.png -%%DATADIR%%/themes/breathe/images/next.png -%%DATADIR%%/themes/breathe/images/previous.png -%%DATADIR%%/themes/breathe/images/reload.png -%%DATADIR%%/themes/breathe/images/restore.png -%%DATADIR%%/themes/breathe/images/rss.png -%%DATADIR%%/themes/breathe/images/semi-transp.png -%%DATADIR%%/themes/breathe/images/siteicon-bg-a.png -%%DATADIR%%/themes/breathe/images/siteicon-bg-h.png -%%DATADIR%%/themes/breathe/images/siteicon-bg.png -%%DATADIR%%/themes/breathe/images/siteicon-secure-bg-a.png -%%DATADIR%%/themes/breathe/images/siteicon-secure-bg-h.png -%%DATADIR%%/themes/breathe/images/siteicon-secure-bg.png -%%DATADIR%%/themes/breathe/images/star-a.png -%%DATADIR%%/themes/breathe/images/star.png -%%DATADIR%%/themes/breathe/images/stop.png -%%DATADIR%%/themes/breathe/images/tab-left.png -%%DATADIR%%/themes/breathe/images/tab-right.png -%%DATADIR%%/themes/breathe/images/tabs-list.png -%%DATADIR%%/themes/breathe/images/transp.png -%%DATADIR%%/themes/breathe/images/trash.png -%%DATADIR%%/themes/breathe/images/websearch-bg-a.png -%%DATADIR%%/themes/breathe/images/websearch-bg-h.png -%%DATADIR%%/themes/breathe/images/websearch-bg.png -%%DATADIR%%/themes/breathe/main.css -%%DATADIR%%/themes/breathe/rtl.css -%%DATADIR%%/themes/breathe/theme.info -%%DATADIR%%/themes/breathe/theme.png -%%DATADIR%%/themes/chrome/images/flash.png -%%DATADIR%%/themes/chrome/images/flashstart.png +bin/falkon +lib/libFalkonPrivate.so.2 +lib/libFalkonPrivate.so.2.1.99 +%%QT_PLUGINDIR%%/falkon/AutoScroll.so +%%QT_PLUGINDIR%%/falkon/FlashCookieManager.so +%%QT_PLUGINDIR%%/falkon/GreaseMonkey.so +%%QT_PLUGINDIR%%/falkon/ImageFinder.so +%%QT_PLUGINDIR%%/falkon/KWalletPasswords.so +%%QT_PLUGINDIR%%/falkon/MouseGestures.so +%%QT_PLUGINDIR%%/falkon/PIM.so +%%QT_PLUGINDIR%%/falkon/StatusBarIcons.so +%%QT_PLUGINDIR%%/falkon/TabManager.so +share/applications/org.kde.Falkon.desktop +share/bash-completion/completions/falkon %%DATADIR%%/themes/chrome/images/gotoaddress.png %%DATADIR%%/themes/chrome/images/key.png %%DATADIR%%/themes/chrome/images/library-bg.png @@ -126,7 +24,6 @@ %%DATADIR%%/themes/chrome/images/navigation-reload.png %%DATADIR%%/themes/chrome/images/navigation-stop.png %%DATADIR%%/themes/chrome/images/navigation-supermenu.png -%%DATADIR%%/themes/chrome/images/rss.png %%DATADIR%%/themes/chrome/images/search-icon.png %%DATADIR%%/themes/chrome/images/searchbar-provider-bg.png %%DATADIR%%/themes/chrome/images/semi-transp.png @@ -150,61 +47,21 @@ %%DATADIR%%/themes/chrome/theme.license %%DATADIR%%/themes/chrome/theme.png %%DATADIR%%/themes/chrome/windows.css -%%DATADIR%%/themes/default/images/arrow-down.gif -%%DATADIR%%/themes/default/images/background.png -%%DATADIR%%/themes/default/images/flash.png -%%DATADIR%%/themes/default/images/flashstart.png -%%DATADIR%%/themes/default/images/gotoaddress.png -%%DATADIR%%/themes/default/images/key.png -%%DATADIR%%/themes/default/images/library-bg.png -%%DATADIR%%/themes/default/images/lineedit-bg.png -%%DATADIR%%/themes/default/images/navigation-addtab.png -%%DATADIR%%/themes/default/images/navigation-back.png -%%DATADIR%%/themes/default/images/navigation-forward.png -%%DATADIR%%/themes/default/images/navigation-home.png -%%DATADIR%%/themes/default/images/navigation-reload.png -%%DATADIR%%/themes/default/images/navigation-stop.png -%%DATADIR%%/themes/default/images/navigation-supmenu.png -%%DATADIR%%/themes/default/images/rss.png -%%DATADIR%%/themes/default/images/search.png -%%DATADIR%%/themes/default/images/semi-transp.png -%%DATADIR%%/themes/default/images/siteicon-bg-secure.png -%%DATADIR%%/themes/default/images/siteicon-bg.png -%%DATADIR%%/themes/default/images/star.png -%%DATADIR%%/themes/default/images/starg.png -%%DATADIR%%/themes/default/images/tab-left-arrow.png -%%DATADIR%%/themes/default/images/tab-right-arrow.png -%%DATADIR%%/themes/default/images/tabs-list-button.png -%%DATADIR%%/themes/default/images/transp.png -%%DATADIR%%/themes/default/images/websearchbar-bg.png -%%DATADIR%%/themes/default/main.css -%%DATADIR%%/themes/default/rtl.css -%%DATADIR%%/themes/default/theme.info -%%DATADIR%%/themes/default/theme.png -%%DATADIR%%/themes/default/windows.css -%%DATADIR%%/themes/linux/images/flash.png -%%DATADIR%%/themes/linux/images/flashstart.png -%%DATADIR%%/themes/linux/images/goto.png -%%DATADIR%%/themes/linux/images/key.png +%%DATADIR%%/themes/linux/images/arrow-down.svg +%%DATADIR%%/themes/linux/images/goto.svg %%DATADIR%%/themes/linux/images/library-bg.png -%%DATADIR%%/themes/linux/images/menu.png -%%DATADIR%%/themes/linux/images/navigation-dropdown.png -%%DATADIR%%/themes/linux/images/rss.png +%%DATADIR%%/themes/linux/images/menu.svg %%DATADIR%%/themes/linux/images/semi-transp.png -%%DATADIR%%/themes/linux/images/star-a.png -%%DATADIR%%/themes/linux/images/star.png -%%DATADIR%%/themes/linux/images/tab-left-arrow.png -%%DATADIR%%/themes/linux/images/tab-right-arrow.png -%%DATADIR%%/themes/linux/images/tabs-list-button.png +%%DATADIR%%/themes/linux/images/star-a.svg +%%DATADIR%%/themes/linux/images/star.svg +%%DATADIR%%/themes/linux/images/tab-left-arrow.svg +%%DATADIR%%/themes/linux/images/tab-right-arrow.svg %%DATADIR%%/themes/linux/images/transp.png -%%DATADIR%%/themes/linux/images/websearch-bg.png +%%DATADIR%%/themes/linux/images/user.svg %%DATADIR%%/themes/linux/main.css %%DATADIR%%/themes/linux/rtl.css %%DATADIR%%/themes/linux/theme.info %%DATADIR%%/themes/linux/theme.png -%%DATADIR%%/themes/mac/images/feed-icon.png -%%DATADIR%%/themes/mac/images/flash.png -%%DATADIR%%/themes/mac/images/flashstart.png %%DATADIR%%/themes/mac/images/gotoaddress.png %%DATADIR%%/themes/mac/images/key.png %%DATADIR%%/themes/mac/images/library-bg.png @@ -233,7 +90,6 @@ %%DATADIR%%/themes/mac/images/tabs-list-button_rtl.png %%DATADIR%%/themes/mac/images/toolbar-bg.png %%DATADIR%%/themes/mac/images/transp.png -%%DATADIR%%/themes/mac/images/user-trash-full.png %%DATADIR%%/themes/mac/linux.css %%DATADIR%%/themes/mac/main.css %%DATADIR%%/themes/mac/rtl.css @@ -241,45 +97,18 @@ %%DATADIR%%/themes/mac/theme.license %%DATADIR%%/themes/mac/theme.png %%DATADIR%%/themes/mac/windows.css -%%DATADIR%%/themes/windows/images/flash.png -%%DATADIR%%/themes/windows/images/flashstart.png -%%DATADIR%%/themes/windows/images/gotoaddress.png -%%DATADIR%%/themes/windows/images/key.png -%%DATADIR%%/themes/windows/images/library-bg-left.png -%%DATADIR%%/themes/windows/images/lineedit-bg.png -%%DATADIR%%/themes/windows/images/navigation-addtab.png -%%DATADIR%%/themes/windows/images/navigation-back.png -%%DATADIR%%/themes/windows/images/navigation-dropdown.png -%%DATADIR%%/themes/windows/images/navigation-forward.png -%%DATADIR%%/themes/windows/images/navigation-home.png -%%DATADIR%%/themes/windows/images/navigation-reload.png -%%DATADIR%%/themes/windows/images/navigation-stop.png -%%DATADIR%%/themes/windows/images/navigation-supermenu.png -%%DATADIR%%/themes/windows/images/rss.png -%%DATADIR%%/themes/windows/images/search-icon.png -%%DATADIR%%/themes/windows/images/searchbar-provider-bg.png +%%DATADIR%%/themes/windows/images/library-bg.png %%DATADIR%%/themes/windows/images/semi-transp.png -%%DATADIR%%/themes/windows/images/siteicon-bg.png -%%DATADIR%%/themes/windows/images/siteicon-secure-bg.png -%%DATADIR%%/themes/windows/images/star-a.png -%%DATADIR%%/themes/windows/images/star.png -%%DATADIR%%/themes/windows/images/tab-active-bg.png -%%DATADIR%%/themes/windows/images/tab-deactive-bg.png -%%DATADIR%%/themes/windows/images/tab-deactive-hover-bg.png -%%DATADIR%%/themes/windows/images/tab-left-arrow.png -%%DATADIR%%/themes/windows/images/tab-right-arrow.png -%%DATADIR%%/themes/windows/images/tabbar-addtab-outside.png -%%DATADIR%%/themes/windows/images/tabbar-addtab.png -%%DATADIR%%/themes/windows/images/tabbar-addtab_rtl.png -%%DATADIR%%/themes/windows/images/tabs-bg.png -%%DATADIR%%/themes/windows/images/tabs-list-button.png -%%DATADIR%%/themes/windows/images/toolbar-bg.png %%DATADIR%%/themes/windows/images/transp.png -%%DATADIR%%/themes/windows/images/user-trash-full.png -%%DATADIR%%/themes/windows/linux.css %%DATADIR%%/themes/windows/main.css %%DATADIR%%/themes/windows/rtl.css %%DATADIR%%/themes/windows/theme.info -%%DATADIR%%/themes/windows/theme.license %%DATADIR%%/themes/windows/theme.png -%%DATADIR%%/themes/windows/windows.css +share/icons/hicolor/128x128/apps/qupzilla.png +share/icons/hicolor/16x16/apps/qupzilla.png +share/icons/hicolor/256x256/apps/qupzilla.png +share/icons/hicolor/32x32/apps/qupzilla.png +share/icons/hicolor/48x48/apps/qupzilla.png +share/icons/hicolor/64x64/apps/qupzilla.png +share/metainfo/org.kde.Falkon.appdata.xml +share/pixmaps/qupzilla.png Index: www/qupzilla-qt4/Makefile =================================================================== --- www/qupzilla-qt4/Makefile +++ www/qupzilla-qt4/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell -CONFLICTS_INSTALL= ${PORTNAME}-qt5* +CONFLICTS_INSTALL= ${PORTNAME}-qt5* falkon-2.* USES= desktop-file-utils pkgconfig qmake ssl tar:xz USE_QT4= corelib gui network script sql webkit xml \ Index: www/qupzilla-qt5/Makefile =================================================================== --- www/qupzilla-qt5/Makefile +++ www/qupzilla-qt5/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell -CONFLICTS_INSTALL= ${PORTNAME}-qt4* +CONFLICTS_INSTALL= ${PORTNAME}-qt4* falkon-2.* USES= desktop-file-utils pkgconfig qmake ssl tar:xz USE_QT5= core concurrent gui network printsupport script sql webkit \