[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fink-beginners
Subject:    Re: [Fink-beginners] kdebase4-workspace-x11 won't compile
From:       George Karrys <karrysg () cox ! net>
Date:       2010-06-19 1:07:12
Message-ID: C8416650.19FD%karrysg () cox ! net
[Download RAW message or body]




On 6/13/10 12:53 AM, "Martin Costabel" <costabel@wanadoo.fr> wrote:

> George Karrys wrote:
> []
>> Compile fails while patching
>> 
>> can't find file to patch at input line 1590
>> Perhaps you used the wrong -p or --strip option?
>> The text leading up to this was:
>> --------------------------
>> | 
>> |--- 
>> trunk/KDE/kdebase/workspace/plasma/generic/dataengines/geolocation/location_
>> gps.cpp    2010/01/05 19:40:06    1070488
>> |+++ 
>> trunk/KDE/kdebase/workspace/plasma/generic/dataengines/geolocation/location_
>> gps.cpp    2010/01/05 19:48:55    1070489
>> --------------------------
>> File to patch: 
>> 
>> I tried directing to
>> /sw/src/fink.build/kdebase4-workspace-x11-4.4.1-1/kdebase-workspace-4.4.1/pl
>> asma/generic/dataengines/geolocations/location_gps.cpp
>> 
>> And get file not found
>> 
>> 
>> Is there something I'm missing.
> 
> Read "man patch" about the -p option. Fink uses, unless told otherwise,
> -p1, see <http://www.finkproject.org/doc/packaging/reference.php?#patches>.
> This means that the path you give has to have exactly *one* extra
> component in front of the build directory, in your example
> 
> whatever/plasma/generic/dataengines/geolocation/location_gps.cpp
 
Got file to patch by adding

diff -Nurd 
kdebase-workspace-4.4.1/plasma/generic/dataengines/geolocation/location_gps.
cpp 
kdebase-workspace-4.4.1-new/plasma/generic/dataengines/geolocation/location_
gps.cpp
--- 
kdebase-workspace-4.4.1/plasma/generic/dataengines/geolocation/location_gps.
cpp    2010/01/05 19:40:06    1070488
+++ 
kdebase-workspace-4.4.1/plasma/generic/dataengines/geolocation/location_gps.
cpp    2010/01/05 19:48:55    1070489
@@ -41,7 +41,11 @@
 
 void Gpsd::run()
 {
+#if GPSD_API_MAJOR_VERSION == 3 && defined( WATCH_ENABLE )
+    gps_stream(m_gpsdata, WATCH_ENABLE, NULL);
+#else
     gps_query(m_gpsdata, "w+x\n");
+#endif
 
     while (!m_abort) {
         Plasma::DataEngine::Data d;


Then received following error

patching file plasma/generic/dataengines/geolocation/location_gps.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
plasma/generic/dataengines/geolocation/location_gps.cpp.rej
### execution of sed failed, exit code 1
Removing runtime build-lock...
Removing build-lock package...

location_gps.cpp.rej reads

***************
*** 41,47 ****
  
  void Gpsd::run()
  {
      gps_query(m_gpsdata, "w+x\n");
  
      while (!m_abort) {
          Plasma::DataEngine::Data d;
--- 41,51 ----
  
  void Gpsd::run()
  {
+ #if GPSD_API_MAJOR_VERSION == 3 && defined( WATCH_ENABLE )
+     gps_stream(m_gpsdata, WATCH_ENABLE, NULL);
+ #else
      gps_query(m_gpsdata, "w+x\n");
+ #endif
  
      while (!m_abort) {
          Plasma::DataEngine::Data d;

Line 1478 of kdebase-workspace.patch also references  location_gps.cpp

I didn't expect this to get so involved but if you have the time and
patience and this can be solved lets keep going

George




------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Fink-beginners mailing list
Fink-beginners@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.beginners
[prev in list] [next in list] [prev in thread] [next in thread]