diff options
| -rw-r--r-- | packages/qsvn/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/qsvn/files/build.patch | 23 | ||||
| -rw-r--r-- | packages/qsvn/qsvn_0.3.0.bb | 3 | ||||
| -rw-r--r-- | packages/subversion/subversion_1.4.3.bb | 6 |
4 files changed, 30 insertions, 2 deletions
diff --git a/packages/qsvn/files/.mtn2git_empty b/packages/qsvn/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qsvn/files/.mtn2git_empty diff --git a/packages/qsvn/files/build.patch b/packages/qsvn/files/build.patch new file mode 100644 index 0000000000..086f532a70 --- /dev/null +++ b/packages/qsvn/files/build.patch @@ -0,0 +1,23 @@ +--- qsvn-0.3.0/qsvn.pro 2007-06-11 00:47:22.514013379 +0200 ++++ qsvn-0.3.0/qsvn.pro 2007-06-11 00:47:49.206941206 +0200 +@@ -7,9 +7,6 @@ + UI_DIR = .ui + OBJECTS_DIR = .obj + +- INCLUDEPATH += /usr/include/subversion-1 \ +- /usr/include/apr-0 +- + LIBS += -lsvn_client-1 \ + -lsvn_delta-1 \ + -lsvn_diff-1 \ +@@ -18,8 +15,8 @@ + -lsvn_repos-1 \ + -lsvn_subr-1 \ + -lsvn_wc-1 \ +- -lapr-0 \ +- -laprutil-0 ++ -lapr-1 \ ++ -laprutil-1 + } + + win32 { diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb index 13653ea898..575e9359b7 100644 --- a/packages/qsvn/qsvn_0.3.0.bb +++ b/packages/qsvn/qsvn_0.3.0.bb @@ -7,7 +7,8 @@ SECTION = "network" DEPENDS = "apr-util subversion" PR = "r0" -SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz" +SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \ + file://build.patch;patch=1" inherit qmake qt4x11 diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb index c0a2a02e08..1b73017d25 100644 --- a/packages/subversion/subversion_1.4.3.bb +++ b/packages/subversion/subversion_1.4.3.bb @@ -5,7 +5,7 @@ RDEPENDS = "neon" LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" -DEFAULT_PREFERENCE = "-1" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ @@ -27,3 +27,7 @@ do_configure() { aclocal -I build/ -I build/ac-macros/ && autoconf oe_runconf } + +do_stage() { + autotools_stage_all +} |