rpms/konq-plugins/devel konq-plugins-4.0.1-docsdir.patch, NONE, 1.1 konq-plugins-4.0.1-icons.patch, NONE, 1.1 konq-plugins-4.0.2-cmakelists.patch, NONE, 1.1 konq-plugins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Sebastian Vahl (svahl)]

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5800/devel

Modified Files:
	.cvsignore sources 
Added Files:
	konq-plugins-4.0.1-docsdir.patch 
	konq-plugins-4.0.1-icons.patch 
	konq-plugins-4.0.2-cmakelists.patch konq-plugins.spec 
Log Message:

initial import


konq-plugins-4.0.1-docsdir.patch:

--- NEW FILE konq-plugins-4.0.1-docsdir.patch ---
diff -Naur konq-plugins-4.0.1/doc/CMakeLists.txt konq-plugins-4.0.1.new/doc/CMakeLists.txt
--- konq-plugins-4.0.1/doc/CMakeLists.txt	2008-02-13 23:14:34.000000000 +0100
+++ konq-plugins-4.0.1.new/doc/CMakeLists.txt	2008-02-14 00:35:22.000000000 +0100
@@ -11,4 +11,4 @@
 add_subdirectory(webarchiver)
 ########### install files ###############
 
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR konq-plugins)

konq-plugins-4.0.1-icons.patch:

--- NEW FILE konq-plugins-4.0.1-icons.patch ---
diff -ur konq-plugins-4.0.2/akregator/konqfeedicon.cpp konq-plugins-4.0.2-icons/akregator/konqfeedicon.cpp
--- konq-plugins-4.0.2/akregator/konqfeedicon.cpp	2008-02-14 00:26:40.000000000 +0100
+++ konq-plugins-4.0.2-icons/akregator/konqfeedicon.cpp	2008-02-14 01:44:29.000000000 +0100
@@ -124,7 +124,7 @@
     if(m_feedList.count() == 1)
     {
         m_menu->addTitle(m_feedList.first().title());
-        m_menu->addAction(SmallIcon("bookmark-new"), i18n("Add Feed to Akregator"), this, SLOT(addFeeds()) );
+        m_menu->addAction(KIcon("bookmark-new"), i18n("Add Feed to Akregator"), this, SLOT(addFeeds()) );
     }
     else
     {
@@ -133,12 +133,12 @@
         int id = 0;
         for(FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it)
         {
-            m_menu->insertItem(SmallIcon("bookmark-new"), (*it).title(), id);
+            m_menu->insertItem(KIcon("bookmark-new"), (*it).title(), id);
             id++;
         }
         //disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int)));
         m_menu->addSeparator();
-        m_menu->insertItem(SmallIcon("bookmark-new"), i18n("Add All Found Feeds to Akregator"), this, SLOT(addFeeds()), 0, 50000 );
+        m_menu->insertItem(KIcon("bookmark-new"), i18n("Add All Found Feeds to Akregator"), this, SLOT(addFeeds()), 0, 50000 );
     }
     m_menu->popup(QCursor::pos());
 }
diff -ur konq-plugins-4.0.2/microformat/konqmficon.cpp konq-plugins-4.0.2-icons/microformat/konqmficon.cpp
--- konq-plugins-4.0.2/microformat/konqmficon.cpp	2008-02-14 00:26:42.000000000 +0100
+++ konq-plugins-4.0.2-icons/microformat/konqmficon.cpp	2008-02-14 01:44:50.000000000 +0100
@@ -268,15 +268,15 @@
 	connect(m_menu, SIGNAL(activated(int)), this, SLOT(addMF(int)));
 	int id = 0;
 	for (QList<QPair<QString, QString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) {
-		m_menu->insertItem(SmallIcon("bookmark-new"), (*it).first, id);
+		m_menu->insertItem(KIcon("bookmark-new"), (*it).first, id);
 		id++;
 	}
 	for (QList<QPair<QString, QString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) {
-		m_menu->insertItem(SmallIcon("bookmark-new"), (*it).first, id);
+		m_menu->insertItem(KIcon("bookmark-new"), (*it).first, id);
 		id++;
 	}
 	m_menu->addSeparator();
-	m_menu->insertItem(SmallIcon("bookmark-new"), i18n("Import All Microformats"), this, SLOT(addMFs()), 0, 50000 );
+	m_menu->insertItem(KIcon("bookmark-new"), i18n("Import All Microformats"), this, SLOT(addMFs()), 0, 50000 );
 	m_menu->popup(QCursor::pos());
 }
 
