components: added compton and conky manager

elements/components/compiz.yml

@@ -27,6 +27,9 @@ depends:
   - components/py/py-gobject.yml
   - components/x11/xserver.yml
   - components/x11/xprop.yml
+  - components/gtkmm.yml
+  - components/startup-notification.yml
+  - components/glu.yml
 
 build-depends:
   - components/boost.yml
@@ -37,3 +40,7 @@ build-depends:
 
 sources:
   - https://launchpad.net/compiz/%{version:3}/%{version}/+download/compiz-%{version}.tar.xz
+
+integration: |-
+  SESSION_FILE="%{sysconfdir}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
+  [ -f "${SESSION_FILE}" ] && sed -i 's#xfwm4#compiz#g' ${SESSION_FILE}

elements/components/conky.yml

@@ -1,5 +1,5 @@
 id: conky
-version: 1.12.2
+version: 1.19.6
 about: Lightweight system monitor for X
 
 configure: >
@@ -10,16 +10,13 @@ configure: >
   -D BUILD_IMLIB2=ON
   -D BUILD_CURL=ON
   -D BUILD_RSS=ON
+  -D BUILD_WAYLAND=ON
   -D BUILD_WEATHER_METAR=ON
   -D BUILD_PULSEAUDIO=ON
   -D BUILD_JOURNAL=ON
   -D CMAKE_BUILD_TYPE=Release
   -Wno-dev
 
-post-script: |
-  install -Dm 644 extras/vim/syntax/conkyrc.vim -t %{install-root}/%{datadir}/vim/vimfiles/syntax
-  install -Dm 644 extras/vim/ftdetect/conkyrc.vim -t %{install-root}/%{datadir}/vim/vimfiles/ftdetect
-
 depends:
   - components/curl.yml
   - components/glib.yml
@@ -34,6 +31,7 @@ depends:
   - components/ncurses.yml
   - components/desktop-file-utils.yml
 build-depends:
+  - components/wayland-protocols.yml
   - components/cmake.yml
   - components/git.yml
 sources:

elements/components/lua.yml

@@ -1,15 +1,18 @@
 id: lua
-version: 5.3.6
+version: 5.4.6
 about: A powerful light-weight programming language designed for extending applications
 sources:
   - https://www.lua.org/ftp/lua-%{version}.tar.gz
   - patches/lua/liblua.so.patch
+  - patches/lua/paths.patch
 
 depends:
   - components/glibc.yml
 
 script: |
   patch -Np1 -i liblua.so.patch
+  patch -Np1 -i paths.patch
+  
   sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' \
     src/luaconf.h
   make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux

elements/components/p7zip.yml

@@ -1,11 +1,11 @@
 id: p7zip
-version: 17.04
+version: 17.05
 about: commandline file archive with high compression ratio
 
 depends:
   - components/glibc.yml
 sources:
-  - https://github.com/jinfeihan57/p7zip/archive/v%{version}/p7zip-v%{version}.tar.gz
+  - https://github.com/p7zip-project/p7zip/archive/v%{version}/p7zip-v%{version}.tar.gz
 
 script: |-
   make 7z 7zr 7za

elements/system/deps.yml

@@ -222,6 +222,9 @@ depends:
 
   - components/initial-setup.yml
 
+  - components/compiz.yml
+  - components/conky-manager.yml
+
   # X11 drivers
   - components/x11/xf86-input-libinput.yml
   - components/x11/xf86-input-wacom.yml

patches/lua/liblua.so.patch

@@ -1,41 +1,41 @@
 diff --git a/Makefile b/Makefile
-index 7fa91c8..dccf485 100644
+index 416f444..eeaff03 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -52,7 +52,7 @@ R= $V.0
  all:	$(PLAT)
-
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
-
- test:	dummy
- 	src/lua -v
+ 
+ $(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
++	@cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
 diff --git a/src/Makefile b/src/Makefile
-index 2e7a412..fa5769f 100644
+index 514593d..372a6dc 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -29,6 +29,7 @@ MYOBJS=
- PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
-
+@@ -33,6 +33,7 @@ CMCFLAGS= -Os
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+ 
  LUA_A=	liblua.a
 +LUA_SO= liblua.so
- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- 	ltm.o lundump.o lvm.o lzio.o
-@@ -43,7 +44,7 @@ LUAC_T=	luac
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+@@ -44,7 +45,7 @@ LUAC_T=	luac
  LUAC_O=	luac.o
-
+ 
  ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
 +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
  ALL_A= $(LUA_A)
-
+ 
  # Targets start here.
-@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O)
+@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
  	$(AR) $@ $(BASE_O)
  	$(RANLIB) $@
-
+ 
 +$(LUA_SO): $(CORE_O) $(LIB_O)
 +	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
 +	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
@@ -44,17 +44,4 @@ index 2e7a412..fa5769f 100644
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
  	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
-diff --git a/src/luaconf.h b/src/luaconf.h
-index fd28d21..e2662cc 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -175,7 +175,7 @@
-
- #else			/* }{ */
-
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
- #define LUA_PATH_DEFAULT  \
+

patches/lua/paths.patch

@@ -0,0 +1,33 @@
+diff --git a/src/luaconf.h b/src/luaconf.h
+--- a/src/luaconf.h	2023-05-03 06:02:30.000000000 +1000
++++ b/src/luaconf.h	2023-12-13 12:24:30.287727037 +1100
+@@ -224,19 +224,28 @@
+ #else			/* }{ */
+
+ #define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT2	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
++#define LUA_LDIR2	LUA_ROOT2 "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
++#define LUA_CDIR2	LUA_ROOT2 "lib/lua/" LUA_VDIR "/"
+
+ #if !defined(LUA_PATH_DEFAULT)
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
++		LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
++		LUA_CDIR2"?.lua;"  LUA_CDIR2"?/init.lua;" \
+ 		"./?.lua;" "./?/init.lua"
+ #endif
+
+ #if !defined(LUA_CPATH_DEFAULT)
+ #define LUA_CPATH_DEFAULT \
+-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
++		LUA_CDIR"?.so;" \
++		LUA_CDIR2"?.so;" \
++		LUA_CDIR"loadall.so;" \
++		LUA_CDIR2"loadall.so;" \
++		"./?.so"
+ #endif
+
+ #endif			/* } */