summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaffaele Mancuso2023-07-06 13:45:23 +0200
committerRaffaele Mancuso2023-07-06 13:48:36 +0200
commitccf2217c9d8697403fba775effdc1eab6402439d (patch)
tree671562b2ce553f732fb34b9b8bacd54181e66c13
parent19527fe40d20f3a30e54dbe4591401d0daf53aaa (diff)
downloadaur-ccf2217c9d8697403fba775effdc1eab6402439d.tar.gz
Remove CMakeDesktopNoDep.patch
It has been merged upstream
-rw-r--r--.SRCINFO2
-rw-r--r--CMakeDesktopNoDep.patch24
-rw-r--r--PKGBUILD3
3 files changed, 0 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 24e60c011d30..392fe4158f78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,11 +25,9 @@ pkgbase = pdf4qt-git
conflicts = pdf4qt
source = pdf4qt-git::git+https://github.com/JakubMelka/PDF4QT
source = CMakePatch.patch
- source = CMakeDesktopNoDep.patch
source = FindLCMS2.cmake
b2sums = SKIP
b2sums = be47f2902d2639170b6fc10742b118cd14b263f30d2225aa601820cb33f946d1d9b5f032fd9c0671e1ac4936c072ff4c6dc7f57c7a53f95f1ad59ba5c2b3ff1c
- b2sums = c413589e2ae48dbf137e7156b5378093fe88d0eac7aa935e1390be03dbfbe9f94e0c3bada3d1c76e4300be929274cff47f9866dfb7387629b7f9d15f1f9d3169
b2sums = d26119741d02bddc6e18234aeb9d437ed866676f126e073f87efa8f19e3eedfbb77d2f571ff0e1c3963fabc86e1db83b7a1864edfdc1ba8f63cdd1e36da1e382
pkgname = pdf4qt-git
diff --git a/CMakeDesktopNoDep.patch b/CMakeDesktopNoDep.patch
deleted file mode 100644
index ce6aed964786..000000000000
--- a/CMakeDesktopNoDep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d656713..4877af8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,6 +89,9 @@ add_subdirectory(WixInstaller)
- message("CMAKE_PREFIX_PATH = " ${CMAKE_PREFIX_PATH})
- message("CMAKE_TOOLCHAIN_FILE = " ${CMAKE_TOOLCHAIN_FILE})
-
-+install(FILES Desktop/Pdf4QtDocDiff.desktop Desktop/Pdf4QtDocPageOrganizer.desktop Desktop/Pdf4QtViewerLite.desktop Desktop/Pdf4QtViewerProfi.desktop DESTINATION usr/share/applications)
-+install(FILES Desktop/Pdf4QtDocDiff.svg Desktop/Pdf4QtDocPageOrganizer.svg Desktop/Pdf4QtViewerLite.svg Desktop/Pdf4QtViewerProfi.svg DESTINATION usr/share/icons)
-+
- if(PDF4QT_INSTALL_DEPENDENCIES)
- install(DIRECTORY ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/
- TYPE BIN
-@@ -98,9 +101,6 @@ if(PDF4QT_INSTALL_DEPENDENCIES)
- PATTERN "*.dylib"
- )
-
-- install(FILES Desktop/Pdf4QtDocDiff.desktop Desktop/Pdf4QtDocPageOrganizer.desktop Desktop/Pdf4QtViewerLite.desktop Desktop/Pdf4QtViewerProfi.desktop DESTINATION usr/share/applications)
-- install(FILES Desktop/Pdf4QtDocDiff.svg Desktop/Pdf4QtDocPageOrganizer.svg Desktop/Pdf4QtViewerLite.svg Desktop/Pdf4QtViewerProfi.svg DESTINATION usr/share/icons)
--
- if("${PDF4QT_QT_ROOT}" STREQUAL "")
- message(WARNING "Set variable PDF4QT_QT_ROOT to Qt6 root directory")
- endif()
diff --git a/PKGBUILD b/PKGBUILD
index c14d6696118c..b7f32df660f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,11 +28,9 @@ provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=("$pkgname"::'git+https://github.com/JakubMelka/PDF4QT'
'CMakePatch.patch'
- 'CMakeDesktopNoDep.patch'
'FindLCMS2.cmake')
b2sums=('SKIP'
'be47f2902d2639170b6fc10742b118cd14b263f30d2225aa601820cb33f946d1d9b5f032fd9c0671e1ac4936c072ff4c6dc7f57c7a53f95f1ad59ba5c2b3ff1c'
- 'c413589e2ae48dbf137e7156b5378093fe88d0eac7aa935e1390be03dbfbe9f94e0c3bada3d1c76e4300be929274cff47f9866dfb7387629b7f9d15f1f9d3169'
'd26119741d02bddc6e18234aeb9d437ed866676f126e073f87efa8f19e3eedfbb77d2f571ff0e1c3963fabc86e1db83b7a1864edfdc1ba8f63cdd1e36da1e382')
pkgver() {
@@ -43,7 +41,6 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
patch -p1 -i "$srcdir/CMakePatch.patch"
- patch -p1 -i "$srcdir/CMakeDesktopNoDep.patch"
}
build() {