Anonymous avatar Anonymous committed 9c78933

Add some patches for LXPanel from Mandrivas's SVN. Problem with logout dialog solved.

Comments (0)

Files changed (5)

lxde-base/lxpanel/Manifest

 AUX lxpanel-docbook-fix.patch 469 RMD160 a3a903bdc9716b49f24060caaa8d3abee3f789bf SHA1 44eb9f86c73fa087ac55370076f8903df3e932d6 SHA256 95580d99702b84e3f1c1eecec46b76182fefdbc8252b94c50a5581fb86967241
+AUX lxpanel-iconext.patch 934 RMD160 ffce1aaada7ba2ef2b9795f64d2e3e24d2d84426 SHA1 068f120e464e13c6a9a0593ad4a974cefc31321b SHA256 1bc1c1035b19e43d7ccd47ed30ebb2b6a04de40e461c67ec2908d89786a8c49c
 AUX lxpanel-icons.patch 7550 RMD160 ca37a2ce9c8b65e7fc7fe805034afe5e4e469f1f SHA1 9449f5c561ca67374f67ee791db1860b5d7c0f8c SHA256 8f0c55f51b212b95ae4a2998a5f748e2f566fc84c69786a170b6042164432171
+AUX lxpanel-logout.patch 961 RMD160 6930075cbdcb693c9922f62d4bf92e7c735ba194 SHA1 344d38655745e04ce927e7367b5cf7345dc92728 SHA256 bac732cb02b6bf291d9ed91b72cd436625118daf3f0a33809c91fd05176a3c1a
+AUX lxpanel-menu.patch 719 RMD160 c9ebc811fdf78a83983f45762313112dbf5a603b SHA1 fc98ded17274cc410e306ed034033ce149c643a6 SHA256 c5ccde58cf69d80ef3af6b54e34a2d7921cd966f1e710c12617eb2613af353c6
 DIST lxpanel-0.3.8.1.tar.gz 711879 RMD160 f4368966baeb32b05efa4cd6aa54214dd0b003cb SHA1 bbe15008f84dd7d9dcabd1a3b9e66ae69d82156f SHA256 b3d3a06b946dba977007a84035da6667bbaa3617e1aecb83483d6a207c319021
 EBUILD lxpanel-0.3.8.1.ebuild 554 RMD160 710043919a04c98c4343e83177498ea56c7dfe0b SHA1 7a86c95f1cabe10ce989f41a60bf2b6569253992 SHA256 8696cec4a2f304e7973ab81d2c92e94baa0f7ca170c4b7e6948daccdb0f751d9
-EBUILD lxpanel-9999.ebuild 1112 RMD160 434ed8daac32f5bdfae6d8aaf5b31398892bc9bf SHA1 17c4dc7ce713a6ae5ba6d3fbf40059d754e3b879 SHA256 ceaeea02acc0baf8589da711f80c336946f7c432ab25de62996470e3f0d55df3
-MISC .lxpanel-9999.ebuild.swp 12288 RMD160 66b7bfd57b1d5a5b350d31f201e248add5bb6383 SHA1 2a7efff48b9d6ffcaea4de27b7e93453180c1d86 SHA256 264c7711e00c05eecdeac437c470cc8cddc7b2016ae8cc22c5bfe779b17e191c
+EBUILD lxpanel-9999.ebuild 1234 RMD160 c49aa12e319d32ac2dfa006f779d2b57e83a7791 SHA1 36227a23724d527dfc5d0ed67a8b5287c1493923 SHA256 2bd67929d69f6c6871e595b838ea99379eee6746bb3a5d61bfbdbd8b46deddab

lxde-base/lxpanel/files/lxpanel-iconext.patch

+diff -p -up lxpanel-0.3.8.1/src/plugins/ptk-app-menu.c.iconext lxpanel-0.3.8.1/src/plugins/ptk-app-menu.c
+--- lxpanel-0.3.8.1/src/plugins/ptk-app-menu.c.iconext	2008-10-16 12:37:19.000000000 +0200
++++ lxpanel-0.3.8.1/src/plugins/ptk-app-menu.c	2008-10-16 12:49:08.000000000 +0200
+@@ -460,12 +460,6 @@ static void do_load_dir( int prefix_len,
+                                           "size-request",
+                       G_CALLBACK(on_menu_item_size_request), data );
+                         icon = g_strdup( g_key_file_get_string( file, desktop_ent, "Icon", NULL) );
+-                        if( icon )
+-                        {
+-                            char* dot = strchr( icon, '.' );
+-                            if( icon[0] !='/' && dot )
+-                                *dot = '\0';
+-                        }
+                         data->icon = icon;
+                         if( !prev )
+                         {

lxde-base/lxpanel/files/lxpanel-logout.patch

+diff -p -up lxpanel-0.3.8.1/src/configurator.c.logout lxpanel-0.3.8.1/src/configurator.c
+--- lxpanel-0.3.8.1/src/configurator.c.logout	2008-06-11 05:51:19.000000000 +0200
++++ lxpanel-0.3.8.1/src/configurator.c	2008-10-16 11:03:07.000000000 +0200
+@@ -1037,14 +1037,14 @@ void restart(void)
+ 
+ void logout(void)
+ {
+-    const char* logout_cmd = logout_cmd;
++    const char* l_logout_cmd = logout_cmd;
+     /* If LXSession is running, _LXSESSION_PID will be set */
+-    if( ! logout_cmd && getenv("_LXSESSION_PID") )
+-        logout_cmd = "lxsession-logout";
++    if( ! l_logout_cmd && getenv("_LXSESSION_PID") )
++        l_logout_cmd = "lxsession-logout";
+ 
+-    if( logout_cmd ) {
++    if( l_logout_cmd ) {
+         GError* err = NULL;
+-        if( ! g_spawn_command_line_async( logout_cmd, &err ) ) {
++        if( ! g_spawn_command_line_async( l_logout_cmd, &err ) ) {
+             show_error( NULL, err->message );
+             g_error_free( err );
+         }

lxde-base/lxpanel/files/lxpanel-menu.patch

+--- src/plugins/ptk-app-menu.c.ori	2008-05-12 01:59:45.000000000 +0200
++++ src/plugins/ptk-app-menu.c	2008-05-28 21:45:30.000000000 +0200
+@@ -101,6 +101,9 @@
+    "P2P",
+    "RemoteAccess",
+    "Telephony",
++   "VideoConference",
++   "WebBrowser",
++   "X-MandrivaLinux-Internet",
+    NULL
+ };
+ 
+@@ -179,8 +182,10 @@
+             const char** sub_cats = known_cats[i].sub_cats;
+             while( *sub_cats )
+             {
+-                if( 0 == strncmp(*cat, "X-", 2) ) /*  Desktop specific*/
++#if 0
++ 		if( 0 == strncmp(*cat, "X-", 2) ) /*  Desktop specific*/
+                     return -1;
++#endif
+                 if( 0 == strcmp( *sub_cats, *cat ) )
+                     return i;
+                 ++sub_cats;

lxde-base/lxpanel/lxpanel-9999.ebuild

 	subversion_src_unpack
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-docbook-fix.patch
+	epatch "${FILESDIR}"/${PN}-menu.patch
+	epatch "${FILESDIR}"/${PN}-logout.patch
 	epatch "${FILESDIR}"/${PN}-icons.patch
+	epatch "${FILESDIR}"/${PN}-iconext.patch
 	./autogen.sh
 }
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.