summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2014-07-31 14:07:24 +0000
committerSergey Popov <pinkbyte@gentoo.org>2014-07-31 14:07:24 +0000
commit903d4d2a50b520c02654647c9e8c38967c57cc0f (patch)
treec4f3b806a71de69253bd5ee9d10e73a91804f0d1 /app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
parentRevbump with backported patch for security bug #518646 (CVE-2014-3564) (diff)
downloadgentoo-2-903d4d2a50b520c02654647c9e8c38967c57cc0f.tar.gz
gentoo-2-903d4d2a50b520c02654647c9e8c38967c57cc0f.tar.bz2
gentoo-2-903d4d2a50b520c02654647c9e8c38967c57cc0f.zip
Revision bump: unbundle QtSingleApplication, wrt bug #489148. Drop old revision
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch')
-rw-r--r--app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..e7815be0ee5f
--- /dev/null
+++ b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
@@ -0,0 +1,36 @@
+--- focuswriter.pro.orig 2014-07-20 17:37:05.000000000 +0400
++++ focuswriter.pro 2014-07-31 17:56:00.702801120 +0400
+@@ -90,13 +90,14 @@
+ src/spelling/dictionary_provider_voikko.cpp
+
+ lessThan(QT_MAJOR_VERSION, 5) {
++ CONFIG += qtsingleapplication
+ SOURCES += src/sdl/sound.cpp
+ } else {
+ SOURCES += src/sound.cpp
+ }
+ }
+
+-INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
++INCLUDEPATH += src src/fileformats src/qtzip src/spelling
+
+ # Specify program sources
+ HEADERS += src/action_manager.h \
+@@ -155,8 +156,6 @@
+ src/fileformats/rtf_tokenizer.h \
+ src/fileformats/rtf_writer.h \
+ src/fileformats/txt_reader.h \
+- src/qtsingleapplication/qtsingleapplication.h \
+- src/qtsingleapplication/qtlocalpeer.h \
+ src/qtzip/qtzipreader.h \
+ src/qtzip/qtzipwriter.h \
+ src/spelling/abstract_dictionary.h \
+@@ -219,8 +218,6 @@
+ src/fileformats/rtf_tokenizer.cpp \
+ src/fileformats/rtf_writer.cpp \
+ src/fileformats/txt_reader.cpp \
+- src/qtsingleapplication/qtsingleapplication.cpp \
+- src/qtsingleapplication/qtlocalpeer.cpp \
+ src/qtzip/qtzip.cpp \
+ src/spelling/dictionary_dialog.cpp \
+ src/spelling/dictionary_manager.cpp \