Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

Hi

In bug #869359 (Rather use qt4 due to qt5 bugs) I was asked to build
texstudio against qt4 instead of qt5 because of a severe bug in qt5. In
short qt5 does not allow to input polytonic greek letters like ἀ ἁ ἄ ἅ ἂ
ἃ ἆ ἐ ἑ etc.

Due to the problems with qt5, upstream is still shipping two versions of
their own debian packages, one with qt4 and one with qt5 support.

In my opinion it makes sense to go back to qt4 for stretch.

I've made the necessary changes and built texstudio for stretch against
qt4. Please find attached the debdiff.

Thanks and regards
Tom
diff -Nru texstudio-2.11.2+debian/debian/changelog 
texstudio-2.11.2+debian/debian/changelog
--- texstudio-2.11.2+debian/debian/changelog    2016-10-23 19:37:11.000000000 
+0200
+++ texstudio-2.11.2+debian/debian/changelog    2017-10-03 09:17:23.000000000 
+0200
@@ -1,3 +1,9 @@
+texstudio (2.11.2+debian-1+deb9u1) stretch; urgency=medium
+
+  * Moving back to using qt4 instead of qt5 (Closes: #869359).
+
+ -- Tom Jampen <t...@cryptography.ch>  Tue, 03 Oct 2017 09:17:23 +0200
+
 texstudio (2.11.2+debian-1) unstable; urgency=medium
 
   * Merging upstream version 2.11.2+debian.
diff -Nru texstudio-2.11.2+debian/debian/control 
texstudio-2.11.2+debian/debian/control
--- texstudio-2.11.2+debian/debian/control      2016-10-11 23:28:14.000000000 
+0200
+++ texstudio-2.11.2+debian/debian/control      2017-08-17 09:13:57.000000000 
+0200
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Tom Jampen <t...@cryptography.ch>
 Build-Depends:
- debhelper (>= 9), libhunspell-dev, libpoppler-qt5-dev, libqt5svg5-dev,
- libquazip5-dev, pkg-config, qt5-qmake, qtscript5-dev, qttools5-dev, zlib1g-dev
+ debhelper (>= 9), libhunspell-dev, libpoppler-qt4-dev, libquazip-dev,
+ libx11-dev, pkg-config, qt4-qmake, zlib1g-dev
 Standards-Version: 3.9.8
 Homepage: http://texstudio.sf.net/
 
 Package: texstudio
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5svg5
+Depends: ${misc:Depends}, ${shlibs:Depends}, libqt4-svg
 Recommends:
  texlive-base, texlive-latex-base, texlive-latex-recommended, texstudio-doc,
  texstudio-l10n
diff -Nru texstudio-2.11.2+debian/debian/patches/04-quazip-qt5.patch 
texstudio-2.11.2+debian/debian/patches/04-quazip-qt5.patch
--- texstudio-2.11.2+debian/debian/patches/04-quazip-qt5.patch  2016-10-12 
07:41:57.000000000 +0200
+++ texstudio-2.11.2+debian/debian/patches/04-quazip-qt5.patch  1970-01-01 
01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Author: Tom Jampen <t...@cryptography.ch>
-Description:
- Patches texstudio.pro to use libquazip5 as TeXstudio is built against qt5.
-
-diff -Naurp a/texstudio.pro b/texstudio.pro
---- a/texstudio.pro    2016-10-12 07:40:25.470131505 +0200
-+++ b/texstudio.pro    2016-10-12 07:41:08.138720884 +0200
-@@ -471,7 +471,7 @@ isEmpty(USE_SYSTEM_QUAZIP) {
-   DEFINES += QUAZIP_STATIC
-   include(quazip/quazip/quazip.pri)
- } else {
--  isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip
-+  isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
-   isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip
- 
-   INCLUDEPATH += $${QUAZIP_INCLUDE}
diff -Nru texstudio-2.11.2+debian/debian/patches/series 
texstudio-2.11.2+debian/debian/patches/series
--- texstudio-2.11.2+debian/debian/patches/series       2016-10-11 
23:28:14.000000000 +0200
+++ texstudio-2.11.2+debian/debian/patches/series       2017-08-17 
09:12:42.000000000 +0200
@@ -1,4 +1,3 @@
 01-removed-upstream-files.patch
 02-fix-desktop.patch
 03-disable-auto-update.patch
-04-quazip-qt5.patch
diff -Nru texstudio-2.11.2+debian/debian/rules 
texstudio-2.11.2+debian/debian/rules
--- texstudio-2.11.2+debian/debian/rules        2016-10-11 23:28:14.000000000 
+0200
+++ texstudio-2.11.2+debian/debian/rules        2017-08-17 09:13:34.000000000 
+0200
@@ -2,7 +2,6 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
-export QT_SELECT=qt5
 
 DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog \

Reply via email to