TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

Browse Source
v3.5.13-sru
Robert Xu 13 years ago
parent 343544d84f f65bcb8326
commit 81bacbb76d
12 changed files with 0 additions and 201 deletions
Show Stats Download Patch File Download Diff File

11
debian/lenny/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff vendored
Unescape View File

@ -1,11 +0,0 @@
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header

12
debian/lenny/kdeartwork/debian/patches/common/05_pedantic-errors.diff vendored
Unescape View File

@ -1,12 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2144,9 +2144,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
AC_TRY_COMPILE([
$2
],

18
debian/lenny/kdeartwork/debian/patches/common/06_disable_no_undefined.diff vendored
Unescape View File

@ -1,18 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
- [KDE_NO_UNDEFINED=""])],
- [KDE_NO_UNDEFINED=""])
- ;;
- esac
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)

26
debian/lenny/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff vendored
Unescape View File

@ -1,26 +0,0 @@
--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,10 +556,10 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
- if ! test -f $kdepotpath; then
- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
- fi
+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+# if ! test -f $kdepotpath; then
+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

11
debian/squeeze/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff vendored
Unescape View File

@ -1,11 +0,0 @@
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header

12
debian/squeeze/kdeartwork/debian/patches/common/05_pedantic-errors.diff vendored
Unescape View File

@ -1,12 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2144,9 +2144,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
AC_TRY_COMPILE([
$2
],

18
debian/squeeze/kdeartwork/debian/patches/common/06_disable_no_undefined.diff vendored
Unescape View File

@ -1,18 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
- [KDE_NO_UNDEFINED=""])],
- [KDE_NO_UNDEFINED=""])
- ;;
- esac
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)

26
debian/squeeze/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff vendored
Unescape View File

@ -1,26 +0,0 @@
--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,10 +556,10 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
- if ! test -f $kdepotpath; then
- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
- fi
+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+# if ! test -f $kdepotpath; then
+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

11
ubuntu/maverick/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
Unescape View File

@ -1,11 +0,0 @@
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header

12
ubuntu/maverick/kdeartwork/debian/patches/common/05_pedantic-errors.diff
Unescape View File

@ -1,12 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2144,9 +2144,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
AC_TRY_COMPILE([
$2
],

18
ubuntu/maverick/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
Unescape View File

@ -1,18 +0,0 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
- [KDE_NO_UNDEFINED=""])],
- [KDE_NO_UNDEFINED=""])
- ;;
- esac
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)

26
ubuntu/maverick/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
Unescape View File

@ -1,26 +0,0 @@
--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,10 +556,10 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
- if ! test -f $kdepotpath; then
- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
- fi
+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+# if ! test -f $kdepotpath; then
+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
Write Preview
Loading…
Cancel
Save