Line
Link Here
|
0 |
-- kde-base/kdesdk/files/kdesdk-3.5.6-apr-1.patch |
0 |
++ kde-base/kdesdk/files/kdesdk-3.5.6-apr-1.patch |
Line 0
Link Here
|
0 |
-- kde-base/kdesdk/kdesdk-3.5.5.ebuild |
1 |
Patch created by Arfrever Frehtes Taifersar Arahesis. |
|
|
2 |
See https://bugs.gentoo.org/show_bug.cgi?id=169289. |
3 |
--- kdesdk-3.5.6/configure |
4 |
+++ kdesdk-3.5.6/configure |
5 |
@@ -1086,9 +1086,9 @@ |
6 |
--with-db-name=NAME name of the Berkeley DB IV library (default db) |
7 |
--with-subversion enable support for subversion [default=check] |
8 |
--with-apr-config=FILE Use the given path to apr-config when determining |
9 |
- APR configuration; defaults to "apr-config" |
10 |
+ APR configuration; defaults to "apr-1-config" |
11 |
--with-apu-config=FILE Use the given path to apu-config when determining |
12 |
- APR util configuration; defaults to "apu-config" |
13 |
+ APR util configuration; defaults to "apu-1-config" |
14 |
--with-subversion-dir=DIR where Subversion is installed |
15 |
--with-svn-include=DIR Use the given path to the subversion headers. |
16 |
--with-svn-lib=DIR Use the given path to the subversion libraries. |
17 |
@@ -34435,7 +34435,7 @@ |
18 |
SVN_SUBDIR="" |
19 |
if test "x$with_subversion" != xno; then |
20 |
|
21 |
-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" |
22 |
+APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" |
23 |
SVN_SUBDIR="svn" |
24 |
|
25 |
# Check whether --with-apr-config or --without-apr-config was given. |
26 |
@@ -34471,7 +34471,7 @@ |
27 |
APR_LIBS="`$APR_CONFIG --link-ld --libs`" |
28 |
|
29 |
|
30 |
-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" |
31 |
+APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" |
32 |
|
33 |
# Check whether --with-apu-config or --without-apu-config was given. |
34 |
if test "${with_apu_config+set}" = set; then |
35 |
--- kdesdk-3.5.6/configure.in |
36 |
+++ kdesdk-3.5.6/configure.in |
37 |
@@ -267,11 +267,11 @@ |
38 |
SVN_SUBDIR="" |
39 |
if test "x$with_subversion" != xno; then |
40 |
|
41 |
-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" |
42 |
+APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" |
43 |
SVN_SUBDIR="svn" |
44 |
AC_ARG_WITH(apr-config, |
45 |
[[ --with-apr-config=FILE Use the given path to apr-config when determining |
46 |
- APR configuration; defaults to "apr-config"]], |
47 |
+ APR configuration; defaults to "apr-1-config"]], |
48 |
[ |
49 |
if test "$withval" != "yes" -a "$withval" != ""; then |
50 |
APR_CONFIGS=$withval |
51 |
@@ -302,10 +302,10 @@ |
52 |
dnl APR util |
53 |
dnl |
54 |
|
55 |
-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" |
56 |
+APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" |
57 |
AC_ARG_WITH(apu-config, |
58 |
[[ --with-apu-config=FILE Use the given path to apu-config when determining |
59 |
- APR util configuration; defaults to "apu-config"]], |
60 |
+ APR util configuration; defaults to "apu-1-config"]], |
61 |
[ |
62 |
if test "$withval" != "yes" -a "$withval" != ""; then |
63 |
APU_CONFIGS=$withval |
64 |
--- kdesdk-3.5.6/kioslave/svn/README |
65 |
+++ kdesdk-3.5.6/kioslave/svn/README |
66 |
@@ -25,8 +25,8 @@ |
67 |
you can pass the following arguments to configure to help it find your |
68 |
subversion/apr installations : |
69 |
|
70 |
---with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-config" |
71 |
---with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-config" |
72 |
+--with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-1-config" |
73 |
+--with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-1-config" |
74 |
--with-subversion-dir=DIR where Subversion is installed |
75 |
--with-svn-include=DIR Use the given path to the subversion headers. |
76 |
--with-svn-lib=DIR Use the given path to the subversion libraries. |
77 |
--- kdesdk-3.5.6/kioslave/svn/configure.in.in |
78 |
+++ kdesdk-3.5.6/kioslave/svn/configure.in.in |
79 |
@@ -6,11 +6,11 @@ |
80 |
SVN_SUBDIR="" |
81 |
if test "x$with_subversion" != xno; then |
82 |
|
83 |
-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" |
84 |
+APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" |
85 |
SVN_SUBDIR="svn" |
86 |
AC_ARG_WITH(apr-config, |
87 |
[[ --with-apr-config=FILE Use the given path to apr-config when determining |
88 |
- APR configuration; defaults to "apr-config"]], |
89 |
+ APR configuration; defaults to "apr-1-config"]], |
90 |
[ |
91 |
if test "$withval" != "yes" -a "$withval" != ""; then |
92 |
APR_CONFIGS=$withval |
93 |
@@ -41,10 +41,10 @@ |
94 |
dnl APR util |
95 |
dnl |
96 |
|
97 |
-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" |
98 |
+APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" |
99 |
AC_ARG_WITH(apu-config, |
100 |
[[ --with-apu-config=FILE Use the given path to apu-config when determining |
101 |
- APR util configuration; defaults to "apu-config"]], |
102 |
+ APR util configuration; defaults to "apu-1-config"]], |
103 |
[ |
104 |
if test "$withval" != "yes" -a "$withval" != ""; then |
105 |
APU_CONFIGS=$withval |
|
|
106 |
++ kde-base/kdesdk/kdesdk-3.5.5.ebuild |
Lines 20-25
Link Here
|
20 |
DEPEND="${RDEPEND} |
20 |
DEPEND="${RDEPEND} |
21 |
sys-devel/flex" |
21 |
sys-devel/flex" |
22 |
|
22 |
|
|
|
23 |
PATCHES="${FILESDIR}/${PN}-3.5.6-apr-1.patch" |
24 |
|
23 |
src_compile() { |
25 |
src_compile() { |
24 |
local myconf="$(use_with subversion)" |
26 |
local myconf="$(use_with subversion)" |
25 |
|
27 |
|
26 |
-- kde-base/kdesdk/kdesdk-3.5.6.ebuild |
28 |
++ kde-base/kdesdk/kdesdk-3.5.6.ebuild |
Lines 23-30
Link Here
|
23 |
src_unpack() { |
23 |
src_unpack() { |
24 |
kde_src_unpack |
24 |
kde_src_unpack |
25 |
|
25 |
|
|
|
26 |
epatch "${FILESDIR}/${P}-apr-1.patch" |
27 |
|
26 |
# Patch to fix bug 171328 |
28 |
# Patch to fix bug 171328 |
27 |
epatch ${FILESDIR}/umbrello-diagram-fix.diff |
29 |
epatch "${FILESDIR}/umbrello-diagram-fix.diff" |
28 |
} |
30 |
} |
29 |
|
31 |
|
30 |
src_compile() { |
32 |
src_compile() { |
31 |
-- kde-base/kdesdk-kioslaves/files/kdesdk-kioslaves-3.5.6-apr-1.patch |
33 |
++ kde-base/kdesdk-kioslaves/files/kdesdk-kioslaves-3.5.6-apr-1.patch |
Line 0
Link Here
|
0 |
-- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.5.ebuild |
1 |
Patch created by Arfrever Frehtes Taifersar Arahesis. |
|
|
2 |
See https://bugs.gentoo.org/show_bug.cgi?id=169289. |
3 |
--- kdesdk-kioslaves-3.5.6/kioslave/svn/README |
4 |
+++ kdesdk-kioslaves-3.5.6/kioslave/svn/README |
5 |
@@ -25,8 +25,8 @@ |
6 |
you can pass the following arguments to configure to help it find your |
7 |
subversion/apr installations : |
8 |
|
9 |
---with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-config" |
10 |
---with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-config" |
11 |
+--with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-1-config" |
12 |
+--with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-1-config" |
13 |
--with-subversion-dir=DIR where Subversion is installed |
14 |
--with-svn-include=DIR Use the given path to the subversion headers. |
15 |
--with-svn-lib=DIR Use the given path to the subversion libraries. |
16 |
--- kdesdk-kioslaves-3.5.6/kioslave/svn/configure.in.in |
17 |
+++ kdesdk-kioslaves-3.5.6/kioslave/svn/configure.in.in |
18 |
@@ -6,11 +6,11 @@ |
19 |
SVN_SUBDIR="" |
20 |
if test "x$with_subversion" != xno; then |
21 |
|
22 |
-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config" |
23 |
+APR_CONFIGS="apr-1-config apr-config /usr/local/apr/bin/apr-1-config /usr/local/apr/bin/apr-config" |
24 |
SVN_SUBDIR="svn" |
25 |
AC_ARG_WITH(apr-config, |
26 |
[[ --with-apr-config=FILE Use the given path to apr-config when determining |
27 |
- APR configuration; defaults to "apr-config"]], |
28 |
+ APR configuration; defaults to "apr-1-config"]], |
29 |
[ |
30 |
if test "$withval" != "yes" -a "$withval" != ""; then |
31 |
APR_CONFIGS=$withval |
32 |
@@ -41,10 +41,10 @@ |
33 |
dnl APR util |
34 |
dnl |
35 |
|
36 |
-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config" |
37 |
+APU_CONFIGS="apu-1-config apu-config /usr/local/apr/bin/apu-1-config /usr/local/apr/bin/apu-config" |
38 |
AC_ARG_WITH(apu-config, |
39 |
[[ --with-apu-config=FILE Use the given path to apu-config when determining |
40 |
- APR util configuration; defaults to "apu-config"]], |
41 |
+ APR util configuration; defaults to "apu-1-config"]], |
42 |
[ |
43 |
if test "$withval" != "yes" -a "$withval" != ""; then |
44 |
APU_CONFIGS=$withval |
|
|
45 |
++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.5.ebuild |
Lines 13-16
Link Here
|
13 |
IUSE="kdehiddenvisibility" |
13 |
IUSE="kdehiddenvisibility" |
14 |
DEPEND="dev-util/subversion" |
14 |
DEPEND="dev-util/subversion" |
15 |
|
15 |
|
16 |
|
16 |
PATCHES="${FILESDIR}/${PN}-3.5.6-apr-1.patch" |
17 |
-- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6.ebuild |
17 |
++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6.ebuild |
Lines 13-16
Link Here
|
13 |
IUSE="kdehiddenvisibility" |
13 |
IUSE="kdehiddenvisibility" |
14 |
DEPEND="dev-util/subversion" |
14 |
DEPEND="dev-util/subversion" |
15 |
|
15 |
|
16 |
|
16 |
PATCHES="${FILESDIR}/${P}-apr-1.patch" |