git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121463 from lukegb/pr103254

libsForQt5.quazip: 0.9.1 -> 1.1

commitf587042bb90c109e7b8bb7fc0def2576d87c8681 authorLuke Granger-Brown <git@lukegb.com> dateSun 2 May 2021, 13:15 (6 years ago) parent9a943b48a92cdd
8 files changed+163−17
compare with master
unifiedsplit
pkgs/applications/gis/qmapshack/default.nix+3−3 pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch+141 pkgs/applications/graphics/nomacs/default.nix+9 pkgs/applications/graphics/openboard/default.nix+2−1 pkgs/applications/misc/ideamaker/default.nix+3−2 pkgs/applications/networking/instant-messengers/teamspeak/client.nix+1−1 pkgs/development/libraries/quazip/default.nix+2−2 pkgs/top-level/all-packages.nix+2−8
pkgs/applications/gis/qmapshack/default.nix+3−3
@@ -18,13 +18,13 @@ mkDerivation rec {
1818
1919 cmakeFlags = [
2020 "-DROUTINO_XML_PATH=${routino}/share/routino"
21− "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"
22− "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
2321 ];
2422
2523 patches = [
2624 "${src}/FindPROJ4.patch"
27− "${src}/FindQuaZip5.patch"
25+
26+ # Support QuaZip 1.x.
27+ ./pr350-support-quazip-1x.patch
2828 ];
2929
3030 qtWrapperArgs = [
pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patchnew file+141
@@ -0,0 +1,141 @@
1+From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001
2+From: kiozen <oliver.eichler@gmx.de>
3+Date: Sat, 20 Mar 2021 12:14:29 +0100
4+Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x
5+
6+Simply adjusted the cmake scripts
7+---
8+ CMakeLists.txt | 2 +-
9+ src/qmapshack/CMakeLists.txt | 27 +++++++++++++--------------
10+ 3 files changed, 15 insertions(+), 15 deletions(-)
11+
12+diff --git a/CMakeLists.txt b/CMakeLists.txt
13+index 8d2cf127..7420d9b2 100644
14+--- a/CMakeLists.txt
15++++ b/CMakeLists.txt
16+@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED)
17+ find_package(PROJ REQUIRED)
18+ find_package(JPEG REQUIRED)
19+ find_package(ROUTINO REQUIRED)
20+-find_package(QuaZip5 REQUIRED)
21++find_package(QuaZip-Qt5 REQUIRED)
22+ find_package(ALGLIB ) # optional as we can use our local version
23+
24+
25+diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt
26+index 08eeb183..9b3836d6 100644
27+--- a/src/qmapshack/CMakeLists.txt
28++++ b/src/qmapshack/CMakeLists.txt
29+@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH})
30+ # All source files needed to compile
31+ ###############################################################################################
32+
33+-set( SRCS
34+- CAbout.cpp
35++set( SRCS
36++ CAbout.cpp
37+ CMainWindow.cpp
38+ CSingleInstanceProxy.cpp
39+ canvas/CCanvas.cpp
40+@@ -160,7 +160,7 @@ set( SRCS
41+ gis/trk/CInvalidTrk.cpp
42+ gis/trk/CKnownExtension.cpp
43+ gis/trk/CListTrkPts.cpp
44+- gis/trk/CPropertyTrk.cpp
45++ gis/trk/CPropertyTrk.cpp
46+ gis/trk/CScrOptTrk.cpp
47+ gis/trk/CSelectActivityColor.cpp
48+ gis/trk/CTableTrk.cpp
49+@@ -272,7 +272,7 @@ set( SRCS
50+ mouse/line/CLineOpMovePoint.cpp
51+ mouse/line/CLineOpSelectRange.cpp
52+ mouse/line/CScrOptEditLine.cpp
53+- mouse/line/CScrOptRangeLine.cpp
54++ mouse/line/CScrOptRangeLine.cpp
55+ mouse/line/ILineOp.cpp
56+ mouse/line/IMouseEditLine.cpp
57+ plot/CPlot.cpp
58+@@ -401,7 +401,7 @@ set( HDRS
59+ gis/CGisListDB.h
60+ gis/CGisListWks.h
61+ gis/CGisWorkspace.h
62+- gis/CSelDevices.h
63++ gis/CSelDevices.h
64+ gis/IGisItem.h
65+ gis/IGisLine.h
66+ gis/Poi.h
67+@@ -512,7 +512,7 @@ set( HDRS
68+ gis/trk/CInvalidTrk.h
69+ gis/trk/CKnownExtension.h
70+ gis/trk/CListTrkPts.h
71+- gis/trk/CPropertyTrk.h
72++ gis/trk/CPropertyTrk.h
73+ gis/trk/CScrOptTrk.h
74+ gis/trk/CSelectActivityColor.h
75+ gis/trk/CTableTrk.h
76+@@ -579,7 +579,7 @@ set( HDRS
77+ map/CMapList.h
78+ map/CMapMAP.h
79+ map/CMapPathSetup.h
80+- map/CMapPropSetup.h
81++ map/CMapPropSetup.h
82+ map/CMapRMAP.h
83+ map/CMapTMS.h
84+ map/CMapVRT.h
85+@@ -655,7 +655,7 @@ set( HDRS
86+ realtime/CRtSelectSource.h
87+ realtime/CRtWorkspace.h
88+ realtime/IRtInfo.h
89+- realtime/IRtRecord.h
90++ realtime/IRtRecord.h
91+ realtime/IRtSource.h
92+ realtime/gpstether/CRtGpsTether.h
93+ realtime/gpstether/CRtGpsTetherInfo.h
94+@@ -764,7 +764,7 @@ set( UIS
95+ gis/search/IGeoSearchWebConfigDialog.ui
96+ gis/search/ISearchExplanationDialog.ui
97+ gis/summary/IGisSummary.ui
98+- gis/summary/IGisSummarySetup.ui
99++ gis/summary/IGisSummarySetup.ui
100+ gis/trk/ICombineTrk.ui
101+ gis/trk/ICutTrk.ui
102+ gis/trk/IDetailsTrk.ui
103+@@ -818,7 +818,7 @@ set( UIS
104+ mouse/range/IActionSelect.ui
105+ mouse/range/IRangeToolSetup.ui
106+ mouse/range/IScrOptRangeTool.ui
107+- mouse/range/IScrOptRangeTrk.ui
108++ mouse/range/IScrOptRangeTrk.ui
109+ mouse/IScrOptRuler.ui
110+ mouse/IScrOptSelect.ui
111+ mouse/line/IScrOptEditLine.ui
112+@@ -899,7 +899,6 @@ include_directories(
113+ ${PROJ_INCLUDE_DIRS}
114+ ${ROUTINO_INCLUDE_DIRS}
115+ ${ALGLIB_INCLUDE_DIRS}
116+- ${QUAZIP_INCLUDE_DIRS}
117+ )
118+
119+ if(APPLE)
120+@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND)
121+
122+ target_link_libraries(${APPLICATION_NAME}
123+ Qt5::Widgets
124+- Qt5::Xml
125++ Qt5::Xml
126+ Qt5::Sql
127+ Qt5::PrintSupport
128+- Qt5::UiTools
129++ Qt5::UiTools
130+ Qt5::Network
131+ Qt5::WebEngineWidgets
132+ Qt5::Qml
133+@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME}
134+ ${PROJ_LIBRARIES}
135+ ${ROUTINO_LIBRARIES}
136+ ${ALGLIB_LIBRARIES}
137+- ${QUAZIP_LIBRARIES}
138++ QuaZip::QuaZip
139+ )
140+
141+ if(APPLE)
pkgs/applications/graphics/nomacs/default.nix+9
@@ -27,6 +27,15 @@ mkDerivation rec {
2727 sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
2828 };
2929
30+ patches = [
31+ # Add support for Quazip 1.x.
32+ (fetchpatch {
33+ url = "https://github.com/nomacs/nomacs/pull/576.patch";
34+ sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm";
35+ stripLen = 1;
36+ })
37+ ];
38+
3039 setSourceRoot = ''
3140 sourceRoot=$(echo */ImageLounge)
3241 '';
pkgs/applications/graphics/openboard/default.nix+2−1
@@ -34,7 +34,8 @@ in mkDerivation rec {
3434
3535 postPatch = ''
3636 substituteInPlace OpenBoard.pro \
37− --replace '/usr/include/quazip' '${quazip}/include/quazip5' \
37+ --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
38+ --replace '-lquazip5' '-lquazip1-qt5' \
3839 --replace '/usr/include/poppler' '${poppler.dev}/include/poppler'
3940 '';
4041
pkgs/applications/misc/ideamaker/default.nix+3−2
@@ -9,7 +9,7 @@
99, libcork
1010, makeDesktopItem
1111, qt5
12−, quazip_qt4
12+, quazip
1313, zlib
1414}:
1515stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 libcork
3636 qt5.qtbase
3737 qt5.qtserialport
38− quazip_qt4
38+ quazip
3939 zlib
4040 ];
4141
@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
7373 license = licenses.unfree;
7474 platforms = [ "x86_64-linux" ];
7575 maintainers = with maintainers; [ lovesegfault ];
76+ broken = true; # Segfaults on startup.
7677 };
7778}
pkgs/applications/networking/instant-messengers/teamspeak/client.nix+1−1
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060 ''
6161 mv ts3client_linux_${arch} ts3client
6262 echo "patching ts3client..."
63− patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client
63+ patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client
6464 patchelf \
6565 --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
6666 --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
pkgs/development/libraries/quazip/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "quazip";
5− version = "0.9.1";
5+ version = "1.1";
66
77 src = fetchFromGitHub {
88 owner = "stachenov";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq";
11+ sha256 = "06srglrj6jvy5ngmidlgx03i0d5w91yhi7sf846wql00v8rvhc5h";
1212 };
1313
1414 buildInputs = [ zlib qtbase ];
pkgs/top-level/all-packages.nix+2−8
@@ -8231,16 +8231,10 @@ in
82318231
82328232 screen-message = callPackage ../tools/X11/screen-message { };
82338233
8234− screencloud = callPackage ../applications/graphics/screencloud {
8235− quazip = quazip_qt4;
8236− };
8234+ screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
82378235
82388236 screenkey = callPackage ../applications/video/screenkey { };
82398237
8240− quazip_qt4 = libsForQt5.quazip.override {
8241− qtbase = qt4;
8242− };
8243−
82448238 scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
82458239
82468240 scriptaculous = callPackage ../development/libraries/scriptaculous { };
@@ -23920,7 +23914,7 @@ in
2392023914
2392123915 id3v2 = callPackage ../applications/audio/id3v2 { };
2392223916
23923− ideamaker = callPackage ../applications/misc/ideamaker { };
23917+ ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { };
2392423918
2392523919 ifenslave = callPackage ../os-specific/linux/ifenslave { };
2392623920