diff options
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/focuswriter/ChangeLog | 10 | ||||
| -rw-r--r-- | app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch | 36 | ||||
| -rw-r--r-- | app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild (renamed from app-editors/focuswriter/focuswriter-1.5.2.ebuild) | 16 |
3 files changed, 55 insertions, 7 deletions
diff --git a/app-editors/focuswriter/ChangeLog b/app-editors/focuswriter/ChangeLog index 0407741b962a..ac7ff01b1df9 100644 --- a/app-editors/focuswriter/ChangeLog +++ b/app-editors/focuswriter/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/focuswriter # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/ChangeLog,v 1.19 2014/07/31 10:49:52 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/ChangeLog,v 1.20 2014/07/31 14:07:24 pinkbyte Exp $ + +*focuswriter-1.5.2-r1 (31 Jul 2014) + + 31 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -focuswriter-1.5.2.ebuild, + +focuswriter-1.5.2-r1.ebuild, + +files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch: + Revision bump: unbundle QtSingleApplication, wrt bug #489148. Drop old + revision *focuswriter-1.5.2 (31 Jul 2014) 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 \ diff --git a/app-editors/focuswriter/focuswriter-1.5.2.ebuild b/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild index c9cab120d623..13f2f1beb60e 100644 --- a/app-editors/focuswriter/focuswriter-1.5.2.ebuild +++ b/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/focuswriter-1.5.2.ebuild,v 1.1 2014/07/31 10:49:52 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild,v 1.1 2014/07/31 14:07:24 pinkbyte Exp $ EAPI=5 @@ -21,6 +21,7 @@ IUSE="debug" RDEPEND="app-text/hunspell dev-qt/qtcore:4 dev-qt/qtgui:4 + dev-qt/qtsingleapplication[X] sys-libs/zlib" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -29,8 +30,16 @@ DOCS=( ChangeLog CREDITS NEWS README ) DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is installed with wav useflag enabled." +PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" ) + +rm_loc() { + sed -e "s|translations/${PN}_${1}.ts||" -i ${PN}.pro || die 'sed failed' + rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed" +} + src_prepare() { l10n_for_each_disabled_locale_do rm_loc + qt4-r2_src_prepare } src_configure() { @@ -56,8 +65,3 @@ pkg_postrm() { gnome2_icon_cache_update fdo-mime_desktop_database_update } - -rm_loc() { - sed -e "s|translations/${PN}_${1}.ts||" -i ${PN}.pro || die 'sed failed' - rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed" -} |