diff options
Diffstat (limited to 'misc')
92 files changed, 856 insertions, 2023 deletions
diff --git a/misc/chntpw/chntpw.SlackBuild b/misc/chntpw/chntpw.SlackBuild index 796ac11cde..1c7d8a9a9a 100644 --- a/misc/chntpw/chntpw.SlackBuild +++ b/misc/chntpw/chntpw.SlackBuild @@ -25,13 +25,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chntpw -VERSION=${VERSION:-110511} +VERSION=${VERSION:-140201} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -66,27 +66,23 @@ unzip $CWD/$PRGNAM-source-$VERSION.zip cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Disable forcing 32 bit -zcat $CWD/defaultarch.patch.gz | patch -p0 --verbose || exit 1 +for i in $CWD/patches/* ; do patch -p1 < $i ; done -make \ - OSSLPATH=/usr \ - OSSLLIB=/usr/lib${LIBDIRSUFFIX} +make EXTRA_CFLAGS="$SLKCFLAGS" # No automatic install available, manual installation (easy) mkdir -p $PKG/usr/bin -for i in chntpw chntpw.static cpnt reged reged.static +for i in chntpw cpnt reged do - echo cp $i $PKG/usr/bin/. - cp $i $PKG/usr/bin/. + install -m 0755 $i $PKG/usr/bin/$i done -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/misc/chntpw/chntpw.info b/misc/chntpw/chntpw.info index 31b27a1715..22f3756df2 100644 --- a/misc/chntpw/chntpw.info +++ b/misc/chntpw/chntpw.info @@ -1,8 +1,8 @@ PRGNAM="chntpw" -VERSION="110511" +VERSION="140201" HOMEPAGE="http://pogostick.net/~pnh/ntpasswd/" -DOWNLOAD="http://pogostick.net/~pnh/ntpasswd/chntpw-source-110511.zip" -MD5SUM="a3fb358d1adec589cd6bc8dedf68896c" +DOWNLOAD="http://pogostick.net/~pnh/ntpasswd/chntpw-source-140201.zip" +MD5SUM="d60bc657206b07ad84d926649d6417dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/chntpw/defaultarch.patch.gz b/misc/chntpw/defaultarch.patch.gz Binary files differdeleted file mode 100644 index e28e7afed1..0000000000 --- a/misc/chntpw/defaultarch.patch.gz +++ /dev/null diff --git a/misc/chntpw/patches/chntpw-080526-correct-test-for-failing-open-syscall.patch b/misc/chntpw/patches/chntpw-080526-correct-test-for-failing-open-syscall.patch new file mode 100644 index 0000000000..3c68146b09 --- /dev/null +++ b/misc/chntpw/patches/chntpw-080526-correct-test-for-failing-open-syscall.patch @@ -0,0 +1,75 @@ +From jim@meyering.net Mon Jul 20 20:05:55 2009 +Return-Path: jim@meyering.net +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on amd.home.annexia.org +X-Spam-Level: +X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00, + UNPARSEABLE_RELAY autolearn=ham version=3.2.5 +Received: from mail.corp.redhat.com [10.5.5.51] + by amd.home.annexia.org with IMAP (fetchmail-6.3.8) + for <rjones@localhost> (single-drop); Mon, 20 Jul 2009 20:05:55 +0100 (BST) +Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO + zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by + mail06.corp.redhat.com with LMTP; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from localhost (localhost.localdomain [127.0.0.1]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2C1134E4EB + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1]) + by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id a7N9dvNRkYQB for <rjones@redhat.com>; + Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 034384E4D6 + for <rjones@mail.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 (EDT) +Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) + by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6KJ5kIt032703 + for <rjones@int-mx2.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 +Received: from mx.meyering.net (sebastian-int.corp.redhat.com [172.16.52.221]) + by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6KJ5jf3021050 + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:45 -0400 +Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) + id D674638154; Mon, 20 Jul 2009 21:05:44 +0200 (CEST) +From: Jim Meyering <jim@meyering.net> +To: "Richard W. M. Jones" <rjones@redhat.com> +Subject: chntpw [PATCH] correct test for failing "open" syscall +Date: Mon, 20 Jul 2009 21:05:44 +0200 +Message-ID: <878wij899z.fsf@meyering.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 +Status: RO +Content-Length: 1103 +Lines: 33 + +This one is weird. +It must be code that is never exercised, +since the existing code is totally bogus. +The condition, !open(...), will almost always be true. +(sole exception is when starting a program with stdin +initially closed) + +>From bc4cddb06cf13c189fbdc93e6962cad072779097 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Mon, 20 Jul 2009 14:59:19 -0400 +Subject: [PATCH] correct test for failing "open" syscall + +* ntreg.c (writeHive): Test open() < 0, not !open(). +--- + ntreg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ntreg.c b/ntreg.c +index be6b680..21cd3e3 100644 +--- a/ntreg.c ++++ b/ntreg.c +@@ -2765,7 +2765,7 @@ int writeHive(struct hive *hdesc) + if ( !(hdesc->state & HMODE_DIRTY)) return(0); + + if ( !(hdesc->state & HMODE_OPEN)) { /* File has been closed */ +- if (!(hdesc->filedesc = open(hdesc->filename,O_RDWR))) { ++ if ((hdesc->filedesc = open(hdesc->filename,O_RDWR)) < 0) { + fprintf(stderr,"writeHive: open(%s) failed: %s, FILE NOT WRITTEN!\n",hdesc->filename,strerror(errno)); + return(1); + } +-- +1.6.2.5 + diff --git a/misc/chntpw/patches/chntpw-110511-detect-failure-to-write-key.patch b/misc/chntpw/patches/chntpw-110511-detect-failure-to-write-key.patch new file mode 100644 index 0000000000..818639d83a --- /dev/null +++ b/misc/chntpw/patches/chntpw-110511-detect-failure-to-write-key.patch @@ -0,0 +1,19 @@ +diff -ur chntpw-110511.orig/ntreg.c chntpw-110511/ntreg.c +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-11-01 13:45:02.550421729 -0700 +@@ -3389,7 +3389,14 @@ + + fprintf(file,"\r\n"); /* Must end file with an empty line, windows does that */ + +- fclose(file); ++ if (ferror (file)) { ++ printf("failed to write file '%s'\n", filename); ++ fclose (file); ++ return; ++ } ++ if (fclose(file)) ++ printf("failed to write file '%s': %s\n", filename, ++ strerror(errno)); + } + + /* ================================================================ */ diff --git a/misc/chntpw/patches/chntpw-110511-reged-no-deref-null.patch b/misc/chntpw/patches/chntpw-110511-reged-no-deref-null.patch new file mode 100644 index 0000000000..0193cd4937 --- /dev/null +++ b/misc/chntpw/patches/chntpw-110511-reged-no-deref-null.patch @@ -0,0 +1,15 @@ +diff -ur chntpw-110511.orig/reged.c chntpw-110511/reged.c +--- chntpw-110511.orig/reged.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/reged.c 2011-11-01 13:46:55.569625286 -0700 +@@ -167,6 +167,11 @@ + + if (edit) { /* Call editor. Rest of arguments are considered hives to load */ + hivename = argv[optind+no_hives]; ++ if (!hivename) { ++ fprintf(stderr,"with -e you must specify at least one hive file name\n"); ++ usage(); ++ exit(1); ++ } + do { + if (!(hive[no_hives] = openHive(hivename, + HMODE_RW|mode))) { diff --git a/misc/chntpw/patches/chntpw-110511-robustness.patch b/misc/chntpw/patches/chntpw-110511-robustness.patch new file mode 100644 index 0000000000..ea2363f343 --- /dev/null +++ b/misc/chntpw/patches/chntpw-110511-robustness.patch @@ -0,0 +1,39 @@ +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-12-18 17:09:06.290818997 -0800 +@@ -190,14 +190,18 @@ + + int fmyinput(char *prmpt, char *ibuf, int maxlen) + { +- ++ int len; + printf("%s",prmpt); + + fgets(ibuf,maxlen+1,stdin); ++ len = strlen(ibuf); + +- ibuf[strlen(ibuf)-1] = 0; ++ if (len) { ++ ibuf[len-1] = 0; ++ --len; ++ } + +- return(strlen(ibuf)); ++ return len; + } + + /* Print len number of hexbytes */ +@@ -4119,6 +4123,14 @@ + closeHive(hdesc); + return(NULL); + } ++ ++ if (r < sizeof (*hdesc)) { ++ fprintf(stderr, ++ "file is too small; got %d bytes while expecting %d or more\n", ++ r, sizeof (*hdesc)); ++ closeHive(hdesc); ++ return(NULL); ++ } + + /* Now run through file, tallying all pages */ + /* NOTE/KLUDGE: Assume first page starts at offset 0x1000 */ diff --git a/misc/chntpw/patches/chntpw-140201-fix-bogus-errno-use.patch b/misc/chntpw/patches/chntpw-140201-fix-bogus-errno-use.patch new file mode 100644 index 0000000000..ff7c8467b7 --- /dev/null +++ b/misc/chntpw/patches/chntpw-140201-fix-bogus-errno-use.patch @@ -0,0 +1,34 @@ +diff -u chntpw-140201.orig/ntreg.c chntpw-140201/ntreg.c +--- chntpw-140201.orig/ntreg.c 2019-06-22 13:09:59.583717369 -0700 ++++ chntpw-140201/ntreg.c 2019-06-22 13:16:26.714726148 -0700 +@@ -4241,10 +4241,13 @@ + do { /* On some platforms read may not block, and read in chunks. handle that */ + r = read(hdesc->filedesc, hdesc->buffer + rt, hdesc->size - rt); + rt += r; +- } while ( !errno && (rt < hdesc->size) ); ++ } while ( r > 0 && (rt < hdesc->size) ); + +- if (errno) { +- perror("openHive(): read error: "); ++ if (r <= 0) { ++ if (r < 0) ++ perror("openHive(): read error"); ++ else ++ fprintf(stderr, "openHive(): read error: unexpected EOF\n"); + closeHive(hdesc); + return(NULL); + } +@@ -4255,10 +4258,10 @@ + return(NULL); + } + +- if (r < sizeof (*hdesc)) { ++ if (rt < sizeof (*hdesc)) { + fprintf(stderr, +- "file is too small; got %d bytes while expecting %d or more\n", +- r, sizeof (*hdesc)); ++ "file is too small; got %d bytes while expecting %zu or more\n", ++ rt, sizeof (*hdesc)); + closeHive(hdesc); + return(NULL); + } diff --git a/misc/chntpw/patches/chntpw-140201-get_abs_path.patch b/misc/chntpw/patches/chntpw-140201-get_abs_path.patch new file mode 100644 index 0000000000..c9f1a3decc --- /dev/null +++ b/misc/chntpw/patches/chntpw-140201-get_abs_path.patch @@ -0,0 +1,10 @@ +--- chntpw-140201/ntreg.c.orig 2014-02-01 08:54:37.000000000 -0800 ++++ chntpw-140201/ntreg.c 2018-07-02 16:10:39.625152640 -0700 +@@ -1511,6 +1511,7 @@ + } + + strncpy(tmp,path,ABSPATHLEN-1); ++ tmp[ABSPATHLEN-1] = '\0'; + + if (key->type & 0x20) + keyname = mem_str(key->keyname, key->len_name); diff --git a/misc/chntpw/patches/chntpw-140201-port-to-gcrypt-debian.patch b/misc/chntpw/patches/chntpw-140201-port-to-gcrypt-debian.patch new file mode 100644 index 0000000000..305cd780bd --- /dev/null +++ b/misc/chntpw/patches/chntpw-140201-port-to-gcrypt-debian.patch @@ -0,0 +1,195 @@ +diff -Naur chntpw-140201.orig/Makefile chntpw-140201/Makefile +--- chntpw-140201.orig/Makefile 2014-02-01 17:54:37.000000000 +0100 ++++ chntpw-140201/Makefile 2021-04-04 19:25:52.517404000 +0200 +@@ -1,32 +1,14 @@ + # + # Makefile for the Offline NT Password Editor + # +-# +-# Change here to point to the needed OpenSSL libraries & .h files +-# See INSTALL for more info. +-# +- +-#SSLPATH=/usr/local/ssl +-OSSLPATH=/usr +-OSSLINC=$(OSSLPATH)/include + + CC=gcc ++CFLAGS=-DUSELIBGCRYPT -g -I. $(shell libgcrypt-config --cflags) -Wall $(EXTRA_CFLAGS) + +-# Force 32 bit +-CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 +-OSSLLIB=$(OSSLPATH)/lib +- +-# 64 bit if default for compiler setup +-#CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall +-#OSSLLIB=$(OSSLPATH)/lib64 +- +- +-# This is to link with whatever we have, SSL crypto lib we put in static +-#LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a +-LIBS=-L$(OSSLLIB) ++LIBS=$(shell libgcrypt-config --libs) + + +-all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static ++all: chntpw cpnt reged samusrgrp sampasswd + + chntpw: chntpw.o ntreg.o edlib.o libsam.o + $(CC) $(CFLAGS) -o chntpw chntpw.o ntreg.o edlib.o libsam.o $(LIBS) +diff -Naur chntpw-140201.orig/chntpw.c chntpw-140201/chntpw.c +--- chntpw-140201.orig/chntpw.c 2014-02-01 17:54:37.000000000 +0100 ++++ chntpw-140201/chntpw.c 2021-04-04 19:24:37.185404000 +0200 +@@ -16,6 +16,7 @@ + * 2010-jun: Syskey not visible in menu, but is selectable (2) + * 2010-apr: Interactive menu adapts to show most relevant + * selections based on what is loaded ++ * 2008-may: port to libgcrypt to avoid GPL/OpenSSL incompatibility [Debian] + * 2008-mar: Minor other tweaks + * 2008-mar: Interactive reg ed moved out of this file, into edlib.c + * 2008-mar: 64 bit compatible patch by Mike Doty, via Alon Bar-Lev +@@ -79,8 +80,14 @@ + */ + + #ifdef DOCRYPTO ++#if defined(USEOPENSSL) + #include <openssl/des.h> + #include <openssl/md4.h> ++#elif defined(USELIBGCRYPT) ++ #include <gcrypt.h> ++#else ++ #error No DES encryption and MD4 hashing library found ++#endif + #endif + + #define uchar u_char +@@ -155,7 +162,9 @@ + for (i=0;i<8;i++) { + key[i] = (key[i]<<1); + } ++#if defined(USEOPENSSL) + DES_set_odd_parity((des_cblock *)key); ++#endif + } + + /* +@@ -200,6 +209,7 @@ + + void E1(uchar *k, uchar *d, uchar *out) + { ++#if defined(USEOPENSSL) + des_key_schedule ks; + des_cblock deskey; + +@@ -210,6 +220,15 @@ + des_set_key((des_cblock *)deskey,ks); + #endif /* __FreeBsd__ */ + des_ecb_encrypt((des_cblock *)d,(des_cblock *)out, ks, DES_ENCRYPT); ++#elif defined(USELIBGCRYPT) ++ gcry_cipher_hd_t ks; ++ uchar deskey[8]; ++ str_to_key(k,deskey); ++ gcry_cipher_open(&ks, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0); ++ gcry_cipher_setkey(ks, deskey, 8); ++ gcry_cipher_encrypt(ks, out, 8, d, 8); ++ gcry_cipher_close(ks); ++#endif + } + + #endif /* DOCRYPTO */ +@@ -343,9 +362,16 @@ + int i; + char md4[32],lanman[32]; + char newunipw[34], despw[20], newlanpw[16], newlandes[20]; ++#ifdef USEOPENSSL + des_key_schedule ks1, ks2; + des_cblock deskey1, deskey2; + MD4_CTX context; ++#elif defined(USELIBGCRYPT) ++ gcry_cipher_hd_t ks1, ks2; ++ uchar deskey1[8], deskey2[8]; ++ unsigned char *p; ++ gcry_md_hd_t context; ++#endif + unsigned char digest[16]; + uchar x1[] = {0x4B,0x47,0x53,0x21,0x40,0x23,0x24,0x25}; + #endif +@@ -460,6 +486,7 @@ + } + + #ifdef DOCRYPTO ++#if defined(USEOPENSSL) + /* Get the two decrpt keys. */ + sid_to_key1(rid,(unsigned char *)deskey1); + des_set_key((des_cblock *)deskey1,ks1); +@@ -477,6 +504,25 @@ + (des_cblock *)lanman, ks1, DES_DECRYPT); + des_ecb_encrypt((des_cblock *)(vp+lmpw_offs + 8), + (des_cblock *)&lanman[8], ks2, DES_DECRYPT); ++#elif defined(USELIBGCRYPT) ++ /* Start the keys */ ++ gcry_cipher_open(&ks1, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0); ++ gcry_cipher_open(&ks2, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0); ++ ++ /* Get the two decrpt keys. */ ++ sid_to_key1(rid,deskey1); ++ gcry_cipher_setkey(ks1, deskey1, 8); ++ sid_to_key2(rid,deskey2); ++ gcry_cipher_setkey(ks2, deskey2, 8); ++ ++ /* Decrypt the NT md4 password hash as two 8 byte blocks. */ ++ gcry_cipher_decrypt(ks1, md4, 8, vp+ntpw_offs, 8); ++ gcry_cipher_decrypt(ks2, &md4[8], 8, vp+ntpw_offs+8, 8); ++ ++ /* Decrypt the lanman password hash as two 8 byte blocks. */ ++ gcry_cipher_decrypt(ks1, lanman, 8, vp+lmpw_offs, 8); ++ gcry_cipher_decrypt(ks2, &lanman[8], 8, vp+lmpw_offs+8, 8); ++#endif + + if (gverbose) { + hexprnt("MD4 hash : ",(unsigned char *)md4,16); +@@ -544,9 +590,17 @@ + + /* printf("Ucase Lanman: %s\n",newlanpw); */ + ++#if defined(USEOPENSSL) + MD4Init (&context); + MD4Update (&context, newunipw, pl<<1); + MD4Final (digest, &context); ++#elif defined(USELIBGCRYPT) ++ gcry_md_open(&context, GCRY_MD_MD4, 0); ++ gcry_md_write(context, newunipw, pl<<1); ++ p = gcry_md_read(context, GCRY_MD_MD4); ++ if(p) memcpy(digest, p, gcry_md_get_algo_dlen(GCRY_MD_MD4)); ++ gcry_md_close(context); ++#endif + + if (gverbose) hexprnt("\nNEW MD4 hash : ",digest,16); + +@@ -555,6 +609,7 @@ + + if (gverbose) hexprnt("NEW LANMAN hash : ",(unsigned char *)lanman,16); + ++#if defined(USEOPENSSL) + /* Encrypt the NT md4 password hash as two 8 byte blocks. */ + des_ecb_encrypt((des_cblock *)digest, + (des_cblock *)despw, ks1, DES_ENCRYPT); +@@ -565,6 +620,18 @@ + (des_cblock *)newlandes, ks1, DES_ENCRYPT); + des_ecb_encrypt((des_cblock *)(lanman+8), + (des_cblock *)&newlandes[8], ks2, DES_ENCRYPT); ++#elif defined(USELIBGCRYPT) ++ /* Encrypt the NT md4 password hash as two 8 byte blocks. */ ++ gcry_cipher_encrypt(ks1, despw, 8, digest, 8); ++ gcry_cipher_encrypt(ks2, &despw[8], 8, digest+8, 8); ++ ++ gcry_cipher_encrypt(ks1, newlandes, 8, lanman, 8); ++ gcry_cipher_encrypt(ks2, &newlandes[8], 8, lanman+8, 8); ++ ++ /* Close keys, not needed after this */ ++ gcry_cipher_close(ks1); ++ gcry_cipher_close(ks2); ++#endif + + if (gverbose) { + hexprnt("NEW DES crypt : ",(unsigned char *)despw,16); diff --git a/misc/dmg2img/0001-openssl-1.1-compatibility.patch b/misc/dmg2img/0001-openssl-1.1-compatibility.patch new file mode 100644 index 0000000000..b5ed45d2ff --- /dev/null +++ b/misc/dmg2img/0001-openssl-1.1-compatibility.patch @@ -0,0 +1,219 @@ +From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001 +From: Peter Wu <peter@lekensteyn.nl> +Date: Tue, 2 May 2017 15:53:38 +0200 +Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility + +Allocate contexts from the heap on all OpenSSL versions, this is needed +since OpenSSL 1.1.0. No attempt is done at addressing issues like global +variables and fixing potential memleaks on error paths. + +Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g +(Ubuntu 16.04), I have no test file. + +Fixes https://github.com/Lekensteyn/dmg2img/issues/4 +--- + vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 80 insertions(+), 23 deletions(-) + +diff --git a/vfdecrypt.c b/vfdecrypt.c +index 56d3530..b1a36d3 100644 +--- a/vfdecrypt.c ++++ b/vfdecrypt.c +@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { + pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); + } + +-HMAC_CTX hmacsha1_ctx; ++HMAC_CTX *hmacsha1_ctx; + AES_KEY aes_decrypt_key; + int CHUNK_SIZE=4096; // default + +@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) { + unsigned int mdLen; + + chunk_no = OSSwapHostToBigInt32(chunk_no); +- HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL); +- HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); +- HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen); ++ HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL); ++ HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); ++ HMAC_Final(hmacsha1_ctx, mdResult, &mdLen); + memcpy(iv, mdResult, CIPHER_BLOCKSIZE); + } + +@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) { + /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 + * wrapped_key has to be 40 bytes in length. */ + int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) { +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1, *TEMP2, *CEKICV; + uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 }; + int outlen, tmplen, i; + +- EVP_CIPHER_CTX_init(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(wrapped_key_len); + TEMP2 = malloc(wrapped_key_len); + CEKICV = malloc(wrapped_key_len); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + /* reverse order of TEMP3 */ + for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1]; + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); +- if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); ++ if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { + fprintf(stderr, "internal error (3) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) { + fprintf(stderr, "internal error (4) during key unwrap operation!\n"); + return(-1); + } + + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + memcpy(unwrapped_key, CEKICV+4, outlen-4); + free(TEMP1); + free(TEMP2); + free(CEKICV); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ free(ctx); ++#endif + return(0); + } + +@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae + int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) { + /* derived key is a 3DES-EDE key */ + uint8_t derived_key[192/8]; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1; + int outlen, tmplen; + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ + PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20, + PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key); + + print_hex(derived_key, 192/8); + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(header->encrypted_keyblob_size); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++ free(ctx); ++#endif + memcpy(aes_key, TEMP1, 16); + memcpy(hmacsha1_key, TEMP1, 20); + +@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) { + CHUNK_SIZE = v2header.blocksize; + } + +- HMAC_CTX_init(&hmacsha1_ctx); +- HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ hmacsha1_ctx = HMAC_CTX_new(); ++#else ++ hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx)); ++#endif ++ if (!hmacsha1_ctx) { ++ fprintf(stderr, "Out of memory: HMAC CTX!\n"); ++ exit(1); ++ } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_reset(hmacsha1_ctx); ++#else ++ HMAC_CTX_init(hmacsha1_ctx); ++#endif ++ HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); + AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key); + + if (verbose >= 1) { +@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) { + } + + if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_free(hmacsha1_ctx); ++#else ++ HMAC_CTX_cleanup(hmacsha1_ctx); ++ free(hmacsha1_ctx); ++#endif + return(0); + } diff --git a/misc/dmg2img/dmg2img.SlackBuild b/misc/dmg2img/dmg2img.SlackBuild index 941b7bae53..468aa42a51 100644 --- a/misc/dmg2img/dmg2img.SlackBuild +++ b/misc/dmg2img/dmg2img.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks Archlinux! +patch -lp1 < $CWD/0001-openssl-1.1-compatibility.patch + make CFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/misc/fcitx-configtool/README b/misc/fcitx-configtool/README deleted file mode 100644 index 3d8e03b013..0000000000 --- a/misc/fcitx-configtool/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-configtool is a GTK-based configuration tool for fcitx. diff --git a/misc/fcitx-configtool/fcitx-configtool.SlackBuild b/misc/fcitx-configtool/fcitx-configtool.SlackBuild deleted file mode 100644 index 0cecb62533..0000000000 --- a/misc/fcitx-configtool/fcitx-configtool.SlackBuild +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-configtool - -# Copyright 2012 vvoody <vvoodywang@gmail.com> -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fcitx-configtool -VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/fcitx-configtool/fcitx-configtool.info b/misc/fcitx-configtool/fcitx-configtool.info deleted file mode 100644 index 668dea588c..0000000000 --- a/misc/fcitx-configtool/fcitx-configtool.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-configtool" -VERSION="0.4.9" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx" -DOWNLOAD="https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.9.tar.xz" -MD5SUM="b7f28c13d912826d41a4f815bef4d12b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/fcitx-configtool/slack-desc b/misc/fcitx-configtool/slack-desc deleted file mode 100644 index fc87d15e47..0000000000 --- a/misc/fcitx-configtool/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-configtool: fcitx-configtool (configuration tool for fcitx) -fcitx-configtool: -fcitx-configtool: fcitx-configtool is a GTK-based configuration tool for fcitx. -fcitx-configtool: -fcitx-configtool: Homepage: https://fcitx-im.org -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: diff --git a/misc/fcitx-libpinyin/README b/misc/fcitx-libpinyin/README deleted file mode 100644 index e9594fb1a9..0000000000 --- a/misc/fcitx-libpinyin/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-libpinyin is a fcitx wrapper for libpinyin. diff --git a/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild b/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild deleted file mode 100644 index 0d2292db3f..0000000000 --- a/misc/fcitx-libpinyin/fcitx-libpinyin.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-libpinyin -# -# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fcitx-libpinyin -VERSION=${VERSION:-0.5.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/fcitx-libpinyin/fcitx-libpinyin.info b/misc/fcitx-libpinyin/fcitx-libpinyin.info deleted file mode 100644 index e70b49b6eb..0000000000 --- a/misc/fcitx-libpinyin/fcitx-libpinyin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-libpinyin" -VERSION="0.5.3" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx" -DOWNLOAD="https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3.tar.xz" -MD5SUM="8ed5dff04bf869c9572e12f93b225761" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx-qt5 libpinyin" -MAINTAINER="Isaac Yu" -EMAIL="isaacyu1@isaacyu1.com" diff --git a/misc/fcitx-libpinyin/slack-desc b/misc/fcitx-libpinyin/slack-desc deleted file mode 100644 index 25663fb0d7..0000000000 --- a/misc/fcitx-libpinyin/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-libpinyin: fcitx-libpinyin (wrapper for libpinyin) -fcitx-libpinyin: -fcitx-libpinyin: fcitx-libpinyin is a fcitx wrapper for libpinyin. -fcitx-libpinyin: -fcitx-libpinyin: Homepage: https://fcitx-im.org -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: diff --git a/misc/fcitx-qt5/README b/misc/fcitx-qt5/README deleted file mode 100644 index 66926fc454..0000000000 --- a/misc/fcitx-qt5/README +++ /dev/null @@ -1 +0,0 @@ -fcitx-qt5 is the Fcitx IME plugin for Qt5 based applications. diff --git a/misc/fcitx-qt5/fcitx-qt5.SlackBuild b/misc/fcitx-qt5/fcitx-qt5.SlackBuild deleted file mode 100644 index 9c6ae20257..0000000000 --- a/misc/fcitx-qt5/fcitx-qt5.SlackBuild +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx-qt5 input plugin - -# Copyright 2018 CapEnt <capent@yahoo.com> -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fcitx-qt5 -VERSION=${VERSION:-1.2.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf "${CWD}"/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir build -cd build - cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/fcitx-qt5/fcitx-qt5.info b/misc/fcitx-qt5/fcitx-qt5.info deleted file mode 100644 index 47738b475e..0000000000 --- a/misc/fcitx-qt5/fcitx-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx-qt5" -VERSION="1.2.3" -HOMEPAGE="https://fcitx-im.org/" -DOWNLOAD="https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.3.tar.xz" -MD5SUM="0d7703f96729dfb756c6c7821cc8c5fd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx qt5 extra-cmake-modules" -MAINTAINER="CapEnt" -EMAIL="capent@yahoo.com" diff --git a/misc/fcitx-qt5/slack-desc b/misc/fcitx-qt5/slack-desc deleted file mode 100644 index 994e862232..0000000000 --- a/misc/fcitx-qt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-qt5: fcitx-qt5 (Qt5 IME plugin for Fcitx) -fcitx-qt5: -fcitx-qt5: fcitx-qt5 is the Fcitx IME plugin for Qt5 based applications -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: Homepage: https://fcitx-im.org -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: diff --git a/misc/fcitx/README b/misc/fcitx/README deleted file mode 100644 index d85f15ffda..0000000000 --- a/misc/fcitx/README +++ /dev/null @@ -1,21 +0,0 @@ -Fcitx is an input method framework with extension support. Currently it -supports linux and Unix systems, like freebsd. It has three builtin -Input Method Engine, Pinyin, QuWei and Table-based input methods. - -By default, this slackbuild will build IM module support for GTK2, GTK3 -and Qt4. - -To enable OpenCC support for chinese input, you can pass OPENCC=On to -the script: - - OPENCC=On ./fcitx.SlackBuild - -To enable fcitx put the following lines in your ~/.bashrc file - -export GTK_IM_MODULE=fcitx -export XMODIFIERS=@im=fcitx -export QT_IM_MODULE=fcitx - -fcitx is pre-configured to autostart on xdg-compliant desktop environments -if these settings are present. On other desktop environments you can add -"fcitx-autostart" to the respective autostart settings. diff --git a/misc/fcitx/doinst.sh b/misc/fcitx/doinst.sh deleted file mode 100644 index dff5a780c3..0000000000 --- a/misc/fcitx/doinst.sh +++ /dev/null @@ -1,17 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x usr/bin/update-gtk-immodules ]; then - chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/misc/fcitx/fcitx-autostart.patch b/misc/fcitx/fcitx-autostart.patch deleted file mode 100644 index d2d206bb09..0000000000 --- a/misc/fcitx/fcitx-autostart.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fcitx-autostart.orig 2017-03-26 17:58:45.586105103 +0200 -+++ fcitx-autostart 2017-03-26 17:59:09.693105345 +0200 -@@ -1,4 +1,26 @@ --#!/bin/sh -+#!/bin/bash -+ -+START="no" -+ -+if [ "$XIM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$XIM_PROGRAM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$GTK_IM_MODULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$QT_IM_MOFULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$START" = "no" ]; then -+ exit 0 -+fi - - # sleep for a little while to avoid duplicate startup - sleep 2 diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild deleted file mode 100644 index 53824c26b3..0000000000 --- a/misc/fcitx/fcitx.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -# Slackware build script for fcitx. - -# Copyright 2012 vvoody <vvoodywang@gmail.com> -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fcitx -VERSION=${VERSION:-4.2.9.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -OPENCC=${OPENCC:-Off} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Patch fcitx-autostart to only start when fcitx is the configured input method -patch -p0 -d data/script/ -i $CWD/fcitx-autostart.patch - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONFDIR=/etc \ - -DENABLE_GTK2_IM_MODULE=On \ - -DENABLE_GTK3_IM_MODULE=On \ - -DENABLE_QT_IM_MODULE=On \ - -DENABLE_OPENCC=${OPENCC} \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mv $PKG/usr/share/doc $PKG/usr -mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info deleted file mode 100644 index a9b974cb70..0000000000 --- a/misc/fcitx/fcitx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx" -VERSION="4.2.9.4" -HOMEPAGE="https://fcitx-im.org" -DOWNLOAD="https://download.fcitx-im.org/fcitx/fcitx-4.2.9.4_dict.tar.xz" -MD5SUM="01a95b63fae67623cd594ab8517e80e9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libxkbcommon extra-cmake-modules" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/fcitx/slack-desc b/misc/fcitx/slack-desc deleted file mode 100644 index d56560b5aa..0000000000 --- a/misc/fcitx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx: fcitx (Free Chinese Input Toy for X) -fcitx: -fcitx: Fcitx(Free Chinese Input Toy for X) is a collection of -fcitx: Simplified Chinese input methods for Linux. It supports Pinyin, -fcitx: QuWei and Table-based input methods. -fcitx: -fcitx: There are some good modules you can choose, like fcitx-config, -fcitx: fcitx-{googlepinyin,sunpinyin,cloudpinyin}, fcitx-fbterm, etc. -fcitx: -fcitx: Homepage: https://fcitx-im.org -fcitx: diff --git a/misc/g15daemon/g15daemon.SlackBuild b/misc/g15daemon/g15daemon.SlackBuild index 32b216e4eb..39b167efd7 100644 --- a/misc/g15daemon/g15daemon.SlackBuild +++ b/misc/g15daemon/g15daemon.SlackBuild @@ -75,7 +75,7 @@ find -L . \ # Thanks to Gentoo bugzilla people! patch -p1 < "$CWD/g15daemon-1.9.5.3-uinput.patch" -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --disable-static \ diff --git a/misc/glogg/glogg.SlackBuild b/misc/glogg/glogg.SlackBuild index 0278e2c4e8..33c808c379 100644 --- a/misc/glogg/glogg.SlackBuild +++ b/misc/glogg/glogg.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glogg -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -qmake +qmake-qt5 make make install INSTALL_ROOT=$PKG/usr diff --git a/misc/glogg/glogg.info b/misc/glogg/glogg.info index 61587350f7..fb8c11dd71 100644 --- a/misc/glogg/glogg.info +++ b/misc/glogg/glogg.info @@ -1,10 +1,10 @@ PRGNAM="glogg" -VERSION="1.0.2" +VERSION="1.1.4" HOMEPAGE="http://glogg.bonnefon.org/" -DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.0.2.tar.gz" -MD5SUM="d6d9bb70ed50a38c5fa9114d71b52d3d" +DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.1.4.tar.gz" +MD5SUM="065d292411df490dcb3c6abae35ed608" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Miroslaw Turski" EMAIL="miroslaw.turski@gmail.com" diff --git a/misc/gourmet/gourmet.SlackBuild b/misc/gourmet/gourmet.SlackBuild index e9a2f0f93d..0121943095 100644 --- a/misc/gourmet/gourmet.SlackBuild +++ b/misc/gourmet/gourmet.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gourmet VERSION=${VERSION:-0.17.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to replace removed tostring() with tobytes() +patch -p1 < $CWD/tostring-to-tobytes.patch + python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/misc/gourmet/gourmet.info b/misc/gourmet/gourmet.info index 16bbef1a65..64f0f25902 100644 --- a/misc/gourmet/gourmet.info +++ b/misc/gourmet/gourmet.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz" MD5SUM="937334364abc3093709a604c1d473e9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SQLAlchemy python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl" +REQUIRES="SQLAlchemy lxml python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl pypoppler" MAINTAINER="Erwin van Zanten" EMAIL="e.van.zanten.evz@gmail.com" diff --git a/misc/gourmet/slack-desc b/misc/gourmet/slack-desc index 16eb4722a4..ae51c1b38c 100644 --- a/misc/gourmet/slack-desc +++ b/misc/gourmet/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -gourmet: gourmet (A Recipe organizer for Linux) +gourmet: Gourmet (a recipe organizer for Linux) gourmet: gourmet: Gourmet Recipe Manager is a recipe-organizer that allows you gourmet: to collect, search, organize, and browse your recipes. diff --git a/misc/gourmet/tostring-to-tobytes.patch b/misc/gourmet/tostring-to-tobytes.patch new file mode 100644 index 0000000000..e42c59403d --- /dev/null +++ b/misc/gourmet/tostring-to-tobytes.patch @@ -0,0 +1,26 @@ +diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py +index 0e01735..efa6463 100644 +--- a/gourmet/gtk_extras/ratingWidget.py ++++ b/gourmet/gtk_extras/ratingWidget.py +@@ -135,7 +135,7 @@ class StarGenerator: + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, +diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py +index 61c772c..2e7b08b 100644 +--- a/gourmet/plugins/browse_recipes/icon_helpers.py ++++ b/gourmet/plugins/browse_recipes/icon_helpers.py +@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image): + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, diff --git a/misc/ibus-anthy/README b/misc/ibus-anthy/README deleted file mode 100644 index 1a73db55ae..0000000000 --- a/misc/ibus-anthy/README +++ /dev/null @@ -1,8 +0,0 @@ -Ibus module for Anthy Japanese conversion engine. - -Ibus-Anthy allows users to use Anthy Japanese conversion engine in -Ibus Intelligent Input Bus, a new input framework for Linux. - -After the install of the package, add Japanese-Anthy Input Method in -IBus preferences, Input Method Tab. You will also need to restart -the ibus service after upgrading this package. diff --git a/misc/ibus-anthy/ibus-anthy.SlackBuild b/misc/ibus-anthy/ibus-anthy.SlackBuild deleted file mode 100644 index 22d94a8433..0000000000 --- a/misc/ibus-anthy/ibus-anthy.SlackBuild +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus-anthy - -# Written by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com -# This script is in public domain. If this is not legally possible -# I grant anyone the right to use this work for any purpose, without any conditions, -# unless such conditions are required by law. - -PRGNAM=ibus-anthy -VERSION=${VERSION:-1.2.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/ibus-anthy/ibus-anthy.info b/misc/ibus-anthy/ibus-anthy.info deleted file mode 100644 index d327a1ecc8..0000000000 --- a/misc/ibus-anthy/ibus-anthy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-anthy" -VERSION="1.2.7" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/ibus/ibus-anthy/releases/download/1.2.7/ibus-anthy-1.2.7.tar.gz" -MD5SUM="091a13ff950171981768463993ffb683" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Ozan Türkyılmaz" -EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/misc/ibus-anthy/slack-desc b/misc/ibus-anthy/slack-desc deleted file mode 100644 index 559c966e0d..0000000000 --- a/misc/ibus-anthy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ibus-anthy: ibus-anthy (Anthy Japanese engine for ibus) -ibus-anthy: -ibus-anthy: Ibus-anthy allows users to use anthy Japanese conversion engine in -ibus-anthy: Ibus Intelligent Input Bus, a new input framework for Linux. -ibus-anthy: -ibus-anthy: https://github.com/ibus/ibus/wiki -ibus-anthy: -ibus-anthy: -ibus-anthy: -ibus-anthy: -ibus-anthy: diff --git a/misc/ibus-hangul/README b/misc/ibus-hangul/README deleted file mode 100644 index c1dd099aee..0000000000 --- a/misc/ibus-hangul/README +++ /dev/null @@ -1,3 +0,0 @@ -ibus-hangul is a Korean input method engine for IBus. - -Go to IBus preferences, Input Method tab to add the Korean input engine diff --git a/misc/ibus-hangul/doinst.sh b/misc/ibus-hangul/doinst.sh deleted file mode 100644 index 19400050fd..0000000000 --- a/misc/ibus-hangul/doinst.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - diff --git a/misc/ibus-hangul/ibus-hangul.SlackBuild b/misc/ibus-hangul/ibus-hangul.SlackBuild deleted file mode 100644 index 55bd7c7c82..0000000000 --- a/misc/ibus-hangul/ibus-hangul.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script ibus-hangul - -# Written by Young Chol Song <youngchol.song at gmail dot com> -# All rights reserved. - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=ibus-hangul -VERSION=${VERSION:-1.5.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/ibus-hangul/ibus-hangul.info b/misc/ibus-hangul/ibus-hangul.info deleted file mode 100644 index 0e36310286..0000000000 --- a/misc/ibus-hangul/ibus-hangul.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-hangul" -VERSION="1.5.0" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/choehwanjin/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz" -MD5SUM="a171bf7b25752a1f71257fb85d56346b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Young Chol Song" -EMAIL="youngchol.song@gmail.com" diff --git a/misc/ibus-hangul/slack-desc b/misc/ibus-hangul/slack-desc deleted file mode 100644 index 30bf91bc99..0000000000 --- a/misc/ibus-hangul/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ibus-hangul: ibus-hangul (The Hangul engine for IBus) -ibus-hangul: -ibus-hangul: ibus-hangul is a Korean input method engine for IBus. -ibus-hangul: -ibus-hangul: https://github.com/ibus/ibus/wiki -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: -ibus-hangul: diff --git a/misc/ibus-unikey/README b/misc/ibus-unikey/README deleted file mode 100644 index eaebb03f04..0000000000 --- a/misc/ibus-unikey/README +++ /dev/null @@ -1 +0,0 @@ -ibus-unikey is a Vietnamese input engine for the ibus input framework. diff --git a/misc/ibus-unikey/gcc-6.diff b/misc/ibus-unikey/gcc-6.diff deleted file mode 100644 index 424bd74fb0..0000000000 --- a/misc/ibus-unikey/gcc-6.diff +++ /dev/null @@ -1,227 +0,0 @@ -Index: b/ukengine/data.cpp -=================================================================== ---- a/ukengine/data.cpp -+++ b/ukengine/data.cpp -@@ -96,144 +96,144 @@ See TCVN3 & VPS below for examples - unsigned char SingleByteTables[][TOTAL_VNCHARS] = - - // TCVN3 --{{'A','a','¸','¸','µ','µ','¶','¶','·','·','¹','¹', // 0: a -- '¢','©','Ê','Ê','Ç','Ç','È','È','É','É','Ë','Ë', // 1: a^ -- '¡','¨','¾','¾','»','»','¼','¼','½','½','Æ','Æ', // 2: a( -+{{'A','a',static_cast<unsigned char>('¸'),static_cast<unsigned char>('¸'),static_cast<unsigned char>('µ'),static_cast<unsigned char>('µ'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('·'),static_cast<unsigned char>('·'),static_cast<unsigned char>('¹'),static_cast<unsigned char>('¹'), // 0: a -+ static_cast<unsigned char>('¢'),static_cast<unsigned char>('©'),static_cast<unsigned char>('Ê'),static_cast<unsigned char>('Ê'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('È'),static_cast<unsigned char>('È'),static_cast<unsigned char>('É'),static_cast<unsigned char>('É'),static_cast<unsigned char>('Ë'),static_cast<unsigned char>('Ë'), // 1: a^ -+ static_cast<unsigned char>('¡'),static_cast<unsigned char>('¨'),static_cast<unsigned char>('¾'),static_cast<unsigned char>('¾'),static_cast<unsigned char>('»'),static_cast<unsigned char>('»'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('½'),static_cast<unsigned char>('½'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('Æ'), // 2: a( - 'B','b','C','c','D','d', -- '§','®', -- 'E','e','Ð','Ð','Ì','Ì','Î','Î','Ï','Ï','Ñ','Ñ', // 3: e -- '£','ª','Õ','Õ','Ò','Ò','Ó','Ó','Ô','Ô','Ö','Ö', // 4: e^ -+ static_cast<unsigned char>('§'),static_cast<unsigned char>('®'), -+ 'E','e',static_cast<unsigned char>('Ð'),static_cast<unsigned char>('Ð'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ñ'),static_cast<unsigned char>('Ñ'), // 3: e -+ static_cast<unsigned char>('£'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('Ö'),static_cast<unsigned char>('Ö'), // 4: e^ - 'F','f','G','g','H','h', -- 'I','i','Ý','Ý','×','×','Ø','Ø','Ü','Ü','Þ','Þ', // 5: i -+ 'I','i',static_cast<unsigned char>('Ý'),static_cast<unsigned char>('Ý'),static_cast<unsigned char>('×'),static_cast<unsigned char>('×'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('Ü'),static_cast<unsigned char>('Ü'),static_cast<unsigned char>('Þ'),static_cast<unsigned char>('Þ'), // 5: i - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','ã','ã','ß','ß','á','á','â','â','ä','ä', // 6: o -- '¤','«','è','è','å','å','æ','æ','ç','ç','é','é', // 7: o^ -- '¥','¬','í','í','ê','ê','ë','ë','ì','ì','î','î', // 8: o+ -+ 'O','o',static_cast<unsigned char>('ã'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('á'),static_cast<unsigned char>('á'),static_cast<unsigned char>('â'),static_cast<unsigned char>('â'),static_cast<unsigned char>('ä'),static_cast<unsigned char>('ä'), // 6: o -+ static_cast<unsigned char>('¤'),static_cast<unsigned char>('«'),static_cast<unsigned char>('è'),static_cast<unsigned char>('è'),static_cast<unsigned char>('å'),static_cast<unsigned char>('å'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('é'),static_cast<unsigned char>('é'), // 7: o^ -+ static_cast<unsigned char>('¥'),static_cast<unsigned char>('¬'),static_cast<unsigned char>('í'),static_cast<unsigned char>('í'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('î'),static_cast<unsigned char>('î'), // 8: o+ - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','ó','ó','ï','ï','ñ','ñ','ò','ò','ô','ô', // 9: u -- '¦','','ø','ø','õ','õ','ö','ö','÷','÷','ù','ù', //10: u+ -+ 'U','u',static_cast<unsigned char>('ó'),static_cast<unsigned char>('ó'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('ô'),static_cast<unsigned char>('ô'), // 9: u -+ static_cast<unsigned char>('¦'),static_cast<unsigned char>(''),static_cast<unsigned char>('ø'),static_cast<unsigned char>('ø'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('÷'),static_cast<unsigned char>('÷'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('ù'), //10: u+ - 'V','v','W','w','X','x', -- 'Y','y','ý','ý','ú','ú','û','û','ü','ü','þ','þ', //11: y -+ 'Y','y',static_cast<unsigned char>('ý'),static_cast<unsigned char>('ý'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('û'),static_cast<unsigned char>('û'),static_cast<unsigned char>('ü'),static_cast<unsigned char>('ü'),static_cast<unsigned char>('þ'),static_cast<unsigned char>('þ'), //11: y - 'Z','z', - 0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, - 0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93, - 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, - 0x9C, 0x9E, 0x9F}, - //VPS --{ 'A','a','Á','á','€','à','','ä','‚','ã','å','å', -- 'Â','â','ƒ','Ã','„','À','…','Ä','Å','Å','Æ','Æ', -- 'ˆ','æ','','¡','Ž','¢','','£','ð','¤','¥','¥', -+{ 'A','a',static_cast<unsigned char>('Á'),static_cast<unsigned char>('á'),static_cast<unsigned char>('€'),static_cast<unsigned char>('à'),static_cast<unsigned char>(''),static_cast<unsigned char>('ä'),static_cast<unsigned char>('‚'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('å'),static_cast<unsigned char>('å'), -+ static_cast<unsigned char>('Â'),static_cast<unsigned char>('â'),static_cast<unsigned char>('ƒ'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('„'),static_cast<unsigned char>('À'),static_cast<unsigned char>('…'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('Æ'), -+ static_cast<unsigned char>('ˆ'),static_cast<unsigned char>('æ'),static_cast<unsigned char>(''),static_cast<unsigned char>('¡'),static_cast<unsigned char>('Ž'),static_cast<unsigned char>('¢'),static_cast<unsigned char>(''),static_cast<unsigned char>('£'),static_cast<unsigned char>('ð'),static_cast<unsigned char>('¤'),static_cast<unsigned char>('¥'),static_cast<unsigned char>('¥'), - 'B','b','C','c','D','d', -- 'ñ','Ç', -- 'E','e','É','é','×','è','Þ','È','þ','ë','Ë','Ë', -- 'Ê','ê','','‰','“','Š','”','‹','•','Í','Œ','Œ', -+ static_cast<unsigned char>('ñ'),static_cast<unsigned char>('Ç'), -+ 'E','e',static_cast<unsigned char>('É'),static_cast<unsigned char>('é'),static_cast<unsigned char>('×'),static_cast<unsigned char>('è'),static_cast<unsigned char>('Þ'),static_cast<unsigned char>('È'),static_cast<unsigned char>('þ'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('Ë'),static_cast<unsigned char>('Ë'), -+ static_cast<unsigned char>('Ê'),static_cast<unsigned char>('ê'),static_cast<unsigned char>(''),static_cast<unsigned char>('‰'),static_cast<unsigned char>('“'),static_cast<unsigned char>('Š'),static_cast<unsigned char>('”'),static_cast<unsigned char>('‹'),static_cast<unsigned char>('•'),static_cast<unsigned char>('Í'),static_cast<unsigned char>('Œ'),static_cast<unsigned char>('Œ'), - 'F','f','G','g','H','h', -- 'I','i','´','í','µ','ì','·','Ì','¸','ï','Î','Î', -+ 'I','i',static_cast<unsigned char>('´'),static_cast<unsigned char>('í'),static_cast<unsigned char>('µ'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('·'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('¸'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('Î'), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','¹','ó','¼','ò','½','Õ','¾','õ','†','†', -- 'Ô','ô','–','Ó','—','Ò','˜','°','™','‡','¶','¶', -- '÷','Ö','','§','ž','©','Ÿ','ª','¦','«','®','®', -+ 'O','o',static_cast<unsigned char>('¹'),static_cast<unsigned char>('ó'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('½'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('¾'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('†'),static_cast<unsigned char>('†'), -+ static_cast<unsigned char>('Ô'),static_cast<unsigned char>('ô'),static_cast<unsigned char>('–'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('—'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('˜'),static_cast<unsigned char>('°'),static_cast<unsigned char>('™'),static_cast<unsigned char>('‡'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('¶'), -+ static_cast<unsigned char>('÷'),static_cast<unsigned char>('Ö'),static_cast<unsigned char>(''),static_cast<unsigned char>('§'),static_cast<unsigned char>('ž'),static_cast<unsigned char>('©'),static_cast<unsigned char>('Ÿ'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('¦'),static_cast<unsigned char>('«'),static_cast<unsigned char>('®'),static_cast<unsigned char>('®'), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','Ú','ú','¨','ù','Ñ','û','¬','Û','ø','ø', -- 'Ð','Ü','','Ù','¯','Ø','±','º','»','»','¿','¿', -+ 'U','u',static_cast<unsigned char>('Ú'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('¨'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('Ñ'),static_cast<unsigned char>('û'),static_cast<unsigned char>('¬'),static_cast<unsigned char>('Û'),static_cast<unsigned char>('ø'),static_cast<unsigned char>('ø'), -+ static_cast<unsigned char>('Ð'),static_cast<unsigned char>('Ü'),static_cast<unsigned char>(''),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('¯'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('±'),static_cast<unsigned char>('º'),static_cast<unsigned char>('»'),static_cast<unsigned char>('»'),static_cast<unsigned char>('¿'),static_cast<unsigned char>('¿'), - 'V','v','W','w','X','x', -- 'Y','y','Ý','š','²','ÿ','ý','›','³','Ï','œ','œ', -+ 'Y','y',static_cast<unsigned char>('Ý'),static_cast<unsigned char>('š'),static_cast<unsigned char>('²'),static_cast<unsigned char>('ÿ'),static_cast<unsigned char>('ý'),static_cast<unsigned char>('›'),static_cast<unsigned char>('³'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('œ'),static_cast<unsigned char>('œ'), - 'Z','z', - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x91, 0x92, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - //VISCII --{ 'A','a','Á','á','À','à','Ä','ä','Ã','ã','€','Õ', -- 'Â','â','„','¤','…','¥','†','¦','ç','ç','‡','§', -- 'Å','å','','¡','‚','¢','Æ','Æ','Ç','Ç','ƒ','£', -+{ 'A','a',static_cast<unsigned char>('Á'),static_cast<unsigned char>('á'),static_cast<unsigned char>('À'),static_cast<unsigned char>('à'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>('ä'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('€'),static_cast<unsigned char>('Õ'), -+ static_cast<unsigned char>('Â'),static_cast<unsigned char>('â'),static_cast<unsigned char>('„'),static_cast<unsigned char>('¤'),static_cast<unsigned char>('…'),static_cast<unsigned char>('¥'),static_cast<unsigned char>('†'),static_cast<unsigned char>('¦'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('‡'),static_cast<unsigned char>('§'), -+ static_cast<unsigned char>('Å'),static_cast<unsigned char>('å'),static_cast<unsigned char>(''),static_cast<unsigned char>('¡'),static_cast<unsigned char>('‚'),static_cast<unsigned char>('¢'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('ƒ'),static_cast<unsigned char>('£'), - 'B','b','C','c','D','d', -- 'Ð','ð', -- 'E','e','É','é','È','è','Ë','ë','ˆ','¨','‰','©', -- 'Ê','ê','Š','ª','‹','«','Œ','¬','','','Ž','®', -+ static_cast<unsigned char>('Ð'),static_cast<unsigned char>('ð'), -+ 'E','e',static_cast<unsigned char>('É'),static_cast<unsigned char>('é'),static_cast<unsigned char>('È'),static_cast<unsigned char>('è'),static_cast<unsigned char>('Ë'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('ˆ'),static_cast<unsigned char>('¨'),static_cast<unsigned char>('‰'),static_cast<unsigned char>('©'), -+ static_cast<unsigned char>('Ê'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('Š'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('‹'),static_cast<unsigned char>('«'),static_cast<unsigned char>('Œ'),static_cast<unsigned char>('¬'),static_cast<unsigned char>(''),static_cast<unsigned char>(''),static_cast<unsigned char>('Ž'),static_cast<unsigned char>('®'), - 'F','f','G','g','H','h', -- 'I','i','Í','í','Ì','ì','›','ï','Î','î','˜','¸', -+ 'I','i',static_cast<unsigned char>('Í'),static_cast<unsigned char>('í'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('›'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('î'),static_cast<unsigned char>('˜'),static_cast<unsigned char>('¸'), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','Ó','ó','Ò','ò','™','ö','õ','õ','š','÷', -- 'Ô','ô','','¯','','°','‘','±','’','²','“','µ', -- '´','½','•','¾','–','¶','—','·','³','Þ','”','þ', -+ 'O','o',static_cast<unsigned char>('Ó'),static_cast<unsigned char>('ó'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('™'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('š'),static_cast<unsigned char>('÷'), -+ static_cast<unsigned char>('Ô'),static_cast<unsigned char>('ô'),static_cast<unsigned char>(''),static_cast<unsigned char>('¯'),static_cast<unsigned char>(''),static_cast<unsigned char>('°'),static_cast<unsigned char>('‘'),static_cast<unsigned char>('±'),static_cast<unsigned char>('’'),static_cast<unsigned char>('²'),static_cast<unsigned char>('“'),static_cast<unsigned char>('µ'), -+ static_cast<unsigned char>('´'),static_cast<unsigned char>('½'),static_cast<unsigned char>('•'),static_cast<unsigned char>('¾'),static_cast<unsigned char>('–'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('—'),static_cast<unsigned char>('·'),static_cast<unsigned char>('³'),static_cast<unsigned char>('Þ'),static_cast<unsigned char>('”'),static_cast<unsigned char>('þ'), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','Ú','ú','Ù','ù','œ','ü','','û','ž','ø', -- '¿','ß','º','Ñ','»','×','¼','Ø','ÿ','æ','¹','ñ', -+ 'U','u',static_cast<unsigned char>('Ú'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('œ'),static_cast<unsigned char>('ü'),static_cast<unsigned char>(''),static_cast<unsigned char>('û'),static_cast<unsigned char>('ž'),static_cast<unsigned char>('ø'), -+ static_cast<unsigned char>('¿'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('º'),static_cast<unsigned char>('Ñ'),static_cast<unsigned char>('»'),static_cast<unsigned char>('×'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('ÿ'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('¹'),static_cast<unsigned char>('ñ'), - 'V','v','W','w','X','x', -- 'Y','y','Ý','ý','Ÿ','Ï','Ö','Ö','Û','Û','Ü','Ü', -+ 'Y','y',static_cast<unsigned char>('Ý'),static_cast<unsigned char>('ý'),static_cast<unsigned char>('Ÿ'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ö'),static_cast<unsigned char>('Ö'),static_cast<unsigned char>('Û'),static_cast<unsigned char>('Û'),static_cast<unsigned char>('Ü'),static_cast<unsigned char>('Ü'), - 'Z','z', - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - // BKHCM1 --{'A','a','€','¾','','¿','‚','À','ƒ','Á','„','Â', -- 'Ÿ','Ý','~','Þ','¡','ß','¢','à','£','á','¤','â', -- '™','×','š','Ø','›','Ù','œ','Ú','','Û','˜','Ü', -+{'A','a',static_cast<unsigned char>('€'),static_cast<unsigned char>('¾'),static_cast<unsigned char>(''),static_cast<unsigned char>('¿'),static_cast<unsigned char>('‚'),static_cast<unsigned char>('À'),static_cast<unsigned char>('ƒ'),static_cast<unsigned char>('Á'),static_cast<unsigned char>('„'),static_cast<unsigned char>('Â'), -+ static_cast<unsigned char>('Ÿ'),static_cast<unsigned char>('Ý'),'~',static_cast<unsigned char>('Þ'),static_cast<unsigned char>('¡'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('¢'),static_cast<unsigned char>('à'),static_cast<unsigned char>('£'),static_cast<unsigned char>('á'),static_cast<unsigned char>('¤'),static_cast<unsigned char>('â'), -+ static_cast<unsigned char>('™'),static_cast<unsigned char>('×'),static_cast<unsigned char>('š'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('›'),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('œ'),static_cast<unsigned char>('Ú'),static_cast<unsigned char>(''),static_cast<unsigned char>('Û'),static_cast<unsigned char>('˜'),static_cast<unsigned char>('Ü'), - 'B','b','C','c','D','d', -- '}','½', -- 'E','e','…','Ã','†','Ä','‡','Å','ˆ','Æ','‰','Ç', -- '¥','ã','¦','ä','§','å','¨','æ','©','ç','ª','è', -+ '}',static_cast<unsigned char>('½'), -+ 'E','e',static_cast<unsigned char>('…'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('†'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>('‡'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('ˆ'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('‰'),static_cast<unsigned char>('Ç'), -+ static_cast<unsigned char>('¥'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('¦'),static_cast<unsigned char>('ä'),static_cast<unsigned char>('§'),static_cast<unsigned char>('å'),static_cast<unsigned char>('¨'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('©'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('è'), - 'F','f','G','g','H','h', -- 'I','i','Š','È','‹','É','Œ','Ê','','Ë','Ž','Ì', -+ 'I','i',static_cast<unsigned char>('Š'),static_cast<unsigned char>('È'),static_cast<unsigned char>('‹'),static_cast<unsigned char>('É'),static_cast<unsigned char>('Œ'),static_cast<unsigned char>('Ê'),static_cast<unsigned char>(''),static_cast<unsigned char>('Ë'),static_cast<unsigned char>('Ž'),static_cast<unsigned char>('Ì'), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','','Í','','Î','‘','Ï','’','Ð','“','Ñ', -- '«','é','¬','ê','','ë','®','ì','¯','í','°','î', -- '±','ï','²','ð','³','ñ','´','ò','µ','ó','¶','ô', -+ 'O','o',static_cast<unsigned char>(''),static_cast<unsigned char>('Í'),static_cast<unsigned char>(''),static_cast<unsigned char>('Î'),static_cast<unsigned char>('‘'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('’'),static_cast<unsigned char>('Ð'),static_cast<unsigned char>('“'),static_cast<unsigned char>('Ñ'), -+ static_cast<unsigned char>('«'),static_cast<unsigned char>('é'),static_cast<unsigned char>('¬'),static_cast<unsigned char>('ê'),static_cast<unsigned char>(''),static_cast<unsigned char>('ë'),static_cast<unsigned char>('®'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('¯'),static_cast<unsigned char>('í'),static_cast<unsigned char>('°'),static_cast<unsigned char>('î'), -+ static_cast<unsigned char>('±'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('²'),static_cast<unsigned char>('ð'),static_cast<unsigned char>('³'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('´'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('µ'),static_cast<unsigned char>('ó'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('ô'), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','”','Ò','•','Ó','–','Ô','—','Õ','˜','Ö', -- '·','õ','¸','ö','¹','÷','º','ø','»','ù','¼','ú', -+ 'U','u',static_cast<unsigned char>('”'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('•'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('–'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('—'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('˜'),static_cast<unsigned char>('Ö'), -+ static_cast<unsigned char>('·'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('¸'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('¹'),static_cast<unsigned char>('÷'),static_cast<unsigned char>('º'),static_cast<unsigned char>('ø'),static_cast<unsigned char>('»'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('ú'), - 'V','v','W','w','X','x', -- 'Y','y','{','û','^','ü','`','ý','|','þ','Ž','ÿ', -+ 'Y','y','{',static_cast<unsigned char>('û'),'^',static_cast<unsigned char>('ü'),'`',static_cast<unsigned char>('ý'),'|',static_cast<unsigned char>('þ'),static_cast<unsigned char>('Ž'),static_cast<unsigned char>('ÿ'), - 'Z','z', - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - //Vietware-F --{ 'A','a','À','À','ª','ª','¶','¶','º','º','Á','Á', -- '—','¡','Ê','Ê','Ç','Ç','È','È','É','É','Ë','Ë', -- '–','Ÿ','Å','Å','Â','Â','Ã','Ã','Ä','Ä','Æ','Æ', -+{ 'A','a',static_cast<unsigned char>('À'),static_cast<unsigned char>('À'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('¶'),static_cast<unsigned char>('º'),static_cast<unsigned char>('º'),static_cast<unsigned char>('Á'),static_cast<unsigned char>('Á'), -+ static_cast<unsigned char>('—'),static_cast<unsigned char>('¡'),static_cast<unsigned char>('Ê'),static_cast<unsigned char>('Ê'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('È'),static_cast<unsigned char>('È'),static_cast<unsigned char>('É'),static_cast<unsigned char>('É'),static_cast<unsigned char>('Ë'),static_cast<unsigned char>('Ë'), -+ static_cast<unsigned char>('–'),static_cast<unsigned char>('Ÿ'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('Â'),static_cast<unsigned char>('Â'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>('Æ'),static_cast<unsigned char>('Æ'), - 'B','b','C','c','D','d', -- '˜','¢', -- 'E','e','Ï','Ï','Ì','Ì','Í','Í','Î','Î','Ñ','Ñ', -- '™','£','Õ','Õ','Ò','Ò','Ó','Ó','Ô','Ô','Ö','Ö', -+ static_cast<unsigned char>('˜'),static_cast<unsigned char>('¢'), -+ 'E','e',static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('Í'),static_cast<unsigned char>('Í'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('Ñ'),static_cast<unsigned char>('Ñ'), -+ static_cast<unsigned char>('™'),static_cast<unsigned char>('£'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('Ö'),static_cast<unsigned char>('Ö'), - 'F','f','G','g','H','h', -- 'I','i','Û','Û','Ø','Ø','Ù','Ù','Ú','Ú','Ü','Ü', -+ 'I','i',static_cast<unsigned char>('Û'),static_cast<unsigned char>('Û'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('Ú'),static_cast<unsigned char>('Ú'),static_cast<unsigned char>('Ü'),static_cast<unsigned char>('Ü'), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','â','â','ß','ß','à','à','á','á','ã','ã', -- 'š','¤','ç','ç','ä','ä','å','å','æ','æ','è','è', -- '›','¥','ì','ì','é','é','ê','ê','ë','ë','í','í', -+ 'O','o',static_cast<unsigned char>('â'),static_cast<unsigned char>('â'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('à'),static_cast<unsigned char>('à'),static_cast<unsigned char>('á'),static_cast<unsigned char>('á'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('ã'), -+ static_cast<unsigned char>('š'),static_cast<unsigned char>('¤'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('ä'),static_cast<unsigned char>('ä'),static_cast<unsigned char>('å'),static_cast<unsigned char>('å'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('è'),static_cast<unsigned char>('è'), -+ static_cast<unsigned char>('›'),static_cast<unsigned char>('¥'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('é'),static_cast<unsigned char>('é'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('í'),static_cast<unsigned char>('í'), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','ò','ò','î','î','ï','ï','ñ','ñ','ó','ó', -- 'œ','§','÷','÷','ô','ô','õ','õ','ö','ö','ø','ø', -+ 'U','u',static_cast<unsigned char>('ò'),static_cast<unsigned char>('ò'),static_cast<unsigned char>('î'),static_cast<unsigned char>('î'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('ï'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('ó'),static_cast<unsigned char>('ó'), -+ static_cast<unsigned char>('œ'),static_cast<unsigned char>('§'),static_cast<unsigned char>('÷'),static_cast<unsigned char>('÷'),static_cast<unsigned char>('ô'),static_cast<unsigned char>('ô'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('õ'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('ö'),static_cast<unsigned char>('ø'),static_cast<unsigned char>('ø'), - 'V','v','W','w','X','x', -- 'Y','y','ü','ü','ù','ù','ú','ú','û','û','ÿ','ÿ', -+ 'Y','y',static_cast<unsigned char>('ü'),static_cast<unsigned char>('ü'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('ù'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('û'),static_cast<unsigned char>('û'),static_cast<unsigned char>('ÿ'),static_cast<unsigned char>('ÿ'), - 'Z','z', - 0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, - 0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93, - 0x94, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x9E, 0x00}, - // ISC -- {'A','a','ƒ','¸','€','µ','','¶','‚','·','„','¹', -- '¢','©','Ä',' ','Á','Ç','Â','È','Ã','É','†','Ë', -- '¡','¨','À','¾','¯','»','º','¼','¿','½','…','Æ', -+ {'A','a',static_cast<unsigned char>('ƒ'),static_cast<unsigned char>('¸'),static_cast<unsigned char>('€'),static_cast<unsigned char>('µ'),static_cast<unsigned char>(''),static_cast<unsigned char>('¶'),static_cast<unsigned char>('‚'),static_cast<unsigned char>('·'),static_cast<unsigned char>('„'),static_cast<unsigned char>('¹'), -+ static_cast<unsigned char>('¢'),static_cast<unsigned char>('©'),static_cast<unsigned char>('Ä'),static_cast<unsigned char>(' '),static_cast<unsigned char>('Á'),static_cast<unsigned char>('Ç'),static_cast<unsigned char>('Â'),static_cast<unsigned char>('È'),static_cast<unsigned char>('Ã'),static_cast<unsigned char>('É'),static_cast<unsigned char>('†'),static_cast<unsigned char>('Ë'), -+ static_cast<unsigned char>('¡'),static_cast<unsigned char>('¨'),static_cast<unsigned char>('À'),static_cast<unsigned char>('¾'),static_cast<unsigned char>('¯'),static_cast<unsigned char>('»'),static_cast<unsigned char>('º'),static_cast<unsigned char>('¼'),static_cast<unsigned char>('¿'),static_cast<unsigned char>('½'),static_cast<unsigned char>('…'),static_cast<unsigned char>('Æ'), - 'B','b','C','c','D','d', -- '§','®', -- 'E','e','Ð','Š','‡','Ì','ˆ','Î','‰','Ï','Ñ','‹', -- '£','ª','Ú','Õ','Å','Ò','Í','Ó','Ù','Ô','Œ','Ö', -+ static_cast<unsigned char>('§'),static_cast<unsigned char>('®'), -+ 'E','e',static_cast<unsigned char>('Ð'),static_cast<unsigned char>('Š'),static_cast<unsigned char>('‡'),static_cast<unsigned char>('Ì'),static_cast<unsigned char>('ˆ'),static_cast<unsigned char>('Î'),static_cast<unsigned char>('‰'),static_cast<unsigned char>('Ï'),static_cast<unsigned char>('Ñ'),static_cast<unsigned char>('‹'), -+ static_cast<unsigned char>('£'),static_cast<unsigned char>('ª'),static_cast<unsigned char>('Ú'),static_cast<unsigned char>('Õ'),static_cast<unsigned char>('Å'),static_cast<unsigned char>('Ò'),static_cast<unsigned char>('Í'),static_cast<unsigned char>('Ó'),static_cast<unsigned char>('Ù'),static_cast<unsigned char>('Ô'),static_cast<unsigned char>('Œ'),static_cast<unsigned char>('Ö'), - 'F','f','G','g','H','h', -- 'I','i','','Ý','','×','Ž','Ø','','Ü','‘','Þ', -+ 'I','i',static_cast<unsigned char>(''),static_cast<unsigned char>('Ý'),static_cast<unsigned char>(''),static_cast<unsigned char>('×'),static_cast<unsigned char>('Ž'),static_cast<unsigned char>('Ø'),static_cast<unsigned char>(''),static_cast<unsigned char>('Ü'),static_cast<unsigned char>('‘'),static_cast<unsigned char>('Þ'), - 'J','j','K','k','L','l','M','m','N','n', -- 'O','o','•','ã','’','ß','“','á','”','â','–','ä', -- '¤','«','ÿ','è','Û','å','à','æ','ð','ç','—','é', -- '¥','¬','›','í','˜','ê','™','ë','š','ì','œ','î', -+ 'O','o',static_cast<unsigned char>('•'),static_cast<unsigned char>('ã'),static_cast<unsigned char>('’'),static_cast<unsigned char>('ß'),static_cast<unsigned char>('“'),static_cast<unsigned char>('á'),static_cast<unsigned char>('”'),static_cast<unsigned char>('â'),static_cast<unsigned char>('–'),static_cast<unsigned char>('ä'), -+ static_cast<unsigned char>('¤'),static_cast<unsigned char>('«'),static_cast<unsigned char>('ÿ'),static_cast<unsigned char>('è'),static_cast<unsigned char>('Û'),static_cast<unsigned char>('å'),static_cast<unsigned char>('à'),static_cast<unsigned char>('æ'),static_cast<unsigned char>('ð'),static_cast<unsigned char>('ç'),static_cast<unsigned char>('—'),static_cast<unsigned char>('é'), -+ static_cast<unsigned char>('¥'),static_cast<unsigned char>('¬'),static_cast<unsigned char>('›'),static_cast<unsigned char>('í'),static_cast<unsigned char>('˜'),static_cast<unsigned char>('ê'),static_cast<unsigned char>('™'),static_cast<unsigned char>('ë'),static_cast<unsigned char>('š'),static_cast<unsigned char>('ì'),static_cast<unsigned char>('œ'),static_cast<unsigned char>('î'), - 'P','p','Q','q','R','r','S','s','T','t', -- 'U','u','@','ó','','ï','ž','ñ','Ÿ','ò','|','ô', -- '¦','','`','ø',0x5C,'õ','^','ö','~','÷','#','ù', -+ 'U','u','@',static_cast<unsigned char>('ó'),static_cast<unsigned char>(''),static_cast<unsigned char>('ï'),static_cast<unsigned char>('ž'),static_cast<unsigned char>('ñ'),static_cast<unsigned char>('Ÿ'),static_cast<unsigned char>('ò'),'|',static_cast<unsigned char>('ô'), -+ static_cast<unsigned char>('¦'),static_cast<unsigned char>(''),'`',static_cast<unsigned char>('ø'),0x5C,static_cast<unsigned char>('õ'),'^',static_cast<unsigned char>('ö'),'~',static_cast<unsigned char>('÷'),'#',static_cast<unsigned char>('ù'), - 'V','v','W','w','X','x', -- 'Y','y','³','ý','°','ú','±','û','²','ü','´','þ', -+ 'Y','y',static_cast<unsigned char>('³'),static_cast<unsigned char>('ý'),static_cast<unsigned char>('°'),static_cast<unsigned char>('ú'),static_cast<unsigned char>('±'),static_cast<unsigned char>('û'),static_cast<unsigned char>('²'),static_cast<unsigned char>('ü'),static_cast<unsigned char>('´'),static_cast<unsigned char>('þ'), - 'Z','z', - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13, diff --git a/misc/ibus-unikey/ibus-unikey.SlackBuild b/misc/ibus-unikey/ibus-unikey.SlackBuild deleted file mode 100644 index 3e2c7cc047..0000000000 --- a/misc/ibus-unikey/ibus-unikey.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus-unikey - -# Originally written in ibus-pinyin by Grissiom <chaos.proton@gmail.com> -# Adapted to ibus-unikey by Hoang Xuan Phu <phunehehe@gmail.com> -# Maintained by Binh Nguyen <binhvng@gmail.com> from version 0.5.1 - -PRGNAM=ibus-unikey -VERSION=${VERSION:-0.6.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz - -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Debian patch to fix compile errors with gcc -patch -p1 -i $CWD/gcc-6.diff - -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/ibus-unikey/ibus-unikey.info b/misc/ibus-unikey/ibus-unikey.info deleted file mode 100644 index d12327e7e8..0000000000 --- a/misc/ibus-unikey/ibus-unikey.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ibus-unikey" -VERSION="0.6.1" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/mrlequoctuan/ibus-unikey/archive/0.6.1/ibus-unikey-0.6.1.tar.gz" -MD5SUM="a219025729840ff86dec307373d78f33" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ibus" -MAINTAINER="Binh Nguyen" -EMAIL="binhvng@gmail.com" diff --git a/misc/ibus-unikey/slack-desc b/misc/ibus-unikey/slack-desc deleted file mode 100644 index f73acc1441..0000000000 --- a/misc/ibus-unikey/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ibus-unikey: ibus-unikey (unikey engine for ibus input framework) -ibus-unikey: -ibus-unikey: ibus-unikey is a Vietnamese input engine for the ibus input framework -ibus-unikey: this input engine uses the TELEX input method -ibus-unikey: -ibus-unikey: Homepage: https://github.com/ibus/ibus/wiki -ibus-unikey: -ibus-unikey: -ibus-unikey: -ibus-unikey: -ibus-unikey: diff --git a/misc/ibus/README b/misc/ibus/README deleted file mode 100644 index bddcfd6af2..0000000000 --- a/misc/ibus/README +++ /dev/null @@ -1,19 +0,0 @@ -IBus is an Intelligent Input Bus. It is a new input framework for Linux. -It provides a full featured and user friendly input method user interface. -It also may help developers to develop input method easily. - -After installing at least one engine (e.g. PinYin engine) and enabling it -in ibus-setup, ibus itself should be fully functional. If you want to use -ibus as your primary input method, you should remove the scim package. - -If you use qt applications, then you probably want ibus-qt as well. - -To enable ibus put the following lines in your ~/.bashrc file: - -export GTK_IM_MODULE=ibus -export XMODIFIERS=@im=ibus -export QT_IM_MODULE=ibus - -ibus is pre-configured to autostart on xdg-compliant desktop environments -if these settings are present. On other desktop environments you can add -"ibus-autostart" to the respective autostart settings. diff --git a/misc/ibus/doinst.sh b/misc/ibus/doinst.sh deleted file mode 100644 index 6450401b66..0000000000 --- a/misc/ibus/doinst.sh +++ /dev/null @@ -1,20 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x usr/bin/update-gtk-immodules ]; then - chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - diff --git a/misc/ibus/ibus-autostart b/misc/ibus/ibus-autostart deleted file mode 100644 index 29fab3a050..0000000000 --- a/misc/ibus/ibus-autostart +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -START="no" - -if [ "$XIM" = "ibus" ]; then - START="yes" -fi - -if [ "$XIM_PROGRAM" = "ibus" ]; then - START="yes" -fi - -if [ "$GTK_IM_MODULE" = "ibus" ]; then - START="yes" -fi - -if [ "$QT_IM_MOFULE" = "ibus" ]; then - START="yes" -fi - -if [ "$START" = "yes" ]; then - ibus-daemon -drx -fi diff --git a/misc/ibus/ibus-autostart.desktop b/misc/ibus/ibus-autostart.desktop deleted file mode 100644 index 1dcf7dae84..0000000000 --- a/misc/ibus/ibus-autostart.desktop +++ /dev/null @@ -1,32 +0,0 @@ -[Desktop Entry] -Name=IBus -Name[de]=IBus -Name[es]=IBus -Name[ja]=IBus -Name[zh_CN]=IBus -Name[zh_TW]=IBus -Name[ko]=IBus -GenericName=Input Method -GenericName[de]=Eingabemethode -GenericName[es]=Método de entrada -GenericName[ja]=入力メソッド -GenericName[zh_CN]=输入法 -GenericName[zh_TW]=輸入法 -GenericName[ko]=ìž…ë ¥ 방법 -Comment=Start Input Method -Comment[de]=Eingabemethode starten -Comment[ja]=入力メソッドを開始 -Comment[zh_CN]=å¯åŠ¨è¾“入法 -Comment[zh_TW]=啓動輸入法 -Comment[ko]=ìž…ë ¥ê¸° 시작 -Exec=ibus-autostart -Icon=ibus -Terminal=false -Type=Application -Categories=System;Utility; -StartupNotify=false -X-GNOME-Autostart-Phase=Applications -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=false -X-KDE-autostart-after=panel -X-KDE-StartupNotify=false diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild deleted file mode 100644 index a5f477e4e8..0000000000 --- a/misc/ibus/ibus.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# Slackware build script for ibus - -# Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -# Modified by Grissiom <chaos.proton@gmail.com> to build ibus -# Feedback (especially improvements) is encouraged! :-) - -PRGNAM=ibus -VERSION=${VERSION:-1.5.16} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz -cd ${PRGNAM}-${VERSION} -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -cat $CWD/emoji-test.txt > emoji-test.txt - -# fix libdir -sed -i "s|/lib/python|/lib$LIBDIRSUFFIX/python|g" ./configure - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var/lib \ - --mandir=/usr/man \ - --enable-python-library \ - --with-unicode-emoji-dir=$TMP/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/etc/xdg/autostart -install -m 755 $CWD/ibus-autostart $PKG/usr/bin/ -install -m 644 $CWD/ibus-autostart.desktop $PKG/etc/xdg/autostart/ - -# cleanup temporary files -rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/gi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING* INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/ibus/ibus.info b/misc/ibus/ibus.info deleted file mode 100644 index 24badc3075..0000000000 --- a/misc/ibus/ibus.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="ibus" -VERSION="1.5.16" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -DOWNLOAD="https://github.com/ibus/ibus/releases/download/1.5.16/ibus-1.5.16.tar.gz \ - http://www.unicode.org/Public/emoji/4.0/emoji-test.txt" -MD5SUM="31ea7c1259c7285bd9d71f3000cbd95b \ - 965fe35c4db4401cb9644ebb6251df55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="json-glib cldr-emoji-annotation" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/ibus/slack-desc b/misc/ibus/slack-desc deleted file mode 100644 index 7ead9487bc..0000000000 --- a/misc/ibus/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ibus: ibus (Intelligent Input Bus for Linux) -ibus: -ibus: IBus is an Intelligent Input Bus. It is a new input framework for -ibus: Linux. It provides a full featured and user friendly input method -ibus: user interface. It also may help developers create an input method -ibus: easily. -ibus: -ibus: Homepage: https://github.com/ibus/ibus/wiki -ibus: -ibus: -ibus: diff --git a/misc/kcm-fcitx/README b/misc/kcm-fcitx/README deleted file mode 100644 index 559facee7f..0000000000 --- a/misc/kcm-fcitx/README +++ /dev/null @@ -1,2 +0,0 @@ -kcm-fcitx is a configuration tool that highly integrated with KDE. -You can start it from Fcitx, or find it in KDE Systemsettings -> Locale. diff --git a/misc/kcm-fcitx/doinst.sh b/misc/kcm-fcitx/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/kcm-fcitx/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/misc/kcm-fcitx/kcm-fcitx.SlackBuild b/misc/kcm-fcitx/kcm-fcitx.SlackBuild deleted file mode 100644 index 1959c69bec..0000000000 --- a/misc/kcm-fcitx/kcm-fcitx.SlackBuild +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Slackware build script for kcm-fcitx - -# Copyright 2012 vvoody <vvoodywang@gmail.com> -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=kcm-fcitx -VERSION=${VERSION:-0.4.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/kcm-fcitx/kcm-fcitx.info b/misc/kcm-fcitx/kcm-fcitx.info deleted file mode 100644 index 9b3f34e2c2..0000000000 --- a/misc/kcm-fcitx/kcm-fcitx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kcm-fcitx" -VERSION="0.4.3" -HOMEPAGE="https://fcitx-im.org/wiki/Kcm" -DOWNLOAD="https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.4.3.tar.xz" -MD5SUM="4cc0c0a4362ba9a3b814437273d9adb0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/kcm-fcitx/slack-desc b/misc/kcm-fcitx/slack-desc deleted file mode 100644 index 4b80aed61d..0000000000 --- a/misc/kcm-fcitx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -kcm-fcitx: kcm-fcitx (KDE config module for Fcitx) -kcm-fcitx: -kcm-fcitx: kcm-fcitx is a configuration tool that highly integrated with KDE. -kcm-fcitx: -kcm-fcitx: *Features* -kcm-fcitx: - Change input method list -kcm-fcitx: - Change global configuration -kcm-fcitx: - Change addon configuration and enable/disable addon. -kcm-fcitx: - Download skin from kde-look.org -kcm-fcitx: -kcm-fcitx: Homepage: http://fcitx-im.org/wiki/Kcm diff --git a/misc/krename/README b/misc/krename/README deleted file mode 100644 index 6e6fb3fb3e..0000000000 --- a/misc/krename/README +++ /dev/null @@ -1,9 +0,0 @@ -KRename is a powerful batch renamer for KDE. - -It allows you to easily rename hundreds or even more files in -one go. The filenames can be created by parts of the original -filename, numbering the files or accessing hundreds of -informations about the file, like creation date or Exif -informations of an image. - -krename optionally depends on podofo. diff --git a/misc/krename/doinst.sh b/misc/krename/doinst.sh deleted file mode 100644 index 0d2fdbbd5e..0000000000 --- a/misc/krename/doinst.sh +++ /dev/null @@ -1,16 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/locolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/locolor >/dev/null 2>&1 - fi -fi - diff --git a/misc/krename/krename.SlackBuild b/misc/krename/krename.SlackBuild deleted file mode 100644 index f084711cd4..0000000000 --- a/misc/krename/krename.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for krename - -# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by the slackbuilds.org project. - -PRGNAM=krename -VERSION=${VERSION:-r247} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -KDEPREF=$(kde4-config --prefix) - -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX="$KDEPREF" \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - . - -make -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/krename/krename.info b/misc/krename/krename.info deleted file mode 100644 index 2e04ab61b4..0000000000 --- a/misc/krename/krename.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krename" -VERSION="r247" -HOMEPAGE="http://www.krename.net" -DOWNLOAD="http://www.liwjatan.at/files/src/krename/krename-r247.tar.xz" -MD5SUM="bfbf30b0df6107de2c9ef6788f69b759" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/misc/krename/slack-desc b/misc/krename/slack-desc deleted file mode 100644 index a3cf1f87d6..0000000000 --- a/misc/krename/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -krename: krename (a powerful batch renamer for KDE) -krename: -krename: It allows you to easily rename hundreds or even more files in one go. -krename: The filenames can be created by parts of the original filename, -krename: numbering the files or accessing hundreds of informations about the -krename: file, like creation date or Exif informations of an image. -krename: -krename: Homepage: http://www.krename.net -krename: -krename: -krename: diff --git a/misc/opencc/README b/misc/opencc/README deleted file mode 100644 index 0ba21ba6e1..0000000000 --- a/misc/opencc/README +++ /dev/null @@ -1,4 +0,0 @@ -Open Chinese Convert (OpenCC) is an opensource project for conversion -between Traditional Chinese and Simplified Chinese, supporting -character-level conversion, phrase-level conversion, variant conversion -and regional idioms among Mainland China, Taiwan and Hong kong. diff --git a/misc/opencc/opencc.SlackBuild b/misc/opencc/opencc.SlackBuild deleted file mode 100644 index c46eb39e14..0000000000 --- a/misc/opencc/opencc.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# Slackware build script for OpenCC - -# Copyright 2015 CCHsu, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=opencc -SRCNAM=OpenCC -VERSION=${VERSION:-1.0.3} -SRCVER=ver.$VERSION -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$SRCVER -tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz -cd $SRCNAM-$SRCVER -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -sed -i -e "s/set (LIB_SUFFIX \"\")/set (LIB_SUFFIX \"$LIBDIRSUFFIX\")/" CMakeLists.txt - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/opencc/opencc.info b/misc/opencc/opencc.info deleted file mode 100644 index 27e4a923cb..0000000000 --- a/misc/opencc/opencc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencc" -VERSION="1.0.3" -HOMEPAGE="http://byvoid.github.io/OpenCC/" -DOWNLOAD="https://github.com/BYVoid/OpenCC/archive/ver.1.0.3.tar.gz" -MD5SUM="c196d6fe29d57b2efcc32e868f5ed21b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="CCHsu" -EMAIL="a12321aabb@gmail.com" diff --git a/misc/opencc/slack-desc b/misc/opencc/slack-desc deleted file mode 100644 index f238fed167..0000000000 --- a/misc/opencc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opencc: opencc (Open Chinese Convert) -opencc: -opencc: Open Chinese Convert is an opensource project for conversion -opencc: between Traditional Chinese and Simplified Chinese, supporting -opencc: character-level conversion, phrase-level conversion, variant -opencc: conversion and regional idioms among Mainland China, Taiwan and -opencc: Hong kong. -opencc: -opencc: Homepage: http://byvoid.github.io/OpenCC/ -opencc: -opencc: diff --git a/misc/pinfo/gcc10-stringop.diff b/misc/pinfo/gcc10-stringop.diff new file mode 100644 index 0000000000..a57fa91d08 --- /dev/null +++ b/misc/pinfo/gcc10-stringop.diff @@ -0,0 +1,28 @@ +diff --git a/src/utils.c b/src/utils.c +index cb2fe76..2e4139c 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -848,10 +848,9 @@ char * + make_tempfile() + { + char *filename; +- size_t len; + + /* TODO: fix hardcoded /tmp */ +- char tmpfile_template[] = "/tmp/pinfo.XXXXXX"; ++ char tmpfile_template[32] = "/tmp/pinfo.XXXXXX"; + + /* create a tmpfile */ + int fd = mkstemp(tmpfile_template); +@@ -864,9 +863,8 @@ make_tempfile() + } + + /* allocate a new string and copy the filename there */ +- len = strlen(tmpfile_template)+1; +- filename = xmalloc(len+1); /* guarenteerd to be set to \0's */ +- strncpy(filename, tmpfile_template, len); ++ filename = xmalloc(33); /* guarenteerd to be set to \0's */ ++ strncpy(filename, tmpfile_template, 32); + + /* close the file */ + close(fd); diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild index 5b318d1b5a..779bf904ac 100644 --- a/misc/pinfo/pinfo.SlackBuild +++ b/misc/pinfo/pinfo.SlackBuild @@ -79,9 +79,11 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/gcc10-stringop.diff + [ -e configure ] || sh autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/misc/po4a/po4a.info b/misc/po4a/po4a.info index f699d19960..caa17c89ed 100644 --- a/misc/po4a/po4a.info +++ b/misc/po4a/po4a.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar MD5SUM="25881c0a02c1180ffdec4bf452b4ff0f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Unicode-LineBreak perl-Module-Build perl-YAML-Tiny" +REQUIRES="perl-Pod-Parser perl-Unicode-LineBreak perl-Module-Build perl-YAML-Tiny" MAINTAINER="Didier Spaier" EMAIL="didier at slint dot fr" diff --git a/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild index 9d968995a7..6e09e5937d 100644 --- a/misc/projectM/projectM.SlackBuild +++ b/misc/projectM/projectM.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=projectM -VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,33 +60,19 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-complete-$VERSION-Source.tar.gz -cd $PRGNAM-complete-$VERSION-Source - -patch -p0 < $CWD/patch_use_LIB_SUFFIX.diff -patch -p0 < $CWD/patch_use_both_fonts.diff -patch -p1 < $CWD/projectM-2.1.0_gcc.patch - -chown -R root:root . +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lglut -lGL -std=c++11" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DINCLUDE-PROJECTM-PULSEAUDIO:BOOLEAN=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. +# thanks archlinux! +./configure --prefix=/usr --enable-gles --enable-sdl --enable-threading --enable-qt +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix overlinking +make +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/misc/projectM/projectM.info b/misc/projectM/projectM.info index 789ec2ae31..9b18f846d3 100644 --- a/misc/projectM/projectM.info +++ b/misc/projectM/projectM.info @@ -1,10 +1,10 @@ PRGNAM="projectM" -VERSION="2.1.0" +VERSION="3.1.7" HOMEPAGE="http://projectm.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/projectm/projectM-complete-2.1.0-Source.tar.gz" -MD5SUM="debf30f7ce94ff0102f06fbb0cc4e92b" +DOWNLOAD="https://github.com/projectM-visualizer/projectm/releases/download/v3.1.7/projectM-3.1.7.tar.gz" +MD5SUM="abd4cab7abec65fe05b4dcc064bf5ba3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ftgl" +REQUIRES="ftgl glm" MAINTAINER="M.Dinslage" EMAIL="daedra1980@gmail.com" diff --git a/misc/qtkeychain/README b/misc/qtkeychain/README deleted file mode 100644 index 5457220f6f..0000000000 --- a/misc/qtkeychain/README +++ /dev/null @@ -1,11 +0,0 @@ -QtKeychain is a Qt API to store passwords and other secret data -securely. How the data is stored on Linux: - -If running, GNOME Keyring is used, otherwise qtkeychain tries to -use KWallet (via D-Bus), if available. In unsupported environments -QtKeychain will report an error. It will not store any data -unencrypted unless explicitly requested -(setInsecureFallback( true )). - -If this is built against the optional dependency qt5 it will use -that instead of qt-4.x. diff --git a/misc/qtkeychain/qtkeychain.SlackBuild b/misc/qtkeychain/qtkeychain.SlackBuild deleted file mode 100644 index a56078d4bc..0000000000 --- a/misc/qtkeychain/qtkeychain.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for qtkeychain - -# Copyright 2014 Donald Cooley La Porte, IN USA -# Copyright 2016-2020 Donald Cooley South Haven, IN USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=qtkeychain -VERSION=${VERSION:-0.10.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/qtkeychain/qtkeychain.info b/misc/qtkeychain/qtkeychain.info deleted file mode 100644 index 122ee046de..0000000000 --- a/misc/qtkeychain/qtkeychain.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qtkeychain" -VERSION="0.10.0" -HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" -DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0/qtkeychain-0.10.0.tar.gz" -MD5SUM="00856441d995146b11fb8cfab87b8bc6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" diff --git a/misc/qtkeychain/slack-desc b/misc/qtkeychain/slack-desc deleted file mode 100644 index 7ad29dd2d7..0000000000 --- a/misc/qtkeychain/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qtkeychain: qtkeychain (A Qt API to store passwords and secret data securely) -qtkeychain: -qtkeychain: How the data is stored on Linux: -qtkeychain: -qtkeychain: If running, GNOME Keyring is used, otherwise qtkeychain tries to -qtkeychain: use KWallet (via D-Bus), if available. In unsupported environments -qtkeychain: QtKeychain will report an error. It will not store any data -qtkeychain: unencrypted unless explicitly requested (setInsecureFallback( -qtkeychain: true )). -qtkeychain: -qtkeychain: https://github.com/frankosterfeld/qtkeychain diff --git a/misc/qtspell/qtspell.SlackBuild b/misc/qtspell/qtspell.SlackBuild index a238528724..782cb162f0 100644 --- a/misc/qtspell/qtspell.SlackBuild +++ b/misc/qtspell/qtspell.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qtspell -VERSION=${VERSION:-0.8.2} +VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/misc/qtspell/qtspell.info b/misc/qtspell/qtspell.info index 45f5b7816a..30f4b2db68 100644 --- a/misc/qtspell/qtspell.info +++ b/misc/qtspell/qtspell.info @@ -1,8 +1,8 @@ PRGNAM="qtspell" -VERSION="0.8.2" +VERSION="0.9.0" HOMEPAGE="https://github.com/manisandro/qtspell/" -DOWNLOAD="https://github.com/manisandro/qtspell/releases/download/0.8.2/qtspell-0.8.2.tar.xz" -MD5SUM="08672fa184b7b27c4695bf6ad39b3114" +DOWNLOAD="https://github.com/manisandro/qtspell/archive/0.9.0/qtspell-0.9.0.tar.gz" +MD5SUM="51cec935f402d51ac0d3b3f1f08fc8ae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/stardict-tools/stardict-tools.SlackBuild b/misc/stardict-tools/stardict-tools.SlackBuild index 7a681ee867..5466bff3f4 100644 --- a/misc/stardict-tools/stardict-tools.SlackBuild +++ b/misc/stardict-tools/stardict-tools.SlackBuild @@ -52,6 +52,9 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p0 < $CWD/stardict-tools.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild index 03e9da72dc..a38295a6b7 100644 --- a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild +++ b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wkhtmltopdf -VERSION=${VERSION:-0.12.3.2} +VERSION=${VERSION:-0.12.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,7 +71,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -qmake +qmake-qt5 make make install INSTALL_ROOT=$PKG/usr @@ -88,7 +88,7 @@ mv $PKG/usr/share/man/* $PKG/usr/man/ rm -rf $PKG/usr/share/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG* LICENSE INSTALL.md README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG* LICENSE README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/misc/wkhtmltopdf/wkhtmltopdf.info b/misc/wkhtmltopdf/wkhtmltopdf.info index 808b588bf7..1fc1a55137 100644 --- a/misc/wkhtmltopdf/wkhtmltopdf.info +++ b/misc/wkhtmltopdf/wkhtmltopdf.info @@ -1,8 +1,8 @@ PRGNAM="wkhtmltopdf" -VERSION="0.12.3.2" +VERSION="0.12.6" HOMEPAGE="https://wkhtmltopdf.org/" -DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.3.2.tar.gz" -MD5SUM="8b443f1c541f3f95651f6e766b3f39a6" +DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.6/wkhtmltopdf-0.12.6.tar.gz" +MD5SUM="170ce433d1ea62128ca4713b995f8cba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/yapet/gcc6.patch b/misc/yapet/gcc6.patch new file mode 100644 index 0000000000..a57e0c93c1 --- /dev/null +++ b/misc/yapet/gcc6.patch @@ -0,0 +1,11 @@ +--- yapet-1.0/yapet/cfg.h 2014-02-23 10:18:41.000000000 -0700 ++++ yapet-1.0/yapet/cfg.h 2016-04-14 07:06:49.665672169 -0700 +@@ -163,7 +163,7 @@ + locked = false; + } + +- void is_locked() const { ++ bool is_locked() const { + return locked; + } + diff --git a/misc/yapet/yapet.SlackBuild b/misc/yapet/yapet.SlackBuild index 25630ffe46..91af2b8d91 100644 --- a/misc/yapet/yapet.SlackBuild +++ b/misc/yapet/yapet.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# From upstream +patch -p1 < $CWD/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/misc/ykpers/fix-boolean-value-with-json-c-0.14.patch b/misc/ykpers/fix-boolean-value-with-json-c-0.14.patch new file mode 100644 index 0000000000..8a57ea3184 --- /dev/null +++ b/misc/ykpers/fix-boolean-value-with-json-c-0.14.patch @@ -0,0 +1,83 @@ +From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Sat, 25 Apr 2020 20:55:28 +0200 +Subject: [PATCH 1/1] fix boolean value with json-c 0.14 + +Upstream removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. +--- + ykpers-json.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/ykpers-json.c b/ykpers-json.c +index a62e907..15ad380 100644 +--- a/ykpers-json.c ++++ b/ykpers-json.c +@@ -40,7 +40,7 @@ + #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1 + #endif + + static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP + if(p->mode && (mode & p->mode) == mode) { + json_object *joption; + json_bool ret = yk_json_object_object_get(options, p->json_text, joption); +- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) { ++ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) { + int value = json_object_get_boolean(joption); + if(value == 1) { + p->setter(cfg, true); +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) { ++ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "options", options) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } + +- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) { ++ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) { + int target_config = json_object_get_int(jtarget); + int command; + if(target_config == 1) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + if(mode == MODE_OATH_HOTP) { + json_object *jdigits, *jrandom; + ykp_set_tktflag_OATH_HOTP(cfg, true); +- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) { ++ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) { + int digits = json_object_get_int(jdigits); + if(digits == 8) { + ykp_set_cfgflag_OATH_HOTP8(cfg, true); + } + } +- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) { ++ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) { + int random = json_object_get_boolean(jrandom); + int seed = 0; + if(random == 1) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + goto out; + } else { + json_object *jseed; +- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) { ++ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) { + seed = json_object_get_int(jseed); + } + } diff --git a/misc/ykpers/ykpers.SlackBuild b/misc/ykpers/ykpers.SlackBuild index f6aca572e7..95626291ff 100644 --- a/misc/ykpers/ykpers.SlackBuild +++ b/misc/ykpers/ykpers.SlackBuild @@ -71,7 +71,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +# Thanks archlinux! +patch -p1 < $CWD/fix-boolean-value-with-json-c-0.14.patch + +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/misc/zinnia/zinnia-fixes-gcc6-compile.patch b/misc/zinnia/zinnia-fixes-gcc6-compile.patch new file mode 100644 index 0000000000..848f306edb --- /dev/null +++ b/misc/zinnia/zinnia-fixes-gcc6-compile.patch @@ -0,0 +1,22 @@ +Index: zinnia-0.06/trainer.cpp +=================================================================== +--- zinnia-0.06.orig/trainer.cpp ++++ zinnia-0.06/trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + diff --git a/misc/zinnia/zinnia.SlackBuild b/misc/zinnia/zinnia.SlackBuild index efd04acd51..62b3c033e4 100644 --- a/misc/zinnia/zinnia.SlackBuild +++ b/misc/zinnia/zinnia.SlackBuild @@ -70,6 +70,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fedora for this patch +patch -p1 < $CWD/zinnia-fixes-gcc6-compile.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |