Source: ktikz
Version: 0.12+ds1-3
Tags: patch upstream
User: [email protected]
Usertags: rebootstrap
ktikz fails to cross build from source, because it searches for
poppler-qt* using the build architecture pkg-config. The attached patch
makes it use the requested pkg-config and that's sufficient to make
ktikz cross buildable. Please consider applying the attached patch.
Helmut
--- ktikz-0.12+ds1.orig/qmake/findpoppler.pri
+++ ktikz-0.12+ds1/qmake/findpoppler.pri
@@ -1,12 +1,13 @@
unix:!macx {
# QMAKE_CXXFLAGS += `pkg-config --cflags poppler-qt4`
# QMAKE_LFLAGS += `pkg-config --libs poppler-qt4` # using this, qmake adds 3 times "--libs" to the LFLAGS, which is not recognized by g++ 4.6
+ PKG_CONFIG = $$pkgConfigExecutable()
greaterThan(QT_MAJOR_VERSION, 4) {
- POPPLERINCLUDES = $$system(pkg-config --cflags poppler-qt5)
- POPPLERLIBS = $$system(pkg-config --libs poppler-qt5)
+ POPPLERINCLUDES = $$system($$PKG_CONFIG --cflags poppler-qt5)
+ POPPLERLIBS = $$system($$PKG_CONFIG --libs poppler-qt5)
} else {
- POPPLERINCLUDES = $$system(pkg-config --cflags poppler-qt4)
- POPPLERLIBS = $$system(pkg-config --libs poppler-qt4)
+ POPPLERINCLUDES = $$system($$PKG_CONFIG --cflags poppler-qt4)
+ POPPLERLIBS = $$system($$PKG_CONFIG --libs poppler-qt4)
}
QMAKE_CXXFLAGS += $$POPPLERINCLUDES
QMAKE_LFLAGS += $$POPPLERLIBS
--- ktikz-0.12+ds1.orig/qmake/qtikzmacros.pri
+++ ktikz-0.12+ds1/qmake/qtikzmacros.pri
@@ -3,12 +3,13 @@
unix:!macx {
# QMAKE_CXXFLAGS += `pkg-config --cflags poppler-qt4`
# QMAKE_LFLAGS += `pkg-config --libs poppler-qt4` # using this, qmake adds 3 times "--libs" to the LFLAGS, which is not recognized by g++ 4.6
+ PKG_CONFIG = $$pkgConfigExecutable()
greaterThan(QT_MAJOR_VERSION, 4) {
- POPPLERINCLUDES = $$system(pkg-config --cflags poppler-qt5)
- POPPLERLIBS = $$system(pkg-config --libs poppler-qt5)
+ POPPLERINCLUDES = $$system($$PKG_CONFIG --cflags poppler-qt5)
+ POPPLERLIBS = $$system($$PKG_CONFIG --libs poppler-qt5)
} else {
- POPPLERINCLUDES = $$system(pkg-config --cflags poppler-qt4)
- POPPLERLIBS = $$system(pkg-config --libs poppler-qt4)
+ POPPLERINCLUDES = $$system($$PKG_CONFIG --cflags poppler-qt4)
+ POPPLERLIBS = $$system($$PKG_CONFIG --libs poppler-qt4)
}
QMAKE_CXXFLAGS += $$POPPLERINCLUDES
QMAKE_LFLAGS += $$POPPLERLIBS
_______________________________________________
pkg-kde-extras mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-extras
