summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch10
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild2
2 files changed, 7 insertions, 5 deletions
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
index 4e64c9fad50..cbc1cf2ab09 100644
--- a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
@@ -2,11 +2,11 @@ diff -ruN kdevelop-php-1.2.0.orig/parser/CMakeLists.txt kdevelop-php-1.2.0/parse
--- kdevelop-php-1.2.0.orig/parser/CMakeLists.txt 2011-01-23 20:42:54.000000000 +0100
+++ kdevelop-php-1.2.0/parser/CMakeLists.txt 2011-04-25 22:29:05.486182541 +0200
@@ -21,6 +21,8 @@
- ${KDE4_KTEXTEDITOR_LIBS}
+ target_link_libraries(kdevphpparser LINK_PRIVATE
+ KDev::Language
)
-
-+add_dependencies( kdev4phpparser php-parser-generated )
+
- kde4_add_executable( php-parser main.cpp )
- target_link_libraries(php-parser ${QT_QTCORE_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4phpparser)
++add_dependencies( kdev4phpparser php-parser-generated )
+
+ add_executable( php-parser main.cpp )
diff --git a/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
index 45673a07c04..cbcccd89213 100644
--- a/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
@@ -10,6 +10,7 @@ VIRTUALX_REQUIRED=test
KDEBASE="kdevelop"
KMNAME="kdev-php"
EGIT_REPONAME="${KMNAME}"
+EGIT_BRANCH="1.7"
inherit kde4-base
DESCRIPTION="PHP plugin for KDevelop 4"
@@ -24,6 +25,7 @@ RESTRICT="test"
DEPEND="
>=dev-util/kdevelop-pg-qt-1.0.0
+ <=dev-util/kdevelop-pg-qt-5
"
RDEPEND="
dev-util/kdevelop:${SLOT}