UPDATE: Slim-1.3.5
Hi,
Update for Slim to 1.3.5:
* Support UTF8 string.
* And fix some bugs.
Comments? Ok?
Cheers.-
--
Sending from my iFart...
Index: Makefile
===
RCS file: /cvs/ports/x11/slim/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile11 Mar 2013 11:46:15 - 1.22
+++ Makefile17 Apr 2013 15:10:14 -
@@ -2,7 +2,7 @@
COMMENT= simple login manager
-DISTNAME= slim-1.3.4
+DISTNAME= slim-1.3.5
CATEGORIES=x11
MAINTAINER = Landry Breuil lan...@openbsd.org
@@ -19,8 +19,8 @@ LIB_DEPENDS= graphics/jpeg \
x11/dbus \
graphics/png
-WANTLIB= X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype jpeg png
-WANTLIB += pthread dbus-1 ck-connector
+WANTLIB += X11 Xft Xmu Xrender c ck-connector dbus-1 fontconfig
+WANTLIB += freetype jpeg m png pthread stdc++ z
CONFIGURE_ARGS= -DUSE_CONSOLEKIT=yes
Index: distinfo
===
RCS file: /cvs/ports/x11/slim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo2 Sep 2012 09:22:59 - 1.4
+++ distinfo17 Apr 2013 15:10:14 -
@@ -1,2 +1,2 @@
-SHA256 (slim-1.3.4.tar.gz) = FVwmRgyYufCSViQCi0JUr8DeT9ozMA86xFYGssXL1QE=
-SIZE (slim-1.3.4.tar.gz) = 227197
+SHA256 (slim-1.3.5.tar.gz) = gY0gn1Hi+o1blO91zpCnQVvki0XnltZvgIOpUytlVik=
+SIZE (slim-1.3.5.tar.gz) = 226413
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/slim/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt2 Sep 2012 09:22:59 - 1.1
+++ patches/patch-CMakeLists_txt17 Apr 2013 15:10:14 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2012/09/02 09:22:59 landry Exp $
CMakeLists.txt.origTue Jun 26 10:20:14 2012
-+++ CMakeLists.txt Sat Sep 1 20:39:34 2012
+--- CMakeLists.txt.origMon Dec 31 10:03:42 2012
CMakeLists.txt Wed Apr 17 11:38:56 2013
@@ -24,7 +24,7 @@ set(SLIM_VERSION ${SLIM_VERSION_MAJOR}.${SLIM_VERSION
set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH Installation Directory)
set(PKGDATADIR ${CMAKE_INSTALL_PREFIX}/share/slim)
@@ -28,11 +28,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
${X11_X11_LIB}
${X11_Xft_LIB}
${X11_Xrender_LIB}
-@@ -169,6 +165,6 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bi
+@@ -169,8 +165,8 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bi
# man file
install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
# configure
-install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+install(FILES slim.conf DESTINATION
${CMAKE_INSTALL_PREFIX}/share/examples/slim/)
+ # systemd service file
+-install(FILES slim.service DESTINATION usr/lib/systemd/system)
++#install(FILES slim.service DESTINATION usr/lib/systemd/system)
# themes directory
subdirs(themes)
Index: patches/patch-Ck_cpp
===
RCS file: /cvs/ports/x11/slim/patches/patch-Ck_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Ck_cpp
--- patches/patch-Ck_cpp2 Sep 2012 09:22:59 - 1.1
+++ patches/patch-Ck_cpp17 Apr 2013 15:10:14 -
@@ -1,20 +1,20 @@
$OpenBSD: patch-Ck_cpp,v 1.1 2012/09/02 09:22:59 landry Exp $
Keep track of the successful consolekit session opening
Ck.cpp.origTue Jun 26 10:20:14 2012
-+++ Ck.cpp Sat Sep 1 23:06:17 2012
+--- Ck.cpp.origMon Dec 31 10:03:42 2012
Ck.cpp Mon Apr 15 12:52:25 2013
@@ -101,6 +101,7 @@ namespace Ck {
void Session::open_session(const std::string display, uid_t uid)
{
-+session = false;
- ckc = ck_connector_new();
++ session = false;
+ ckc = ck_connector_new();
- if(!ckc)
+ if(!ckc)
@@ -113,6 +114,7 @@ namespace Ck {
- throw Exception(__func__, cannot open ConsoleKit session: OOM, DBus
system bus
- not available or insufficient privileges);
- }
-+session = true;
+ throw Exception(__func__, cannot open ConsoleKit session: OOM,
DBus system bus
+not available or insufficient
privileges);
+ }
++ session = true;
}
const char * Session::get_xdg_session_cookie()
Index: patches/patch-Ck_h
===
RCS file: /cvs/ports/x11/slim/patches/patch-Ck_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Ck_h
--- patches/patch-Ck_h 2 Sep 2012 09:22:59 - 1.1
+++ patches/patch-Ck_h 17 Apr 2013 15:10:14 -
@@ -1,19 +1,18 @@
$OpenBSD: patch-Ck_h,v 1.1 2012/09/02 09:22:59 landry Exp $
Add a boolean to track the consolekit session success
Ck.h.orig Tue Jun 26 10:20:14 2012
-+++ Ck.h Sat Sep 1 23:06:38 2012
-@@
Re: UPDATE: Slim-1.3.5
New diffs.-
update-patches eats some lines, pointed out by landry@
On Wed, Apr 17, 2013 at 12:13:39PM -0300, Gonzalo L. R. wrote:
; Hi,
;
; Update for Slim to 1.3.5:
;
; * Support UTF8 string.
; * And fix some bugs.
;
; Comments? Ok?
;
; Cheers.-
;
; --
; Sending from my iFart...
; Index: Makefile
; ===
; RCS file: /cvs/ports/x11/slim/Makefile,v
; retrieving revision 1.22
; diff -u -p -r1.22 Makefile
; --- Makefile 11 Mar 2013 11:46:15 - 1.22
; +++ Makefile 17 Apr 2013 15:10:14 -
; @@ -2,7 +2,7 @@
;
; COMMENT= simple login manager
;
; -DISTNAME=slim-1.3.4
; +DISTNAME=slim-1.3.5
;
; CATEGORIES= x11
; MAINTAINER = Landry Breuil lan...@openbsd.org
; @@ -19,8 +19,8 @@ LIB_DEPENDS=graphics/jpeg \
; x11/dbus \
; graphics/png
;
; -WANTLIB= X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype jpeg png
; -WANTLIB += pthread dbus-1 ck-connector
; +WANTLIB += X11 Xft Xmu Xrender c ck-connector dbus-1 fontconfig
; +WANTLIB += freetype jpeg m png pthread stdc++ z
;
; CONFIGURE_ARGS= -DUSE_CONSOLEKIT=yes
;
; Index: distinfo
; ===
; RCS file: /cvs/ports/x11/slim/distinfo,v
; retrieving revision 1.4
; diff -u -p -r1.4 distinfo
; --- distinfo 2 Sep 2012 09:22:59 - 1.4
; +++ distinfo 17 Apr 2013 15:10:14 -
; @@ -1,2 +1,2 @@
; -SHA256 (slim-1.3.4.tar.gz) = FVwmRgyYufCSViQCi0JUr8DeT9ozMA86xFYGssXL1QE=
; -SIZE (slim-1.3.4.tar.gz) = 227197
; +SHA256 (slim-1.3.5.tar.gz) = gY0gn1Hi+o1blO91zpCnQVvki0XnltZvgIOpUytlVik=
; +SIZE (slim-1.3.5.tar.gz) = 226413
; Index: patches/patch-CMakeLists_txt
; ===
; RCS file: /cvs/ports/x11/slim/patches/patch-CMakeLists_txt,v
; retrieving revision 1.1
; diff -u -p -r1.1 patch-CMakeLists_txt
; --- patches/patch-CMakeLists_txt 2 Sep 2012 09:22:59 - 1.1
; +++ patches/patch-CMakeLists_txt 17 Apr 2013 15:10:14 -
; @@ -1,6 +1,6 @@
; $OpenBSD: patch-CMakeLists_txt,v 1.1 2012/09/02 09:22:59 landry Exp $
; CMakeLists.txt.orig Tue Jun 26 10:20:14 2012
; -+++ CMakeLists.txt Sat Sep 1 20:39:34 2012
; +--- CMakeLists.txt.orig Mon Dec 31 10:03:42 2012
; CMakeLists.txt Wed Apr 17 11:38:56 2013
; @@ -24,7 +24,7 @@ set(SLIM_VERSION ${SLIM_VERSION_MAJOR}.${SLIM_VERSION
; set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH Installation Directory)
; set(PKGDATADIR ${CMAKE_INSTALL_PREFIX}/share/slim)
; @@ -28,11 +28,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
; ${X11_X11_LIB}
; ${X11_Xft_LIB}
; ${X11_Xrender_LIB}
; -@@ -169,6 +165,6 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bi
; +@@ -169,8 +165,8 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bi
; # man file
; install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
; # configure
; -install(FILES slim.conf DESTINATION ${SYSCONFDIR})
; +install(FILES slim.conf DESTINATION
${CMAKE_INSTALL_PREFIX}/share/examples/slim/)
; + # systemd service file
; +-install(FILES slim.service DESTINATION usr/lib/systemd/system)
; ++#install(FILES slim.service DESTINATION usr/lib/systemd/system)
; # themes directory
; subdirs(themes)
; Index: patches/patch-Ck_cpp
; ===
; RCS file: /cvs/ports/x11/slim/patches/patch-Ck_cpp,v
; retrieving revision 1.1
; diff -u -p -r1.1 patch-Ck_cpp
; --- patches/patch-Ck_cpp 2 Sep 2012 09:22:59 - 1.1
; +++ patches/patch-Ck_cpp 17 Apr 2013 15:10:14 -
; @@ -1,20 +1,20 @@
; $OpenBSD: patch-Ck_cpp,v 1.1 2012/09/02 09:22:59 landry Exp $
; Keep track of the successful consolekit session opening
; Ck.cpp.orig Tue Jun 26 10:20:14 2012
; -+++ Ck.cpp Sat Sep 1 23:06:17 2012
; +--- Ck.cpp.orig Mon Dec 31 10:03:42 2012
; Ck.cpp Mon Apr 15 12:52:25 2013
; @@ -101,6 +101,7 @@ namespace Ck {
;
; void Session::open_session(const std::string display, uid_t uid)
; {
; -+session = false;
; - ckc = ck_connector_new();
; ++session = false;
; + ckc = ck_connector_new();
;
; - if(!ckc)
; + if(!ckc)
; @@ -113,6 +114,7 @@ namespace Ck {
; - throw Exception(__func__, cannot open ConsoleKit session: OOM,
DBus system bus
; - not available or insufficient privileges);
; - }
; -+session = true;
; + throw Exception(__func__, cannot open ConsoleKit session: OOM,
DBus system bus
; + not available or insufficient
privileges);
; + }
; ++session = true;
; }
;
; const char * Session::get_xdg_session_cookie()
; Index: patches/patch-Ck_h
; ===
; RCS file: /cvs/ports/x11/slim/patches/patch-Ck_h,v
; retrieving revision 1.1
; diff -u -p -r1.1 patch-Ck_h
; ---
