Mercurial > mxe-octave

diff src/qtimageformats-1.patch @ 4900:22937c7fe60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update QT5 5.12.0 * src/qtbase-1-fixes.patch: update patch * src/qtbase.mk: update version, checksum * src/qtimageformats-1.patch: update patch * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools.mk: update checksum
author John Donoghue
date Fri, 14 Dec 2018 08:25:27 -0500
parents 2c34ec679fb3
children 9d35f8eb1e76
line wrap: on
line diff
--- a/src/qtimageformats-1.patch	Wed Dec 12 08:22:38 2018 -0500
+++ b/src/qtimageformats-1.patch	Fri Dec 14 08:25:27 2018 -0500
@@ -1,14 +1,13 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 14:11:02 +0100
-Subject: [PATCH 1/2] add pkg-config support for libtiff-4
+Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4
 
-Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
 
 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
-index f7ac4c1..bd2c6b0 100644
+index 1111111..2222222 100644
 --- a/config.tests/libtiff/libtiff.pro
 +++ b/config.tests/libtiff/libtiff.pro
 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
@@ -21,10 +20,10 @@
 +else:if(unix|win32-g++*): LIBS += -ltiff
  else:win32: LIBS += libtiff.lib
 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
-index 0f841ab..fa22141 100644
+index 1111111..2222222 100644
 --- a/src/plugins/imageformats/tiff/tiff.pro
 +++ b/src/plugins/imageformats/tiff/tiff.pro
-@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
+@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
  OTHER_FILES += tiff.json
  
  config_libtiff {
@@ -35,19 +34,15 @@
      else:win32: LIBS += libtiff.lib
  } else {
      include($$PWD/../../../3rdparty/libtiff.pri)
--- 
-1.8.4.5
 
-
-From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 19 Dec 2012 23:29:52 +0100
-Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)
+Subject: [PATCH 2/3] [MXE] pkg-config support for libmng
 
-Change-Id: I1216f35a01a974321efa2463b687c121baa22667
 
 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
-index adc096e..a20a0a0 100644
+index 1111111..2222222 100644
 --- a/config.tests/libmng/libmng.pro
 +++ b/config.tests/libmng/libmng.pro
 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp
@@ -59,21 +54,58 @@
 +packagesExist(libmng):PKGCONFIG += libmng
 +else:if(unix|win32-g++*): LIBS += -lmng
  else:win32: LIBS += libmng.lib
-diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
-index 5c0fff1..00cd0b3 100644
---- a/src/plugins/imageformats/mng/qmnghandler.pri
-+++ b/src/plugins/imageformats/mng/qmnghandler.pri
-@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD
- HEADERS += $$PWD/qmnghandler_p.h
- SOURCES += $$PWD/qmnghandler.cpp
- config_libmng {
--    unix|mingw: LIBS += -lmng
+diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
+index 1111111..2222222 100644
+--- a/src/plugins/imageformats/mng/mng.pro
++++ b/src/plugins/imageformats/mng/mng.pro
+@@ -5,7 +5,10 @@ SOURCES += main.cpp \
+            qmnghandler.cpp
+ OTHER_FILES += mng.json
+ 
+-msvc: LIBS += libmng.lib
++CONFIG += link_pkgconfig
++packagesExist(libmng):PKGCONFIG += libmng
++else:if(unix|mingw): LIBS += -lmng
++else:msvc: LIBS += libmng.lib
+ else: LIBS += -lmng
+ 
+ PLUGIN_TYPE = imageformats
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Fri, 16 Nov 2018 10:13:11 +0100
+Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp
+
+
+diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro
+index 1111111..2222222 100644
+--- a/config.tests/libwebp/libwebp.pro
++++ b/config.tests/libwebp/libwebp.pro
+@@ -2,5 +2,9 @@ SOURCES = libwebp.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+ win32:CONFIG += console
+-unix|mingw: LIBS += -lwebp -lwebpdemux
++unix|mingw {
 +    CONFIG += link_pkgconfig
-+    packagesExist(libmng):PKGCONFIG += libmng
-+    else:if(unix|win32-g++*): LIBS += -lmng
-     else:win32: LIBS += libmng.lib
++    packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
++    else: LIBS += -lwebp -lwebpdemux
++}
+ else:win32: LIBS += libwebp.lib libwebpdemux.lib
+diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
+index 1111111..2222222 100644
+--- a/src/plugins/imageformats/webp/webp.pro
++++ b/src/plugins/imageformats/webp/webp.pro
+@@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp
+ OTHER_FILES += webp.json
+ 
+ config_libwebp {
+-    unix|win32-g++*: LIBS += -lwebp -lwebpdemux
++    unix|mingw {
++        CONFIG += link_pkgconfig
++        packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
++        else: LIBS += -lwebp -lwebpdemux
++    }
+     else:win32: LIBS += libwebp.lib libwebpdemux.lib
  } else {
-     include($$PWD/../../../3rdparty/libmng.pri)
--- 
-1.8.4.5
-
+     include($$PWD/../../../3rdparty/libwebp.pri)