public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/texstudio/files: texstudio-2.5-hunspell.patch texstudio-2.5-viewers-use-xdg-open.patch texstudio-2.5-qtsingle.patch
@ 2012-11-05 18:57 Justin Lecher (jlec)
  0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2012-11-05 18:57 UTC (permalink / raw
  To: gentoo-commits

jlec        12/11/05 18:57:07

  Added:                texstudio-2.5-hunspell.patch
                        texstudio-2.5-viewers-use-xdg-open.patch
                        texstudio-2.5-qtsingle.patch
  Log:
  app-office/texstudio: Version Bump, #439816
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.1                  app-office/texstudio/files/texstudio-2.5-hunspell.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-hunspell.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-hunspell.patch?rev=1.1&content-type=text/plain

Index: texstudio-2.5-hunspell.patch
===================================================================
 spellerutility.h |  2 +-
 texstudio.pro    | 37 ++++++-------------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/spellerutility.h b/spellerutility.h
index 1e1d6e2..083f412 100644
--- a/spellerutility.h
+++ b/spellerutility.h
@@ -13,7 +13,7 @@
 
 #include "mostQtHeaders.h"
 
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 class SpellerUtility: public QObject {
 	Q_OBJECT
 public:
diff --git a/texstudio.pro b/texstudio.pro
index 541b6b6..f801fc2 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
     debughelper.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 \
@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
     latexdocument.h \
     unicodeinsertion.h \
     universalinputdialog.h \
-    hunspell/replist.hxx \
     scriptengine.h \
     insertgraphics.h \
     txstabwidget.h \
@@ -157,18 +138,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 \
@@ -591,4 +560,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 -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.1                  app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch?rev=1.1&content-type=text/plain

Index: texstudio-2.5-viewers-use-xdg-open.patch
===================================================================
From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sun, 9 Sep 2012 10:56:06 +0200
Subject: [PATCH] viewer

---
 buildmanager.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git buildmanager.cpp buildmanager.cpp
index ac7027a..ac913d0 100644
--- buildmanager.cpp
+++ buildmanager.cpp
@@ -762,25 +762,13 @@
 // xdvi %.dvi  -sourceposition @:%.tex
 // kdvi "file:%.dvi#src:@ %.tex"
 QString getCommandLineViewDvi(){
-	switch (x11desktop_env()) {
-	case 3:	return "kdvi %.dvi > /dev/null";
-	case 4:	return "okular %.dvi > /dev/null";
-	default:return "evince %.dvi > /dev/null";
-	}
+	return "xdg-open %.dvi > /dev/null";
 };
 QString getCommandLineViewPs(){
-	switch (x11desktop_env()) {
-	case 3:  return "kghostview %.ps > /dev/null";
-	case 4:  return "okular %.ps > /dev/null";
-	default: return "evince %.ps > /dev/null";
-	};
+	return "xdg-open %.ps > /dev/null";
 }
 QString getCommandLineViewPdfExternal(){
-	switch (x11desktop_env()) {
-	case 3:  return "kpdf %.pdf > /dev/null";
-	case 4:  return "okular %.pdf > /dev/null";
-	default: return "evince %.pdf > /dev/null";
-	};
+	return "xdg-open %.pdf > /dev/null";
 }
 QString getCommandLineGhostscript(){ return ""; }
 



1.1                  app-office/texstudio/files/texstudio-2.5-qtsingle.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-qtsingle.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texstudio/files/texstudio-2.5-qtsingle.patch?rev=1.1&content-type=text/plain

Index: texstudio-2.5-qtsingle.patch
===================================================================
 texstudio.pro | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/texstudio.pro b/texstudio.pro
index f801fc2..2b1d3df 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -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
@@ -567,3 +565,6 @@ unix {
   PKGCONFIG += hunspell
 }
 
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
+





^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-11-05 18:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-05 18:57 [gentoo-commits] gentoo-x86 commit in app-office/texstudio/files: texstudio-2.5-hunspell.patch texstudio-2.5-viewers-use-xdg-open.patch texstudio-2.5-qtsingle.patch Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox