From 219b83376a409860249a1c35ebb0a03da919dd38 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 24 Jan 2011 00:07:29 +0300 Subject: [PATCH] Add patch for use Leafpad in CLDX. --- sys-apps/calculate-templates/ChangeLog | 7 + sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.8-r1.ebuild | 37 ++++++ ...-templates-2.2.3-use_leafpad_in_CLDX.patch | 120 ++++++++++++++++++ 4 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index b3e4c5ffa..e339b1cd7 100644 --- a/sys-apps/calculate-templates/ChangeLog +++ b/sys-apps/calculate-templates/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-templates-2.2.8-r1 (23 Jan 2011) + + 23 Jan 2011; Alexander Tratsevskiy + +files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch, + +calculate-templates-2.2.8-r1.ebuild: + Add patch for use Leafpad in CLDX + *calculate-templates-2.2.8 (20 Jan 2011) 20 Jan 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 3f4bfa4f1..b73003eac 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -1,5 +1,6 @@ AUX calculate-templates-2.2.3-fix_flash_install.patch 319 RMD160 c365b5a1b038f7f8ce2ba3e0056ffe0071731c2e SHA1 75ed08181e61050ecd79a51a63a5041161d98adb SHA256 0816aaedca262faa724bc034299a89e3009d2cf2ec72bded03b1104f7168910a AUX calculate-templates-2.2.3-fix_samsung_templates.patch 7129 RMD160 5708c2079b8269eeb0629b4b1319865950d61963 SHA1 2a25544357be1cc2e3312035ea1449610afd502a SHA256 01fcf0edd39634d0c85510371452e058eb4f94aeb3b4942ef577f1990d198dd5 +AUX calculate-templates-2.2.3-use_leafpad_in_CLDX.patch 4284 RMD160 a13d94464103dfebdcfb8dd9294021acfd39e679 SHA1 8fc5e06749e6407dcdd4f811b49213941efc3ec9 SHA256 d041a39758725533763624f695f6e4a9b1d7073ee1111249885c475d9c1067a5 AUX calculate-templates-2.2.4-back_port.patch 595008 RMD160 fd94c29940fd079b29bb954485b8802e96010d4d SHA1 9f5bda50d15890367ab82c5ee5731a0510f7964a SHA256 97a4b66e0d7f3caf38fe922f78962f62b5441f1398555e959f682de543d12938 AUX calculate-templates-2.2.5-assemble-python2.6.patch 445 RMD160 05f2f026180b1e2a01a6118495f7857456a639c6 SHA1 7fc10d3138d318129c5c3b37330a3ea28cafd19d SHA256 102bdf244390e51c473d8acf57a6655812161dc7661f405b53dd9ceb3f15a392 DIST calculate-templates-2.2.3.tar.bz2 204601 RMD160 4353347ae2fb0f08435b4b432fd211dbafd5c10e SHA1 e891163f165c1657225bbce47fbf05296c7eaedc SHA256 4f56e61dd42d1d642fe953d75eff782dc4e3c53e640a87addd6624f5ee567c63 @@ -20,7 +21,8 @@ EBUILD calculate-templates-2.2.5-r2.ebuild 696 RMD160 76f6e413019fa14c59370eec5b EBUILD calculate-templates-2.2.5-r3.ebuild 696 RMD160 76f6e413019fa14c59370eec5b3ee75d1c6797e9 SHA1 73fdd77eec5684c299c7782a221b447a2800f5f6 SHA256 fafc4ff41e5abd757d18e5b6e3f0b824c02e7c22bd339c8fb82376879e033e27 EBUILD calculate-templates-2.2.6.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d EBUILD calculate-templates-2.2.7.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d +EBUILD calculate-templates-2.2.8-r1.ebuild 702 RMD160 0c91f8d0ced915267d1f51bffe70c19181d743a4 SHA1 e19a807105c023ac9e43c6f071909d3b6b5a9fbb SHA256 fd5d6a3a73b56cc38eac926af822d747640af71975bd86f91d47d83b2278425c EBUILD calculate-templates-2.2.8.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70 -MISC ChangeLog 13858 RMD160 5936996ad3d0fb0f79d37dfa6fc6ac86dde68b9e SHA1 91f0183add0d0c1268075cbaebcbcabb71c6b4bd SHA256 289df74990a91e06d226325801b004699e75a4fe3fdc6164337fce397a36387e +MISC ChangeLog 14097 RMD160 ce241cda5dd77b93c68ffb8f6bf3a0ec32fd45a3 SHA1 549f976ef12986775b216d8bd548fdd5808adff1 SHA256 e84e15ef635cd54bf94d1a2e5cdbceb072a373d07052b5705937b52a03bc3cff MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild new file mode 100644 index 000000000..637709b96 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit distutils eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="Templates for calculate utilities 2.2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + #Use Leafpad in CLDX + epatch "${FILESDIR}/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch" +} + +src_compile() { +: +} + +src_install() { + dodir /usr/share/calculate/templates + insinto /usr/share/calculate/templates + doins -r * +} diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch new file mode 100644 index 000000000..7ee146c52 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch @@ -0,0 +1,120 @@ +diff --git a/desktop/00-desktop-init/empty_dir/0ini.env b/desktop/00-desktop-init/empty_dir/0ini.env +index affd6d2..0330d55 100644 +--- a/desktop/00-desktop-init/empty_dir/0ini.env ++++ b/desktop/00-desktop-init/empty_dir/0ini.env +@@ -4,7 +4,7 @@ + update = on + + [ver] +-patch = 2.2.6 ++patch = 2.2.8 + + [update] + patch = on +diff --git a/desktop/desktop/00-patch-2.2.7/kcminputrc b/desktop/desktop/00-patch-2.2.7/kcminputrc +deleted file mode 100644 +index 76b306a..0000000 +--- a/desktop/desktop/00-patch-2.2.7/kcminputrc ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= +-[$Version] +-#для отмены сброса настройки cursorTheme +-update_info=mouse_cursor_theme.upd:kde3.4.99 +- +-[Mouse] +-#тема курсоров мыши +-cursorTheme=neutral +diff --git a/desktop/desktop/00-patch-2.2.8/.calculate_directory b/desktop/desktop/00-patch-2.2.8/.calculate_directory +new file mode 100644 +index 0000000..ef8044f +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.8 +diff --git a/desktop/desktop/00-patch-2.2.8/10000000043.desktop b/desktop/desktop/00-patch-2.2.8/10000000043.desktop +new file mode 100644 +index 0000000..b08d698 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/10000000043.desktop +@@ -0,0 +1,3 @@ ++# Calculate format=kde link=/usr/share/applications/leafpad.desktop path=~/.config/xfce4/panel/launcher-43 ++[Desktop Entry] ++X-XFCE-Source=file:///usr/share/applications/leafpad.desktop +diff --git a/desktop/desktop/00-patch-2.2.8/ini.env b/desktop/desktop/00-patch-2.2.8/ini.env +new file mode 100644 +index 0000000..35b0f29 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++patch = 2.2.8 ++ ++[update] ++patch = on +diff --git a/desktop/desktop/00-patch-2.2.8/kcminputrc b/desktop/desktop/00-patch-2.2.8/kcminputrc +new file mode 100644 +index 0000000..c710477 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/kcminputrc +@@ -0,0 +1,8 @@ ++# Calculate format=kde ini(ver.kde)!= path=~/.kde/share/config ++[$Version] ++#для отмены сброса настройки cursorTheme ++update_info=mouse_cursor_theme.upd:kde3.4.99 ++ ++[Mouse] ++#тема курсоров мыши ++cursorTheme=neutral +diff --git a/desktop/desktop/00-patch-2.2.8/kcminputrc-bad b/desktop/desktop/00-patch-2.2.8/kcminputrc-bad +new file mode 100644 +index 0000000..b9e0ea2 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/kcminputrc-bad +@@ -0,0 +1,2 @@ ++# Calculate ini(ver.kde)!= append=remove name=kcminputrc ++ +diff --git a/desktop/desktop/00-patch-2.2.8/leafpadrc b/desktop/desktop/00-patch-2.2.8/leafpadrc +new file mode 100644 +index 0000000..8d0a375 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/leafpadrc +@@ -0,0 +1,8 @@ ++# Calculate path=~/.config/leafpad ++0.8.17 ++600 ++400 ++Droid Sans Mono 10 ++1 ++0 ++0 +diff --git a/desktop/desktop/00-patch-2.2.8/xfce4-panel.xml b/desktop/desktop/00-patch-2.2.8/xfce4-panel.xml +new file mode 100644 +index 0000000..08a87c7 +--- /dev/null ++++ b/desktop/desktop/00-patch-2.2.8/xfce4-panel.xml +@@ -0,0 +1,12 @@ ++# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/10000000043.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/10000000043.desktop +index 903d2f1..deaad8d 100644 +--- a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/10000000043.desktop ++++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/10000000043.desktop +@@ -1,3 +1,3 @@ +-# Calculate format=kde link=/usr/share/applications/mousepad.desktop ++# Calculate format=kde link=/usr/share/applications/leafpad.desktop + [Desktop Entry] +-X-XFCE-Source=file:///usr/share/applications/mousepad.desktop ++X-XFCE-Source=file:///usr/share/applications/leafpad.desktop