Update templates for fix samsung templates.

14 years ago · 744306d5e0
parent b09dcfd211
commit 744306d5e0
3 changed files with 120 additions and 1 deletions
--- a/sys-apps/calculate-templates/Manifest
+++ b/sys-apps/calculate-templates/Manifest
@ -1,8 +1,9 @@
 AUX calculate-templates-2.2.1-backport.patch 83894 RMD160 e4c0ae811e4dcfd9cff5333a31b3d6d9389c7c5a SHA1 3f3ee718285b13c8191bd25b33a8ba9a3e85b492 SHA256 57f18fed44f32013856d3e53db4e77772c40dd58fcf6293f3f3a7aa73f6b6302
+AUX calculate-templates-2.2.3-fix_samsung_templates.patch 7129 RMD160 5708c2079b8269eeb0629b4b1319865950d61963 SHA1 2a25544357be1cc2e3312035ea1449610afd502a SHA256 01fcf0edd39634d0c85510371452e058eb4f94aeb3b4942ef577f1990d198dd5
 DIST calculate-templates-2.2.1.tar.bz2 204279 RMD160 3678eac817a6a9d67ece576914c911971b4e2706 SHA1 28a0f718174314bdd2d9696e73cfefe8d3b7b2e3 SHA256 475d4914983f42b96bc3bcdafab8484becd1621ccbf7eae1722366fe6a86344c
 DIST calculate-templates-2.2.3.tar.bz2 204601 RMD160 4353347ae2fb0f08435b4b432fd211dbafd5c10e SHA1 e891163f165c1657225bbce47fbf05296c7eaedc SHA256 4f56e61dd42d1d642fe953d75eff782dc4e3c53e640a87addd6624f5ee567c63
 EBUILD calculate-templates-2.2.1-r8.ebuild 691 RMD160 ea4ac09d969ab47c40a868a3bcbfec9e18505b13 SHA1 23015aa9238ffdd254e9e64ad851b13e5329f500 SHA256 52fa83eb398917185e9e4865ecd45f71451b1d51c8c9f62564dd762218c1e182
-EBUILD calculate-templates-2.2.3.ebuild 561 RMD160 d0af742ee41ab2c56e0c5af6b8d240ac379bb317 SHA1 870e7364ede01e30ac935a080034e3c7af4de0fc SHA256 5b311c77218df881f7847755f1161d6087c98450c62f9df4f505e3d0156063b1
+EBUILD calculate-templates-2.2.3-r1.ebuild 704 RMD160 946753aee51049efb2bc5c88410244717db476ea SHA1 f5e1e57728ee27289f51745b4c8b2a1054bf3bf0 SHA256 40a0f2f59d5aab91ae83eb3d09eba4313b80ddec82d4dabcdabb24f2590ef589
 EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70
 MISC ChangeLog 11889 RMD160 a28a02ae00fd9f19f426c75205437f34ae13c03a SHA1 6da49bc5aee621e3a53820b5ebbbe8a3b87c1647 SHA256 61a46b4c60387f61cc02244cb50aeaf1448291933ee7fc27155a4653e41ce52d
 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d
--- a/sys-apps/calculate-templates/calculate-templates-2.2.3-r1.ebuild
+++ b/sys-apps/calculate-templates/calculate-templates-2.2.3-r1.ebuild
@ -18,6 +18,14 @@ DEPEND=""

 RDEPEND="${DEPEND}"

+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# backport templates
+	epatch "${FILESDIR}/calculate-templates-2.2.3-fix_samsung_templates.patch"
+}
+
 src_compile() {
 :
 }