diff -ur konq-plugins-4.0.2/searchbar/searchbar.cpp konq-plugins-4.0.2-icons/searchbar/searchbar.cpp
--- konq-plugins-4.0.2/searchbar/searchbar.cpp	2008-02-14 00:26:43.000000000 +0100
+++ konq-plugins-4.0.2-icons/searchbar/searchbar.cpp	2008-02-14 09:46:19.000000000 +0100
@@ -43,6 +43,7 @@
 #include <q3popupmenu.h>
 #include <qtimer.h>
 #include <qstyle.h>
+#include <QIcon>
 
 //Added by qt3to4:
 #include <QPixmap>
@@ -320,13 +321,13 @@
 	if(!m_popupMenu)
 	{
 		KService::Ptr service;
-		QPixmap icon;
+		QIcon icon;
 		KUriFilterData data;
 		QStringList list;
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
 		m_popupMenu = new Q3PopupMenu(m_searchCombo, "search selection menu");
-		m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()),  0, 999);
+		m_popupMenu->insertItem(KIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()),  0, 999);
 		m_popupMenu->addSeparator();
 
 		int i=-1;
@@ -346,18 +347,18 @@
 				QString iconPath = KStandardDirs::locate("cache", KMimeType::favIconForUrl(data.uri()) + ".png");
 				if(iconPath.isEmpty())
 				{
-					icon = SmallIcon("unknown");
+					icon = KIcon("unknown");
 				}
 				else
 				{
-					icon = QPixmap( iconPath );
+					icon = QIcon( iconPath );
 				}
 			m_popupMenu->insertItem(icon, service->name(), i);
 			}
 		}
 
 		m_popupMenu->addSeparator();
-		m_popupMenu->insertItem(SmallIcon("enhanced_browsing"), i18n("Select Search Engines..."),
+		m_popupMenu->insertItem(KIcon("enhanced_browsing"), i18n("Select Search Engines..."),
 			this, SLOT(selectSearchEngines()), 0, 1000);
 		connect(m_popupMenu, SIGNAL(activated(int)), SLOT(useSearchProvider(int)));
 	}

konq-plugins-4.0.2-cmakelists.patch:

--- NEW FILE konq-plugins-4.0.2-cmakelists.patch ---
diff -Naur konq-plugins-4.0.2/CMakeLists.txt konq-plugins-4.0.2.new/CMakeLists.txt
--- konq-plugins-4.0.2/CMakeLists.txt	2008-03-03 22:56:28.000000000 +0100
+++ konq-plugins-4.0.2.new/CMakeLists.txt	2008-03-03 23:12:18.000000000 +0100
@@ -1,3 +1,9 @@
+project(konq-plugins)
+
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+include_directories (${KDE4_INCLUDES})
+
 add_subdirectory( crashes ) 
 add_subdirectory( khtmlsettingsplugin ) 
 #add_subdirectory( kimgalleryplugin ) 


--- NEW FILE konq-plugins.spec ---
# TODO:
# should akgregator plugin require kdepim or be splitted into subpkg?

%define    svn_date 20080303

Name:           konq-plugins
Version:        4.0.2 
Release:        0.2.%{svn_date}svn%{?dist}
Summary:        Additional plugins that interact with konqueror

# FIXME: find proper Group
Group:          Applications/Internet
# FIXME: Check license (some are also LGPLv2.1+ and LGPLv2+)
License:        GPLv2+
URL:            http://extragear.kde.org

# Creation of tarball from svn
#
# Kevin Kofler enhanced the create_tarball.rb script from upstream to also 
# support %{name}. This script also download the translations and docs
# To use it you will need the script itself and a config.ini in the same directory
#
# http://repo.calcforge.org/f9/kde4-tarballs/create_tarball.rb
# http://repo.calcforge.org/f9/kde4-tarballs/config.ini
#
# To create a new checkout use it with anonymous svn access
# ./create_tarball.rb -n
# At the prompt you have to enter "%{name}" (without brackets)


