Re: Building kde-workspace with latest checkout

2011-09-21 Thread Hugo Pereira Da Costa

Adding kde-core-devel, which is better suited for these kind of emails.

Seems to me that trunk is actually not up to date for kdelibs, and that 
accessor to


resizeMethodHint is missing from plasma/wallpaper.h / .cpp


See patch attached. (can someone fix/commit this ?)


At least it made things compile again for me.


Hugo



Hi guys,

I keep getting this error while trying to build kde-workspace module:

[ 57%] Building CXX object
plasma/generic/wallpapers/image/CMakeFiles/plasma_wallpaper_image.dir/backgroundlistmodel.o
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:
In member function ‘virtual void Image::save(KConfigGroup)’:
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:130:66:
error: ‘resizeMethodHint’ was not declared in this scope
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:
In member function ‘virtual QWidget*
Image::createConfigurationInterface(QWidget*)’:
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:152:51:
error: ‘resizeMethodHint’ was not declared in this scope
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:241:34:
error: ‘resizeMethodHint’ was not declared in this scope
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:251:60:
error: ‘resizeMethodHint’ was not declared in this scope
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:
In member function ‘void Image::positioningChanged(int)’:
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:630:47:
error: ‘resizeMethodHint’ was not declared in this scope
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:
In member function ‘void Image::renderWallpaper(const QString)’:
/home/ggorosito/kde/kdesrc/kde/kde-workspace/plasma/generic/wallpapers/image/image.cpp:783:44:
error: ‘resizeMethodHint’ was not declared in this scope
make[2]: *** 
[plasma/generic/wallpapers/image/CMakeFiles/plasma_wallpaper_image.dir/image.o]
Error 1

Full log: http://pastebin.com/UnE2m3Am

Today I talked with Aaron about this, he told me to make sure that
kdelibs is up to date and is setted up to branch KDE/4.7.. and it is:

ggorosito@glaptop:~/kde/kdesrc/kde/kdelibs$ git config --get-all
remote.origin.url
http://anongit.kde.org/kdelibs.git

ggorosito@glaptop:~/kde/kdesrc/kde/kdelibs$ git branch
* KDE/4.7
   master

Any ideas!?

###
#  Gonzalo Gorosito
#  Programador  sysadmin
#
#  http://www.tutorialesdebian.com - Tutoriales para debianeros,
scripts, info, notícias y mucho mas.
#  http://www.ggorosito.com.ar - Website personal
###


Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe


diff --git a/plasma/wallpaper.cpp b/plasma/wallpaper.cpp
index 97ec7e8..16cf3a7 100644
--- a/plasma/wallpaper.cpp
+++ b/plasma/wallpaper.cpp
@@ -421,6 +421,9 @@ void Wallpaper::setResizeMethodHint(Wallpaper::ResizeMethod 
resizeMethod)
 emit renderHintsChanged();
 }
 
+Wallpaper::ResizeMethod Wallpaper::resizeMethodHint( void ) const
+{ return d-lastResizeMethod; }
+
 void Wallpaper::setTargetSizeHint(const QSizeF targetSize)
 {
 d-targetSize = targetSize;
diff --git a/plasma/wallpaper.h b/plasma/wallpaper.h
index e1e9891..3086517 100644
--- a/plasma/wallpaper.h
+++ b/plasma/wallpaper.h
@@ -416,12 +416,17 @@ class PLASMA_EXPORT Wallpaper : public QObject
 /**
  * This method is invoked by setUrls(KUrl::List)
  * Can be Overriden by Plugins which want to support setting Image URLs
- * Will be changed to virtual method in libplasma2/KDE5 
+ * Will be changed to virtual method in libplasma2/KDE5
  * @since 4.7
  */
 void addUrls(const KUrl::List urls);
 
 protected:
+
+
+Wallpaper::ResizeMethod resizeMethodHint( void ) const;
+
+
 /**
  * This constructor is to be used with the plugin loading systems
  * found in KPluginInfo and KService. The argument list is expected


Re: Building kde-workspace with latest checkout

2011-09-21 Thread Aaron J. Seigo
On Wednesday, September 21, 2011 12:07:36 Hugo Pereira Da Costa wrote:
 Adding kde-core-devel, which is better suited for these kind of emails.
 
 Seems to me that trunk is actually not up to date for kdelibs, and that
 accessor to

master is dead. do not use it. use the KDE/4.7 branch for building other KDE 
software, or frameworks for development of kdleibs..

-- 
Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks


signature.asc
Description: This is a digitally signed message part.


kdelibs/master: zap it? (Was: Building kde-workspace with latest checkout)

2011-09-21 Thread Allen Winter
On Wednesday 21 September 2011 7:51:50 AM Aaron J. Seigo wrote:
 On Wednesday, September 21, 2011 12:07:36 Hugo Pereira Da Costa wrote:
  Adding kde-core-devel, which is better suited for these kind of emails.
  
  Seems to me that trunk is actually not up to date for kdelibs, and that
  accessor to
 
 master is dead. do not use it. use the KDE/4.7 branch for building other KDE 
 software, or frameworks for development of kdleibs..
 
Perhaps we should remove all of the files in the master branch?
then commit a MASTER_IS_DEAD_USE_4.7 file?



Re: Building kde-workspace with latest checkout

2011-09-21 Thread Aaron J. Seigo
On Wednesday, September 21, 2011 11:56:59 Gorosito Gonzalo wrote:
 My kdelibs its already on KDE/4.7:

it was part of commit 6ef2c70949c0188f72789b924d9d88b8fb72459e

-- 
Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks


signature.asc
Description: This is a digitally signed message part.


Re: kdelibs/master: zap it? (Was: Building kde-workspace with latest checkout)

2011-09-21 Thread Oswald Buddenhagen
On Wed, Sep 21, 2011 at 09:02:53AM -0400, Allen Winter wrote:
 On Wednesday 21 September 2011 7:51:50 AM Aaron J. Seigo wrote:
  On Wednesday, September 21, 2011 12:07:36 Hugo Pereira Da Costa wrote:
   Adding kde-core-devel, which is better suited for these kind of emails.
   
   Seems to me that trunk is actually not up to date for kdelibs, and that
   accessor to
  
  master is dead. do not use it. use the KDE/4.7 branch for building other 
  KDE 
  software, or frameworks for development of kdleibs..
  
 Perhaps we should remove all of the files in the master branch?
 then commit a MASTER_IS_DEAD_USE_4.7 file?
 
you know, one can simply remove the master branch and point HEAD to
something else ... ;)