summaryrefslogtreecommitdiffstats
path: root/arch/tde-base
diff options
context:
space:
mode:
Diffstat (limited to 'arch/tde-base')
-rw-r--r--arch/tde-base/tde-i18n/PKGBUILD148
-rw-r--r--arch/tde-base/tde-tdeadmin/PKGBUILD36
-rw-r--r--arch/tde-base/tde-tdeartwork/PKGBUILD37
-rw-r--r--arch/tde-base/tde-tdebindings/PKGBUILD26
-rw-r--r--arch/tde-base/tde-tdebindings/bp000-817f960e.diff31
-rw-r--r--arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff401
-rw-r--r--arch/tde-base/tde-tdebindings/bp002-33697c89.diff24
-rw-r--r--arch/tde-base/tde-tdegraphics/PKGBUILD49
-rw-r--r--arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff33
-rw-r--r--arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff63
-rw-r--r--arch/tde-base/tde-tdeutils/PKGBUILD36
11 files changed, 242 insertions, 642 deletions
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD
new file mode 100644
index 000000000..5d9fcec95
--- /dev/null
+++ b/arch/tde-base/tde-i18n/PKGBUILD
@@ -0,0 +1,148 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tde-i18n
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod/tde-}"
+pkgname=("$pkgbase")
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Internationalized (i18n) files for TDE"
+arch=('any')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+makedepends=('tde-cmake-trinity')
+depends=('tde-tdelibs')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a5a69fb9f1e4dae6852a68d4725ee6c3')
+install=''
+
+_languages=(
+ 'af "Afrikaans"'
+ 'ar "Arabic"'
+ 'az "Azerbaijani"'
+ 'be "Belarusian"'
+ 'bg "Bulgarian"'
+ 'bn "Bengali"'
+ 'br "Breton"'
+ 'bs "Bosnian"'
+ 'ca "Catalan"'
+ 'cs "Czech"'
+ 'csb "Kashubian"'
+ 'cy "Welsh"'
+ 'da "Danish"'
+ 'de "German"'
+ 'el "Greek"'
+ 'en_GB "English (British)"'
+ 'eo "Esperanto"'
+ 'es "Spanish"'
+ 'es_AR "Spanish (Argentina)"'
+ 'et "Estonian"'
+ 'eu "Basque"'
+ 'fa "Persian"'
+ 'fi "Finnish"'
+ 'fr "French"'
+ 'fy "Frisian"'
+ 'ga "Irish"'
+ 'gl "Galician"'
+ 'he "Hebrew"'
+ 'hi "Hindi"'
+ 'hr "Croatian"'
+ 'hu "Hungarian"'
+ 'is "Icelandic"'
+ 'it "Italian"'
+ 'ja "Japanese"'
+ 'kk "Kazakh"'
+ 'km "Khmer"'
+ 'ko "Korean"'
+ 'lt "Lithuanian"'
+ 'lv "Latvian"'
+ 'mk "Macedonian"'
+ 'mn "Mongolian"'
+ 'ms "Malay"'
+ 'nb "Norwegian Bokmål"'
+ 'nds "Low Saxon"'
+ 'nl "Dutch"'
+ 'nn "Norwegian Nynorsk"'
+ 'pa "Punjabi"'
+ 'pl "Polish"'
+ 'pt "Portuguese"'
+ 'pt_BR "Portuguese (Brazil)"'
+ 'ro "Romanian"'
+ 'ru "Russian"'
+ 'rw "Kinyarwanda"'
+ 'se "Northern Sami"'
+ 'sk "Slovak"'
+ 'sl "Slovenian"'
+ 'sr "Serbian"'
+ 'sr@Latn "Serbian Latin"'
+ 'ss "Swati"'
+ 'sv "Swedish"'
+ 'ta "Tamil"'
+ 'te "Telugu"'
+ 'tg "Tajik"'
+ 'th "Thai"'
+ 'tr "Turkish"'
+ 'uk "Ukrainian"'
+ 'uz "Uzbek"'
+ 'uz@cyrillic "Uzbek (Cyrillic)"'
+ 'vi "Vietnamese"'
+ 'wa "Walloon"'
+ 'zh_CN "Chinese (Simplified)"'
+ 'zh_TW "Chinese (Traditional)"'
+)
+
+_pkglangs=()
+for _lang in "${_languages[@]}"; do
+ _locale=${_lang%% *}
+ _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \
+ sed "s|@latn|latin|" | \
+ tr -d "_" | tr -d "@")
+ _pkgname=${pkgbase}-${_pkglang}
+
+ pkgname+=($_pkgname)
+ _pkglangs+=($_pkgname)
+ eval "package_$_pkgname() {
+ _package $_pkglang $_lang
+ }"
+done
+
+_package() {
+ pkgdesc="$3 ($2) internationalized (i18n) files for TDE"
+ provides=("${_mod}-${1}")
+ conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}")
+ replaces=("trinity-${_mod}-${1}")
+
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_}
+}
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON
+
+ msg "Building - ${pkgname#*-}..."
+ ninja $NUMJOBS
+}
+
+package_tde-i18n() {
+ pkgdesc="All languages (all) internationalized (i18n) files for TDE"
+ provides=("${_mod}")
+ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+ replaces=("trinity-${_mod}")
+ depends+=(${_pkglangs[@]})
+}
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
index 7dcd22bcf..8ad9aab9a 100644
--- a/arch/tde-base/tde-tdeadmin/PKGBUILD
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -1,48 +1,52 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeadmin
-pkgver=14.0.10
+_mod=tdeadmin
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The TDE system administration utilities"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz")
-md5sums=('401907e03f80ad2433614761af6978b1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('1cdc7261b0a07b2b5767024ee699d852')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
- -DBUILD_KNETWORKCONF=OFF
+ -DBUILD_KNETWORKCONF=OFF \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
index d5a66134c..5c4f59b62 100644
--- a/arch/tde-base/tde-tdeartwork/PKGBUILD
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -1,48 +1,51 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeartwork
-pkgver=14.0.10
+_mod=tdeartwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeartwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
depends=('tde-tdebase' 'xscreensaver' 'libxss')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=('tdeartwork')
-conflicts=('trinity-tdeartwork' 'trinity-kdeartwork')
-replaces=('trinity-tdeartwork')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeartwork-trinity-${pkgver}.tar.xz")
-md5sums=('71830a98f9d130a37ba1b3c6107fdd66')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fc7ac94e49b18619699b7872339fe8d1')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
index ecdbc822b..eadab5f96 100644
--- a/arch/tde-base/tde-tdebindings/PKGBUILD
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -3,26 +3,23 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdebindings
-pkgver=14.0.10
+_mod=tdebindings
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https//scm.trinitydesktop.org/scm/git/tdebindings'
+url="https//scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop bindings"
depends=('tde-tdelibs')
makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2')
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
- 'bp000-817f960e.diff'
- 'bp001-8301a3c8.diff'
- 'bp002-33697c89.diff')
-md5sums=('47294367d80fa79fefa80d755a6bf93d'
- '79e6de2ddfec059b7601fac3f3a1adc5'
- '8267435e92a265b83efbf07db5e36c01'
- 'feb8afbd1b3467c3e36f1dffb8c5ca53')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3f4933a66c0e1b32011148b9b4733579')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -31,11 +28,6 @@ build() {
## Generate config files and update with autoreconf
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- msg "Apply backported patches..."
- patch -p1 < ${srcdir}/bp000-817f960e.diff
- patch -p1 < ${srcdir}/bp001-8301a3c8.diff
- patch -p1 < ${srcdir}/bp002-33697c89.diff
-
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
diff --git a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff b/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
deleted file mode 100644
index e8d31b474..000000000
--- a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 817f960e8ecca5074171cfc8267dcebbb1a7f514 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Mon, 10 May 2021 20:45:41 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qt.cpp:2643:17: error: ordered comparison of pointer with integer zero ('void*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- qtruby/rubylib/qtruby/Qt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
-index 834cc3b2..abb44588 100644
---- a/qtruby/rubylib/qtruby/Qt.cpp
-+++ b/qtruby/rubylib/qtruby/Qt.cpp
-@@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj)
- {
- void * ptr = 0;
- ptr = value_to_ptr(obj);
-- return (ptr > 0 ? Qtrue : Qfalse);
-+ return (ptr != 0 ? Qtrue : Qfalse);
- }
-
- static VALUE
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff b/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
deleted file mode 100644
index b64ad2535..000000000
--- a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
+++ /dev/null
@@ -1,401 +0,0 @@
-From 8301a3c8e542675e9b5f310d79ad24b9a12baaf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Wed, 22 Sep 2021 20:38:45 +0200
-Subject: Add check whether Ruby requires explicit specification of C++
- standard.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- korundum/bin/Makefile.am | 2 +
- korundum/configure.in.in | 90 +++++++++++++++++++++++++++++++
- korundum/rubylib/korundum/Makefile.am | 2 +
- korundum/rubylib/korundum/configure.in.in | 59 --------------------
- qtruby/bin/Makefile.am | 2 +
- qtruby/configure.in.in | 90 +++++++++++++++++++++++++++++++
- qtruby/rubylib/designer/uilib/Makefile.am | 2 +
- qtruby/rubylib/qtruby/Makefile.am | 2 +
- qtruby/rubylib/qtruby/configure.in.in | 59 --------------------
- 9 files changed, 190 insertions(+), 118 deletions(-)
- create mode 100644 korundum/configure.in.in
- delete mode 100644 korundum/rubylib/korundum/configure.in.in
- create mode 100644 qtruby/configure.in.in
- delete mode 100644 qtruby/rubylib/qtruby/configure.in.in
-
-diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
-index 508f7731..47a8bb02 100644
---- a/korundum/bin/Makefile.am
-+++ b/korundum/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = krubyinit
-diff --git a/korundum/configure.in.in b/korundum/configure.in.in
-new file mode 100644
-index 00000000..c420adc9
---- /dev/null
-+++ b/korundum/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
-index 840b6ab6..74995c3d 100644
---- a/korundum/rubylib/korundum/Makefile.am
-+++ b/korundum/rubylib/korundum/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
-deleted file mode 100644
-index 0a987639..00000000
---- a/korundum/rubylib/korundum/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
-diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am
-index a1005f0b..988ba3d4 100644
---- a/qtruby/bin/Makefile.am
-+++ b/qtruby/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = qtrubyinit
-diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
-new file mode 100644
-index 00000000..84ad88ec
---- /dev/null
-+++ b/qtruby/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
-index 45876ed6..80363009 100644
---- a/qtruby/rubylib/designer/uilib/Makefile.am
-+++ b/qtruby/rubylib/designer/uilib/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
-index 7083719c..c273c599 100644
---- a/qtruby/rubylib/qtruby/Makefile.am
-+++ b/qtruby/rubylib/qtruby/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb
-diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
-deleted file mode 100644
-index db0594a3..00000000
---- a/qtruby/rubylib/qtruby/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
deleted file mode 100644
index a559fec2a..000000000
--- a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 5092f046c4f6b678a728bb1156123e0f0e45380f
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri Sep 24 15:02:20 2021 +0200
-
- Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
- (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
-
-diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
-index be90dd10..2fe8e5d5 100644
---- a/dcopjava/binding/Makefile.am
-+++ b/dcopjava/binding/Makefile.am
-@@ -1,8 +1,8 @@
- lib_LTLIBRARIES = libjavadcop.la
-
- libjavadcop_la_SOURCES = client.cpp
--libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
--libjavadcop_la_LIBADD = $(LIB_TDECORE)
-+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
-+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-
- INCLUDES = $(jni_includes) $(all_includes)
-
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD
index 29618eb11..394218e39 100644
--- a/arch/tde-base/tde-tdegraphics/PKGBUILD
+++ b/arch/tde-base/tde-tdegraphics/PKGBUILD
@@ -1,54 +1,55 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com>
-pkgname=tde-tdegraphics
-pkgver=14.0.10
+_mod=tdegraphics
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop Graphics Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegraphics'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
-depends=('tde-tdelibs' 'libgphoto2' 'fribidi' 'sane')
-makedepends=('pkgconfig' 'cmake' 'imlib')
-provides=('tdegraphics')
-conflicts=('trinity-tdegraphics' 'trinity-kdegraphics')
-replaces=('trinity-tdegraphics')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegraphics-trinity-${pkgver}.tar.xz"
- 'bp000-d19460fd6e.diff'
- 'bp001-866f96c1f4.diff')
-md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9'
- 'c5ccbf331b4b0b6a0af61687cc3308a5'
- 'bd4a586fb17963697afceef79adc35a5')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('04d2c95040a3a5664c4b0dca8556d10d')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-d19460fd6e.diff
- patch -p1 < ${srcdir}/bp001-866f96c1f4.diff
-
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_T1LIB=ON \
+ -DWITH_PAPER=ON \
+ -DWITH_TIFF=ON \
+ -DWITH_OPENEXR=ON \
+ -DWITH_PDF=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
deleted file mode 100644
index 1565ee3f2..000000000
--- a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001
-From: Mavridis Philippe <mavridisf@gmail.com>
-Date: Thu, 8 Jul 2021 23:14:10 +0300
-Subject: Corrected boolean usage to conform with C++17 standard.
-
-This resolves a FTBFS on some systems.
-
-Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
----
- kfaxview/libkfaximage/faxinit.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp
-index aa6166aa..fa4517d2 100644
---- a/kfaxview/libkfaximage/faxinit.cpp
-+++ b/kfaxview/libkfaximage/faxinit.cpp
-@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
- void
- fax_init_tables(void)
- {
-- static bool already_initialized = 0;
-+ static bool already_initialized = false;
- if (already_initialized)
- return;
-
-- ++already_initialized;
-+ already_initialized = true;
-
- FillTable(MainTable, 7, Pass, S_Pass);
- FillTable(MainTable, 7, Horiz, S_Horiz);
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
deleted file mode 100644
index 3508d7437..000000000
--- a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Thu, 8 Jul 2021 19:46:45 +0200
-Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves
- FTBFS on FreeBSD 13.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- kpovmodeler/CMakeLists.txt | 4 ++--
- kpovmodeler/ConfigureChecks.cmake | 9 +++++----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
-index 6ec98ae4..b589117f 100644
---- a/kpovmodeler/CMakeLists.txt
-+++ b/kpovmodeler/CMakeLists.txt
-@@ -19,7 +19,7 @@ include_directories(
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-- ${GLU_INCLUDE_DIRS}
-+ ${OPENGL_INCLUDE_DIRS}
- ${FREETYPE_INCLUDE_DIRS}
- )
-
-@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
- pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
- pmpartiface.skel
- VERSION 0.0.0
-- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
-+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
-index f4fdd1c0..a55045d4 100644
---- a/kpovmodeler/ConfigureChecks.cmake
-+++ b/kpovmodeler/ConfigureChecks.cmake
-@@ -10,13 +10,14 @@
- #################################################
-
- # glu
--pkg_search_module( GLU glu )
--if( NOT GLU_FOUND )
-+set( OpenGL_GL_PREFERENCE LEGACY )
-+find_package( OpenGL )
-+if( NOT OPENGL_FOUND )
- check_include_file ( GL/glu.h HAVE_GLU )
- if( NOT HAVE_GLU )
-- tde_message_fatal( "glu is required, but was not found on your system" )
-+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
- endif ( )
-- set( GLU_LIBRARIES "-lGL -lGLU" )
-+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
- endif( )
-
-
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD
index 46126989c..d3c4ea03b 100644
--- a/arch/tde-base/tde-tdeutils/PKGBUILD
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeutils
-pkgver=14.0.10
+_mod=tdeutils
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The TDE something - with Trinity upstream"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdebase' 'xmms2')
-makedepends=('pkgconfig' 'cmake' 'python2')
+makedepends=('tde-cmake-trinity' 'python2')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeutils-trinity-${pkgver}.tar.xz")
-md5sums=('95e778a8775b416739fd7e836e4ecdcd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('9d5bc073642e7f540f9c168e7d8ea989')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
## cmake call
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
-DWITH_DPMS=ON \
- -DBUILD_ALL=ON
+ -DWITH_XSCREENSAVER=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 20:20:59 +0000