From 15a4ca57ef30414b4901b904053201f993aed6e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Jun 2017 14:36:00 +0200 Subject: add upstream patch for https://bugzilla.redhat.com/1461390 --- edit-download.svg.png | Bin 0 -> 236 bytes help-contents.svg.png | Bin 0 -> 226 bytes help-donate.svg.png | Bin 0 -> 207 bytes kdenlive-show-video.svg.png | Bin 0 -> 220 bytes qelectrotech-svgpng.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++ qelectrotech.spec | 17 ++++++++- 6 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 edit-download.svg.png create mode 100644 help-contents.svg.png create mode 100644 help-donate.svg.png create mode 100644 kdenlive-show-video.svg.png create mode 100644 qelectrotech-svgpng.patch diff --git a/edit-download.svg.png b/edit-download.svg.png new file mode 100644 index 0000000..98f4e83 Binary files /dev/null and b/edit-download.svg.png differ diff --git a/help-contents.svg.png b/help-contents.svg.png new file mode 100644 index 0000000..8183d91 Binary files /dev/null and b/help-contents.svg.png differ diff --git a/help-donate.svg.png b/help-donate.svg.png new file mode 100644 index 0000000..aad0dc9 Binary files /dev/null and b/help-donate.svg.png differ diff --git a/kdenlive-show-video.svg.png b/kdenlive-show-video.svg.png new file mode 100644 index 0000000..2f80f51 Binary files /dev/null and b/kdenlive-show-video.svg.png differ diff --git a/qelectrotech-svgpng.patch b/qelectrotech-svgpng.patch new file mode 100644 index 0000000..93429e5 --- /dev/null +++ b/qelectrotech-svgpng.patch @@ -0,0 +1,88 @@ +Modified: trunk/qelectrotech.qrc +=================================================================== +--- trunk/qelectrotech.qrc 2017-06-13 14:38:50 UTC (rev 4977) ++++ trunk/qelectrotech.qrc 2017-06-14 11:56:32 UTC (rev 4978) +@@ -249,10 +249,10 @@ + ico/24x16/br.png + ico/22x22/grid.png + ico/22x22/terminalstrip.png +- ico/16x16/help-contents.svg +- ico/16x16/help-donate.svg +- ico/16x16/edit-download.svg +- ico/16x16/kdenlive-show-video.svg ++ ico/16x16/help-contents.svg.png ++ ico/16x16/help-donate.svg.png ++ ico/16x16/edit-download.svg.png ++ ico/16x16/kdenlive-show-video.svg.png + ico/22x22/format-text-subscript.svg.png + ico/22x22/format-text-superscript.svg.png + + +Modified: trunk/sources/qeticons.cpp +=================================================================== +--- trunk/sources/qeticons.cpp 2017-06-13 14:38:50 UTC (rev 4977) ++++ trunk/sources/qeticons.cpp 2017-06-14 11:56:32 UTC (rev 4978) +@@ -293,22 +293,22 @@ + EditRename .addFile(":/ico/22x22/edit-rename.png"); + EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); + EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); +- EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); +- EditTableCellMerge .addFile(":ico/22x22/edit-table-cell-merge.png"); +- EditTableCellSplit .addFile(":ico/16x16/edit-table-cell-split.png"); +- EditTableCellSplit .addFile(":ico/22x22/edit-table-cell-split.png"); +- EditTableDeleteColumn .addFile(":ico/16x16/edit-table-delete-column.png"); +- EditTableDeleteColumn .addFile(":ico/22x22/edit-table-delete-column.png"); +- EditTableDeleteRow .addFile(":ico/16x16/edit-table-delete-row.png"); +- EditTableDeleteRow .addFile(":ico/22x22/edit-table-delete-row.png"); +- EditTableInsertColumnLeft .addFile(":ico/16x16/edit-table-insert-column-left.png"); +- EditTableInsertColumnLeft .addFile(":ico/22x22/edit-table-insert-column-left.png"); +- EditTableInsertColumnRight.addFile(":ico/16x16/edit-table-insert-column-right.png"); +- EditTableInsertColumnRight.addFile(":ico/22x22/edit-table-insert-column-right.png"); +- EditTableInsertRowAbove .addFile(":ico/16x16/edit-table-insert-row-above.png"); +- EditTableInsertRowAbove .addFile(":ico/22x22/edit-table-insert-row-above.png"); +- EditTableInsertRowUnder .addFile(":ico/16x16/edit-table-insert-row-under.png"); +- EditTableInsertRowUnder .addFile(":ico/22x22/edit-table-insert-row-under.png"); ++ EditTableCellMerge .addFile(":/ico/16x16/edit-table-cell-merge.png"); ++ EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png"); ++ EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png"); ++ EditTableCellSplit .addFile(":/ico/22x22/edit-table-cell-split.png"); ++ EditTableDeleteColumn .addFile(":/ico/16x16/edit-table-delete-column.png"); ++ EditTableDeleteColumn .addFile(":/ico/22x22/edit-table-delete-column.png"); ++ EditTableDeleteRow .addFile(":/ico/16x16/edit-table-delete-row.png"); ++ EditTableDeleteRow .addFile(":/ico/22x22/edit-table-delete-row.png"); ++ EditTableInsertColumnLeft .addFile(":/ico/16x16/edit-table-insert-column-left.png"); ++ EditTableInsertColumnLeft .addFile(":/ico/22x22/edit-table-insert-column-left.png"); ++ EditTableInsertColumnRight.addFile(":/ico/16x16/edit-table-insert-column-right.png"); ++ EditTableInsertColumnRight.addFile(":/ico/22x22/edit-table-insert-column-right.png"); ++ EditTableInsertRowAbove .addFile(":/ico/16x16/edit-table-insert-row-above.png"); ++ EditTableInsertRowAbove .addFile(":/ico/22x22/edit-table-insert-row-above.png"); ++ EditTableInsertRowUnder .addFile(":/ico/16x16/edit-table-insert-row-under.png"); ++ EditTableInsertRowUnder .addFile(":/ico/22x22/edit-table-insert-row-under.png"); + if (rtl) { + EditUndo.addPixmap(QPixmap(":/ico/16x16/edit-undo.png").transformed(reverse)); + EditUndo.addPixmap(QPixmap(":/ico/22x22/edit-undo.png").transformed(reverse)); +@@ -384,12 +384,12 @@ + ProjectFile .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-project.png"); + ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png"); + ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png"); +- QETDonate .addFile(":/ico/16x16/help-donate.svg"); +- QETDownload .addFile(":/ico/16x16/edit-download.svg"); ++ QETDonate .addFile(":/ico/16x16/help-donate.svg.png"); ++ QETDownload .addFile(":/ico/16x16/edit-download.svg.png"); + QETIcon .addFile(":/ico/256x256/qelectrotech.png"); + ProjectFileGP .addFile(":/ico/16x16/project-WH.png"); + QETLogo .addFile(":/ico/16x16/qet.png"); +- QETManual .addFile(":/ico/16x16/help-contents.svg"); ++ QETManual .addFile(":/ico/16x16/help-contents.svg.png"); + QETLogo .addFile(":/ico/256x256/qet.png"); + QETOxygenLogo .addFile(":/ico/oxygen-icons/128x128/apps/qelectrotech.png"); + QETOxygenLogo .addFile(":/ico/oxygen-icons/16x16/apps/qelectrotech.png"); +@@ -398,7 +398,7 @@ + QETOxygenLogo .addFile(":/ico/oxygen-icons/32x32/apps/qelectrotech.png"); + QETOxygenLogo .addFile(":/ico/oxygen-icons/48x48/apps/qelectrotech.png"); + QETOxygenLogo .addFile(":/ico/oxygen-icons/64x64/apps/qelectrotech.png"); +- QETVideo .addFile(":/ico/16x16/kdenlive-show-video.svg"); ++ QETVideo .addFile(":/ico/16x16/kdenlive-show-video.svg.png"); + QtLogo .addFile(":/ico/32x32/qt.png"); + Raise .addFile(":/ico/22x22/raise.png"); + Remove .addFile(":/ico/16x16/list-remove.png"); diff --git a/qelectrotech.spec b/qelectrotech.spec index 692405a..593ac23 100644 --- a/qelectrotech.spec +++ b/qelectrotech.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # #global svnrel 4947 -%global rdate 20170613 +%global rdate 20170614 %global upver 0.6rc2 Name: qelectrotech @@ -35,7 +35,7 @@ Version: 0.60~rc2 %if 0%{?svnrel} Release: 2.svn%{svnrel}%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif Group: Applications/Engineering @@ -52,6 +52,13 @@ Source1: mksrc.sh Source0: http://download.tuxfamily.org/qet/tags/%{rdate}/qelectrotech-%{upver}-src.tar.gz %endif +# Upstream revision 4978 +Patch0: %{name}-svgpng.patch +Source2: edit-download.svg.png +Source3: help-contents.svg.png +Source4: help-donate.svg.png +Source5: kdenlive-show-video.svg.png + BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel @@ -176,6 +183,9 @@ Colecção de elementos para QElectroTech. %setup -q -n %{name}-%{upver}-src %endif +%patch0 -p1 -b .r4978 +cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} ico/16x16/ + sed -e s,/usr/local/,%{_prefix}/, \ -e /QET_MAN_PATH/s,'man/','share/man', \ -e /QET_MIME/s,../,, \ @@ -262,6 +272,9 @@ fi %changelog +* Wed Jun 14 2017 Remi Collet - 0.60~rc2-3 +- add upstream patch for https://bugzilla.redhat.com/1461390 + * Tue Jun 13 2017 Remi Collet - 0.60~rc2-2 - drop dependency on electronics-menu (RHEL-7) -- cgit