--- a/sys-apps/calculate-templates/files/calculate-templates-2.2.3-fix_samsung_templates.patch
+++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.3-fix_samsung_templates.patch
@ -0,0 +1,110 @@
+diff --git a/install/2laptop/samsung/calculate-install/bin/backlight b/install/2laptop/samsung/calculate-install/bin/backlight
+index 740b596..1d9c619 100644
+--- a/install/2laptop/samsung/calculate-install/bin/backlight
+++ b/install/2laptop/samsung/calculate-install/bin/backlight
+@@ -1,4 +1,4 @@
+-# Calculate chmod=0755 comment=# load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+# Calculate chmod=0755 comment=# load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+ #!/bin/bash
+ # increase/decrease/set/get the backlight brightness (range 0-255)
+ #
+diff --git a/install/2laptop/samsung/calculate-install/init.d/laptopd b/install/2laptop/samsung/calculate-install/init.d/laptopd
+index b0bbc11..6d780f2 100644
+--- a/install/2laptop/samsung/calculate-install/init.d/laptopd
+++ b/install/2laptop/samsung/calculate-install/init.d/laptopd
+@@ -14,11 +14,11 @@ start() {
+ 	setkeycodes e003 236   # Fn+F2 maps to battery
+ 	setkeycodes e004 148   # Fn+F5 maps to prog1
+ 	setkeycodes e006 238   # Fn+F9 maps to wlan
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(/sys/bus/pci/devices/0000:00:02.0/device,root)!=0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)!=0xa011#
+ 	setkeycodes e008 225   # Fn+Up maps to brightnessup
+ 	setkeycodes e009 224   # Fn+Dn maps to brightnessdown
+ #load#
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+ 	setkeycodes e008 230   # Fn+Up maps to brightnessup
+ 	setkeycodes e009 229   # Fn+Dn maps to brightnessdown
+ 	/usr/bin/backlight set aa
+diff --git a/install/2laptop/samsung/gconf/%gconf-tree.xml b/install/2laptop/samsung/gconf/%gconf-tree.xml
+index ea92328..ba0b1dc 100644
+--- a/install/2laptop/samsung/gconf/%gconf-tree.xml
+++ b/install/2laptop/samsung/gconf/%gconf-tree.xml
+@@ -4,7 +4,7 @@
+ 	<dir name="desktop">
+ 		<dir name="gnome">
+ 			<dir name="keybindings">
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+ 				<dir name="custom_brn_up">
+ 					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_brn_up/action"/>
+ 					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_brn_up/name"/>
+@@ -33,7 +33,7 @@
+ 		<dir name="desktop">
+ 			<dir name="gnome">
+ 				<dir name="keybindings">
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+ 					<dir name="custom_brn_up">
+ 						<entry name="action" type="schema" stype="string" owner="calculate">
+ 							<local_schema locale="C" short_desc="Increase backlight">
+diff --git a/install/2laptop/samsung/khotkeys/brightdown.khotkeys b/install/2laptop/samsung/khotkeys/brightdown.khotkeys
+index fa100f5..94beb05 100644
+--- a/install/2laptop/samsung/khotkeys/brightdown.khotkeys
+++ b/install/2laptop/samsung/khotkeys/brightdown.khotkeys
+@@ -1,4 +1,4 @@
+-# Calculate load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+ [Data]
+ DataCount=1
+ 
+diff --git a/install/2laptop/samsung/khotkeys/brightup.khotkeys b/install/2laptop/samsung/khotkeys/brightup.khotkeys
+index 824e05e..35b49ab 100644
+--- a/install/2laptop/samsung/khotkeys/brightup.khotkeys
+++ b/install/2laptop/samsung/khotkeys/brightup.khotkeys
+@@ -1,4 +1,4 @@
+-# Calculate load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+ [Data]
+ DataCount=1
+ 
+diff --git a/install/2laptop/samsung/khotkeys/togglebacklight.khotkeys b/install/2laptop/samsung/khotkeys/togglebacklight.khotkeys
+index 55653a7..5442406 100644
+--- a/install/2laptop/samsung/khotkeys/togglebacklight.khotkeys
+++ b/install/2laptop/samsung/khotkeys/togglebacklight.khotkeys
+@@ -1,4 +1,4 @@
+-# Calculate load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011
+ [Data]
+ DataCount=1
+ 
+diff --git a/install/2laptop/samsung/libxfcegui4/xfce4-keyboard-shortcuts.xml b/install/2laptop/samsung/libxfcegui4/xfce4-keyboard-shortcuts.xml
+index 825ea23..98baf82 100644
+--- a/install/2laptop/samsung/libxfcegui4/xfce4-keyboard-shortcuts.xml
+++ b/install/2laptop/samsung/libxfcegui4/xfce4-keyboard-shortcuts.xml
+@@ -4,7 +4,7 @@
+ <channel name="xfce4-keyboard-shortcuts" version="1.0">
+   <property name="commands" type="empty">
+     <property name="default" type="empty">
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+       <property name="XF86KbdBrightnessUp" type="string" value="sudo /usr/bin/backlight up"/>
+       <property name="XF86KbdBrightnessDown" type="string" value="sudo /usr/bin/backlight down"/>
+       <property name="XF86Launch1" type="string" value="sudo /usr/bin/backlight toggle"/>
+diff --git a/install/2laptop/samsung/sudo/sudoers b/install/2laptop/samsung/sudo/sudoers
+index 78e10bd..615c2b6 100644
+--- a/install/2laptop/samsung/sudo/sudoers
+++ b/install/2laptop/samsung/sudo/sudoers
+@@ -2,10 +2,10 @@
+ <reg>(# BEGIN laptop configuration)
+ .*(# END laptop configuration)</reg>
+ <text>\1
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(/sys/bus/pci/devices/0000:00:02.0/device,root)!=0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)!=0xa011#
+ Cmnd_Alias NETBOOK_CMDS = /usr/bin/cpufreq_toggle_osd, /usr/bin/cpufreq_toggle
+ #load#
+-#?load(/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011#
+ Cmnd_Alias NETBOOK_CMDS = /usr/bin/backlight, /usr/bin/cpufreq_toggle_osd, /usr/bin/cpufreq_toggle
+ #load#
+ %users	ALL=(ALL) NOPASSWD: NETBOOK_CMDS