[packages/kdebase/dev-trinity] drop automake related build artifacts
glen
glen at pld-linux.org
Wed Jun 4 23:12:16 CEST 2014
commit f59a30135a5137d2c2904517cb7332a2714f9ab0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jun 5 00:10:53 2014 +0300
drop automake related build artifacts
ac264.patch | 22 -------
kde-am.patch | 11 ----
kde-common-PLD.patch | 154 ---------------------------------------------
kdebase-fontdir.patch | 21 -------
kdebase-kdmconfig.patch | 11 ----
kdebase-no_mkfontdir.patch | 12 ----
kdebase-screensavers.patch | 10 ---
kdebase-session.patch | 54 ----------------
kdebase.spec | 8 +--
9 files changed, 1 insertion(+), 302 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index efe8ab9..c9865ef 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -37,7 +37,7 @@ Summary(uk.UTF-8): K Desktop Environment - базові файли
Summary(zh_CN.UTF-8): KDE核心
Name: kdebase
Version: 3.5.13.2
-Release: 0.14
+Release: 0.15
Epoch: 9
License: GPL
Group: X11/Applications
@@ -57,7 +57,6 @@ Source10: %{name}-servicemenus.tar.bz2
Source13: %{name}-konqsidebartng-PLD-entries-0.2.tar.bz2
# Source13-md5: aa373b561e1cedb78b652f43e19fc122
#Patch100: %{name}-branch.diff
-Patch0: kde-common-PLD.patch
Patch1: %{name}-fontdir.patch
# http://www.icefox.net/articles/kdeosx/grouplayer.diff
Patch2: %{name}-grouplayer.patch
@@ -76,8 +75,6 @@ Patch19: %{name}-konsole-default-keytab.patch
Patch21: %{name}-konsole-wordseps.patch
Patch25: %{name}-konsole-history_clear.patch
Patch26: %{name}-kdm-default_background.patch
-Patch28: %{name}-no_mkfontdir.patch
-Patch30: ac264.patch
%{?with_openexr:BuildRequires: OpenEXR-devel >= 1.4.0.a}
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
@@ -1088,7 +1085,6 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
%prep
%setup -q -n %{name}-trinity-%{version}
#%patch100 -p0
-%patch0 -p1
%patch1 -p1
%{?with_groupwindows:%patch2 -p1}
%patch3 -p1
@@ -1109,8 +1105,6 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
%patch21 -p1
%patch25 -p1
%patch26 -p1
-%patch28 -p1
-%patch30 -p1
cd kcontrol/ebrowsing/plugins/ikws/searchproviders
for i in google*.desktop
diff --git a/ac264.patch b/ac264.patch
deleted file mode 100644
index 74bb200..0000000
--- a/ac264.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdebase-3.5.10/kdm/configure.in.in~ 2010-01-18 21:59:26.000000000 +0200
-+++ kdebase-3.5.10/kdm/configure.in.in 2010-01-18 23:39:03.889841065 +0200
-@@ -93,7 +93,7 @@
- $X_LDFLAGS -lX11 $LIBSOCKET)
-
- AC_ARG_WITH(xdmcp,
-- AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
-+ AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support (default=with xdmcp)]), ,
- [with_xdmcp=yes])
- if test "x$with_xdmcp" = xyes; then
- AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
---- kdebase-3.5.10/admin/acinclude.m4.in~ 2010-01-19 00:23:09.000000000 +0200
-+++ kdebase-3.5.10/admin/acinclude.m4.in 2010-01-19 00:25:25.115858232 +0200
-@@ -4065,7 +4065,7 @@
-
- want_pam=
- AC_ARG_WITH(pam,
-- AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-+ AC_HELP_STRING([--with-pam@<:@=ARG@:>@],[enable support for PAM: ARG=@<:@yes|no|service name@:>@]),
- [ if test "x$withval" = "xyes"; then
- want_pam=yes
- pam_service=kde
diff --git a/kde-am.patch b/kde-am.patch
deleted file mode 100644
index 5a23f3a..0000000
--- a/kde-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
deleted file mode 100644
index 7bd956d..0000000
--- a/kde-common-PLD.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- kdebase-trinity-3.5.13.2/admin/acinclude.m4.in~ 2014-05-27 13:52:35.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/admin/acinclude.m4.in 2014-05-27 13:54:12.266346471 +0300
-@@ -468,7 +468,7 @@
- if test "$1" = "default"; then
-
- if test -z "$kde_htmldir"; then
-- kde_htmldir='\${datadir}/doc/tde/HTML'
-+ kde_htmldir='/usr/share/doc/kde/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\${datadir}/applnk'
-@@ -2977,41 +2977,6 @@
-
- AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
- [
-- AC_MSG_CHECKING([whether $CC is blacklisted])
--
-- dnl In theory we have tu run this test against $CC and $CXX
-- dnl in C and in C++ mode, because its perfectly legal for
-- dnl the user to mix compiler versions, since C has a defined
-- dnl ABI.
-- dnl
-- dnl For now, we assume the user is not on crack.
--
-- AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
-- kde_bad_compiler=no,
-- kde_bad_compiler=yes
--)
--
-- AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
-- AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version.
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
-
- ])
-
-@@ -3153,8 +3118,6 @@
-
- AC_PROG_CXX
-
-- KDE_CHECK_FOR_BAD_COMPILER
--
- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
- if test "$kde_use_debug_code" != "no"; then
- if test "$CXX" = "KCC"; then
-@@ -4579,9 +4542,9 @@
- LIBPYTHON=-lpython$version
- fi
-
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
- python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
-+if test ! -r $python_moddir/copy.pyc; then
- python_moddir=no
- fi
-
-@@ -4728,32 +4691,11 @@
- [
- AC_MSG_CHECKING([for utmp file])
-
-- AC_CACHE_VAL(kde_cv_utmp_file,
-- [
-- kde_cv_utmp_file=no
-+ AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
-
-- for ac_file in \
-- \
-- /var/run/utmp \
-- /var/adm/utmp \
-- /etc/utmp \
-- ; \
-- do
-- if test -r "$ac_file"; then
-- kde_cv_utmp_file=$ac_file
-- break
-- fi
-- done
-- ])
--
-- if test "$kde_cv_utmp_file" != "no"; then
-- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-- $1
-- AC_MSG_RESULT($kde_cv_utmp_file)
-- else
-- $2
-- AC_MSG_RESULT([non found])
-- fi
-+ AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+ $1
-+ AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
-
-
-@@ -5536,7 +5478,7 @@
- kde_qtdir="$with_qt_dir"
- fi
-
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
-
- AC_SUBST(QTDOCDIR)
---- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
-+++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300
-@@ -499,6 +499,15 @@
- }
- }
-
-+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+ }
-+ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
-+ }
-+
- $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
-
- $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
-@@ -578,6 +587,14 @@
- local @kde_options = split(/[\034\s]+/, $kde_options_str);
- if (grep(/^foreign$/, @kde_options)) {
- push(@foreignfiles, $makefileDir . "/");
-+
-+ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
-+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+ updateMakefile ();
-+ }
-+
- return 0; # don't touch me
- }
- for $opt (@kde_options) {
-
diff --git a/kdebase-fontdir.patch b/kdebase-fontdir.patch
index c533fe5..496b3a1 100644
--- a/kdebase-fontdir.patch
+++ b/kdebase-fontdir.patch
@@ -1,24 +1,3 @@
---- kdebase/konsole/fonts/Makefile.am.orig 2005-06-20 19:41:50.000000000 +0200
-+++ kdebase/konsole/fonts/Makefile.am 2005-06-22 14:33:16.000000000 +0200
-@@ -1,16 +1,9 @@
--fontdir = $(kde_datadir)/konsole/fonts
--font_DATA =console8x16.pcf.gz 9x15.pcf.gz
-+fontdir = /usr/share/fonts/misc
-+font_DATA =console8x16.pcf.gz
-
- EXTRA_DIST = $(font_DATA)
-
--# This uses -hook instead of -local so that it is run after fonts are installed
--install-data-hook:
-- -mkfontdir $(DESTDIR)$(fontdir)
--
- console8x16.pcf.gz: $(srcdir)/console8x16.bdf
- bdftopcf -o console8x16.pcf $(srcdir)/console8x16.bdf
- gzip --best console8x16.pcf
-
--9x15.pcf.gz: $(srcdir)/9x15.bdf
-- bdftopcf -o 9x15.pcf $(srcdir)/9x15.bdf
-- gzip --best 9x15.pcf
--- kdebase-trinity-3.5.13.2/konsole/fonts/CMakeLists.txt~ 2012-05-24 04:35:16.000000000 +0300
+++ kdebase-trinity-3.5.13.2/konsole/fonts/CMakeLists.txt 2014-06-04 10:58:16.675576558 +0300
@@ -11,8 +11,7 @@
diff --git a/kdebase-kdmconfig.patch b/kdebase-kdmconfig.patch
index 03d51fa..fbd7bbf 100644
--- a/kdebase-kdmconfig.patch
+++ b/kdebase-kdmconfig.patch
@@ -111,17 +111,6 @@
char *ptr;
int fd;
---- kdebase-030930/kdm/kfrontend/Makefile.am~ 2003-09-30 00:47:50.000000000 +0200
-+++ kdebase-030930/kdm/kfrontend/Makefile.am 2003-09-30 10:06:29.000000000 +0200
-@@ -38,7 +38,7 @@
- genkdmconf_LDADD = $(LIB_X11)
-
- install-data-local: genkdmconf
-- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
-+ ./genkdmconf --in $(DESTDIR)/etc/X11/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
-
- messages:
- $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
--- kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt~ 2012-09-16 15:52:03.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt 2014-06-04 11:10:30.672252448 +0300
@@ -35,7 +35,7 @@
diff --git a/kdebase-no_mkfontdir.patch b/kdebase-no_mkfontdir.patch
deleted file mode 100644
index 82fdff8..0000000
--- a/kdebase-no_mkfontdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdebase-3.5.9/kcontrol/input/Makefile.am 2005-09-10 10:25:07.000000000 +0200
-+++ kdebase-3.5.9-new/kcontrol/input/Makefile.am 2008-03-28 00:36:12.925981000 +0100
-@@ -39,9 +39,6 @@
-
- updatedir = $(kde_datadir)/kconf_update
-
--install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override
-- -mkfontdir $(DESTDIR)$(datadir)/fonts/override
- ##I'd like to install this automatically, but it only works on Linux, and I don't want to break things...
- ## $(INSTALL_DATA) $(srcdir)/consoleUserPerms $(DESTDIR)/etc/hotplug/usb/consoleUserPerms
- ## $(INSTALL_DATA) $(srcdir)/logitechmouse.usermap $(DESTDIR)/etc/hotplug/usb/logitechmouse.usermap
diff --git a/kdebase-screensavers.patch b/kdebase-screensavers.patch
index b5044eb..62d0427 100644
--- a/kdebase-screensavers.patch
+++ b/kdebase-screensavers.patch
@@ -33,16 +33,6 @@
readSettings( false );
mSetupProc = new KProcess;
---- kdebase-3.1.1/kscreensaver/Makefile.am~ Sun Oct 27 00:07:04 2002
-+++ kdebase-3.1.1/kscreensaver/Makefile.am Tue Apr 1 00:28:59 2003
-@@ -23,6 +23,6 @@
- ########## Meta objects ##########
-
- desktop_DATA = KRandom.desktop KBlankscreen.desktop
--desktopdir = $(kde_appsdir)/System/ScreenSavers
-+desktopdir = $(kde_datadir)/kscreensaver
-
- EXTRA_DIST = $(desktop_DATA)
--- kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt~ 2012-09-16 15:52:04.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt 2014-06-04 11:07:10.329823207 +0300
@@ -23,7 +23,7 @@
diff --git a/kdebase-session.patch b/kdebase-session.patch
index 1096d83..30f3cd4 100644
--- a/kdebase-session.patch
+++ b/kdebase-session.patch
@@ -1,57 +1,3 @@
---- kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/Makefile.am~ 2012-09-16 15:52:03.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/Makefile.am 2014-05-27 14:47:14.574323666 +0300
-@@ -1,49 +1,3 @@
--sessionsdir = $(kde_datadir)/kdm/sessions
--sessions_DATA = \
-- admin.desktop tde.desktop gnome.desktop \
-- 9wm.desktop \
-- aewm++.desktop \
-- aewm.desktop \
-- afterstep.desktop \
-- amaterus.desktop \
-- amiwm.desktop \
-- asclassic.desktop \
-- blackbox.desktop \
-- cde.desktop \
-- ctwm.desktop \
-- cwwm.desktop \
-- enlightenment.desktop \
-- evilwm.desktop \
-- fluxbox.desktop \
-- flwm.desktop \
-- fvwm.desktop \
-- fvwm95.desktop \
-- golem.desktop \
-- icewm.desktop \
-- ion.desktop \
-- larswm.desktop \
-- lwm.desktop \
-- matchbox.desktop \
-- metacity.desktop \
-- mwm.desktop \
-- olvwm.desktop \
-- olwm.desktop \
-- openbox.desktop \
-- oroborus.desktop \
-- phluid.desktop \
-- pwm.desktop \
-- qvwm.desktop \
-- ratpoison.desktop \
-- sapphire.desktop \
-- sawfish.desktop \
-- twm.desktop \
-- ude.desktop \
-- vtwm.desktop \
-- w9wm.desktop \
-- waimea.desktop \
-- wm2.desktop \
-- wmaker.desktop \
-- xfce.desktop \
-- xfce4.desktop
--
-+sessionsdir = /usr/share/xsessions
-+sessions_DATA = kde.desktop
- EXTRA_DIST = $(sessions_DATA)
--- kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt~ 2012-09-16 15:52:03.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt 2014-06-04 11:22:28.208119436 +0300
@@ -12,18 +12,5 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/f59a30135a5137d2c2904517cb7332a2714f9ab0
More information about the pld-cvs-commit
mailing list