svn commit: r554642 - in head: archivers/quazip astro/marble astro/merkaartor astro/merkaartor/files astro/qmapshack astro/qmapshack/files editors/texstudio editors/texstudio/files emulators/emu64 ...
Tobias C. Berner
tcberner at FreeBSD.org
Sun Nov 8 18:57:06 UTC 2020
Author: tcberner
Date: Sun Nov 8 18:57:00 2020
New Revision: 554642
URL: https://svnweb.freebsd.org/changeset/ports/554642
Log:
archivers/quazip: update to 1.1
- fix / modify find calls and include directories in dependent ports
Added:
head/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp (contents, props changed)
head/editors/texstudio/files/patch-texstudio.pro (contents, props changed)
head/emulators/emu64/files/patch-src_src.pro (contents, props changed)
head/emulators/emu64/files/patch-src_widget__file__browse.h (contents, props changed)
head/emulators/mupen64plus-qt/files/
head/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro (contents, props changed)
head/emulators/mupen64plus-qt/files/patch-src_common.cpp (contents, props changed)
head/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp (contents, props changed)
Modified:
head/archivers/quazip/Makefile
head/archivers/quazip/distinfo
head/archivers/quazip/pkg-plist
head/astro/marble/Makefile
head/astro/merkaartor/Makefile
head/astro/merkaartor/files/patch-src_src.pro
head/astro/qmapshack/Makefile
head/astro/qmapshack/files/patch-CMakeLists.txt (contents, props changed)
head/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt (contents, props changed)
head/editors/texstudio/Makefile
head/emulators/emu64/Makefile
head/emulators/mupen64plus-qt/Makefile
head/graphics/krita/Makefile
head/graphics/nomacs/Makefile
head/graphics/nomacs/distinfo
head/security/keepassxc/Makefile
Modified: head/archivers/quazip/Makefile
==============================================================================
--- head/archivers/quazip/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/archivers/quazip/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -3,7 +3,7 @@
PORTNAME= quazip
DISTVERSIONPREFIX= v
-DISTVERSION= 0.9.1
+DISTVERSION= 1.1
CATEGORIES= archivers
PKGNAMESUFFIX= -qt5
@@ -16,9 +16,11 @@ USES= cmake compiler:c++11-lang qt:5
USE_GITHUB= yes
GH_ACCOUNT= stachenov
USE_LDCONFIG= yes
-USE_QT= core buildtools_build qmake_build
+USE_QT= core network testlib \
+ buildtools_build qmake_build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE
-PLIST_SUB= QTVER_SUFFIX=5
+PLIST_SUB= QTVER_SUFFIX=5 \
+ QUAZIP_VERSION=${DISTVERSION}
.include <bsd.port.mk>
Modified: head/archivers/quazip/distinfo
==============================================================================
--- head/archivers/quazip/distinfo Sun Nov 8 17:59:48 2020 (r554641)
+++ head/archivers/quazip/distinfo Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590411942
-SHA256 (stachenov-quazip-v0.9.1_GH0.tar.gz) = 5d36b745cb94da440432690050e6db45b99b477cfe9bc3b82fd1a9d36fff95f5
-SIZE (stachenov-quazip-v0.9.1_GH0.tar.gz) = 155775
+TIMESTAMP = 1604822379
+SHA256 (stachenov-quazip-v1.1_GH0.tar.gz) = 54edce9c11371762bd4f0003c2937b5d8806a2752dd9c0fd9085e90792612ad0
+SIZE (stachenov-quazip-v1.1_GH0.tar.gz) = 153870
Modified: head/archivers/quazip/pkg-plist
==============================================================================
--- head/archivers/quazip/pkg-plist Sun Nov 8 17:59:48 2020 (r554641)
+++ head/archivers/quazip/pkg-plist Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,22 +1,25 @@
-include/quazip%%QTVER_SUFFIX%%/JlCompress.h
-include/quazip%%QTVER_SUFFIX%%/ioapi.h
-include/quazip%%QTVER_SUFFIX%%/minizip_crypt.h
-include/quazip%%QTVER_SUFFIX%%/quaadler32.h
-include/quazip%%QTVER_SUFFIX%%/quachecksum32.h
-include/quazip%%QTVER_SUFFIX%%/quacrc32.h
-include/quazip%%QTVER_SUFFIX%%/quagzipfile.h
-include/quazip%%QTVER_SUFFIX%%/quaziodevice.h
-include/quazip%%QTVER_SUFFIX%%/quazip.h
-include/quazip%%QTVER_SUFFIX%%/quazip_global.h
-include/quazip%%QTVER_SUFFIX%%/quazipdir.h
-include/quazip%%QTVER_SUFFIX%%/quazipfile.h
-include/quazip%%QTVER_SUFFIX%%/quazipfileinfo.h
-include/quazip%%QTVER_SUFFIX%%/quazipnewinfo.h
-include/quazip%%QTVER_SUFFIX%%/unzip.h
-include/quazip%%QTVER_SUFFIX%%/zip.h
-lib/cmake/QuaZip%%QTVER_SUFFIX%%/QuaZip%%QTVER_SUFFIX%%Config.cmake
-lib/libquazip%%QTVER_SUFFIX%%.a
-lib/libquazip%%QTVER_SUFFIX%%.so
-lib/libquazip%%QTVER_SUFFIX%%.so.1
-lib/libquazip%%QTVER_SUFFIX%%.so.1.0.0
-libdata/pkgconfig/quazip.pc
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/JlCompress.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/ioapi.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/minizip_crypt.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quaadler32.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quachecksum32.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quacrc32.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quagzipfile.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quaziodevice.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip_global.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip_qt_compat.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipdir.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipfile.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipfileinfo.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipnewinfo.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/unzip.h
+include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/zip.h
+lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5Config.cmake
+lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5ConfigVersion.cmake
+lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5_SharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5_SharedTargets.cmake
+lib/libquazip1-qt5.so
+lib/libquazip1-qt5.so.1.0.0
+lib/libquazip1-qt5.so.%%QUAZIP_VERSION%%
+libdata/pkgconfig/quazip1-qt5.pc
Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/marble/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -2,6 +2,7 @@
PORTNAME= marble
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= astro kde kde-applications
MAINTAINER= kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Virtual globe and world atlas for KDE
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-LIB_DEPENDS= libquazip5.so:archivers/quazip
+LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip
USES= cmake compiler:c++11-lang desktop-file-utils gettext \
kde:5 qt:5 shared-mime-info tar:xz
Modified: head/astro/merkaartor/Makefile
==============================================================================
--- head/astro/merkaartor/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/merkaartor/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= astro
MAINTAINER= dev2 at heesakkers.info
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
- libquazip5.so:archivers/quazip
+ libquazip1-qt5.so:archivers/quazip
USES= compiler:c++11-lang gnome pkgconfig qmake qt:5 sqlite:3
USE_GITHUB= yes
Modified: head/astro/merkaartor/files/patch-src_src.pro
==============================================================================
--- head/astro/merkaartor/files/patch-src_src.pro Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/merkaartor/files/patch-src_src.pro Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,12 +1,13 @@
Link against the right library name for archivers/quazip-qt5.
--- src/src.pro.orig 2015-07-19 14:50:09 UTC
+++ src/src.pro
-@@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) {
+@@ -15,7 +15,8 @@ isEmpty(SYSTEM_QUAZIP) {
DEFINES += QUAZIP_STATIC
include(../3rdparty/quazip-0.7/quazip.pri)
} else {
- LIBS += -lquazip
-+ LIBS += -lquazip5
++ CONFIG += link_pkgconfig
++ PKGCONFIG += quazip1-qt5
}
#Qt Version
Modified: head/astro/qmapshack/Makefile
==============================================================================
--- head/astro/qmapshack/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/qmapshack/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -4,6 +4,7 @@
PORTNAME= qmapshack
PORTVERSION= 1.15.0
DISTVERSIONPREFIX= V_
+PORTREVISION= 1
CATEGORIES= astro
MAINTAINER= bofh at FreeBSD.org
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
- libquazip5.so:archivers/quazip \
+ libquazip1-qt5.so:archivers/quazip \
libroutino.so:astro/routino
RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
Modified: head/astro/qmapshack/files/patch-CMakeLists.txt
==============================================================================
--- head/astro/qmapshack/files/patch-CMakeLists.txt Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/qmapshack/files/patch-CMakeLists.txt Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2020-03-27 08:07:31 UTC
+--- CMakeLists.txt.orig 2020-06-14 10:22:49 UTC
+++ CMakeLists.txt
@@ -65,6 +65,7 @@ include(TranslateDesktop)
include(DefineCMakeDefaults)
@@ -8,7 +8,7 @@
include(CPackConfig.cmake)
include(ConfigureChecks.cmake)
-@@ -167,7 +168,10 @@ find_package(Qt5WebEngineWidgets REQUIRED)
+@@ -167,10 +168,13 @@ find_package(Qt5WebEngineWidgets REQUIRED)
find_package(Qt5Qml REQUIRED)
find_package(Qt5Help REQUIRED)
find_package(GDAL REQUIRED)
@@ -19,4 +19,8 @@
+endif()
find_package(JPEG REQUIRED)
find_package(ROUTINO REQUIRED)
- find_package(QuaZip5 REQUIRED)
+-find_package(QuaZip5 REQUIRED)
++find_package(QuaZip-Qt5 REQUIRED)
+ find_package(ALGLIB ) # optional as we can use our local version
+
+
Modified: head/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt
==============================================================================
--- head/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt Sun Nov 8 17:59:48 2020 (r554641)
+++ head/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,11 +1,25 @@
---- src/qmapshack/CMakeLists.txt.orig 2020-03-27 08:07:31 UTC
+--- src/qmapshack/CMakeLists.txt.orig 2020-06-14 10:22:49 UTC
+++ src/qmapshack/CMakeLists.txt
-@@ -920,7 +920,7 @@ target_link_libraries(${APPLICATION_NAME}
+@@ -897,7 +897,6 @@ include_directories(
+ ${PROJ4_INCLUDE_DIRS}
+ ${ROUTINO_INCLUDE_DIRS}
+ ${ALGLIB_INCLUDE_DIRS}
+- ${QUAZIP_INCLUDE_DIRS}
+ )
+
+ if(APPLE)
+@@ -941,12 +940,12 @@ target_link_libraries(${APPLICATION_NAME}
+ Qt5::Qml
+ Qt5::Positioning
Qt5::Help
++ QuaZip::QuaZip
${DBUS_LIB}
${GDAL_LIBRARIES}
- ${PROJ4_LIBRARIES}
+ ${PROJ4_LDFLAGS} ${PROJ4_LIBRARIES}
${ROUTINO_LIBRARIES}
${ALGLIB_LIBRARIES}
- ${QUAZIP_LIBRARIES}
+- ${QUAZIP_LIBRARIES}
+ )
+
+ if(APPLE)
Added: head/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,11 @@
+--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2020-11-08 17:59:37 UTC
++++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
+@@ -22,7 +22,7 @@
+ #include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
+ #include "helpers/CWebPage.h"
+ #include "setup/IAppSetup.h"
+-#include <JlCompress.h>
++#include <quazip/JlCompress.h>
+ #include <proj_api.h>
+ #include <QFileDialog>
+ #include <QMessageBox>
Modified: head/editors/texstudio/Makefile
==============================================================================
--- head/editors/texstudio/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/editors/texstudio/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -2,7 +2,7 @@
PORTNAME= texstudio
DISTVERSION= 3.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors
MAINTAINER= rigoletto at FreeBSD.org
@@ -15,14 +15,12 @@ BROKEN_armv6= fails to compile: error: no member named
LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \
libpoppler.so:graphics/poppler \
libpoppler-qt5.so:graphics/poppler-qt5 \
- libquazip5.so:archivers/quazip
+ libquazip1-qt5.so:archivers/quazip
USES= compiler:c++11-lang desktop-file-utils dos2unix \
ghostscript:run gl pkgconfig qmake qt:5 xorg
USE_QT = core gui network script svg widgets xml \
printsupport concurrent uitools buildtools_build
-QMAKE_ARGS= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
- QUAZIP_LIB="-lquazip5"
QTVER_SUFFIX= 5
USE_XORG= x11
Added: head/editors/texstudio/files/patch-texstudio.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/texstudio/files/patch-texstudio.pro Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,15 @@
+--- texstudio.pro.orig 2020-11-08 18:12:21 UTC
++++ texstudio.pro
+@@ -366,10 +366,8 @@ isEmpty(USE_SYSTEM_QUAZIP) {
+ include(src/quazip/quazip/quazip.pri)
+ } else {
+ message(System quazip5)
+- isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
+- isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
+- INCLUDEPATH += $${QUAZIP_INCLUDE}
+- LIBS += $${QUAZIP_LIB}
++ CONFIG += link_pkgconfig
++ PKGCONFIG += quazip1-qt5
+ }
+
+ include(src/pdfviewer/pdfviewer.pri)
Modified: head/emulators/emu64/Makefile
==============================================================================
--- head/emulators/emu64/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/emulators/emu64/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -3,7 +3,7 @@
PORTNAME= emu64
PORTVERSION= 5.0.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MAINTAINER= felix at palmen-it.de
@@ -12,7 +12,7 @@ COMMENT= Commodore 64 emulator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libquazip5.so:archivers/quazip \
+LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip \
libpng.so:graphics/png \
libavcodec.so:multimedia/ffmpeg
@@ -21,7 +21,8 @@ USES= compiler:c++11-lang desktop-file-utils dos2unix
USE_GL= gl glu
USE_QT= core gui widgets buildtools_build linguisttools_build
-DOS2UNIX_FILES= src/c64_class.cpp
+DOS2UNIX_FILES= src/c64_class.cpp \
+ src/widget_file_browse.h
USE_SDL= sdl2 image2
USE_GITHUB= yes
Added: head/emulators/emu64/files/patch-src_src.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emu64/files/patch-src_src.pro Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,11 @@
+--- src/src.pro.orig 2020-11-08 17:21:01 UTC
++++ src/src.pro
+@@ -73,7 +73,7 @@ DEFINES += ZIP_SUPPORT=true
+ win32 {
+ PKGCONFIG += quazip
+ } else {
+- LIBS += -lquazip5
++ PKGCONFIG += quazip1-qt5
+ }
+
+ # Quelltexte
Added: head/emulators/emu64/files/patch-src_widget__file__browse.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emu64/files/patch-src_widget__file__browse.h Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,13 @@
+--- src/widget_file_browse.h.orig 2020-11-08 17:22:47 UTC
++++ src/widget_file_browse.h
+@@ -26,8 +26,8 @@
+ #include "quazip/quazip.h"
+ #include "quazip/quazipfile.h"
+ #else
+- #include "quazip5/quazip.h"
+- #include "quazip5/quazipfile.h"
++ #include "quazip/quazip.h"
++ #include "quazip/quazipfile.h"
+ #endif
+ #endif
+
Modified: head/emulators/mupen64plus-qt/Makefile
==============================================================================
--- head/emulators/mupen64plus-qt/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/emulators/mupen64plus-qt/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -2,6 +2,7 @@
PORTNAME= mupen64plus-qt
DISTVERSION= 1.14
+PORTREVISION= 1
CATEGORIES= emulators
MAINTAINER= maintainer at hasting.email
@@ -10,7 +11,7 @@ COMMENT= Basic launcher for Mupen64Plus
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libquazip5.so:archivers/quazip
+LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip
RUN_DEPENDS= ${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \
${LOCALBASE}/lib/mupen64plus/mupen64plus-audio-sdl.so:emulators/mupen64plus-audio-sdl \
${LOCALBASE}/lib/mupen64plus/mupen64plus-input-sdl.so:emulators/mupen64plus-input-sdl \
@@ -18,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmupen64plus.so.2:emul
${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice \
mupen64plus:emulators/mupen64plus-ui-console
-USES= gl qmake qt:5
+USES= gl pkgconfig qmake qt:5
USE_GL= gl
USE_QT= core gui network sql widgets xml \
buildtools_build \
Added: head/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,12 @@
+--- mupen64plus-qt.pro.orig 2020-11-08 17:31:05 UTC
++++ mupen64plus-qt.pro
+@@ -86,7 +86,8 @@ win32|macx|linux_quazip_static {
+ LIBS += -lquazip5
+ }
+ } else {
+- LIBS += -lquazip5
++ CONFIG += link_pkgconfig
++ PKGCONFIG += quazip1-qt5
+ }
+ }
+ }
Added: head/emulators/mupen64plus-qt/files/patch-src_common.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-qt/files/patch-src_common.cpp Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,13 @@
+--- src/common.cpp.orig 2020-11-08 17:32:57 UTC
++++ src/common.cpp
+@@ -40,8 +40,8 @@
+ #include <QLocale>
+ #include <QSize>
+
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipfile.h>
++#include <quazip/quazip.h>
++#include <quazip/quazipfile.h>
+
+ #ifdef Q_OS_WIN
+ #include <QCoreApplication>
Added: head/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp Sun Nov 8 18:57:00 2020 (r554642)
@@ -0,0 +1,13 @@
+--- src/emulation/emulatorhandler.cpp.orig 2020-11-08 17:32:57 UTC
++++ src/emulation/emulatorhandler.cpp
+@@ -38,8 +38,8 @@
+ #include <QFile>
+ #include <QMessageBox>
+
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipfile.h>
++#include <quazip/quazip.h>
++#include <quazip/quazipfile.h>
+
+
+ EmulatorHandler::EmulatorHandler(QWidget *parent) : QObject(parent)
Modified: head/graphics/krita/Makefile
==============================================================================
--- head/graphics/krita/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/graphics/krita/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -2,7 +2,7 @@
PORTNAME= krita
DISTVERSION= 4.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -26,7 +26,7 @@ LIB_DEPENDS= libImath.so:graphics/ilmbase \
libpng.so:graphics/png \
libpoppler.so:graphics/poppler \
libpoppler-qt5.so:graphics/poppler-qt5 \
- libquazip5.so:archivers/quazip \
+ libquazip1-qt5.so:archivers/quazip \
libraw.so:graphics/libraw \
libtiff.so:graphics/tiff \
libxcb.so:x11/libxcb \
Modified: head/graphics/nomacs/Makefile
==============================================================================
--- head/graphics/nomacs/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/graphics/nomacs/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -3,8 +3,12 @@
PORTNAME= nomacs
PORTVERSION= 3.16
DISTVERSIONSUFFIX= .224
+PORTREVISION= 1
CATEGORIES= graphics
+PATCH_SITES= https://github.com/nomacs/nomacs/commit/
+PATCHFILES= 8c44e10ae48a88ed2ea885f432c65a0859013011.patch:-p1
+
MAINTAINER= vidar at karlsen.tech
COMMENT= Small, fast, and free image viewer
@@ -14,7 +18,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libopencv_highgui.so:graphics/opencv \
libopencv_core.so:graphics/opencv-core \
liblcms2.so:graphics/lcms2 \
- libquazip5.so:archivers/quazip
+ libquazip1-qt5.so:archivers/quazip
USES= cmake compiler:c++11-lang desktop-file-utils \
dos2unix pkgconfig qt:5
Modified: head/graphics/nomacs/distinfo
==============================================================================
--- head/graphics/nomacs/distinfo Sun Nov 8 17:59:48 2020 (r554641)
+++ head/graphics/nomacs/distinfo Sun Nov 8 18:57:00 2020 (r554642)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1603554304
+TIMESTAMP = 1604849830
SHA256 (nomacs-nomacs-3.16.224_GH0.tar.gz) = bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c
SIZE (nomacs-nomacs-3.16.224_GH0.tar.gz) = 1932366
SHA256 (nomacs-nomacs-plugins-3.16_GH0.tar.gz) = ab6a91c582d48f4a4697d80ce549886921888cfbb32ea8b8c3b172fb7139225a
SIZE (nomacs-nomacs-plugins-3.16_GH0.tar.gz) = 561522
+SHA256 (8c44e10ae48a88ed2ea885f432c65a0859013011.patch) = b92910d9f685c2919948f2bcf627ab0d83ba97491708abb6a8675d831604c627
+SIZE (8c44e10ae48a88ed2ea885f432c65a0859013011.patch) = 4137
Modified: head/security/keepassxc/Makefile
==============================================================================
--- head/security/keepassxc/Makefile Sun Nov 8 17:59:48 2020 (r554641)
+++ head/security/keepassxc/Makefile Sun Nov 8 18:57:00 2020 (r554642)
@@ -2,6 +2,7 @@
PORTNAME= keepassxc
DISTVERSION= 2.6.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/
@@ -45,7 +46,7 @@ BROWSER_DESC= Browser integration with KeePassXC-Brow
KEESHARE_CMAKE_BOOL= WITH_XC_KEESHARE WITH_XC_KEESHARE_SECURE
KEESHARE_DESC= Sharing integration with KeeShare
-KEESHARE_LIB_DEPENDS= libquazip5.so:archivers/quazip
+KEESHARE_LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip
# Legacy/Deprecated.
NETWORKING_CMAKE_BOOL= WITH_XC_NETWORKING
More information about the svn-ports-head
mailing list