summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-14 09:13:54 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-14 09:13:54 +0000
commit5fb0956f051200ee085f6780f68bb35fa53351aa (patch)
tree2ce37b93b47d0bb13fdf47d0a326c13ca670b881 /kde-base/kdm/files
parentfixed -lm in 1.6-r3 bug #106652 (diff)
downloadhistorical-5fb0956f051200ee085f6780f68bb35fa53351aa.tar.gz
historical-5fb0956f051200ee085f6780f68bb35fa53351aa.tar.bz2
historical-5fb0956f051200ee085f6780f68bb35fa53351aa.zip
Use patch from tarball in mirrors.
Package-Manager: portage-2529-svn
Diffstat (limited to 'kde-base/kdm/files')
-rw-r--r--kde-base/kdm/files/digest-kdm-3.5.01
-rw-r--r--kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch58
2 files changed, 1 insertions, 58 deletions
diff --git a/kde-base/kdm/files/digest-kdm-3.5.0 b/kde-base/kdm/files/digest-kdm-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kdm/files/digest-kdm-3.5.0
+++ b/kde-base/kdm/files/digest-kdm-3.5.0
@@ -1 +1,2 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185
diff --git a/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch b/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
deleted file mode 100644
index 1f84c2f00460..000000000000
--- a/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur kdebase-3.4.92.orig/kdm/configure.in.in kdebase-3.4.92/kdm/configure.in.in
---- kdebase-3.4.92.orig/kdm/configure.in.in 2005-10-10 17:04:31.000000000 +0200
-+++ kdebase-3.4.92/kdm/configure.in.in 2005-10-19 15:30:11.000000000 +0200
-@@ -1,39 +1,19 @@
--KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+AC_MSG_CHECKING([X paths for KDM])
-
--dnl ask imake about various X settings
--AC_MSG_CHECKING([X paths])
--imkv=8
--test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
--AC_CACHE_VAL(kde_cv_defines_imake, [
-- rm -fr conftestdir
-- if mkdir conftestdir; then
-- cd conftestdir
-- cat > Imakefile <<'EOF'[
--
--acimake:
-- @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
--
--]EOF
-- if $XMKMF >&5 2>&1 && test -f Makefile; then
-- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
-- kde_cv_defines_imake_version=$imkv
-- else
-- AC_MSG_RESULT([failed])
-- AC_MSG_ERROR([$XMKMF (imake) failed.
--Make sure you have all necessary X development packages installed.
--On some systems a missing /lib/cpp symlink is at fault.])
-- fi
-- cd ..
-- rm -fr conftestdir
-- else
-- AC_MSG_RESULT([failed])
-- AC_MSG_ERROR([cannot create temporary directory])
-- fi
--])
--AC_MSG_RESULT([done])
--eval "$kde_cv_defines_imake"
--AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
--AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+AC_ARG_WITH(x-binaries-dir,
-+ [AS_HELP_STRING(--with-x-binaries-dir=DIR,
-+ [set the location of X binaries for KDM])],
-+ [], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
-+
-+AC_ARG_WITH(x-libraries-dir,
-+ [AS_HELP_STRING(--with-x-libraries-dir=DIR,
-+ [set the location of X libraries for KDM])],
-+ [], [with_x_libraries_dir=$kde_x_libraries])
-+
-+AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
-+
-+AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
-
- if test -f /etc/ttys; then
- AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])