[arch-commits] Commit in slim/trunk (4 files)

Tobias Powalowski tpowa at archlinux.org
Fri Jul 13 10:13:24 UTC 2012


    Date: Friday, July 13, 2012 @ 06:13:23
  Author: tpowa
Revision: 163487

upgpkg: slim 1.3.4-1

bump to latest version

Added:
  slim/trunk/libpng-1.4+-support.patch
Modified:
  slim/trunk/PKGBUILD
Deleted:
  slim/trunk/fix-numlock-1.3.3.patch
  slim/trunk/ptr_pam.patch

---------------------------+
 PKGBUILD                  |   17 +++++---------
 fix-numlock-1.3.3.patch   |   46 --------------------------------------
 libpng-1.4+-support.patch |   14 +++++++++++
 ptr_pam.patch             |   52 --------------------------------------------
 4 files changed, 21 insertions(+), 108 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-13 05:33:54 UTC (rev 163486)
+++ PKGBUILD	2012-07-13 10:13:23 UTC (rev 163487)
@@ -5,8 +5,8 @@
 # Contributor: Hugo Ideler <hugoideler at dse.nl>
 
 pkgname=slim
-pkgver=1.3.3
-pkgrel=5
+pkgver=1.3.4
+pkgrel=1
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -19,17 +19,15 @@
         'pam.d'
         'logrotate'
         'slim.service'
-        'ptr_pam.patch'
         'session-name.patch'
-        'fix-numlock-1.3.3.patch')
+        'libpng-1.4+-support.patch')
 
 install=install
 
 build() {
         cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling
+        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
         cd ${srcdir}
         mkdir build
         cd build
@@ -55,11 +53,10 @@
         # install systemd files
         install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
 }
-md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
+md5sums=('51543533e492b41007811f7d880720fa'
          'd8ea9c4dee2811524b67f4f666311a1f'
          'd33edc74724c6ca00445767ce38fc732'
          '43da096480bf72c3ccec8ad8400f34f0'
-         '7c0bf1fb6292537e2c63ec04f8532079'
-         'ae4b237d472ec5d373e30080aa0ff804'
+         'a5d6bde9e63899df7d2081e1585bbe54'
          'ebcb6829028615686de7b64ceeaaf8ed'
-         '6c29c93370e44ed310ff30132424b619')
+         '6d19bd7a91592ed2bb902b22b9594565')

Deleted: fix-numlock-1.3.3.patch
===================================================================
--- fix-numlock-1.3.3.patch	2012-07-13 05:33:54 UTC (rev 163486)
+++ fix-numlock-1.3.3.patch	2012-07-13 10:13:23 UTC (rev 163487)
@@ -1,46 +0,0 @@
---- trunk/app.cpp	2012/02/21 23:57:28	211
-+++ trunk/app.cpp	2012/04/16 23:28:34	212
-@@ -332,6 +332,15 @@
-             Login();
-         }
-     }
-+
-+    // Set NumLock
-+    string numlock = cfg->getOption("numlock");
-+    if (numlock == "on") {
-+        NumLock::setOn(Dpy);
-+    } else if (numlock == "off") {
-+        NumLock::setOff(Dpy);
-+    }
-+    
-     // Start looping
-     int panelclosed = 1;
-     Panel::ActionType Action;
-@@ -971,13 +980,6 @@
-         break;
-     }
- 
--    string numlock = cfg->getOption("numlock");
--    if (numlock == "on") {
--        NumLock::setOn(Dpy);
--    } else if (numlock == "off") {
--        NumLock::setOff(Dpy);
--    }
--    
-     delete args;
- 
-     serverStarted = true;
---- trunk/numlock.cpp	2012/02/21 23:57:28	211
-+++ trunk/numlock.cpp	2012/04/16 23:28:34	212
-@@ -68,9 +68,9 @@
-         return;
- 
-     if( flag == true )
--        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
--    else
-         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
-+    else
-+        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
- }
- 
- void NumLock::setOn(Display *dpy) {

Added: libpng-1.4+-support.patch
===================================================================
--- libpng-1.4+-support.patch	                        (rev 0)
+++ libpng-1.4+-support.patch	2012-07-13 10:13:23 UTC (rev 163487)
@@ -0,0 +1,14 @@
+--- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+                                 (png_infopp) NULL);
+     }
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++    if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+     if (setjmp(png_ptr->jmpbuf)) {
++#endif
+         goto png_destroy;
+     }
+ 

Deleted: ptr_pam.patch
===================================================================
--- ptr_pam.patch	2012-07-13 05:33:54 UTC (rev 163486)
+++ ptr_pam.patch	2012-07-13 10:13:23 UTC (rev 163487)
@@ -1,52 +0,0 @@
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
-+++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
-@@ -43,8 +43,8 @@
-     Panel* panel = *static_cast<Panel**>(appdata_ptr);
-     int result = PAM_SUCCESS;
-     for (int i=0; i<num_msg; i++){
--        resp[i]->resp=0;
--        resp[i]->resp_retcode=0;
-+        (*resp)[i].resp=0;
-+        (*resp)[i].resp_retcode=0;
-         switch(msg[i]->msg_style){
-             case PAM_PROMPT_ECHO_ON:
-                 // We assume PAM is asking for the username
-@@ -53,13 +53,13 @@
-                     case Panel::Suspend:
-                     case Panel::Halt:
-                     case Panel::Reboot:
--                        resp[i]->resp=strdup("root");
-+                        (*resp)[i].resp=strdup("root");
-                         break;
- 
-                     case Panel::Console:
-                     case Panel::Exit:
-                     case Panel::Login:
--                        resp[i]->resp=strdup(panel->GetName().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetName().c_str());
-                         break;
-                 }
-                 break;
-@@ -75,7 +75,7 @@
- 
-                     default:
-                         panel->EventHandler(Panel::Get_Passwd);
--                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                         break;
-                 }
-                 break;
-@@ -91,9 +91,9 @@
-     }
-     if (result!=PAM_SUCCESS){
-         for (int i=0; i<num_msg; i++){
--            if (resp[i]->resp==0) continue;
--            free(resp[i]->resp);
--            resp[i]->resp=0;
-+            if ((*resp)[i].resp==0) continue;
-+            free((*resp)[i].resp);
-+            (*resp)[i].resp=0;
-         };
-         free(*resp);
-         *resp=0;




More information about the arch-commits mailing list