[Pkg-voip-commits] [linphone] 01/04: add a patch regenerating png images from their svg sources

Tue Apr 25 11:35:57 UTC 2017

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository linphone.

commit f4234141c5675730276fae37bb95a97bcd36c8f0
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Tue Apr 25 10:58:32 2017 +0200

    add a patch regenerating png images from their svg sources
---
 debian/changelog                    |   1 +
 debian/control                      |   3 +-
 debian/patches/regenerate-png-icons | 124 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |   1 +
 4 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3d934a1..d5bd9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ linphone (3.11.1-1) UNRELEASED; urgency=low
     package
   * remove debian/linphone.menu as package already provides .desktop file
   * add a patch adding the Keywords entry to the linphone.desktop file
+  * add a patch regenerating png images from their svg sources
 
  -- Felix Lechner <felix.lechner at gmail.com>  Fri, 03 Jul 2015 17:24:11 -0700
 
diff --git a/debian/control b/debian/control
index 2e90bf4..bfe5b63 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,8 @@ Build-Depends: debhelper (>= 9),
  libbctoolbox-dev,
  libortp-dev (>= 1:0.24.0),
  libmediastreamer-dev (>= 1:2.11.0),
- libmbedtls-dev
+ libmbedtls-dev,
+ librsvg2-bin
 #
 # Requires updated libsrtp-dev
 # libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
diff --git a/debian/patches/regenerate-png-icons b/debian/patches/regenerate-png-icons
new file mode 100644
index 0000000..7ed676a
--- /dev/null
+++ b/debian/patches/regenerate-png-icons
@@ -0,0 +1,124 @@
+Regenerate png icons from svg sources. The source for linphone-take-screenshot.png is missing.
+
+--- a/pixmaps/CMakeLists.txt
++++ b/pixmaps/CMakeLists.txt
+@@ -20,6 +20,63 @@
+ #
+ ############################################################################
+ 
++set(status_icons
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-micro-muted.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-speaker-muted.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-micro-enabled.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-speaker-enabled.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-status-online.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-status-away.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-status-donotdisturb.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-status-offline.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-chat-nothing.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-chat-new-message.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-chat-writing.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-chat-new-message-and-writing.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-call-status-incoming.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-call-status-outgoing.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-call-status-missed.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-ok.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-inprogress.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-failed.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-camera-enabled.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-camera-disabled.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-security-ok.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-security-pending.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-media-play.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-media-pause.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-warning.png
++	)
++
++set(action_icons
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-start-call2.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-add-call.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-start-call.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-start-chat.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-stop-call.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-hold-on.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-hold-off.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-history.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-edit.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-delete.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-contact-add.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-conference-start.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-call-transfer.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-record.png
++	${CMAKE_CURRENT_BINARY_DIR}/linphone-chat-send.png
++	)
++
++foreach(png ${status_icons} ${action_icons})
++	set_source_files_properties(${png}, PROPERTIES GENERATED TRUE)
++	get_filename_component(svg "${png}" NAME_WE)
++	set(svg "${CMAKE_CURRENT_SOURCE_DIR}/svg/${svg}.svg")
++	add_custom_command(OUTPUT ${png}
++			   COMMAND rsvg-convert --width 48 --height 48 --output ${png} --format png ${svg}
++			   DEPENDS ${svg})
++endforeach()
++add_custom_target(status_icons ALL DEPENDS ${status_icons})
++add_custom_target(action_icons ALL DEPENDS ${action_icons})
++
+ set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/icons/hicolor)
+ 
+ install(FILES "linphone.icns" "linphone-banner.png"
+@@ -76,53 +133,12 @@ install(FILES
+ 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
+ 
+-install(FILES
+-	linphone-micro-muted.png
+-	linphone-speaker-muted.png
+-	linphone-micro-enabled.png
+-	linphone-speaker-enabled.png
+-	linphone-status-online.png
+-	linphone-status-away.png
+-	linphone-status-donotdisturb.png
+-	linphone-status-offline.png
+-	linphone-chat-nothing.png
+-	linphone-chat-new-message.png
+-	linphone-chat-writing.png
+-	linphone-chat-new-message-and-writing.png
+-	linphone-call-status-incoming.png
+-	linphone-call-status-outgoing.png
+-	linphone-call-status-missed.png
+-	linphone-ok.png
+-	linphone-inprogress.png
+-	linphone-failed.png
+-	linphone-camera-enabled.png
+-	linphone-camera-disabled.png
+-	linphone-security-ok.png
+-	linphone-security-pending.png
+-	linphone-media-play.png
+-	linphone-media-pause.png
+-	linphone-warning.png
++install(FILES ${status_icons}
+ 	DESTINATION ${ICONS_INSTALL_DIR}/48x48/status
+ 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
+ 
+-install(FILES
+-	linphone-start-call2.png
+-	linphone-add-call.png
+-	linphone-start-call.png
+-	linphone-start-chat.png
+-	linphone-stop-call.png
+-	linphone-hold-on.png
+-	linphone-hold-off.png
+-	linphone-history.png
+-	linphone-edit.png
+-	linphone-delete.png
+-	linphone-contact-add.png
+-	linphone-conference-start.png
+-	linphone-call-transfer.png
+-	linphone-record.png
+-	linphone-chat-send.png
+-	linphone-take-screenshot.png
++install(FILES ${action_icons}
+ 	DESTINATION ${ICONS_INSTALL_DIR}/48x48/actions
+ 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
diff --git a/debian/patches/series b/debian/patches/series
index fa1573d..d222461 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-spelling-errors.patch
 install-pkgconfig
 desktop-file-keywords
+regenerate-png-icons

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git

