+ Add standalone package tde-cmake-trinity
+ Switch CMake builds to use Ninja
+ Switch some packages to CMake
+ Add tde-tqca and tde-akode
+ Add tde-i18n packages
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1838e1a41f)
pull/158/head
parent
455c3e56aa
commit
b9d33de362
@ -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[@]})
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -1,42 +1,46 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-avahi-tqt
|
||||
pkgver=14.0.10
|
||||
_mod=avahi-tqt
|
||||
_cat=dependencies/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="Trinity Avahi-TQt"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-core')
|
||||
depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
|
||||
# nss-mdns should probably move to tdelibs depends
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('avahi-tqt')
|
||||
replaces=('trinity-avahi-tqt')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('6cce8423a3030505bb56a8c73f6235d6')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('e9e31775dc7ad94159e9e8ea0edf028c')
|
||||
|
||||
[ -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
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DWITH_GCC_VISIBILITY=ON
|
||||
-DWITH_ALL_OPTIONS=ON
|
||||
|
||||
msg "Building - $pkgname..."
|
||||
make $NUMJOBS
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - $pkgname"
|
||||
cd ${srcdir}/build
|
||||
make -j1 DESTDIR="$pkgdir" install
|
||||
DESTDIR="$pkgdir" ninja -j1 install
|
||||
}
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
# Contributor: Slávek Banko <slavek.banko@axis.cz>
|
||||
|
||||
_mod=cmake-trinity
|
||||
_cat=common/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="TDE CMake modules"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
|
||||
license=('GPL')
|
||||
provides=("${_mod}")
|
||||
groups=('tde-core')
|
||||
depends=(
|
||||
'cmake'
|
||||
'perl'
|
||||
'ninja'
|
||||
'pkgconfig'
|
||||
)
|
||||
makedepends=()
|
||||
optdepends=()
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
install=
|
||||
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
|
||||
md5sums=('954185aabae978ef840c78efd940bee0')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p "$srcdir/build"
|
||||
cd "$srcdir/build"
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${_mod}-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON
|
||||
|
||||
msg "Building - ${pkgname}..."
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - ${pkgname}-${pkgver}"
|
||||
cd "$srcdir/build"
|
||||
DESTDIR="$pkgdir" ninja -j1 install
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
|
||||
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
# Contributor: Slávek Banko <slavek.banko@axis.cz>
|
||||
|
||||
_mod=tqca
|
||||
_cat=dependencies/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-core')
|
||||
depends=('tde-tqtinterface' 'openssl-1.0')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=(${_mod})
|
||||
conflicts=("trinity-${_mod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p ${srcdir}/build
|
||||
cd ${srcdir}/build
|
||||
|
||||
export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=$QTDIR \
|
||||
-DBUILD_ALL=OFF \
|
||||
-DBUILD_TQCA=ON \
|
||||
-DWITH_ALL_OPTIONS=ON
|
||||
|
||||
msg "Building - $pkgname..."
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - $pkgname-$pkgver"
|
||||
cd ${srcdir}/build
|
||||
DESTDIR="${pkgdir}" ninja -j1 install
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: Wed Sep 22 15:00:08 2021 +0200
|
||||
|
||||
Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
|
||||
|
||||
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 92cec273..f021f563 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2828,7 +2828,7 @@ g++*)
|
||||
3.*)
|
||||
COMPILER_VERSION="3.*"
|
||||
;;
|
||||
- [1-9][0-9]|[7-9]|[4-6].*)
|
||||
+ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
|
||||
COMPILER_VERSION="4.*"
|
||||
;;
|
||||
*)
|
||||
@ -1,11 +0,0 @@
|
||||
--- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200
|
||||
+++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
|
||||
tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
|
||||
tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" )
|
||||
-tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
|
||||
+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
|
||||
|
||||
|
||||
##### tqtinterface sources ######################
|
||||
@ -1,46 +1,49 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-tdesdk
|
||||
pkgver=14.0.10
|
||||
_mod=tdesdk
|
||||
_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/tdesdk'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-devel')
|
||||
pkgdesc="Trinity Desktop Development Tools"
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man')
|
||||
provides=('tdesdk')
|
||||
conflicts=('trinity-tdesdk' 'trinity-kdesdk')
|
||||
replaces=('trinity-tdesdk')
|
||||
makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man')
|
||||
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/tdesdk-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('5d117cbbe1cd938624656917646eebab')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('36895ffc0ee52be3c30bfef9019cf424')
|
||||
|
||||
[ -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
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,53 +1,51 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-tdevelop
|
||||
pkgver=14.0.10
|
||||
_mod=tdevelop
|
||||
_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/tdevelop'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-devel')
|
||||
pkgdesc="Trinity Desktop Developer Tools"
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion')
|
||||
provides=('tdevelop')
|
||||
conflicts=('trinity-tdevelop' 'trinity-kdevelop')
|
||||
replaces=('trinity-tdevelop')
|
||||
makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
|
||||
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/tdevelop-trinity-${pkgver}.tar.xz"
|
||||
'bp000-ba5f58bf.diff')
|
||||
md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
|
||||
'e7519ea06bd63b4fc9aa7e0ac5076576')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('2323f9116e354a28e72da92a4f820641')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
|
||||
|
||||
cd $srcdir
|
||||
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 \
|
||||
-DWITH_BUILDTOOL_ALL=ON \
|
||||
-DWITH_LANGUAGE_ALL=ON \
|
||||
-DWITH_VCS_ALL=ON \
|
||||
-DBUILD_ALL=ON
|
||||
-DWITH_VCS_ALL=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
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,43 +1,47 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdewebdev
|
||||
pkgver=14.0.10
|
||||
_mod=tdewebdev
|
||||
_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/tdewebdev'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-devel')
|
||||
pkgdesc="Trinity Web Developer Tools"
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('tdewebdev')
|
||||
conflicts=('trinity-tdewebdev' 'trinity-kdewebdev')
|
||||
replaces=('trinity-tdewebdev')
|
||||
makedepends=('tde-cmake-trinity' 'tde-tdesdk')
|
||||
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/tdewebdev-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('e345b611edd878ca09a65d9d9e0739e0')
|
||||
|
||||
[ -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
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
|
||||
-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
|
||||
}
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
# Contributor: Slávek Banko <slavek.banko@axis.cz>
|
||||
|
||||
_mod=akode
|
||||
_cat=dependencies/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="akode plugin for aRts"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('alsa-plugins'
|
||||
'alsa-tools'
|
||||
'alsa-utils'
|
||||
'audiofile'
|
||||
'libmad'
|
||||
'libogg'
|
||||
'libvorbis'
|
||||
'pulseaudio-alsa')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
conflicts=("kdemod3-${_mod}" "${_mod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!emptydirs')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('64f003d3a2098535d07a6dc9a210f148')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p build
|
||||
cd build
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DWITH_ALL_OPTIONS=ON \
|
||||
-DWITH_JACK_SINK=OFF
|
||||
|
||||
msg "Building $pkgname..."
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - $pkgname-$pkgver"
|
||||
cd ${srcdir}/build
|
||||
DESTDIR="$pkgdir" ninja -j1 install
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
post_install() {
|
||||
ldconfig &> /dev/null
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install
|
||||
}
|
||||
@ -1,47 +1,60 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-amarok
|
||||
pkgver=14.0.10
|
||||
_mod=amarok
|
||||
_cat=applications/multimedia/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="TDE Amarok"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdebase' 'taglib' 'xine-lib')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
#provides=('tde-amarok')
|
||||
#conflicts=('tde-amarok')
|
||||
#replaces=('tde-amarok')
|
||||
makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('fab4ed783d4027711e4aaca098bb04b1')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('4542cc22dc8104f46e6dd1640ea54cb7')
|
||||
install=''
|
||||
|
||||
[ -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 \
|
||||
-DWITH_ALL_OPTIONS=ON \
|
||||
-DWITH_YAUAP=OFF \
|
||||
-DWITH_NJB=OFF \
|
||||
-DWITH_IFP=OFF \
|
||||
-DWITH_IPOD=OFF \
|
||||
-DWITH_MP4V2=OFF \
|
||||
-DWITH_EMBEDDED_SQLITE=ON \
|
||||
-DWITH_OPENGL=ON
|
||||
-DWITH_SYSTEM_SQLITE=OFF \
|
||||
-DWITH_MYSQL=OFF \
|
||||
-DWITH_POSTGRESQL=OFF \
|
||||
-DWITH_AMAZON=OFF
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
commit 6ccb5528ecff0cf0db5fe2f81b26a79959e87902
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: Fri Oct 29 03:47:53 2021 +0200
|
||||
|
||||
Prevent null pointer deference in methods for selection.
|
||||
This resolves the crash when exporting the Basket archive.
|
||||
|
||||
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||
(cherry picked from commit a08c6ac9e3c8ac162ce08b730fd6108e2f71213c)
|
||||
|
||||
diff --git a/src/archive.cpp b/src/archive.cpp
|
||||
index 3f3377c..aec789f 100644
|
||||
--- a/src/archive.cpp
|
||||
+++ b/src/archive.cpp
|
||||
@@ -228,7 +228,8 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS
|
||||
|
||||
// Recursively save child baskets:
|
||||
BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket);
|
||||
- if (recursive && item->firstChild()) {
|
||||
+ if (recursive && item && item->firstChild())
|
||||
+ {
|
||||
for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) {
|
||||
saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress);
|
||||
}
|
||||
diff --git a/src/basket.cpp b/src/basket.cpp
|
||||
index a4edb31..67107d2 100644
|
||||
--- a/src/basket.cpp
|
||||
+++ b/src/basket.cpp
|
||||
@@ -4469,12 +4469,20 @@ void Basket::noteUngroup()
|
||||
|
||||
void Basket::unplugSelection(NoteSelection *selection)
|
||||
{
|
||||
+ if (!selection)
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked())
|
||||
unplugNote(toUnplug->note);
|
||||
}
|
||||
|
||||
void Basket::insertSelection(NoteSelection *selection, Note *after)
|
||||
{
|
||||
+ if (!selection)
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
|
||||
if (toUnplug->note->isGroup()) {
|
||||
Note *group = new Note(this);
|
||||
@@ -4496,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after)
|
||||
|
||||
void Basket::selectSelection(NoteSelection *selection)
|
||||
{
|
||||
+ if (!selection)
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
|
||||
if (toUnplug->note->isGroup())
|
||||
selectSelection(toUnplug);
|
||||
@ -1,46 +1,50 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-gtk-qt-engine
|
||||
pkgver=14.0.10
|
||||
_mod=gtk-qt-engine
|
||||
_cat=applications/themes/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="gtk qt engine"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdelibs' 'gtk2')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
#provides=('gtk-qt-engine')
|
||||
#conflicts=('gtk-qt-engine')
|
||||
#replaces=('gtk-qt-engine')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('419342ad15dca93e5e4424eb7b0a2e59')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('60aa938573a877aa4589e49ee312253e')
|
||||
install=''
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p "$srcdir/build"
|
||||
cd "$srcdir/build"
|
||||
mkdir -p ${srcdir}/build
|
||||
cd ${srcdir}/build
|
||||
|
||||
msg "Starting cmake..."
|
||||
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
|
||||
-DBUILD_ALL=ON \
|
||||
-DWITH_GCC_VISIBILITY=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
|
||||
}
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: Fri Sep 24 14:54:59 2021 +0200
|
||||
|
||||
Fix FTBFS in case TQt3 is not installed in the system directory.
|
||||
|
||||
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||
(cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989)
|
||||
|
||||
diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am
|
||||
index 54a5db3..f1886dc 100644
|
||||
--- a/tdegtk/Makefile.am
|
||||
+++ b/tdegtk/Makefile.am
|
||||
@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c)
|
||||
libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
||||
libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
||||
|
||||
-libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
|
||||
-
|
||||
-libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
||||
+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
|
||||
+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
||||
|
||||
lib_LTLIBRARIES = libtqtcairo.la
|
||||
|
||||
@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
||||
libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
||||
|
||||
libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI)
|
||||
-
|
||||
-libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
||||
+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
||||
@ -1,48 +1,53 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-kmplayer
|
||||
pkgver=14.0.10
|
||||
_mod=kmplayer
|
||||
_cat=applications/multimedia/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="TDE KMPlayer"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib')
|
||||
makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
|
||||
#provides=('kmplayer')
|
||||
#conflicts=('kmplayer')
|
||||
#replaces=('kmplayer')
|
||||
makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('bafbf516d47a05cfe2e943f27a93408c')
|
||||
install=''
|
||||
|
||||
[ -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_KOFFICE_PLUGIN=OFF \
|
||||
-DBUILD_KGSTPLAYER=OFF
|
||||
-DBUILD_KGSTPLAYER=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
|
||||
}
|
||||
|
||||
@ -1,46 +1,50 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-ksplash-engine-moodin
|
||||
pkgver=14.0.10
|
||||
_mod=ksplash-engine-moodin
|
||||
_cat=applications/themes/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="TDE KSplash Engine Moodin"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdebase')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
#provides=('ksplash-engine-moodin')
|
||||
#conflicts=('ksplash-engine-moodin')
|
||||
#replaces=('ksplash-engine-moodin')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('3a10d2089ed4e165ff74994e9efbf262')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('dcb22daf00d9604f284d1315b2870f5e')
|
||||
install=''
|
||||
|
||||
[ -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 \
|
||||
-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
|
||||
}
|
||||
|
||||
@ -1,46 +1,50 @@
|
||||
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-tdeaccessibility
|
||||
pkgver=14.0.10
|
||||
_mod=tdeaccessibility
|
||||
_cat=core/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="Accessibility utilities for the TDE Desktop"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
|
||||
makedepends=('tde-cmake-trinity' 'tde-tdemultimedia')
|
||||
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/tdeaccessibility-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('f364bf5a1a460c2278f78b99ded4d646')
|
||||
|
||||
[ -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_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
|
||||
}
|
||||
|
||||
@ -1,46 +1,50 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdeaddons
|
||||
pkgver=14.0.10
|
||||
_mod=tdeaddons
|
||||
_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/tdeaddons'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
pkgdesc="Trinity Desktop Addons"
|
||||
depends=('tde-tdebase')
|
||||
makedepends=('pkgconfig' 'cmake' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim')
|
||||
provides=('tdeaddons')
|
||||
conflicts=('trinity-tdeaddons' 'trinity-kdeaddons')
|
||||
replaces=('trinity-tdeaddons')
|
||||
makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl')
|
||||
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/tdeaddons-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('27557921bf86569042c72d597b87c877')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('70b3c7131761a0c405942614ea8f5243')
|
||||
|
||||
[ -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 \
|
||||
-DWITH_XMMS=OFF
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,51 +1,52 @@
|
||||
# Maintainer: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdeedu
|
||||
pkgver=14.0.10
|
||||
_mod=tdeedu
|
||||
_cat=core/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="Educational utilities for the TDE Desktop"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
|
||||
makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
|
||||
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/tdeedu-trinity-${pkgver}.tar.xz"
|
||||
'bp000-0cb84fb9.diff')
|
||||
md5sums=('3859da24d70f0d787c0cc7f41540772d'
|
||||
'5ae3959dc2dc62f1f7421620b198d175')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('10d3f00e8539e7bb74ecb02c6a91c507')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
patch -p1 < ${srcdir}/bp000-0cb84fb9.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}
|
||||
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_ALL_OPTIONS=ON \
|
||||
-DWITH_OCAML_SOLVER=OFF \
|
||||
-DWITH_LIBUSB=OFF
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
|
||||
Date: Tue, 11 May 2021 09:15:26 +0200
|
||||
Subject: Fix FTBFS on Fedora 34
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
error: static assertion failed: comparison object must be invocable as const
|
||||
|
||||
Signed-off-by: François Andriot <francois.andriot@free.fr>
|
||||
---
|
||||
kiten/learn.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
|
||||
index 94e77b9a..a1b685d4 100644
|
||||
--- a/kiten/learn.cpp
|
||||
+++ b/kiten/learn.cpp
|
||||
@@ -762,7 +762,7 @@ void Learn::qupdate()
|
||||
|
||||
struct Learn::scoreCompare
|
||||
{
|
||||
- bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
|
||||
+ bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
|
||||
{
|
||||
return v1->text(4).toInt() < v2->text(4).toInt();
|
||||
}
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,46 +1,49 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdegames
|
||||
pkgver=14.0.10
|
||||
_mod=tdegames
|
||||
_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/tdegames'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
pkgdesc="Trinity Desktop Games"
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('tdegames')
|
||||
conflicts=('trinity-tdegames' 'trinity-kdegames')
|
||||
replaces=('trinity-tdegames')
|
||||
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/tdegames-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('870352e848a991f1ff0045ef5590bc47')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('ef150b0d95ed82704e6d622da077dd60')
|
||||
|
||||
[ -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
|
||||
}
|
||||
|
||||
@ -1,49 +1,52 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-tdemultimedia
|
||||
pkgver=14.0.10
|
||||
_mod=tdemultimedia
|
||||
_cat=core/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="Trinity Desktop MultiMedia Components"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdelibs' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('tdemultimedia')
|
||||
conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
|
||||
replaces=('trinity-tdemultimedia')
|
||||
depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
|
||||
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/tdemultimedia-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('dc18c8aa1cdd7f4cbbb6628378ad0e82')
|
||||
# install=''
|
||||
|
||||
[ -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_ALL_OPTIONS=ON \
|
||||
-DWITH_ARTS_AKODE=OFF \
|
||||
-DBUILD_ALL=ON \
|
||||
-DBUILD_JUK=OFF
|
||||
-DWITH_ALL_OPTIONS=ON \
|
||||
-DWITH_GSTREAMER=OFF
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,48 +1,60 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-tdenetwork
|
||||
pkgver=14.0.10
|
||||
_mod=tdenetwork
|
||||
_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/tdenetwork'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
pkgdesc="Trinity Desktop Network Components"
|
||||
depends=('tde-tdelibs' 'speex' 'wireless_tools' 'wpa_supplicant')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('tdenetwork')
|
||||
conflicts=('trinity-tdenetwork' 'trinity-kdenetwork')
|
||||
replaces=('trinity-tdenetwork')
|
||||
depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant')
|
||||
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/tdenetwork-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('c3d26523623fbcc65993a044bd83d0f6')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('c5ec9a45b636c8da74d71194ed384b81')
|
||||
# install=''
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
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}
|
||||
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
|
||||
-DWITH_SPEEX=ON \
|
||||
-DWITH_ARTS=ON \
|
||||
-DBUILD_ALL=ON
|
||||
-DBUILD_ALL=ON \
|
||||
-DWITH_ALL_OPTIONS=ON \
|
||||
-DWITH_JINGLE=OFF \
|
||||
-DWITH_SPEEX=OFF \
|
||||
-DWITH_XMMS=OFF \
|
||||
-DWITH_SLP=OFF \
|
||||
-DBUILD_KOPETE_PROTOCOL_ALL=ON \
|
||||
-DBUILD_KOPETE_PROTOCOL_SMS=OFF \
|
||||
-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \
|
||||
-DBUILD_KOPETE_PLUGIN_ALL=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
|
||||
}
|
||||
|
||||
@ -1,55 +1,48 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdenetworkmanager
|
||||
pkgver=14.0.10
|
||||
_mod=tdenetworkmanager
|
||||
_cat=applications/settings/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod/tde-}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="gtk qt engine"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdelibs')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
#provides=('tdenetworkmanager')
|
||||
#conflicts=('tdenetworkmanager')
|
||||
#replaces=('tdenetworkmanager')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=(
|
||||
"https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz"
|
||||
'bp000-ea2b20ed7a.diff'
|
||||
'bp001-e4e7853030.diff'
|
||||
)
|
||||
md5sums=(
|
||||
'2edab1bc48066a52f0b53a19457495a2'
|
||||
'40f95a5c7c02471e629e109aeca86ce3'
|
||||
'd292626fb10780eb68bbc1a60c1e7ed7'
|
||||
)
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('9e36a8f2697081bdb92589ea914980f0')
|
||||
install=''
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
patch -p1 < ${srcdir}/bp000-ea2b20ed7a.diff
|
||||
patch -p1 < ${srcdir}/bp001-e4e7853030.diff
|
||||
|
||||
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_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
|
||||
-DBUILD_ALL=ON \
|
||||
-DWITH_GCC_VISIBILITY=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
|
||||
}
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
commit ea2b20ed7ab3e83b8585e20d2febdbb5f2d356c1
|
||||
Author: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
Date: Mon Aug 2 11:24:50 2021 +0900
|
||||
|
||||
Removed unused hardwareEvent code.
|
||||
|
||||
Initialization of TDEHardwareDevices() always happens before the signal
|
||||
was connected. The constructor of TDEHardwareDevices() is the only place
|
||||
that was triggering the signal emission, so the code was non functional.
|
||||
|
||||
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
|
||||
diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
index 5f1f26e..085435c 100644
|
||||
--- a/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
@@ -74,8 +74,6 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
|
||||
|
||||
TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
|
||||
|
||||
- // Listen for hardware change events
|
||||
- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
|
||||
// Trigger an initial hardware information update
|
||||
tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
|
||||
|
||||
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
|
||||
index 9427679..173464f 100644
|
||||
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
|
||||
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
|
||||
@@ -963,14 +963,6 @@ void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev)
|
||||
}
|
||||
}
|
||||
|
||||
-void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString)
|
||||
-{
|
||||
- if (event == TDEHardwareEvent::HardwareListModified) {
|
||||
- updateDeviceTrays();
|
||||
- connectTrayDeviceManager();
|
||||
- }
|
||||
-}
|
||||
-
|
||||
void Tray::slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message)
|
||||
{
|
||||
if (event == TDENetworkVPNEventType::LoginBanner) {
|
||||
@@ -1094,7 +1086,6 @@ Tray::Tray() : KSystemTray()
|
||||
// get notified about new/removed devices
|
||||
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
|
||||
connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*)));
|
||||
- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
|
||||
|
||||
// Notifications
|
||||
connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
|
||||
diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
|
||||
index d086902..6f4fdea 100644
|
||||
--- a/tdenetworkmanager/src/tdenetman-tray.h
|
||||
+++ b/tdenetworkmanager/src/tdenetman-tray.h
|
||||
@@ -115,7 +115,6 @@ class Tray : public KSystemTray
|
||||
private slots:
|
||||
void slotGenericDeviceAdded(TDEGenericDevice*);
|
||||
void slotGenericDeviceRemoved(TDEGenericDevice*);
|
||||
- void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString);
|
||||
void slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message);
|
||||
|
||||
private:
|
||||
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
index 2d4eccb..9b855ec 100644
|
||||
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
@@ -487,9 +487,6 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
|
||||
setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
|
||||
setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
|
||||
|
||||
- // Listen for hardware change events
|
||||
- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
|
||||
-
|
||||
// Trigger an initial hardware information update
|
||||
tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
|
||||
}
|
||||
@ -1,121 +0,0 @@
|
||||
commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269
|
||||
Author: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
Date: Mon Aug 2 23:19:04 2021 +0900
|
||||
|
||||
Removed unused hardwareEvent code - part 2.
|
||||
|
||||
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
|
||||
diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
index 085435c..2ea4e35 100644
|
||||
--- a/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
|
||||
@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
|
||||
TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
|
||||
|
||||
// Trigger an initial hardware information update
|
||||
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
|
||||
+ TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
|
||||
+ TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
|
||||
+
|
||||
+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
|
||||
+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
|
||||
|
||||
m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection";
|
||||
m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection";
|
||||
@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const
|
||||
return m_device;
|
||||
}
|
||||
|
||||
-void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
|
||||
-{
|
||||
- if (event == TDEHardwareEvent::HardwareListModified) {
|
||||
- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
|
||||
- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
|
||||
- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
|
||||
-
|
||||
- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
|
||||
- connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
|
||||
- }
|
||||
-}
|
||||
-
|
||||
void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) {
|
||||
kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl;
|
||||
|
||||
diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
|
||||
index af0ccea..c3c40e1 100644
|
||||
--- a/tdenetworkmanager/src/devicetraycomponent.h
|
||||
+++ b/tdenetworkmanager/src/devicetraycomponent.h
|
||||
@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent
|
||||
void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
|
||||
|
||||
private slots:
|
||||
- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
|
||||
void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message);
|
||||
|
||||
protected:
|
||||
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
index 9b855ec..8811650 100644
|
||||
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
|
||||
@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress)
|
||||
KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
|
||||
}
|
||||
|
||||
-void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
|
||||
-{
|
||||
- if (event == TDEHardwareEvent::HardwareListModified) {
|
||||
- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
|
||||
- TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL;
|
||||
-
|
||||
- // get notified when the device state changes
|
||||
- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
|
||||
-
|
||||
- // get notified of all AP changes
|
||||
- connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
|
||||
-
|
||||
- // force status update to ensure correct icon is shown on startup
|
||||
- if ((dev) && (deviceConnMan)) {
|
||||
- slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) {
|
||||
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
|
||||
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
|
||||
@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
|
||||
setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
|
||||
setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
|
||||
|
||||
- // Trigger an initial hardware information update
|
||||
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
|
||||
+ // initial hardware information update
|
||||
+ TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
|
||||
+ TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL;
|
||||
+
|
||||
+ // get notified when the device state changes
|
||||
+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
|
||||
+
|
||||
+ // get notified of all AP changes
|
||||
+ connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
|
||||
+
|
||||
+ // force status update to ensure correct icon is shown on startup
|
||||
+ if ((netdev) && (deviceConnMan)) {
|
||||
+ slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode());
|
||||
+ }
|
||||
}
|
||||
|
||||
WirelessDeviceTray::~WirelessDeviceTray ()
|
||||
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
|
||||
index 59a24a1..eb429b9 100644
|
||||
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
|
||||
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
|
||||
@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent
|
||||
void slotAccessPointRemoved(TDEMACAddress);
|
||||
|
||||
private slots:
|
||||
- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
|
||||
void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType);
|
||||
void sendUpdateUI();
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
|
||||
Date: Tue, 11 May 2021 19:45:01 +0200
|
||||
Subject: Fix ftbfs on Fedora 34
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
error: ordered comparison of pointer with integer zero ('char*' and 'int')
|
||||
|
||||
Signed-off-by: François Andriot <francois.andriot@free.fr>
|
||||
---
|
||||
tdesudo/tdesudo.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
|
||||
index c255d0f..83158ab 100644
|
||||
--- a/tdesudo/tdesudo.cpp
|
||||
+++ b/tdesudo/tdesudo.cpp
|
||||
@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
|
||||
chmod(m_tmpname.ascii(),0644);
|
||||
|
||||
QCStringList output;
|
||||
- while (fgets(buf, 1024, f) > 0)
|
||||
+ while (fgets(buf, 1024, f) != NULL)
|
||||
output += buf;
|
||||
if (pclose(f) < 0) {
|
||||
kdError() << k_lineinfo << "Could not run xauth.\n";
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,43 +1,46 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-tdetoys
|
||||
pkgver=14.0.10
|
||||
_mod=tdetoys
|
||||
_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/tdetoys'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
pkgdesc="Trinity Desktop Toys"
|
||||
depends=('tde-tdebase')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
provides=('tdetoys')
|
||||
conflicts=('trinity-tdetoys' 'trinity-kdetoys')
|
||||
replaces=('trinity-tdetoys')
|
||||
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/tdetoys-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('f91d22efed453b5053e2110782d85d93')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('2bb8f5d47d4e094e459597b5069b7a3d')
|
||||
|
||||
[ -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
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
|
||||
-DBUILD_ALL=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
|
||||
}
|
||||
|
||||
@ -1,54 +1,50 @@
|
||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||
|
||||
pkgname=tde-twin-style-crystal
|
||||
pkgver=14.0.10
|
||||
_mod=twin-style-crystal
|
||||
_cat=applications/themes/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="TDE TWin Style Crystal"
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-extra')
|
||||
depends=('tde-tdebase')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
#provides=('twin-style-crystal')
|
||||
#conflicts=('twin-style-crystal')
|
||||
#replaces=('twin-style-crystal')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
provides=("${_mod}")
|
||||
conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
|
||||
replaces=("trinity-${_kdemod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
|
||||
# install=''
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('b435ddeae50565fd440dc3705f503218')
|
||||
install=''
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
## Generate config files and update with autoreconf
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
|
||||
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
|
||||
|
||||
msg "Running make -f admin/Makefile.common ...."
|
||||
make -f admin/Makefile.common
|
||||
|
||||
## configure
|
||||
msg "Configuring - ${pkgname#*-}..."
|
||||
./configure \
|
||||
--prefix=${TDEDIR} \
|
||||
--with-qt-dir=${QTDIR} \
|
||||
--with-qt-includes=${QTDIR}/include \
|
||||
--with-qt-libraries=${QTDIR}/lib \
|
||||
--sysconfdir=${TDEDIR}/etc \
|
||||
--localstatedir=/var \
|
||||
--enable-closure
|
||||
|
||||
msg "Building - ${pkgname#*-}..."
|
||||
make $NUMJOBS
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p "$srcdir/build"
|
||||
cd "$srcdir/build"
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
|
||||
-GNinja \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
|
||||
-DBUILD_ALL=ON \
|
||||
-DWITH_ALL_OPTIONS=ON
|
||||
|
||||
msg "Building - ${pkgname}..."
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - $pkgname-$pkgver"
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
make -j1 DESTDIR="${pkgdir}" install
|
||||
msg "Packaging - ${pkgname}-${pkgver}"
|
||||
cd "$srcdir/build"
|
||||
DESTDIR="$pkgdir" ninja -j1 install
|
||||
}
|
||||
|
||||
@ -1,44 +1,47 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contribuitor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-libcaldav
|
||||
pkgver=14.0.10
|
||||
_mod=libcaldav
|
||||
_cat=dependencies/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/libcaldav"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-libs')
|
||||
depends=('curl' 'glib2')
|
||||
makedepends=('doxygen' 'pkgconfig' 'cmake')
|
||||
makedepends=('doxygen' 'tde-cmake-trinity')
|
||||
optdepends=()
|
||||
provides=('libcaldav')
|
||||
# conflicts=()
|
||||
replaces=('trinity-libcaldav')
|
||||
provides=("${_mod}")
|
||||
replaces=("trinity-${_mod}")
|
||||
options=('staticlibs' 'libtool' '!strip')
|
||||
install=
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('75662017b1a02ffc631e5120b7addfd0')
|
||||
|
||||
_prefix=/usr
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p build
|
||||
cd build
|
||||
mkdir -p ${srcdir}/build
|
||||
cd ${srcdir}/build
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${_prefix} \
|
||||
-DWITH_GCC_VISIBILITY=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
|
||||
}
|
||||
|
||||
@ -1,41 +1,45 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty@gmail.com>
|
||||
|
||||
pkgname=tde-libcarddav
|
||||
pkgver=14.0.10
|
||||
_mod=libcarddav
|
||||
_cat=dependencies/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="A client library adding support for the CardDAV protocol"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/libcarddav"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
groups=('tde-libs')
|
||||
depends=('curl')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
license=('GPL')
|
||||
provides=('libcarddav')
|
||||
provides=("${_mod}")
|
||||
# conflicts=()
|
||||
replaces=('trinity-libcarddav')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('54a5c89bb094ec40cc8cd5734233f743')
|
||||
replaces=("trinity-${_mod}")
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('79e1c4e92751eb72c843ce0ddc70e5fe')
|
||||
|
||||
_prefix=/usr
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p build
|
||||
cd build
|
||||
mkdir -p ${srcdir}/build
|
||||
cd ${srcdir}/build
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${_prefix} \
|
||||
-DWITH_GCC_VISIBILITY=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
|
||||
}
|
||||
|
||||
@ -1,66 +1,49 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-libkdcraw
|
||||
pkgver=14.0.10
|
||||
_mod=libkdcraw
|
||||
_cat=libraries/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-libs')
|
||||
depends=('tde-tdelibs' 'libraw' 'lcms2')
|
||||
makedepends=('pkgconfig' 'autoconf' 'imake')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
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/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('fedf15518c80f85174071df185a45c88')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('2daaa1a383d0ccdfd914c29db7f05c37')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
## Generate config files and update with autoreconf
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||
|
||||
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
|
||||
|
||||
msg "Running autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf"
|
||||
aclocal
|
||||
autoupdate
|
||||
autoconf
|
||||
automake --add-missing
|
||||
|
||||
msg "Running make -f admin/Makefile.common ...."
|
||||
make -f admin/Makefile.common
|
||||
|
||||
## configure
|
||||
msg "Configuring - ${pkgname}..."
|
||||
|
||||
./configure \
|
||||
--prefix=${TDEDIR} \
|
||||
--with-qt-dir=${QTDIR} \
|
||||
--with-qt-includes=${QTDIR}/include \
|
||||
--with-qt-libraries=${QTDIR}/lib \
|
||||
--localstatedir=/var \
|
||||
--enable-debug=full \
|
||||
--enable-closure
|
||||
|
||||
## make $NUMJOBS
|
||||
msg "Building - ${pkgname}..."
|
||||
make $NUMJOBS
|
||||
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_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DBUILD_ALL=ON \
|
||||
-DWITH_ALL_OPTIONS=ON
|
||||
|
||||
msg "Building $pkgname..."
|
||||
ninja $NUMJOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
msg "Packaging - $pkgname-$pkgver"
|
||||
|
||||
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} # use for non-out-of-source
|
||||
|
||||
make -j1 DESTDIR="$pkgdir" install
|
||||
msg "Packaging - $pkgname-$pkgver"
|
||||
cd ${srcdir}/build
|
||||
DESTDIR="$pkgdir" ninja -j1 install
|
||||
}
|
||||
|
||||
@ -1,44 +1,48 @@
|
||||
# Maintainer: Michael Manley <mmanley@nasutek.com>
|
||||
# Contributor: David C. Rankin <drankinatty at gmail dot com>
|
||||
|
||||
pkgname=tde-libkexiv2
|
||||
pkgver=14.0.10
|
||||
_mod=libkexiv2
|
||||
_cat=libraries/
|
||||
_kdemod="${_mod/tde/kde}"
|
||||
|
||||
pkgname="tde-${_mod}"
|
||||
pkgver=14.0.11
|
||||
pkgrel=1
|
||||
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
|
||||
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
|
||||
license=('GPL')
|
||||
groups=('tde-libs')
|
||||
depends=('tde-tdelibs' 'exiv2')
|
||||
makedepends=('pkgconfig' 'cmake')
|
||||
makedepends=('tde-cmake-trinity')
|
||||
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/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
|
||||
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
|
||||
md5sums=('94635dfeca198fce57cb45a15d31a222')
|
||||
|
||||
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||
mkdir -p build
|
||||
cd build
|
||||
mkdir -p ${srcdir}/build
|
||||
cd ${srcdir}/build
|
||||
|
||||
msg "Starting cmake..."
|
||||
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
|
||||
-GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||
-DWITH_GCC_VISIBILITY=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
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue