packages: kde4-kdevelop/kde4-kdevelop.spec, kde4-kdevelop/kdev-relative-inc...

[pluto]

Author: pluto                        Date: Wed Jan 25 21:27:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow relative paths in .kdev_include_paths (backport from mainstream / https://bugs.kde.org/show_bug.cgi?id=282242).
  release 4.

---- Files affected:
packages/kde4-kdevelop:
   kde4-kdevelop.spec (1.45 -> 1.46) , kdev-relative-include-paths.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdevelop/kde4-kdevelop.spec
diff -u packages/kde4-kdevelop/kde4-kdevelop.spec:1.45 packages/kde4-kdevelop/kde4-kdevelop.spec:1.46
--- packages/kde4-kdevelop/kde4-kdevelop.spec:1.45	Sat Jan 21 23:02:11 2012
+++ packages/kde4-kdevelop/kde4-kdevelop.spec	Wed Jan 25 22:27:02 2012
@@ -15,12 +15,13 @@
 Summary(zh_CN.UTF-8):	KDE C/C++集成开发环境
 Name:		kde4-kdevelop
 Version:	4.2.3
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Development/Tools
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	8b6e59764612314e6776edb3386c0930
 Patch0:		%{name}-okteta.patch
+Patch1:		kdev-relative-include-paths.patch
 URL:		http://www.kdevelop.org/
 BuildRequires:	QtHelp-devel >= %{qtver}
 BuildRequires:	QtNetwork-devel >= %{qtver}
@@ -115,6 +116,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -219,6 +221,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2012/01/25 21:27:02  pluto
+- allow relative paths in .kdev_include_paths (backport from mainstream / https://bugs.kde.org/show_bug.cgi?id=282242).
+  release 4.
+
 Revision 1.45  2012/01/21 22:02:11  pluto
 - fix okteta plugins build, release 3.
 

================================================================
Index: packages/kde4-kdevelop/kdev-relative-include-paths.patch
diff -u /dev/null packages/kde4-kdevelop/kdev-relative-include-paths.patch:1.1
--- /dev/null	Wed Jan 25 22:27:08 2012
+++ packages/kde4-kdevelop/kdev-relative-include-paths.patch	Wed Jan 25 22:27:02 2012
@@ -0,0 +1,41 @@
+diff --git a/languages/cpp/codegen/ui/custom_include_paths.ui b/languages/cpp/codegen/ui/custom_include_paths.ui
+--- a/languages/cpp/codegen/ui/custom_include_paths.ui
++++ b/languages/cpp/codegen/ui/custom_include_paths.ui
+@@ -7,7 +7,7 @@
+     <x>0</x>
+     <y>0</y>
+     <width>526</width>
+-    <height>504</height>
++    <height>536</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+@@ -113,14 +113,8 @@
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
+-        <property name="sizePolicy">
+-         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+-          <horstretch>0</horstretch>
+-          <verstretch>0</verstretch>
+-         </sizepolicy>
+-        </property>
+         <property name="text">
+-         <string>You can add a list of custom include paths here.</string>
++         <string>You can add a list of custom include paths here. Relative paths will be resolved from the storage directory.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
+--- a/languages/cpp/includepathresolver.cpp
++++ b/languages/cpp/includepathresolver.cpp
+@@ -381,6 +381,9 @@ CustomIncludePathsSettings CustomIncludePathsSettings::read(QString storagePath)
+               }
+             }
+           }else{
++            // Turn relative paths into absolute paths from the storage path
++            if (!textLine.startsWith("/"))
++              textLine = sourceDir.absoluteFilePath(textLine);
+             ret.paths << textLine;
+           }
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdevelop/kde4-kdevelop.spec?r1=1.45&r2=1.46&f=u