diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
commit | fe379ffc9b1b75ba62a68f5bc21b854e5da49259 (patch) | |
tree | 312e1b5003b9ef65e718b145052d447f2f8e2653 /packages/roadmap/zroadmap-1.0.12 | |
parent | 8a2fba6940e3e07bc7613a431c99a6b7ed433588 (diff) | |
parent | f4a7dac492fabd4f30dcad003cdcabdf6684e39e (diff) |
merge of 'ad95f08d419bba954eab21c0d4ef155b70f86dbc'
and 'eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43'
Diffstat (limited to 'packages/roadmap/zroadmap-1.0.12')
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch | 36 | ||||
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch | 25 | ||||
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/zroadgps.png | bin | 0 -> 1949 bytes |
4 files changed, 61 insertions, 0 deletions
diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch new file mode 100644 index 0000000000..24fe1c9bdb --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch @@ -0,0 +1,36 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- src/qt/qt_main.cc~qt2-fixes-r1.patch ++++ src/qt/qt_main.cc +@@ -137,7 +137,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -146,7 +146,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } +--- src/qt/Makefile~qt2-fixes-r1.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif + diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch new file mode 100644 index 0000000000..46b17b8cfb --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes ++++ roadmap-1.0.12/src/qt/qt_main.cc +@@ -123,7 +123,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -132,7 +132,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/zroadmap-1.0.12/zroadgps.png Binary files differnew file mode 100644 index 0000000000..a77b3729b7 --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/zroadgps.png |