[texmaker/f21] Update to latest version 4.4

nonamedotc nonamedotc at fedoraproject.org
Fri Dec 19 02:40:38 UTC 2014


commit 83073ccf348c942b1abe459f7f778ab551c8052d
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date:   Thu Dec 18 20:40:30 2014 -0600

    Update to latest version 4.4
    
    - spec file clean up

 texmaker-4.4-f21.patch |   33 +++++++++++----------------------
 1 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/texmaker-4.4-f21.patch b/texmaker-4.4-f21.patch
index f12eef6..4279532 100644
--- a/texmaker-4.4-f21.patch
+++ b/texmaker-4.4-f21.patch
@@ -1,14 +1,11 @@
---- texmaker.pro.orig	2014-12-06 15:29:22.391001886 -0600
-+++ texmaker.pro	2014-12-06 15:36:57.933482657 -0600
-@@ -19,11 +19,14 @@
+--- texmaker.pro.orig	2014-12-18 20:31:51.515949665 -0600
++++ texmaker.pro	2014-12-18 20:34:30.086810813 -0600
+@@ -19,11 +19,11 @@
  unix:!macx {
  contains( QT_VERSION, "^5.*" ) {
  CONFIG		+= link_pkgconfig
 -PKGCONFIG 	= poppler-qt5
 +PKGCONFIG 	= poppler-qt5 hunspell
-+
-+CONFIG		+= qtsingleapplication
-+
  DEFINES += POPPLER24
  } else {
  CONFIG		+= link_pkgconfig
@@ -17,7 +14,7 @@
  DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
  contains( DETECTEDPOPPLER, "^0.18.*" ){
  DEFINES += OLDPOPPLER
-@@ -97,29 +100,6 @@
+@@ -97,25 +97,6 @@
  	unicodedialog.h \
  	unicodeview.h \
  	quickbeamerdialog.h \
@@ -40,10 +37,10 @@
 -	hunspell/hunzip.hxx \
 -	hunspell/replist.hxx \
 -	hunspell/w_char.hxx \
- 	encodingprober/CharDistribution.h \
- 	encodingprober/ChineseGroupProber.h \
- 	encodingprober/ctype_test_p.h \
-@@ -208,22 +188,6 @@
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -208,18 +189,6 @@
  	unicodedialog.cpp \
  	unicodeview.cpp \
  	quickbeamerdialog.cpp \
@@ -59,14 +56,6 @@
 -	hunspell/filemgr.cxx \
 -	hunspell/replist.cxx \
 -	hunspell/hunzip.cxx \
- 	encodingprober/CharDistribution.cpp \
- 	encodingprober/ChineseGroupProber.cpp \
- 	encodingprober/JapaneseGroupProber.cpp \
-@@ -334,8 +298,7 @@
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 
-+SOURCES	+= x11fontdialog.cpp 
- FORMS += x11fontdialog.ui
- 
- utilities.files = doc/doc1.png \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \


More information about the scm-commits mailing list