2011-06-10 Laszlo (Laca) Peter <[email protected]> gnome-2-30 NEVADA_168
authorlaca
Fri, 10 Jun 2011 09:37:36 +0000
branchgnome-2-30
changeset 21864 016a696b5609
parent 21863 25cd7cdb9eaa
child 21865 48f176d71258
2011-06-10 Laszlo (Laca) Peter <[email protected]> * base-specs/ptlib.spec: add patch tmp-bld.diff * patches/ptlib-11-tmp-bld.diff: temporary patch to fix the build for 168.
ChangeLog
base-specs/ptlib.spec
patches/ptlib-11-tmp-bld.diff
--- a/ChangeLog	Fri Jun 10 02:38:56 2011 +0000
+++ b/ChangeLog	Fri Jun 10 09:37:36 2011 +0000
@@ -1,3 +1,9 @@
+2011-06-10  Laszlo (Laca) Peter  <[email protected]>
+
+	* base-specs/ptlib.spec: add patch tmp-bld.diff
+	* patches/ptlib-11-tmp-bld.diff: temporary patch to fix the build
+	  for 168.
+
 2011-06-10  Jeff Cai <[email protected]>
 
 	* patches/xscreensaver-06-gtk-lock.diff:
--- a/base-specs/ptlib.spec	Fri Jun 10 02:38:56 2011 +0000
+++ b/base-specs/ptlib.spec	Fri Jun 10 09:37:36 2011 +0000
@@ -39,6 +39,9 @@
 # owner:brian date:2011-02-13 type:bug
 Patch9:       ptlib-10-operator-new-delete.diff
 
+# temporary build fix, please find the root cause and fix properly
+Patch11:      ptlib-11-tmp-bld.diff
+
 URL:          http://www.ekiga.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -65,6 +68,7 @@
 %patch5 -p1
 %patch8 -p1
 %patch9 -p1
+%patch11 -p1
 
 # symlink the make dir to bin so that ptlib-config is found by ekiga
 # ln -s make bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ptlib-11-tmp-bld.diff	Fri Jun 10 09:37:36 2011 +0000
@@ -0,0 +1,11 @@
+--- ptlib-2.6.7/include/ptlib/unix/ptlib/pmachdep.h.bld	2011-06-10 21:33:28.415537140 +1200
++++ ptlib-2.6.7/include/ptlib/unix/ptlib/pmachdep.h	2011-06-10 21:33:37.787148247 +1200
+@@ -199,7 +199,7 @@
+ 
+ int ftime (struct timeb *);
+ pid_t wait3(int *status, int options, struct rusage *rusage);
+-int gethostname(char *, int);
++//int gethostname(char *, int);
+ 
+ };
+ #endif