aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristopher Roy Bratusek <nano@jpberlin.de>2014-09-06 22:46:26 +0200
committerChristopher Roy Bratusek <nano@jpberlin.de>2014-09-06 22:46:26 +0200
commitbb052bd70fba622d26dc3b45786f52a01cf66274 (patch)
tree1f2aa1e2ff5177b3d11ca209de4f2173e76b865c /debian
parentadd missing build-dep on libphonon-dev (diff)
downloadlumina-bb052bd70fba622d26dc3b45786f52a01cf66274.tar.gz
lumina-bb052bd70fba622d26dc3b45786f52a01cf66274.tar.bz2
lumina-bb052bd70fba622d26dc3b45786f52a01cf66274.zip
fix compilation on i386 on Debian
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/02-fix-compilation-non-amd64.diff52
-rw-r--r--debian/patches/series1
2 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches/02-fix-compilation-non-amd64.diff b/debian/patches/02-fix-compilation-non-amd64.diff
new file mode 100644
index 00000000..4957ed4a
--- /dev/null
+++ b/debian/patches/02-fix-compilation-non-amd64.diff
@@ -0,0 +1,52 @@
+Description: Fix compilation on architectures other than amd64
+ don't link against libQtSolutions_SingleApplication-head on amd64/i386 and others.
+ .
+ lumina-desktop (0.6.2.14-1nano) unstable; urgency=low
+ .
+ * Initial release
+Author: Christopher Roy Bratusek <nano@jpberlin.de>
+
+--- lumina-desktop-0.6.2.14.orig/lumina-config/lumina-config.pro
++++ lumina-desktop-0.6.2.14/lumina-config/lumina-config.pro
+@@ -22,7 +22,7 @@ FORMS += mainUI.ui \
+
+ INCLUDEPATH += ../libLumina /usr/include
+
+-linux-g++-64 {
++linux-g++ {
+ LIBS += -L../libLumina -lLuminaUtils
+ } else {
+ LIBS += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
+--- lumina-desktop-0.6.2.14.orig/lumina-desktop/lumina-desktop.pro
++++ lumina-desktop-0.6.2.14/lumina-desktop/lumina-desktop.pro
+@@ -81,7 +81,7 @@ RESOURCES+= Lumina-DE.qrc
+ INCLUDEPATH += ../libLumina /usr/include
+
+ desktop.files = Lumina-DE.desktop
+-linux-g++-64 {
++linux-g++ {
+ desktop.path = /usr/share/xsessions
+ } else {
+ desktop.path = /usr/share/xsessions
+--- lumina-desktop-0.6.2.14.orig/lumina-fm/lumina-fm.pro
++++ lumina-desktop-0.6.2.14/lumina-fm/lumina-fm.pro
+@@ -24,7 +24,7 @@ FORMS += MainUI.ui \
+
+ INCLUDEPATH += ../libLumina /usr/include
+
+-linux-g++-64 {
++linux-g++ {
+ LIBS += -L../libLumina -lLuminaUtils
+ } else {
+ LIBS += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
+--- lumina-desktop-0.6.2.14.orig/lumina-screenshot/lumina-screenshot.pro
++++ lumina-desktop-0.6.2.14/lumina-screenshot/lumina-screenshot.pro
+@@ -15,7 +15,7 @@ FORMS += MainUI.ui
+
+ INCLUDEPATH += ../libLumina /usr/include
+
+-linux-g++-64 {
++linux-g++ {
+ LIBS += -L../libLumina -lLuminaUtils
+ } else {
+ LIBS += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
diff --git a/debian/patches/series b/debian/patches/series
index 3e4f0969..1ba24f47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-change-prefix.diff
+02-fix-compilation-non-amd64.diff
bgstack15