diff --git a/.gitignore b/.gitignore index ed5a532..81a5389 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /texstudio-2.2.tar.gz +/texstudio-2.3.tar.gz diff --git a/sources b/sources index 51fcc4e..f581dd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d23cf71c90f3fd950d49bf480285e920 texstudio-2.2.tar.gz +bd5c7f0f4ae498addf387e7058d5d919 texstudio-2.3.tar.gz diff --git a/texstudio-use-system-hunspell-instead-of-bundled-one.patch b/texstudio-use-system-hunspell-instead-of-bundled-one.patch index 1c365e3..7b498f4 100644 --- a/texstudio-use-system-hunspell-instead-of-bundled-one.patch +++ b/texstudio-use-system-hunspell-instead-of-bundled-one.patch @@ -1,15 +1,15 @@ -From e14c4085029e89da0006a83e72e20e8da29092fd Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Thu, 28 Jul 2011 17:01:34 +0200 -Subject: [PATCH 2/3] use system hunspell instead of bundled one +From b168f39f0b978ef31439e7cef52b20c8fce330d4 Mon Sep 17 00:00:00 2001 +From: hannes +Date: Wed, 30 Nov 2011 21:14:27 +0000 +Subject: [PATCH] hunspell patch --- spellerutility.h | 2 +- - texstudio.pro | 38 +++++++------------------------------- - 2 files changed, 8 insertions(+), 32 deletions(-) + texstudio.pro | 38 ++++++-------------------------------- + 2 files changed, 7 insertions(+), 33 deletions(-) -diff --git spellerutility.h spellerutility.h -index 730920e..bb996e2 100644 +diff --git a/spellerutility.h b/spellerutility.h +index 76fe382..c889105 100644 --- spellerutility.h +++ spellerutility.h @@ -13,7 +13,7 @@ @@ -21,74 +21,73 @@ index 730920e..bb996e2 100644 class SpellerUtility: public QObject { Q_OBJECT public: -diff --git texstudio.pro texstudio.pro -index 437a376..c0b67da 100644 +diff --git a/texstudio.pro b/texstudio.pro +index 80e9ba3..c5b5ec6 100644 --- texstudio.pro +++ texstudio.pro -@@ -55,24 +55,6 @@ HEADERS += texmaker.h \ - codesnippet.h \ - thesaurusdialog.h \ - xmltagslistwidget.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/w_char.hxx \ - qcodeedit/lib/qeditorinputbinding.h \ - qcodeedit/lib/qeditorinputbindinginterface.h \ - randomtextgenerator.h \ -@@ -88,7 +70,6 @@ HEADERS += texmaker.h \ - latexdocument.h \ - unicodeinsertion.h \ - universalinputdialog.h \ -- hunspell/replist.hxx \ - scriptengine.h \ - insertgraphics.h \ - tmxtabwidget.h \ -@@ -142,18 +123,6 @@ SOURCES += main.cpp \ - codesnippet.cpp \ - thesaurusdialog.cpp \ - xmltagslistwidget.cpp \ -- hunspell/affentry.cxx \ -- hunspell/affixmgr.cxx \ -- hunspell/csutil.cxx \ -- hunspell/dictmgr.cxx \ -- hunspell/hashmgr.cxx \ -- hunspell/hunspell.cxx \ -- hunspell/phonet.cxx \ -- hunspell/replist.cxx \ -- hunspell/suggestmgr.cxx \ -- hunspell/utf_info.cxx \ -- hunspell/filemgr.cxx \ -- hunspell/hunzip.cxx \ - encodingdialog.cpp \ - qcodeedit/lib/qeditorinputbinding.cpp \ - randomtextgenerator.cpp \ -@@ -528,3 +497,10 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c - - #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline - QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline -+ -+# enable use of pkgconfig -+unix { -+ CONFIG += link_pkgconfig -+ # use system hunspell -+ PKGCONFIG += hunspell -+} -\ No newline at end of file +@@ -51,24 +51,6 @@ HEADERS += texmaker.h \ + codesnippet.h \ + thesaurusdialog.h \ + xmltagslistwidget.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/w_char.hxx \ + qcodeedit/lib/qeditorinputbinding.h \ + qcodeedit/lib/qeditorinputbindinginterface.h \ + randomtextgenerator.h \ +@@ -84,7 +66,6 @@ HEADERS += texmaker.h \ + latexdocument.h \ + unicodeinsertion.h \ + universalinputdialog.h \ +- hunspell/replist.hxx \ + scriptengine.h \ + insertgraphics.h \ + tmxtabwidget.h \ +@@ -143,18 +124,6 @@ SOURCES += main.cpp \ + codesnippet.cpp \ + thesaurusdialog.cpp \ + xmltagslistwidget.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/replist.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/hunzip.cxx \ + encodingdialog.cpp \ + qcodeedit/lib/qeditorinputbinding.cpp \ + randomtextgenerator.cpp \ +@@ -539,4 +508,9 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c + #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline + QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline + +- ++# enable use of pkgconfig ++unix { ++ CONFIG += link_pkgconfig ++ # use system hunspell ++ PKGCONFIG += hunspell ++} -- -1.7.4.4 +1.7.7.3 diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch index 8b02b9c..969adc4 100644 --- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch +++ b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch @@ -1,36 +1,32 @@ -From 15100e67881ac6ba99e4c29baaa4cb2baa62c3be Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Thu, 28 Jul 2011 17:07:49 +0200 -Subject: [PATCH 3/3] use system qtsingleapplication instead of bundled one +From 7005c1602c40064fb9ef9f5a2fa0c0f0f243a320 Mon Sep 17 00:00:00 2001 +From: hannes +Date: Wed, 30 Nov 2011 21:21:49 +0000 +Subject: [PATCH 2/2] qtsingle --- - texstudio.pro | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + texstudio.pro | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) -diff --git texstudio.pro texstudio.pro -index c0b67da..0c1d9f1 100644 +diff --git a/texstudio.pro b/texstudio.pro +index c5b5ec6..68f36ca 100644 --- texstudio.pro +++ texstudio.pro -@@ -14,8 +14,6 @@ QT += network \ - QT += phonon - DEFINES += PHONON - } --contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x") --else:include(qtsingleapplication/qtsingleapplication.pri) - - # ############################## - PRECOMPILED_HEADER = mostQtHeaders.h -@@ -503,4 +501,7 @@ unix { - CONFIG += link_pkgconfig - # use system hunspell - PKGCONFIG += hunspell --} -\ No newline at end of file -+} -+ -+# use system qtsingleapplication -+CONFIG += qtsingleapplication -\ No newline at end of file +@@ -10,8 +10,6 @@ QT += network \ + QT += phonon + DEFINES += PHONON + } +-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x") +-else:include(qtsingleapplication/qtsingleapplication.pri) + + # ############################## + PRECOMPILED_HEADER = mostQtHeaders.h +@@ -514,3 +512,6 @@ unix { + # use system hunspell + PKGCONFIG += hunspell + } ++ ++#use system qtsingleapplication ++CONFIG += qtsingleapplication -- -1.7.4.4 +1.7.7.3 diff --git a/texstudio.spec b/texstudio.spec index 605995d..0237e4d 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,6 +1,6 @@ Name: texstudio -Version: 2.2 -Release: 9%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: A feature-rich editor for LaTeX documents Group: Applications/Publishing @@ -41,7 +41,7 @@ it tries to be like an improved version of Texmaker, so it keeps it look&feel. %prep -%setup -q -n texstudio2.2 +%setup -q -n %{name}%{version} %patch0 -p0 -b .hunspell %patch1 -p0 -b .qtsingle %patch2 -p0 -b .xdg @@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %changelog +* Thu Feb 09 2012 Johannes Lips 2.3-1 +- update to recent upstream version + * Sat Jan 14 2012 Fedora Release Engineering - 2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild