Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ff188bebf1a
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 25bd238f1fb0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 31, 2021

  1. texstudio, bump version (#6325)

    @Begasus
    Begasus authored Oct 31, 2021
    Copy the full SHA
    25bd238 View commit details
Showing with 35 additions and 3 deletions.
  1. +28 −0 app-office/texstudio/patches/texstudio-4.0.2.patchset
  2. +7 −3 app-office/texstudio/{texstudio-4.0.0.recipe → texstudio-4.0.2.recipe}
28 changes: 28 additions & 0 deletions app-office/texstudio/patches/texstudio-4.0.2.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 37d0687949a31f3d4975bf3395eefb80fcaf18a9 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 30 Oct 2021 14:02:31 +0000
Subject: Fix build with QuaZip-1.0


diff --git a/texstudio.pro b/texstudio.pro
index 0873fec..a9ce848 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -381,11 +381,9 @@ include(src/symbolpanel/symbolpanel.pri)
isEmpty(USE_SYSTEM_QUAZIP) {
include(src/quazip/quazip/quazip.pri)
} else {
- message(System quazip5)
- isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
- isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
- INCLUDEPATH += $${QUAZIP_INCLUDE}
- LIBS += $${QUAZIP_LIB}
+ message(System QuaZip)
+ CONFIG += link_pkgconfig
+ PKGCONFIG += quazip1-qt5
}

include(src/pdfviewer/pdfviewer.pri)
--
2.30.2

10 changes: 7 additions & 3 deletions app-office/texstudio/texstudio-4.0.0.recipe → app-office/texstudio/texstudio-4.0.2.recipe
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,8 @@ LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
CHECKSUM_SHA256="ab541160525be8442aedcdbe4acb33e07518d6362ab819a16bbcd558ff39731c"
CHECKSUM_SHA256="134558670800bf9e9564d25c61efa888ba4b8b0f145c09ca64bcbeffecf12fa6"
PATCHES="texstudio-4.0.2.patchset"
ADDITIONAL_FILES="texstudio.rdef.in"

ARCHITECTURES="all !x86_gcc2"
@@ -34,6 +35,7 @@ REQUIRES="
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libquazip1_qt5$secondaryArchSuffix
lib:libX11$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -52,10 +54,10 @@ BUILD_REQUIRES="
devel:libQt5Svg$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libQt5Xml$secondaryArchSuffix
devel:libquazip1_qt5$secondaryArchSuffix
devel:libX11$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"

BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
@@ -70,7 +72,9 @@ BUILD()
qmake texstudio.pro \
PREFIX=$appsDir \
DATADIR=$dataDir \
USE_SYSTEM_HUNSPELL=1
USE_SYSTEM_HUNSPELL=1 \
USE_SYSTEM_QUAZIP=1 \
QUAZIP_LIB=-lquazip1-qt5
make $jobArgs
}