Skip to content
Snippets Groups Projects
Commit 146584fc authored by nfg's avatar nfg
Browse files

update to new format

parent 98093f7b
No related branches found
Tags 6.5.3-1
No related merge requests found
Pipeline #4280 passed
Stage: update
Hide whitespace changes
Inline Side-by-side
Showing
with 130 additions and 733 deletions
.gitignore
+ 4
− 5
View file @ 146584fc
trunk/pkg/
trunk/src/
trunk/*.pkg.tar.xz
trunk/*.pkg.tar.xz.sig
version/*/bin/
a
b
patch-prepare.sh
patch-make.sh
\ No newline at end of file
.gitlab-ci.yml
+ 85
− 29
View file @ 146584fc
.job_variables: &job_variables
variables:
GIT_SUBMODULE_STRATEGY: none
GIT_DEPTH: 0
PKG_TOKEN: ${PKG_TOKEN}
.job_rules_push: &job_rules_push
rules:
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG == null'
.job_rules_schedule: &job_rules_schedule
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
.job_rules_web: &job_rules_web
rules:
- if: '$CI_PIPELINE_SOURCE == "web"'
.job_rules_pipeline: &job_rules_pipeline
rules:
- if: '$CI_PIPELINE_SOURCE == "pipeline"'
.copy_files: &copy_files
before_script:
- mkdir -p /etc/pkg
- cp ./pkg.cfg /etc/pkg/pkg.cfg
- cp ./pacman.conf.builder /etc/pacman.conf.builder
stages:
- build
- commit
- deploy
- update
- build
- rebuild
- deploy
package:
stage: build
update:
stage: update
<<: *job_variables
<<: *job_rules_schedule
<<: *copy_files
script:
- mkdir -p /etc/pkg
- cp ./pkg.cfg /etc/pkg/pkg.cfg
- cp ./pacman.conf.builder /etc/pacman.conf.builder
- pkg-prepare.sh
- pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
- apkg-update.sh
build:
stage: build
<<: *job_variables
<<: *job_rules_push
<<: *copy_files
script:
- apkg-prepare.sh
- apkg-build.sh
- apkg-tag.sh
artifacts:
name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
paths:
- "*.pkg.tar.xz"
- "*.pkg.tar.xz"
- build.env
only:
changes:
- trunk/PKGBUILD
commit:
stage: commit
only:
changes:
- trunk/PKGBUILD
rebuild:from:
stage: rebuild
<<: *job_variables
<<: *job_rules_pipeline
<<: *copy_files
script:
- apkg-rebuild.sh
artifacts:
name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
paths:
- "*.pkg.tar.xz"
rebuild:dynamic:
stage: rebuild
<<: *job_rules_push
<<: *copy_files
needs: ["build"]
script:
- pkg-commit.sh
- apkg-generate.sh > dynamic-config.yml
artifacts:
paths:
- dynamic-config.yml
rebuild:packages:
stage: rebuild
<<: *job_variables
<<: *job_rules_push
needs: ["rebuild:dynamic","build"]
trigger:
include:
- artifact: dynamic-config.yml
job: rebuild:dynamic
strategy: depend
deploy:
<<: *job_variables
<<: *job_rules_push
stage: deploy
dependencies:
- package
needs: ["build","rebuild:packages"]
script:
- pkg-deploy.sh
only:
changes:
- trunk/PKGBUILD
- apkg-deploy.sh
.gitmodules 0 → 100644
+ 5
− 0
View file @ 146584fc
[submodule "qt6-base"]
path = qt6-base
url = https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-base
branch = main
update = merge
LICENSE 0 → 100644
+ 14
− 0
View file @ 146584fc
Copyright (c) 2023 Eric Vidal <eric@obarun.org>
All rights reserved.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff/patch/PKG.patch 0 → 100644
+ 12
− 0
View file @ 146584fc
diff -uar a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@
-DINSTALL_INCLUDEDIR=include/qt6 \
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
- -DFEATURE_journald=ON \
+ -DFEATURE_journald=OFF \
-DFEATURE_libproxy=ON \
-DFEATURE_openssl_linked=ON \
-DFEATURE_system_sqlite=ON \
pacman.conf.builder
+ 9
− 32
View file @ 146584fc
......@@ -5,11 +5,9 @@
[options]
HoldPkg = pacman glibc
Architecture = auto
IgnorePkg = systemd
IgnorePkg = systemd-libs
NoExtract = usr/lib/libsystemd*.*
IgnorePkg = systemd systemd-libs
NoExtract = usr/lib/libsystemd*.* usr/lib/systemd* etc/systemd*
Color
CheckSpace
VerbosePkgLists
ParallelDownloads = 5
#XferCommand =
......@@ -33,22 +31,6 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
SigLevel = Required
Server = https://cloud.server.obarun.org/$repo/os/$arch/
#[obcommunity-testing]
#SigLevel = Required
#Server = https://cloud.server.obarun.org/$repo/os/$arch/
[obcommunity]
SigLevel = Required
Server = https://cloud.server.obarun.org/$repo/os/$arch/
#[obmultilib-testing]
#SigLevel = Required
#Server = https://cloud.server.obarun.org/$repo/os/$arch/
[obmultilib]
SigLevel = Required
Server = https://cloud.server.obarun.org/$repo/os/$arch/
#[observice-testing]
#SigLevel = Required
#Server = https://cloud.server.obarun.org/$repo/os/$arch/
......@@ -57,23 +39,18 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
SigLevel = Required
Server = https://cloud.server.obarun.org/$repo/os/$arch/
#[testing]
#[core-testing]
#SigLevel = DatabaseOptional
#Include = /etc/pacman.d/mirrorlist
[core]
SigLevel = DatabaseOptional
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
#[community-testing]
#[extra-testing]
#SigLevel = DatabaseOptional
#Include = /etc/pacman.d/mirrorlist
[community]
[extra]
SigLevel = DatabaseOptional
Include = /etc/pacman.d/mirrorlist
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
#[multilib]
#Include = /etc/pacman.d/mirrorlist
qt6-base @ a469f13f
Subproject commit a469f13f4ab5b1aed078f7045751b0b15e66072c
trunk/LICENSE deleted 100644 → 0
+ 0
− 7
View file @ 98093f7b
Copyright (c) 2018-2022 Eric Vidal <eric@obarun.org>
Copyright (c) 2018-2022 Jean-Michel T.Dydak <jean-michel@obarun.org>
All rights reserved.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
trunk/PKGBUILD deleted 100644 → 0
+ 0
− 155
View file @ 98093f7b
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt6-base
#----------------
#--------------------------------------------------------------
# DESCRIPTION ]
pkgname=qt6-base
_qtver=6.5.2
pkgver=${_qtver/-/}
pkgrel=2
pkgdesc="A cross-platform application and UI framework"
url='https://www.qt.io'
_pkgfn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=(
https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz
qt6-base-cflags.patch
qt6-base-nostrip.patch
)
#--------------------
# BUILD PREPARATION ]
prepare() {
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
}
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'cmake'
'ninja'
'libfbclient'
'mariadb-libs'
'unixodbc'
'postgresql'
'alsa-lib'
'gst-plugins-base-libs'
'gtk3'
'libpulse'
'cups'
'freetds'
'xmlstarlet'
)
#------------------------
# INSTALL CONFIGURATION ]
depends=(
'libjpeg-turbo'
'xcb-util-keysyms'
'xcb-util-cursor'
'libgl'
'fontconfig'
'xdg-utils'
'shared-mime-info'
'xcb-util-wm'
'libxrender'
'libxi'
'sqlite'
'mesa'
'vulkan-headers'
'tslib'
'libinput'
'libxkbcommon-x11'
'libproxy'
'libcups'
'double-conversion'
'brotli'
'libb2'
'md4c'
)
optdepends=(
'qt6-wayland: to run Qt6 applications in a Wayland session'
'postgresql-libs: PostgreSQL driver'
'mariadb-libs: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'freetds: MS SQL driver'
'gtk3: GTK platform plugin'
'perl: for syncqt'
)
groups=(
'qt6'
)
#----------------
# BUILD CONTROL ]
_flags=(
-DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DINSTALL_BINDIR=lib/qt6/bin
-DINSTALL_PUBLICBINDIR=usr/bin
-DINSTALL_LIBEXECDIR=lib/qt6
-DINSTALL_DOCDIR=share/doc/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
-DINSTALL_DATADIR=share/qt6
-DINSTALL_INCLUDEDIR=include/qt6
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples
-DFEATURE_journald=OFF
-DFEATURE_libproxy=ON
-DFEATURE_openssl_linked=ON
-DFEATURE_system_sqlite=ON
-DFEATURE_system_xcb_xinput=ON
-DFEATURE_no_direct_extern_access=ON
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
)
options=(
'debug'
)
#--------
# BUILD ]
build() {
cmake -B build -S ${_pkgfn} -G Ninja "${_flags[@]}"
cmake --build build
}
#----------
# PACKAGE ]
package() {
depends+=(qt6-translations)
DESTDIR="$pkgdir" cmake --install build
install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir"/usr/share/licenses/$pkgbase
# Install symlinks for user-facing tools
cd "$pkgdir"
mkdir usr/bin
while read _line; do
ln -s $_line
done < "$srcdir"/build/user_facing_tool_links.txt
}
#-------------------------
# LICENCE AND VALIDATION ]
arch=(x86_64)
license=(GPL3 LGPL3 FDL custom)
sha512sums=('')
trunk/qt6-base-cflags.patch deleted 100644 → 0
+ 0
− 46
View file @ 98093f7b
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
index a493cd5984..41342f5020 100644
--- a/mkspecs/common/g++-unix.conf
+++ b/mkspecs/common/g++-unix.conf
@@ -10,5 +10,6 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+SYSTEM_LDFLAGS = $$(LDFLAGS)
+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 1f919d270a..7ef6046326 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-QMAKE_CFLAGS_DEBUG += -g
+SYSTEM_CFLAGS = $$(CFLAGS)
+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
trunk/qt6-base-nostrip.patch deleted 100644 → 0
+ 0
− 13
View file @ 98093f7b
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 99d77156fd..fc840fe9f6 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -31,6 +31,8 @@
# you can use the manual test in tests/manual/mkspecs.
#
+CONFIG += nostrip ltcg
+
QMAKE_CFLAGS_OPTIMIZE = -O2
QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
version/6.2.2-6/LICENSE deleted 100644 → 0
+ 0
− 7
View file @ 98093f7b
Copyright (c) 2018-2022 Eric Vidal <eric@obarun.org>
Copyright (c) 2018-2022 Jean-Michel T.Dydak <jean-michel@obarun.org>
All rights reserved.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
version/6.2.2-6/PKGBUILD deleted 100644 → 0
+ 0
− 153
View file @ 98093f7b
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt6-base
#----------------
#--------------------------------------------------------------
# DESCRIPTION ]
pkgname=qt6-base
_qtver=6.2.2
pkgver=${_qtver/-/}
pkgrel=6
pkgdesc='A cross-platform application and UI framework'
url='https://www.qt.io'
_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
source=(
https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qt6-base-cflags.patch
qt6-base-nostrip.patch
qtbug-97908.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9b7f7115
)
#--------------------
# BUILD PREPARATION ]
prepare() {
patch -d $_pkgfn -p1 -i ../qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 -i ../qt6-base-nostrip.patch # Don't strip binaries with qmake
patch -d $_pkgfn -p1 < qtbug-97908.patch # Fix scrolling with PgUp/PgDown keys
}
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'cmake'
'ninja'
'libfbclient'
'mariadb-libs'
'unixodbc'
'postgresql'
'alsa-lib'
'gst-plugins-base-libs'
'gtk3'
'libpulse'
'cups'
'freetds'
'xmlstarlet'
)
#------------------------
# INSTALL CONFIGURATION ]
depends=(
'libjpeg-turbo'
'xcb-util-keysyms'
'xcb-util-cursor'
'libgl'
'fontconfig'
'xdg-utils'
'shared-mime-info'
'xcb-util-wm'
'libxrender'
'libxi'
'sqlite'
'mesa'
'vulkan-headers'
'tslib'
'libinput'
'libxkbcommon-x11'
'libproxy'
'libcups'
'double-conversion'
'brotli'
'libb2'
'md4c'
)
optdepends=(
'qt6-wayland: to run Qt6 applications in a Wayland session'
'postgresql-libs: PostgreSQL driver'
'mariadb-libs: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'freetds: MS SQL driver'
'gtk3: GTK platform plugin'
'perl: for syncqt'
)
groups=(qt6)
#----------------
# BUILD CONTROL ]
_path=(
-DCMAKE_INSTALL_PREFIX=/usr
-DINSTALL_BINDIR=lib/qt6/bin
-DINSTALL_PUBLICBINDIR=usr/bin
-DINSTALL_LIBEXECDIR=lib/qt6
-DINSTALL_DOCDIR=share/doc/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
-DINSTALL_DATADIR=share/qt6
-DINSTALL_INCLUDEDIR=include/qt6
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples
)
_flags=(
-DQT_FEATURE_journald=OFF
-DQT_FEATURE_openssl_linked=ON
-DQT_FEATURE_system_sqlite=ON
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
)
#--------
# BUILD ]
build() {
cmake -B build -S $_pkgfn -G Ninja "${_path[@]}" "${_flags[@]}"
cmake --build build
}
#----------
# PACKAGE ]
package() {
depends+=(qt6-translations)
DESTDIR="$pkgdir" cmake --install build
install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
# Install symlinks for user-facing tools
cd "$pkgdir"
mkdir usr/bin
while read _line; do
ln -s $_line
done < "$srcdir"/build/user_facing_tool_links.txt
}
#-------------------------
# LICENCE AND VALIDATION ]
arch=(x86_64)
license=(GPL3 LGPL3 FDL custom)
sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
'06590303498a10950408d26f027928ec12019fe631237d1862c2d720f1d331bb')
version/6.2.2-6/qt6-base-cflags.patch deleted 100644 → 0
+ 0
− 46
View file @ 98093f7b
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
index a493cd5984..41342f5020 100644
--- a/mkspecs/common/g++-unix.conf
+++ b/mkspecs/common/g++-unix.conf
@@ -10,5 +10,6 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+SYSTEM_LDFLAGS = $$(LDFLAGS)
+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 1f919d270a..7ef6046326 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-QMAKE_CFLAGS_DEBUG += -g
+SYSTEM_CFLAGS = $$(CFLAGS)
+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
version/6.2.2-6/qt6-base-nostrip.patch deleted 100644 → 0
+ 0
− 13
View file @ 98093f7b
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 99d77156fd..fc840fe9f6 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -31,6 +31,8 @@
# you can use the manual test in tests/manual/mkspecs.
#
+CONFIG += nostrip
+
QMAKE_CFLAGS_OPTIMIZE = -O2
QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
version/6.2.3-5/LICENSE deleted 100644 → 0
+ 0
− 7
View file @ 98093f7b
Copyright (c) 2018-2022 Eric Vidal <eric@obarun.org>
Copyright (c) 2018-2022 Jean-Michel T.Dydak <jean-michel@obarun.org>
All rights reserved.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
version/6.2.3-5/PKGBUILD deleted 100644 → 0
+ 0
− 154
View file @ 98093f7b
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt6-base
#----------------
#--------------------------------------------------------------
# DESCRIPTION ]
pkgname=qt6-base
_qtver=6.2.3
pkgver=${_qtver/-/}
pkgrel=5
pkgdesc='A cross-platform application and UI framework'
url='https://www.qt.io'
_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
source=(
https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qt6-base-cflags.patch
qt6-base-nostrip.patch
)
#--------------------
# BUILD PREPARATION ]
prepare() {
patch -d $_pkgfn -p1 -i ../qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 -i ../qt6-base-nostrip.patch # Don't strip binaries with qmake
}
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'cmake'
'ninja'
'libfbclient'
'mariadb-libs'
'unixodbc'
'postgresql'
'alsa-lib'
'gst-plugins-base-libs'
'gtk3'
'libpulse'
'cups'
'freetds'
'xmlstarlet'
)
#------------------------
# INSTALL CONFIGURATION ]
depends=(
'libjpeg-turbo'
'xcb-util-keysyms'
'xcb-util-cursor'
'libgl'
'fontconfig'
'xdg-utils'
'shared-mime-info'
'xcb-util-wm'
'libxrender'
'libxi'
'sqlite'
'mesa'
'vulkan-headers'
'tslib'
'libinput'
'libxkbcommon-x11'
'libproxy'
'libcups'
'double-conversion'
'brotli'
'libb2'
'md4c'
)
optdepends=(
'qt6-wayland: to run Qt6 applications in a Wayland session'
'postgresql-libs: PostgreSQL driver'
'mariadb-libs: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'freetds: MS SQL driver'
'gtk3: GTK platform plugin'
'perl: for syncqt'
)
groups=(qt6)
#----------------
# BUILD CONTROL ]
_path=(
-DCMAKE_INSTALL_PREFIX=/usr
-DINSTALL_BINDIR=lib/qt6/bin
-DINSTALL_PUBLICBINDIR=usr/bin
-DINSTALL_LIBEXECDIR=lib/qt6
-DINSTALL_DOCDIR=share/doc/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
-DINSTALL_DATADIR=share/qt6
-DINSTALL_INCLUDEDIR=include/qt6
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples
)
_flags=(
-DQT_FEATURE_journald=OFF
-DQT_FEATURE_openssl_linked=ON
-DQT_FEATURE_system_sqlite=ON
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-DCMAKE_BUILD_TYPE=RelWithDebInfo
)
options=(debug)
#--------
# BUILD ]
build() {
cmake -B build -S $_pkgfn -G Ninja "${_path[@]}" "${_flags[@]}"
cmake --build build
}
#----------
# PACKAGE ]
package() {
depends+=(qt6-translations)
DESTDIR="$pkgdir" cmake --install build
install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
# Install symlinks for user-facing tools
cd "$pkgdir"
mkdir usr/bin
while read _line; do
ln -s $_line
done < "$srcdir"/build/user_facing_tool_links.txt
}
#-------------------------
# LICENCE AND VALIDATION ]
arch=(x86_64)
license=(GPL3 LGPL3 FDL custom)
sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
'06590303498a10950408d26f027928ec12019fe631237d1862c2d720f1d331bb')
version/6.2.3-5/qt6-base-cflags.patch deleted 100644 → 0
+ 0
− 46
View file @ 98093f7b
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
index a493cd5984..41342f5020 100644
--- a/mkspecs/common/g++-unix.conf
+++ b/mkspecs/common/g++-unix.conf
@@ -10,5 +10,6 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+SYSTEM_LDFLAGS = $$(LDFLAGS)
+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 1f919d270a..7ef6046326 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-QMAKE_CFLAGS_DEBUG += -g
+SYSTEM_CFLAGS = $$(CFLAGS)
+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
version/6.2.3-5/qt6-base-nostrip.patch deleted 100644 → 0
+ 0
− 13
View file @ 98093f7b
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 99d77156fd..fc840fe9f6 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -31,6 +31,8 @@
# you can use the manual test in tests/manual/mkspecs.
#
+CONFIG += nostrip
+
QMAKE_CFLAGS_OPTIMIZE = -O2
QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
version/6.2.3-6/LICENSE deleted 100644 → 0
+ 0
− 7
View file @ 98093f7b
Copyright (c) 2018-2022 Eric Vidal <eric@obarun.org>
Copyright (c) 2018-2022 Jean-Michel T.Dydak <jean-michel@obarun.org>
All rights reserved.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment