rpms/piklab/F-12 piklab-0.15.8.DSO-linking.patch, NONE, 1.1 piklab-0.15.8.rename-likeback-icons.patch, NONE, 1.1 piklab.spec, 1.29, 1.30
Alain Portal
dionysos at fedoraproject.org
Sat May 22 21:04:23 UTC 2010
- Previous message: rpms/piklab/F-11 piklab-0.15.8.DSO-linking.patch, NONE, 1.1 piklab-0.15.8.rename-likeback-icons.patch, NONE, 1.1 piklab.spec, 1.28, 1.29
- Next message: rpms/piklab/F-13 piklab-0.15.8.rename-likeback-icons.patch, NONE, 1.1 piklab.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dionysos
Update of /cvs/pkgs/rpms/piklab/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26807
Modified Files:
piklab.spec
Added Files:
piklab-0.15.8.DSO-linking.patch
piklab-0.15.8.rename-likeback-icons.patch
Log Message:
* Sat May 22 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-3
- Change name of likeback icons to fix BZ #594932
* Thu May 20 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-2
- Fix makefile http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
piklab-0.15.8.DSO-linking.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE piklab-0.15.8.DSO-linking.patch ---
--- src/piklab/CMakeLists.txt.orig 2010-05-01 15:52:52.000000000 +0200
+++ src/piklab/CMakeLists.txt 2010-05-20 19:54:32.000000000 +0200
@@ -6,7 +6,7 @@
automoc(${piklab_SRCS})
add_executable(piklab ${piklab_SRCS})
-target_link_libraries(piklab ${QT_AND_KDECORE_LIBS} ktexteditor khtml ${LIBUSB_LIBRARIES}
+target_link_libraries(piklab ${QT_AND_KDECORE_LIBS} ktexteditor khtml kparts kio kdeui ${LIBUSB_LIBRARIES}
gui toollist
cc5xui boostui mpcui ccscui c18ui jalv2ui
jalui pic30ui piccui sdccui gputilsui
piklab-0.15.8.rename-likeback-icons.patch:
likeback.cpp | 24 ++++++++++++------------
toplevel.cpp | 6 +++---
2 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE piklab-0.15.8.rename-likeback-icons.patch ---
Seulement dans piklab-0.15.8/: po.orig
diff -ru piklab-0.15.8/src/libgui/likeback.cpp piklab-0.15.8-likeback-icons/src/libgui/likeback.cpp
--- piklab-0.15.8/src/libgui/likeback.cpp 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.8-likeback-icons/src/libgui/likeback.cpp 2010-05-22 21:37:45.000000000 +0200
@@ -58,9 +58,9 @@
{
QHBoxLayout *layout = new QHBoxLayout(this);
- QIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", KIcon::Small);
- QIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", KIcon::Small);
- QIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", KIcon::Small);
+ QIconSet likeIconSet = kapp->iconLoader()->loadIconSet("piklab_likeback_like", KIcon::Small);
+ QIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("piklab_likeback_dislike", KIcon::Small);
+ QIconSet bugIconSet = kapp->iconLoader()->loadIconSet("piklab_likeback_bug", KIcon::Small);
// QIconSet configureIconSet = kapp->iconLoader()->loadIconSet("configure", KIcon::Small);
QToolButton *m_likeButton = new QToolButton(this, "ilike");
@@ -165,12 +165,12 @@
void LikeBack::showInformationMessage()
{
- QPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like", KIcon::Small);
- QPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::Small);
- QPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug", KIcon::Small);
- QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon);
- QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
- QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon);
+ QPixmap likeIcon = kapp->iconLoader()->loadIcon("piklab_likeback_like", KIcon::Small);
+ QPixmap dislikeIcon = kapp->iconLoader()->loadIcon("piklab_likeback_dislike", KIcon::Small);
+ QPixmap bugIcon = kapp->iconLoader()->loadIcon("piklab_likeback_bug", KIcon::Small);
+ QMimeSourceFactory::defaultFactory()->setPixmap("piklab_likeback_icon_like", likeIcon);
+ QMimeSourceFactory::defaultFactory()->setPixmap("piklab_likeback_icon_dislike", dislikeIcon);
+ QMimeSourceFactory::defaultFactory()->setPixmap("piklab_likeback_icon_bug", bugIcon);
KMessageBox::information(0,
"<p><b>" + i18n("This is a quick feedback system for %1.").arg(s_about->programName()) + "</b></p>"
"<p>" + i18n("To help us improve it, your comments are important.") + "</p>"
@@ -527,21 +527,21 @@
case LikeBack::ILike:
color = QColor("#DFFFDF");
lineColor = Qt::green;
- icon = kapp->iconLoader()->loadIcon("likeback_like", KIcon::Small);
+ icon = kapp->iconLoader()->loadIcon("piklab_likeback_like", KIcon::Small);
title = i18n("I like...");
please = i18n("Please briefly describe what you like.");
break;
case LikeBack::IDoNotLike:
color = QColor("#FFDFDF");
lineColor = Qt::red;
- icon = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::Small);
+ icon = kapp->iconLoader()->loadIcon("piklab_likeback_dislike", KIcon::Small);
title = i18n("I do not like...");
please = i18n("Please briefly describe what you do not like.");
break;
case LikeBack::IFoundABug:
color = QColor("#C0C0C0");
lineColor = Qt::black;
- icon = kapp->iconLoader()->loadIcon("bug", KIcon::Small);
+ icon = kapp->iconLoader()->loadIcon("piklab_likeback_bug", KIcon::Small);
title = i18n("I found a bug...");
please = i18n("Please briefly describe the bug you encountered.");
break;
Seulement dans piklab-0.15.8-likeback-icons/src/libgui: likeback.cpp~
diff -ru piklab-0.15.8/src/libgui/toplevel.cpp piklab-0.15.8-likeback-icons/src/libgui/toplevel.cpp
--- piklab-0.15.8/src/libgui/toplevel.cpp 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.8-likeback-icons/src/libgui/toplevel.cpp 2010-05-22 21:29:08.000000000 +0200
@@ -320,15 +320,15 @@
// LikeBack buttons
menuBar()->insertItem(new QLabel(menuBar())); // #### first widget is put left-most...
- MenuBarButton *button = new MenuBarButton("likeback_like", menuBar());
+ MenuBarButton *button = new MenuBarButton("piklab_likeback_like", menuBar());
QToolTip::add(button, i18n("I like..."));
connect(button, SIGNAL(clicked()), LikeBack::instance(), SLOT(iLike()));
menuBar()->insertItem(button);
- button = new MenuBarButton("likeback_dislike", menuBar());
+ button = new MenuBarButton("piklab_likeback_dislike", menuBar());
QToolTip::add(button, i18n("I do not like..."));
connect(button, SIGNAL(clicked()), LikeBack::instance(), SLOT(iDoNotLike()));
menuBar()->insertItem(button);
- button = new MenuBarButton("likeback_bug", menuBar());
+ button = new MenuBarButton("piklab_likeback_bug", menuBar());
QToolTip::add(button, i18n("I found a bug..."));
connect(button, SIGNAL(clicked()), LikeBack::instance(), SLOT(iFoundABug()));
menuBar()->insertItem(button);
Seulement dans piklab-0.15.8-likeback-icons/src/libgui: toplevel.cpp~
Index: piklab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/F-12/piklab.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- piklab.spec 19 May 2010 19:21:26 -0000 1.29
+++ piklab.spec 22 May 2010 21:04:23 -0000 1.30
@@ -2,7 +2,7 @@
Name: piklab
Version: 0.15.8
-Release: 1.rev2721%{?dist}
+Release: 3.rev2721%{?dist}
Summary: Development environment for applications based on PIC & dsPIC microcontrollers
Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
@@ -22,6 +22,8 @@ Patch0: %{name}-0.15.3.desktop-fr.pa
Patch1: %{name}-0.12.1.x-desktop-fr.patch
Patch10: %{name}-%{version}.new-pic.patch
Patch11: %{name}-%{version}.use-fedora-docdir.patch
+Patch12: %{name}-%{version}.DSO-linking.patch
+Patch13: %{name}-%{version}.rename-likeback-icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +61,8 @@ comment finir l'installation.
%patch1 -p0 -b .x-desktop-fr
%patch10 -p1 -b .new-pic
%patch11 -p0 -b .use-fedora-docdir
+%patch12 -p0 -b .linking-kparts
+%patch13 -p1 -b .rename-likeback-icons
%{__install} -pm 644 %{SOURCE5} README.Fedora
%{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -74,6 +78,10 @@ comment finir l'installation.
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
+%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_bug.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_bug.png
+%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_dislike.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_dislike.png
+%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_like.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_like.png
+
desktop-file-install --vendor=fedora \
--dir %{buildroot}%{_datadir}/applications \
--remove-category "Development" \
@@ -138,6 +146,12 @@ gtk-update-icon-cache %{_datadir}/icons/
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
%changelog
+* Sat May 22 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-3
+ - Change name of likeback icons to fix BZ #594932
+
+* Thu May 20 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-2
+ - Fix makefile http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
+
* Tue May 4 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-1
- New upstream version
- Remove patch10 that are no more needed
- Previous message: rpms/piklab/F-11 piklab-0.15.8.DSO-linking.patch, NONE, 1.1 piklab-0.15.8.rename-likeback-icons.patch, NONE, 1.1 piklab.spec, 1.28, 1.29
- Next message: rpms/piklab/F-13 piklab-0.15.8.rename-likeback-icons.patch, NONE, 1.1 piklab.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list