From f99268f797c120a24030a573ef22813cd018beb5 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Sat, 22 Oct 2022 16:29:29 +0100
Subject: Added unrar

---
 skip/unrar/makefile.patch   | 30 ------------------------------
 skip/unrar/unrar.xibuild    | 27 ---------------------------
 skip/xf86-video-vga.xibuild |  2 +-
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 skip/unrar/makefile.patch
 delete mode 100644 skip/unrar/unrar.xibuild

(limited to 'skip')

diff --git a/skip/unrar/makefile.patch b/skip/unrar/makefile.patch
deleted file mode 100644
index 1b0c09f..0000000
--- a/skip/unrar/makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr unrar.orig/makefile unrar/makefile
---- unrar.orig/makefile	2018-03-11 17:33:12.697132381 +0100
-+++ unrar/makefile	2018-03-11 17:33:48.763911497 +0100
-@@ -2,13 +2,14 @@
- # Makefile for UNIX - unrar
- 
- # Linux using GCC
--CXX=c++
--CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
-+CXX?=c++
-+CXXFLAGS?=-O2
-+CXXFLAGS+=-Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
- STRIP=strip
- AR=ar
--LDFLAGS=-pthread
-+LDFLAGS+=-pthread
- DESTDIR=/usr
- 
- # Linux using LCC
-@@ -140,7 +141,7 @@ uninstall:	uninstall-unrar
- clean:
- 	@rm -f *.o *.bak *~
- 
--unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
-+unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
- 	$(STRIP) unrar
-
diff --git a/skip/unrar/unrar.xibuild b/skip/unrar/unrar.xibuild
deleted file mode 100644
index 2d2500a..0000000
--- a/skip/unrar/unrar.xibuild
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-NAME="unrar"
-DESC="RAR uncompression program"
-
-MAKEDEPS="make "
-DEPS="musl "
-
-PKG_VER=6.0.7
-SOURCE="https://www.rarlab.com/rar/unrarsrc-$PKG_VER.tar.gz"
-ADDITIONAL="makefile.patch"
-
-prepare () {
-    apply_patches
-    touch unrar
-}
-
-build () {
-    make CXX="${CXX:-g++}" STRIP=: -f makefile
-}
-
-package () {
-    make PREFIX=/usr DESTDIR=$PKG_DEST install
-
-    install -Dm644 license.txt \
-		"$PKG_DEST"/usr/share/licenses/unrar/license.txt
-}
diff --git a/skip/xf86-video-vga.xibuild b/skip/xf86-video-vga.xibuild
index f6cb712..aa5f374 100644
--- a/skip/xf86-video-vga.xibuild
+++ b/skip/xf86-video-vga.xibuild
@@ -9,7 +9,7 @@ PKG_VER=4.1.0
 SOURCE=https://www.x.org/pub/individual/driver/xf86-video-vga-$PKG_VER.tar.bz2
 
 build () {
-    ./configure $XORG_CONFIG
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
     make
 }
 
-- 
cgit v1.2.1