Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/focuswriter/files: focuswriter-1.5.2-unbundle-qtsingleapplication.patch
Date: Thu, 31 Jul 2014 14:07:32
Message-Id: 20140731140725.52E732004F@flycatcher.gentoo.org
1 pinkbyte 14/07/31 14:07:24
2
3 Added:
4 focuswriter-1.5.2-unbundle-qtsingleapplication.patch
5 Log:
6 Revision bump: unbundle QtSingleApplication, wrt bug #489148. Drop old revision
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
9
10 Revision Changes Path
11 1.1 app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch?rev=1.1&content-type=text/plain
15
16 Index: focuswriter-1.5.2-unbundle-qtsingleapplication.patch
17 ===================================================================
18 --- focuswriter.pro.orig 2014-07-20 17:37:05.000000000 +0400
19 +++ focuswriter.pro 2014-07-31 17:56:00.702801120 +0400
20 @@ -90,13 +90,14 @@
21 src/spelling/dictionary_provider_voikko.cpp
22
23 lessThan(QT_MAJOR_VERSION, 5) {
24 + CONFIG += qtsingleapplication
25 SOURCES += src/sdl/sound.cpp
26 } else {
27 SOURCES += src/sound.cpp
28 }
29 }
30
31 -INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
32 +INCLUDEPATH += src src/fileformats src/qtzip src/spelling
33
34 # Specify program sources
35 HEADERS += src/action_manager.h \
36 @@ -155,8 +156,6 @@
37 src/fileformats/rtf_tokenizer.h \
38 src/fileformats/rtf_writer.h \
39 src/fileformats/txt_reader.h \
40 - src/qtsingleapplication/qtsingleapplication.h \
41 - src/qtsingleapplication/qtlocalpeer.h \
42 src/qtzip/qtzipreader.h \
43 src/qtzip/qtzipwriter.h \
44 src/spelling/abstract_dictionary.h \
45 @@ -219,8 +218,6 @@
46 src/fileformats/rtf_tokenizer.cpp \
47 src/fileformats/rtf_writer.cpp \
48 src/fileformats/txt_reader.cpp \
49 - src/qtsingleapplication/qtsingleapplication.cpp \
50 - src/qtsingleapplication/qtlocalpeer.cpp \
51 src/qtzip/qtzip.cpp \
52 src/spelling/dictionary_dialog.cpp \
53 src/spelling/dictionary_manager.cpp \