From c1d78d1e3c0c2efda4214de03237a7f1c5ca9611 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 12 Jan 2012 10:49:59 +0000 Subject: [PATCH] Version Bump Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- app-office/texmaker/ChangeLog | 8 +- app-office/texmaker/Manifest | 11 +- .../files/texmaker-3.2.2-hunspell.patch | 190 ++++++++++++++++++ app-office/texmaker/texmaker-3.2.2.ebuild | 70 +++++++ 4 files changed, 274 insertions(+), 5 deletions(-) create mode 100644 app-office/texmaker/files/texmaker-3.2.2-hunspell.patch create mode 100644 app-office/texmaker/texmaker-3.2.2.ebuild diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog index 34dc49fef744..d45dfba94184 100644 --- a/app-office/texmaker/ChangeLog +++ b/app-office/texmaker/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/texmaker # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.92 2012/01/05 08:17:31 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.93 2012/01/12 10:49:59 jlec Exp $ + +*texmaker-3.2.2 (12 Jan 2012) + + 12 Jan 2012; Justin Lecher +texmaker-3.2.2.ebuild, + +files/texmaker-3.2.2-hunspell.patch: + Version Bump *texmaker-3.2.1 (05 Jan 2012) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index 72babbc5ea72..93c293c7efc5 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -9,20 +9,23 @@ AUX texmaker-3.02-hunspell.patch 4121 RMD160 6f6e618e6746c808fb783523b4a640d53b2 AUX texmaker-3.1-hunspell.patch 4493 RMD160 15457c250680fb905b5b14cb89ad935966fdc816 SHA1 3a338e267b7991228ca0a688fc1c8e93def1af2b SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87 AUX texmaker-3.2-hunspell.patch 5084 RMD160 f151f5503193ac1d3fc847bc426bd1bad5fa4827 SHA1 9fd98859561e146122fc41f5d33be0ad5b6aa0fd SHA256 865c08acd73f86b9850eccd39357b686419284e2734b8de83e7ff8b22599adf3 AUX texmaker-3.2.1-hunspell.patch 5084 RMD160 f151f5503193ac1d3fc847bc426bd1bad5fa4827 SHA1 9fd98859561e146122fc41f5d33be0ad5b6aa0fd SHA256 865c08acd73f86b9850eccd39357b686419284e2734b8de83e7ff8b22599adf3 +AUX texmaker-3.2.2-hunspell.patch 5084 RMD160 ad42eb0e1db0b3b6918772761aca72e9b18c5ad1 SHA1 70e76b740a884949da829c3b5d29b0e3b0caf7b6 SHA256 ecc4ca5f7a76dc048ad1e9407247c06cd4c6977fca2a8fa66308e809dbf73830 DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8 DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6 +DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675 EBUILD texmaker-2.30.ebuild 1668 RMD160 6878937cbfa64570f592d3b884b29b1e0a38a813 SHA1 dfeab7a1dd653cd8145b5bd77720492eaeae8e07 SHA256 a41f6ced19f138a38e2e1086c40d1d184299fd6ba943c2732dd66c6ad1ebc96f EBUILD texmaker-3.1.ebuild 1817 RMD160 2915839c444ad9f0807e8468ae903305336724b3 SHA1 8989eaeaa2f0540f3f7bfd6951de180e4a71c268 SHA256 b75bd48e3562d466ec513a64ac31847f85b76e6f73f4f3ea03cbda771be3169c EBUILD texmaker-3.2.1.ebuild 1815 RMD160 a7df8ee3293b75e39d04698e171434d24ec924ff SHA1 81e7bd5a5ee7f9a9768f30427413f0d333335b57 SHA256 74f6f4e661c216f1466b30f18bf306be427814c45fa9a316f766b7b0c1e1448c +EBUILD texmaker-3.2.2.ebuild 1815 RMD160 a5ff0cb738e936f0a2ed4a3ee33a12af0d86807b SHA1 355d851dc5213bf55ff5dce1a8e75041c5336798 SHA256 28a61d05ed30edeef8009879d6346f88e114700da22b468c174f542dc807817f EBUILD texmaker-3.2.ebuild 1813 RMD160 7da336204b49cc74b0f5025b1f9a04a119c9586f SHA1 4bd0749b7d6caf92f73c7c347d21d34147739e63 SHA256 b51530c2c97d79fc7a941dd9761861e8fae4daa59b513893ac9884028fa20d34 -MISC ChangeLog 13346 RMD160 77ed3b319a321ab58660b110bfaf106ba820646f SHA1 ac99a2717db7244e1ab55cbcdeba9c7c9fcbcc38 SHA256 43bb70f67b116dc51611de73bdb10489265745cd8709f6d17836ec042a9c2668 +MISC ChangeLog 13504 RMD160 4b76d983d5570f9b3ff58db0899dbeb8f638797e SHA1 b6c0f72c0d5cd83eebe18cd1d9b363e2ef4a3d1f SHA256 c5a2d52ec98e7b0d936a2fa61fa65e4cc09d0f2a4f9a4184ee6ca9596542401e MISC metadata.xml 274 RMD160 e2fb5cd41e542fe16d8cc8204d04110bf23bce3e SHA1 a957d8f40e49b70695325e66693bf622b42f6a39 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk8FXKAACgkQgAnW8HDreRYwHACglUPEGTBkzOdVm+wG30osUB8m -x+4An2vX0a9Z74p8nTbrSG1TL3d0P3ic -=U9gc +iEYEAREKAAYFAk8OutwACgkQgAnW8HDreRZVFwCgpS7JUoApznoIfaBMbj2puq2q +jnoAn1icWGOcjQAYaTwqmrOeHu3RdgjW +=hDdM -----END PGP SIGNATURE----- diff --git a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch new file mode 100644 index 000000000000..b680f30d1aa4 --- /dev/null +++ b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch @@ -0,0 +1,190 @@ +From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001 +Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org> +From: Justin Lecher +Date: Thu, 22 Dec 2011 12:09:32 +0100 +Subject: [PATCH] 3.1-hunspell.patch + +Conflicts: + + latexeditor.h + texmaker.pro +--- + configdialog.cpp | 4 ++-- + latexeditor.h | 2 +- + latexeditorview.h | 2 +- + latexhighlighter.h | 2 +- + spellerdialog.h | 2 +- + texmaker.h | 2 +- + texmaker.pro | 44 +++++++------------------------------------- + 7 files changed, 14 insertions(+), 44 deletions(-) + +diff --git a/configdialog.cpp b/configdialog.cpp +index 144bddc..89e4059 100644 +--- a/configdialog.cpp ++++ b/configdialog.cpp +@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell() + QDir spelldir(QCoreApplication::applicationDirPath()); + #else + #ifdef DEBIAN_SPELLDIR +-QDir spelldir(PREFIX"/share/myspell/dicts"); ++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell"); + #else +-QDir spelldir(PREFIX"/share/texmaker"); ++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker"); + #endif + #endif + +diff --git a/latexeditor.h b/latexeditor.h +index 40cc2f6..d46150f 100644 +--- a/latexeditor.h ++++ b/latexeditor.h +@@ -28,7 +28,7 @@ + + #include "latexhighlighter.h" + #include "textblockselection.h" +-#include "hunspell/hunspell.hxx" ++#include + + typedef int UserBookmarkList[3]; + +diff --git a/latexeditorview.h b/latexeditorview.h +index 283fd8a..1ba39cc 100644 +--- a/latexeditorview.h ++++ b/latexeditorview.h +@@ -22,7 +22,7 @@ + #include "gotolinewidget.h" + #include "replacewidget.h" + #include "minisplitter.h" +-#include "hunspell/hunspell.hxx" ++#include + + class LatexEditorView : public QWidget { + Q_OBJECT +diff --git a/latexhighlighter.h b/latexhighlighter.h +index 029c7ad..9fbb532 100644 +--- a/latexhighlighter.h ++++ b/latexhighlighter.h +@@ -20,7 +20,7 @@ + #include + #include + //#include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + class QTextDocument; + class LatexEditor; +diff --git a/spellerdialog.h b/spellerdialog.h +index 83248ae..cd16dad 100644 +--- a/spellerdialog.h ++++ b/spellerdialog.h +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +diff --git a/texmaker.h b/texmaker.h +index b1a2c65..0806731 100644 +--- a/texmaker.h ++++ b/texmaker.h +@@ -47,7 +47,7 @@ + #include "symbollistwidget.h" + #include "xmltagslistwidget.h" + #include "logeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + #include "browser.h" + #include "pdfviewerwidget.h" + #include "pdfviewer.h" +diff --git a/texmaker.pro b/texmaker.pro +index 5d017ad..87fac99 100644 +--- a/texmaker.pro ++++ b/texmaker.pro +@@ -4,7 +4,8 @@ TARGET = texmaker + QT += network \ + xml \ + webkit +-CONFIG += qt warn_off release ++CONFIG += qt warn_off release link_pkgconfig ++PKGCONFIG = hunspell + TEXMAKERVERSION=3.2.2 + DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" + DEFINES += HAVE_SPLASH +@@ -65,25 +66,6 @@ HEADERS += texmaker.h \ + scandialog.h \ + synctex_parser.h \ + synctex_parser_utils.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -110,7 +92,7 @@ HEADERS += texmaker.h \ + encodingprober/nsSJISProber.h \ + encodingprober/nsUniversalDetector.h \ + encodingprober/qencodingprober.h \ +- encodingprober/UnicodeGroupProber.h ++ encodingprober/UnicodeGroupProber.h + SOURCES += main.cpp \ + texmakerapp.cpp \ + texmaker.cpp \ +@@ -167,18 +149,6 @@ SOURCES += main.cpp \ + scandialog.cpp \ + synctex_parser.c \ + synctex_parser_utils.c \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ +@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) { + ICONDIR=/usr/share/pixmaps + } + +-INCLUDEPATH += /usr/include/poppler/qt4 +-LIBS += -L/usr/lib -lpoppler-qt4 +-LIBS += -L/usr/lib -lz ++INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4 ++LIBS += -lpoppler-qt4 ++LIBS += -lz + DEFINES += PREFIX=\\\"$${PREFIX}\\\" + target.path = $${PREFIX}/bin + +-#DEFINES += DEBIAN_SPELLDIR ++DEFINES += DEBIAN_SPELLDIR + + + INSTALLS = target +-- +1.7.8.1 + diff --git a/app-office/texmaker/texmaker-3.2.2.ebuild b/app-office/texmaker/texmaker-3.2.2.ebuild new file mode 100644 index 000000000000..6e3e3280d458 --- /dev/null +++ b/app-office/texmaker/texmaker-3.2.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.2.ebuild,v 1.1 2012/01/12 10:49:59 jlec Exp $ + +EAPI="3" + +inherit base prefix qt4-r2 versionator + +# The upstream version numbering is bad, so we have to remove a dot in the +# minor version number +MAJOR="$(get_major_version)" +MINOR_1="$(($(get_version_component_range 2)/10))" +MINOR_2="$(($(get_version_component_range 2)%10))" +if [ ${MINOR_2} -eq "0" ] ; then + MY_P="${PN}-${MAJOR}.${MINOR_1}" +else + MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}" +fi + +MY_P="${P}" + +DESCRIPTION="A nice LaTeX-IDE" +HOMEPAGE="http://www.xm1math.net/texmaker/" +SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND=" + app-text/poppler[qt4] + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + >=x11-libs/qt-gui-4.6.1:4 + >=x11-libs/qt-core-4.6.1:4 + >=x11-libs/qt-webkit-4.6.1:4 + >=app-text/hunspell-1.2.4" +RDEPEND="${COMMON_DEPEND} + virtual/latex-base + app-text/psutils + app-text/ghostscript-gpl + media-libs/netpbm" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-hunspell.patch" ) + +src_prepare() { + qt4-r2_src_prepare + eprefixify ${PN}.pro configdialog.cpp +} + +src_install() { + emake INSTALL_ROOT="${ED}" install || die "make install failed" + + insinto /usr/share/pixmaps/texmaker + doins utilities/texmaker*.png || die "doins failed." + doins utilities/texmaker.svg || die "doins failed." + + dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed" +} + +pkg_postinst() { + elog "A user manual with many screenshots is available at:" + elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html" +} -- 2.26.2