Source0:        %{name}-%{version}.tar.bz2
# Fix CMakeLists.txt to be able to build without extragear parentdir
Patch0:         konq-plugins-4.0.2-cmakelists.patch
# Install the documentation into the right subdir
Patch1:         konq-plugins-4.0.1-docsdir.patch
# Fix several wrong referenced icons (Thanks to KevinKofler)
Patch2:         konq-plugins-4.0.1-icons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kde-filesystem >= 4
BuildRequires:  kdelibs4-devel >= 4
BuildRequires:  kdebase-devel >= 4
BuildRequires:  cmake
BuildRequires:  gettext
BuildRequires:  giflib-devel
BuildRequires:  pcre-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires:       kdelibs >= 4
Requires:       oxygen-icon-theme
Requires(post): xdg-utils
Requires(postun): xdg-utils

# FIXME/TODO: re-check if all plugins are mentioned
%description
Some additional plugins that interact with konqueror

* akregator: Add feeds directly to akregator
* autorefresh: Refresh websites after a specifig period
* babelfish: Translate a website with babelfish
* dirfilter: Filter the current directory in many ways
* domtreeviewer: Displays the document object model in a box
* fsview: Graphical Disk Usage for inode/directory
* khtmlsettingsplugin: Enable/disable some HTML settings
* htmlvalidator: Validate webpages with w3c HTML validator
* minitools: Implement bookmarklets into konqueror
* uachanger: Change the user agent for websites

To use the akregator plugin the package kdepim is needed.

%prep
%setup -q

%patch0 -p1 -b .cmakelists
%patch1 -p1 -b .docsdir

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

# locale
for locale in akregator_konqplugin autorefresh babelfish crashesplugin \
  dirfilterplugin domtreeviewer fsview imgalleryplugin khtmlsettingsplugin \
  konqsidebar_mediaplayer konqsidebar_metabar konqsidebar_news mf_konqplugin \
  minitoolsplugin rellinks searchbarplugin uachangerplugin validatorsplugin \
  webarchiver
do
  echo "find locale for $locale"
  %find_lang $locale
  cat $locale.lang >> %{name}.lang
done

%clean
rm -rf %{buildroot}

%post
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :

%postun
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :

%files -f %{name}.lang 
%defattr(-,root,root,-)
%doc COPYING COPYING.DOC COPYING.LIB README
%{_kde4_docdir}/HTML/en/konq-plugins/
# FIXME/TODO: Check directory ownerships
%{_kde4_bindir}/fsview
%{_datadir}/config/translaterc
%{_kde4_appsdir}/akregator/
%{_kde4_appsdir}/domtreeviewer/
%{_kde4_appsdir}/fsview/
%{_kde4_appsdir}/imagerotation/
%{_kde4_appsdir}/khtml/kpartplugins/*
%{_kde4_appsdir}/konqueror/kpartplugins/*
%{_kde4_appsdir}/konqlistview/kpartplugins/*
%{_kde4_appsdir}/konqiconview/kpartplugins/*
%{_kde4_appsdir}/microformat/
%{_kde4_datadir}/kde4/services/*
%{_kde4_iconsdir}/hicolor/*/apps/fsview.png
%{_kde4_iconsdir}/oxygen/*/actions/*
%{_kde4_libdir}/kde4/*
# FIXME: Is this the right place?
%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*

%changelog
* Tue Apr 01 2008 Sebastian Vahl <fedora at deadbabylon.de> - 4.0.2-0.2.20080303svn
- rebuild for NDEBUG and _kde4_libexecdir
- enhance %%description a bit

* Wed Feb 13 2008 Sebastian Vahl <fedora at deadbabylon.de> - 4.0.2-0.1.20080303svn
- new svn checkout (for KDE 4.0.2)
- update cmakelists patch
- remove icons patch (not needed anymore)
- add "svn" to release

* Wed Feb 13 2008 Sebastian Vahl <fedora at deadbabylon.de> - 4.0.1-0.2.20080214svn
- added konq-plugins-4.0.1-icons.patch
- add .po files to tarball

* Wed Feb 13 2008 Sebastian Vahl <fedora at deadbabylon.de> - 4.0.1-0.1.20080213svn
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2008 16:04:28 -0000	1.1
+++ .cvsignore	9 Apr 2008 20:09:46 -0000	1.2
@@ -0,0 +1 @@
+konq-plugins-4.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2008 16:04:28 -0000	1.1
+++ sources	9 Apr 2008 20:09:46 -0000	1.2
@@ -0,0 +1 @@
+81de486f931c1617afc5a63f71e6aacf  konq-plugins-4.0.2.tar.bz2