summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2020-04-27 17:27:30 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2020-04-27 17:27:30 +0200
commitf8882e27c7b6f57bb2e0c9c35476da11cec567f2 (patch)
tree17f171d673fab16f333923e0de126501b92b7fc3
parentcc35881e6a258084de34b0bcda49f220a994e071 (diff)
downloadmedia-f8882e27c7b6f57bb2e0c9c35476da11cec567f2.tar.gz
media-f8882e27c7b6f57bb2e0c9c35476da11cec567f2.tar.xz
gimagereader: bump to snapshot to fix FTBFS with recent Qt versions
-rw-r--r--packages/app-text/gimagereader/files/gimagereader-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch18
-rw-r--r--packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0 (renamed from packages/app-text/gimagereader/gimagereader-3.3.1.exheres-0)4
2 files changed, 11 insertions, 11 deletions
diff --git a/packages/app-text/gimagereader/files/gimagereader-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch b/packages/app-text/gimagereader/files/gimagereader-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch
index 922c6a73..8d2327c0 100644
--- a/packages/app-text/gimagereader/files/gimagereader-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch
+++ b/packages/app-text/gimagereader/files/gimagereader-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch
@@ -2,18 +2,18 @@ Source: Timo Gurr <tgurr@exherbo.org>
Upstream: No
Reason: Use CMAKE_INSTALL_FULL_DATAROOTDIR
-diff -Naur gimagereader-3.3.0/CMakeLists.txt gimagereader-3.3.0.new/CMakeLists.txt
---- gimagereader-3.3.0/CMakeLists.txt 2018-09-26 23:06:06.000000000 +0200
-+++ gimagereader-3.3.0.new/CMakeLists.txt 2018-11-08 11:21:33.433046088 +0100
-@@ -1,27 +1,27 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+diff -Naur gImageReader-623622dd52758c49462a7f6d4154d4005679afbd/CMakeLists.txt gImageReader-623622dd52758c49462a7f6d4154d4005679afbd.new/CMakeLists.txt
+--- gImageReader-623622dd52758c49462a7f6d4154d4005679afbd/CMakeLists.txt 2020-04-27 00:48:54.000000000 +0200
++++ gImageReader-623622dd52758c49462a7f6d4154d4005679afbd.new/CMakeLists.txt 2020-04-27 17:13:44.881149733 +0200
+@@ -4,6 +4,7 @@
+ ENDIF()
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
INCLUDE(GSettings)
+INCLUDE(GNUInstallDirs)
SET(ENV{LC_ALL} "C")
--
- # Project properties
+
+@@ -11,20 +12,20 @@
PROJECT(gimagereader)
SET(PACKAGE_NAME gImageReader)
SET(PACKAGE_VERSION 3.3.1)
@@ -22,7 +22,7 @@ diff -Naur gimagereader-3.3.0/CMakeLists.txt gimagereader-3.3.0.new/CMakeLists.t
# Variables
- SET(INTERFACE_TYPE "qt5" CACHE STRING "Select interface type: qt4/qt5/gtk")
+ SET(INTERFACE_TYPE "qt5" CACHE STRING "Select interface type: qt5/gtk")
MESSAGE(STATUS "${INTERFACE_TYPE} interface will be built")
-SET(MANUAL_DIR "share/doc/gimagereader" CACHE PATH "Path where manual will be installed")
+SET(MANUAL_DIR "doc/gimagereader" CACHE PATH "Path where manual will be installed")
@@ -37,7 +37,7 @@ diff -Naur gimagereader-3.3.0/CMakeLists.txt gimagereader-3.3.0.new/CMakeLists.t
ENDIF()
# Configure files
-@@ -339,11 +339,11 @@
+@@ -339,11 +340,11 @@
ENDIF()
INSTALL(TARGETS gimagereader DESTINATION bin)
diff --git a/packages/app-text/gimagereader/gimagereader-3.3.1.exheres-0 b/packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0
index 936d9bef..b062337e 100644
--- a/packages/app-text/gimagereader/gimagereader-3.3.1.exheres-0
+++ b/packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0
@@ -1,7 +1,7 @@
-# Copyright 2016-2019 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2016-2020 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=manisandro release=v${PV} suffix=tar.xz ] \
+require github [ user=manisandro pn=gImageReader tag=623622dd52758c49462a7f6d4154d4005679afbd ] \
cmake \
freedesktop-desktop \
gtk-icon-cache