Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 117602 Details for
Bug 169289
kde-base/kdesdk{,-kioslaves} cannot find Subversion libraries with dev-libs/apr-1.2.8
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch to 3.5.5 and 3.5.6
kdesdk-3.5.5+3.5.6.patch (text/plain), 8.65 KB, created by
Arfrever Frehtes Taifersar Arahesis (RETIRED)
on 2007-04-28 22:50:23 UTC
(
hide
)
Description:
Updated patch to 3.5.5 and 3.5.6
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis (RETIRED)
Created:
2007-04-28 22:50:23 UTC
Size:
8.65 KB
patch
obsolete
>--- kde-base/kdesdk/files/kdesdk-3.5.6-apr-1.patch >+++ kde-base/kdesdk/files/kdesdk-3.5.6-apr-1.patch >@@ -0,0 +1,105 @@ >+Patch created by Arfrever Frehtes Taifersar Arahesis. >+See https://bugs.gentoo.org/show_bug.cgi?id=169289. >+--- kdesdk-3.5.6/configure >++++ kdesdk-3.5.6/configure >+@@ -1086,9 +1086,9 @@ >+ --with-db-name=NAME name of the Berkeley DB IV library (default db) >+ --with-subversion enable support for subversion [default=check] >+ --with-apr-config=FILE Use the given path to apr-config when determining >+- APR configuration; defaults to "apr-config" >++ APR configuration; defaults to "apr-1-config" >+ --with-apu-config=FILE Use the given path to apu-config when determining >+- APR util configuration; defaults to "apu-config" >++ APR util configuration; defaults to "apu-1-config" >+ --with-subversion-dir=DIR where Subversion is installed >+ --with-svn-include=DIR Use the given path to the subversion headers. >+ --with-svn-lib=DIR Use the given path to the subversion libraries. >+@@ -34435,7 +34435,7 @@ >+ SVN_SUBDIR="" >+ if test "x$with_subversion" != xno; then >+ >+-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" >++APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" >+ SVN_SUBDIR="svn" >+ >+ # Check whether --with-apr-config or --without-apr-config was given. >+@@ -34471,7 +34471,7 @@ >+ APR_LIBS="`$APR_CONFIG --link-ld --libs`" >+ >+ >+-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" >++APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" >+ >+ # Check whether --with-apu-config or --without-apu-config was given. >+ if test "${with_apu_config+set}" = set; then >+--- kdesdk-3.5.6/configure.in >++++ kdesdk-3.5.6/configure.in >+@@ -267,11 +267,11 @@ >+ SVN_SUBDIR="" >+ if test "x$with_subversion" != xno; then >+ >+-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" >++APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" >+ SVN_SUBDIR="svn" >+ AC_ARG_WITH(apr-config, >+ [[ --with-apr-config=FILE Use the given path to apr-config when determining >+- APR configuration; defaults to "apr-config"]], >++ APR configuration; defaults to "apr-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APR_CONFIGS=$withval >+@@ -302,10 +302,10 @@ >+ dnl APR util >+ dnl >+ >+-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" >++APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" >+ AC_ARG_WITH(apu-config, >+ [[ --with-apu-config=FILE Use the given path to apu-config when determining >+- APR util configuration; defaults to "apu-config"]], >++ APR util configuration; defaults to "apu-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APU_CONFIGS=$withval >+--- kdesdk-3.5.6/kioslave/svn/README >++++ kdesdk-3.5.6/kioslave/svn/README >+@@ -25,8 +25,8 @@ >+ you can pass the following arguments to configure to help it find your >+ subversion/apr installations : >+ >+---with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-config" >+---with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-config" >++--with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-1-config" >++--with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-1-config" >+ --with-subversion-dir=DIR where Subversion is installed >+ --with-svn-include=DIR Use the given path to the subversion headers. >+ --with-svn-lib=DIR Use the given path to the subversion libraries. >+--- kdesdk-3.5.6/kioslave/svn/configure.in.in >++++ kdesdk-3.5.6/kioslave/svn/configure.in.in >+@@ -6,11 +6,11 @@ >+ SVN_SUBDIR="" >+ if test "x$with_subversion" != xno; then >+ >+-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" >++APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" >+ SVN_SUBDIR="svn" >+ AC_ARG_WITH(apr-config, >+ [[ --with-apr-config=FILE Use the given path to apr-config when determining >+- APR configuration; defaults to "apr-config"]], >++ APR configuration; defaults to "apr-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APR_CONFIGS=$withval >+@@ -41,10 +41,10 @@ >+ dnl APR util >+ dnl >+ >+-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" >++APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" >+ AC_ARG_WITH(apu-config, >+ [[ --with-apu-config=FILE Use the given path to apu-config when determining >+- APR util configuration; defaults to "apu-config"]], >++ APR util configuration; defaults to "apu-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APU_CONFIGS=$withval >--- kde-base/kdesdk/kdesdk-3.5.5.ebuild >+++ kde-base/kdesdk/kdesdk-3.5.5.ebuild >@@ -20,6 +20,8 @@ > DEPEND="${RDEPEND} > sys-devel/flex" > >+PATCHES="${FILESDIR}/${PN}-3.5.6-apr-1.patch" >+ > src_compile() { > local myconf="$(use_with subversion)" > >--- kde-base/kdesdk/kdesdk-3.5.6.ebuild >+++ kde-base/kdesdk/kdesdk-3.5.6.ebuild >@@ -23,8 +23,10 @@ > src_unpack() { > kde_src_unpack > >+ epatch "${FILESDIR}/${P}-apr-1.patch" >+ > # Patch to fix bug 171328 >- epatch ${FILESDIR}/umbrello-diagram-fix.diff >+ epatch "${FILESDIR}/umbrello-diagram-fix.diff" > } > > src_compile() { >--- kde-base/kdesdk-kioslaves/files/kdesdk-kioslaves-3.5.6-apr-1.patch >+++ kde-base/kdesdk-kioslaves/files/kdesdk-kioslaves-3.5.6-apr-1.patch >@@ -0,0 +1,44 @@ >+Patch created by Arfrever Frehtes Taifersar Arahesis. >+See https://bugs.gentoo.org/show_bug.cgi?id=169289. >+--- kdesdk-kioslaves-3.5.6/kioslave/svn/README >++++ kdesdk-kioslaves-3.5.6/kioslave/svn/README >+@@ -25,8 +25,8 @@ >+ you can pass the following arguments to configure to help it find your >+ subversion/apr installations : >+ >+---with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-config" >+---with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-config" >++--with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-1-config" >++--with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-1-config" >+ --with-subversion-dir=DIR where Subversion is installed >+ --with-svn-include=DIR Use the given path to the subversion headers. >+ --with-svn-lib=DIR Use the given path to the subversion libraries. >+--- kdesdk-kioslaves-3.5.6/kioslave/svn/configure.in.in >++++ kdesdk-kioslaves-3.5.6/kioslave/svn/configure.in.in >+@@ -6,11 +6,11 @@ >+ SVN_SUBDIR="" >+ if test "x$with_subversion" != xno; then >+ >+-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" >++APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" >+ SVN_SUBDIR="svn" >+ AC_ARG_WITH(apr-config, >+ [[ --with-apr-config=FILE Use the given path to apr-config when determining >+- APR configuration; defaults to "apr-config"]], >++ APR configuration; defaults to "apr-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APR_CONFIGS=$withval >+@@ -41,10 +41,10 @@ >+ dnl APR util >+ dnl >+ >+-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" >++APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" >+ AC_ARG_WITH(apu-config, >+ [[ --with-apu-config=FILE Use the given path to apu-config when determining >+- APR util configuration; defaults to "apu-config"]], >++ APR util configuration; defaults to "apu-1-config"]], >+ [ >+ if test "$withval" != "yes" -a "$withval" != ""; then >+ APU_CONFIGS=$withval >--- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.5.ebuild >+++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.5.ebuild >@@ -13,4 +13,4 @@ > IUSE="kdehiddenvisibility" > DEPEND="dev-util/subversion" > >- >+PATCHES="${FILESDIR}/${PN}-3.5.6-apr-1.patch" >--- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6.ebuild >+++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6.ebuild >@@ -13,4 +13,4 @@ > IUSE="kdehiddenvisibility" > DEPEND="dev-util/subversion" > >- >+PATCHES="${FILESDIR}/${P}-apr-1.patch"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=117602">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 169289
:
113533
|
113535
|
113536
|
113600
|
114385
|
117602
|
120472
|
122820
|
122906
