From d15337742fe15f0371e672be50a9e6160590c6b3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 Apr 2014 08:38:48 -0500 Subject: [PATCH] fix missing/updated patch --- ...ility-opensource-src-1.2.0-pkgconfig.patch | 13 ------------- ...ility-opensource-src-1.2.2-pkgconfig.patch | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 qt-mobility-opensource-src-1.2.0-pkgconfig.patch create mode 100644 qt-mobility-opensource-src-1.2.2-pkgconfig.patch diff --git a/qt-mobility-opensource-src-1.2.0-pkgconfig.patch b/qt-mobility-opensource-src-1.2.0-pkgconfig.patch deleted file mode 100644 index e54011b..0000000 --- a/qt-mobility-opensource-src-1.2.0-pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.0/features/deploy.pri ---- qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig 2011-09-22 01:59:10.000000000 -0500 -+++ qt-mobility-opensource-src-1.2.0/features/deploy.pri 2011-10-29 11:43:52.340550783 -0500 -@@ -4,7 +4,7 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T - contains(TEMPLATE,.*lib) { - target.path=$$QT_MOBILITY_LIB - -- maemo5|maemo6|meego { -+ linux-*|maemo5|maemo6|meego { - CONFIG += create_pc create_prl - QMAKE_PKGCONFIG_NAME = lib$$TARGET - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -diff -up qt-mobility-opensource-src-1.2.0/src/location/location.pro.pkgconfig qt-mobility-opensource-src-1.2.0/src/location/location.pro diff --git a/qt-mobility-opensource-src-1.2.2-pkgconfig.patch b/qt-mobility-opensource-src-1.2.2-pkgconfig.patch new file mode 100644 index 0000000..1ce1c88 --- /dev/null +++ b/qt-mobility-opensource-src-1.2.2-pkgconfig.patch @@ -0,0 +1,19 @@ +diff -up qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.2/features/deploy.pri +--- qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig 2012-02-23 07:43:48.000000000 -0600 ++++ qt-mobility-opensource-src-1.2.2/features/deploy.pri 2014-04-28 07:08:10.030082137 -0500 +@@ -4,13 +4,14 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T + contains(TEMPLATE,.*lib) { + target.path=$$QT_MOBILITY_LIB + +- maemo5|maemo6|meego { ++ linux-*|maemo5|maemo6|meego { + CONFIG += create_pc create_prl + QMAKE_PKGCONFIG_NAME = lib$$TARGET + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_LIBDIR = $$target.path + QMAKE_PKGCONFIG_INCDIR = $$headers.path + QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility ++ QMAKE_PKGCONFIG_REQUIRES_PRIVATE = QtCore + + pkgconfig.files = $${TARGET}.pc + pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig