diff --git a/Plantillas/ffmpeg-custom/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/Plantillas/ffmpeg-custom/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch deleted file mode 100644 index 7a7466c..0000000 --- a/Plantillas/ffmpeg-custom/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2687070d9b092d3a354a6963c65197054ddf7a75 Mon Sep 17 00:00:00 2001 -From: Carl Eugen Hoyos -Date: Sat, 23 Jan 2021 19:33:13 +0100 -Subject: [PATCH] lsws/ppc/yuv2rgb: Fix transparency converting from - yuv->rgb32. -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Based on 68363b69 by Reimar Döffinger. - -Fixes ticket #9077. ---- - libswscale/ppc/yuv2rgb_altivec.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c -index 58e480dd2c..4f5382e4c1 100644 ---- a/libswscale/ppc/yuv2rgb_altivec.c -+++ b/libswscale/ppc/yuv2rgb_altivec.c -@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ - } - - #define out_abgr(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr) -+ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), c, b, a, ptr) - #define out_bgra(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr) -+ vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr) - #define out_rgba(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr) -+ vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr) - #define out_argb(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr) -+ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), a, b, c, ptr) - #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr) - #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr) - --- -2.20.1 - diff --git a/Plantillas/ffmpeg-custom/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/Plantillas/ffmpeg-custom/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch deleted file mode 100644 index 86f5588..0000000 --- a/Plantillas/ffmpeg-custom/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3 -From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001 -From: Lynne -Date: Tue, 7 Jul 2020 16:01:58 +0100 -Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value - -We return 0 for this particular architecture but should instead be -returning the number of lines. -Fixes users who check the return value matches what they expect. ---- - libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++--------------- - libswscale/aarch64/yuv2rgb_neon.S | 2 ++ - 2 files changed, 16 insertions(+), 17 deletions(-) - -diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c -index 551daad9e353..c7a2a1037df8 100644 ---- a/libswscale/aarch64/swscale_unscaled.c -+++ b/libswscale/aarch64/swscale_unscaled.c -@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], \ -- src[1], srcStride[1], \ -- src[2], srcStride[2], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], \ -+ src[1], srcStride[1], \ -+ src[2], srcStride[2], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \ -@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], src[1], srcStride[1], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], src[1], srcStride[1], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \ -diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S -index b7446aa10511..f4b220fb608e 100644 ---- a/libswscale/aarch64/yuv2rgb_neon.S -+++ b/libswscale/aarch64/yuv2rgb_neon.S -@@ -142,6 +142,7 @@ - .macro declare_func ifmt ofmt - function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - load_args_\ifmt -+ mov w9, w1 - 1: - mov w8, w0 // w8 = width - 2: -@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - increment_\ifmt - subs w1, w1, #1 // height -= 1 - b.gt 1b -+ mov w0, w9 - ret - endfunc - .endm diff --git a/Plantillas/ffmpeg-custom/patches/armv5tel-floating-point.patch b/Plantillas/ffmpeg-custom/patches/armv5tel-floating-point.patch deleted file mode 100644 index 9a55178..0000000 --- a/Plantillas/ffmpeg-custom/patches/armv5tel-floating-point.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200 -+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100 -@@ -39,6 +39,15 @@ - #endif - #include - -+#if (FE_ALL_EXCEPT == 0) -+/* E.g. ARM soft float does not define these */ -+#define FE_INVALID 0 -+#define FE_DIVBYZERO 0 -+#define FE_OVERFLOW 0 -+#define FE_UNDERFLOW 0 -+#define FE_INEXACT 0 -+#endif -+ - #if CONFIG_LIBFONTCONFIG - #include - #endif diff --git a/Plantillas/ffmpeg-custom/patches/workaround-mesa-readeon-vaapi-bug.patch b/Plantillas/ffmpeg-custom/patches/workaround-mesa-readeon-vaapi-bug.patch deleted file mode 100644 index 00e3f68..0000000 --- a/Plantillas/ffmpeg-custom/patches/workaround-mesa-readeon-vaapi-bug.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 26 Jan 2019 19:48:35 +0100 -Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices - -This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368. -It was hit frequently when watching h264 channels received via DVB-X. -Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704 ---- - libavcodec/vaapi_h264.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c -index 5854587a255..f12fdc457a4 100644 ---- a/libavcodec/vaapi_h264.c -+++ b/libavcodec/vaapi_h264.c -@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx) - H264SliceContext *sl = &h->slice_ctx[0]; - int ret; - -+ if (pic->nb_slices == 0) { -+ ret = AVERROR_INVALIDDATA; -+ goto finish; -+ } -+ - ret = ff_vaapi_decode_issue(avctx, pic); - if (ret < 0) - goto finish; diff --git a/Plantillas/grub-custom/files/grub.default b/Plantillas/grub-custom/files/grub.default deleted file mode 100644 index 8e82316..0000000 --- a/Plantillas/grub-custom/files/grub.default +++ /dev/null @@ -1,21 +0,0 @@ -# -# Configuration file for GRUB. -# -GRUB_DEFAULT=0 -#GRUB_HIDDEN_TIMEOUT=0 -#GRUB_HIDDEN_TIMEOUT_QUIET=false -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Void" -GRUB_CMDLINE_LINUX_DEFAULT="loglevel=4" -# Uncomment to use basic console -#GRUB_TERMINAL_INPUT="console" -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console -#GRUB_BACKGROUND=/usr/share/void-artwork/splash.png -#GRUB_GFXMODE=1920x1080x32 -#GRUB_DISABLE_LINUX_UUID=true -#GRUB_DISABLE_RECOVERY=true -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" diff --git a/Plantillas/grub-custom/files/kernel.d/grub.post b/Plantillas/grub-custom/files/kernel.d/grub.post deleted file mode 100644 index 561d8b2..0000000 --- a/Plantillas/grub-custom/files/kernel.d/grub.post +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# Kernel hook for GRUB 2. -# -# Arguments passed to this script: $1 pkgname, $2 version. -# -PKGNAME="$1" -VERSION="$2" - -export ZPOOL_VDEV_NAME_PATH=YES - -if command -v grub-mkconfig >/dev/null 2>&1; then - if [ -d $ROOTDIR/boot/grub ]; then - grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg - exit $? - fi -fi - -exit 0 diff --git a/Plantillas/grub-custom/patches/0004-add-GRUB_COLOR_variables.patch b/Plantillas/grub-custom/patches/0004-add-GRUB_COLOR_variables.patch deleted file mode 100644 index 903a39c..0000000 --- a/Plantillas/grub-custom/patches/0004-add-GRUB_COLOR_variables.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d..f271608 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ - GRUB_BACKGROUND \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index d2e7252..8259f45 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -125,6 +125,14 @@ cat < -Date: Sat, 6 Sep 2014 12:20:12 +0100 -Subject: grub-install: Install PV Xen binaries into the upstream specified - path - -Upstream have defined a specification for where guests ought to place their -xenpv grub binaries in order to facilitate chainloading from a stage 1 grub -loaded from dom0. - -http://xenbits.xen.org/docs/unstable-staging/misc/x86-xenpv-bootloader.html - -The spec calls for installation into /boot/xen/pvboot-i386.elf or -/boot/xen/pvboot-x86_64.elf. - -Signed-off-by: Ian Campbell - -Bug-Debian: https://bugs.debian.org/762307 -Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-10/msg00041.html -Last-Update: 2014-10-24 - -Patch-Name: grub-install-pvxen-paths.patch - ---- -v2: Respect bootdir, create /boot/xen as needed. ---- - util/grub-install.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/util/grub-install.c b/util/grub-install.c -index b82c14d41..caadada98 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1962,6 +1962,28 @@ main (int argc, char *argv[]) - } - break; - -+ case GRUB_INSTALL_PLATFORM_I386_XEN: -+ { -+ char *path = grub_util_path_concat (2, bootdir, "xen"); -+ char *dst = grub_util_path_concat (2, path, "pvboot-i386.elf"); -+ grub_install_mkdir_p (path); -+ grub_install_copy_file (imgfile, dst, 1); -+ free (dst); -+ free (path); -+ } -+ break; -+ -+ case GRUB_INSTALL_PLATFORM_X86_64_XEN: -+ { -+ char *path = grub_util_path_concat (2, bootdir, "xen"); -+ char *dst = grub_util_path_concat (2, path, "pvboot-x86_64.elf"); -+ grub_install_mkdir_p (path); -+ grub_install_copy_file (imgfile, dst, 1); -+ free (dst); -+ free (path); -+ } -+ break; -+ - case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON: - case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS: - case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: -@@ -1971,8 +1971,6 @@ main (int argc, char *argv[]) - case GRUB_INSTALL_PLATFORM_MIPSEL_ARC: - case GRUB_INSTALL_PLATFORM_ARM_UBOOT: - case GRUB_INSTALL_PLATFORM_I386_QEMU: -- case GRUB_INSTALL_PLATFORM_I386_XEN: -- case GRUB_INSTALL_PLATFORM_X86_64_XEN: - case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: - grub_util_warn ("%s", - _("WARNING: no platform-specific install was performed")); diff --git a/Plantillas/grub-custom/patches/ieee1275-clear-reset.patch b/Plantillas/grub-custom/patches/ieee1275-clear-reset.patch deleted file mode 100644 index 18ff773..0000000 --- a/Plantillas/grub-custom/patches/ieee1275-clear-reset.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 54b741317568867fc4ad801a65397d05f3ea0f59 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Thu, 25 Sep 2014 18:41:29 -0300 -Subject: Include a text attribute reset in the clear command for ppc - -Always clear text attribute for clear command in order to avoid problems -after it boots. - -* grub-core/term/terminfo.c: Add escape for text attribute reset - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1295255 -Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00076.html -Last-Update: 2014-09-26 - -Patch-Name: ieee1275-clear-reset.patch ---- - grub-core/term/terminfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index f0d3e3deb..7cb7909c8 100644 ---- a/grub-core/term/terminfo.c -+++ b/grub-core/term/terminfo.c -@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, - /* Clear the screen. Using serial console, screen(1) only recognizes the - * ANSI escape sequence. Using video console, Apple Open Firmware - * (version 3.1.1) only recognizes the literal ^L. So use both. */ -- data->cls = grub_strdup (" \e[2J"); -+ data->cls = grub_strdup (" \e[2J\e[m"); - data->reverse_video_on = grub_strdup ("\e[7m"); - data->reverse_video_off = grub_strdup ("\e[m"); - if (grub_strcmp ("ieee1275", str) == 0) diff --git a/Plantillas/grub-custom/patches/install_powerpc_machtypes.patch b/Plantillas/grub-custom/patches/install_powerpc_machtypes.patch deleted file mode 100644 index ca992d9..0000000 --- a/Plantillas/grub-custom/patches/install_powerpc_machtypes.patch +++ /dev/null @@ -1,220 +0,0 @@ -From 35118b5023b0d9b4e3ad82f6e15fb696ad8e2a10 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Tue, 28 Jan 2014 14:40:02 +0000 -Subject: Port yaboot logic for various powerpc machine types - -Some powerpc machines require not updating the NVRAM. This can be handled -by existing grub-install command-line options, but it's friendlier to detect -this automatically. - -On chrp_ibm machines, use the nvram utility rather than nvsetenv. (This -is possibly suitable for other machines too, but that needs to be -verified.) - -Forwarded: no -Last-Update: 2014-10-15 - -Patch-Name: install_powerpc_machtypes.patch ---- - grub-core/osdep/basic/platform.c | 5 +++ - grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++ - grub-core/osdep/unix/platform.c | 28 +++++++++--- - grub-core/osdep/windows/platform.c | 6 +++ - include/grub/util/install.h | 3 ++ - util/grub-install.c | 11 +++++ - 6 files changed, 119 insertions(+), 6 deletions(-) - -diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c -index 4b5502aeb..2ab907976 100644 ---- a/grub-core/osdep/basic/platform.c -+++ b/grub-core/osdep/basic/platform.c -@@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void) - return "i386-pc"; - } - -+const char * -+grub_install_get_default_powerpc_machtype (void) -+{ -+ return "generic"; -+} -diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c -index 35f1bcc0e..9805c36d4 100644 ---- a/grub-core/osdep/linux/platform.c -+++ b/grub-core/osdep/linux/platform.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -154,3 +154,74 @@ grub_install_get_default_x86_platform (void) - grub_util_info ("... not found"); - return "i386-pc"; - } -+ -+const char * -+grub_install_get_default_powerpc_machtype (void) -+{ -+ FILE *fp; -+ char *buf = NULL; -+ size_t len = 0; -+ const char *machtype = "generic"; -+ -+ fp = grub_util_fopen ("/proc/cpuinfo", "r"); -+ if (! fp) -+ return machtype; -+ -+ while (getline (&buf, &len, fp) > 0) -+ { -+ if (strncmp (buf, "pmac-generation", -+ sizeof ("pmac-generation") - 1) == 0) -+ { -+ if (strstr (buf, "NewWorld")) -+ { -+ machtype = "pmac_newworld"; -+ break; -+ } -+ if (strstr (buf, "OldWorld")) -+ { -+ machtype = "pmac_oldworld"; -+ break; -+ } -+ } -+ -+ if (strncmp (buf, "motherboard", sizeof ("motherboard") - 1) == 0 && -+ strstr (buf, "AAPL")) -+ { -+ machtype = "pmac_oldworld"; -+ break; -+ } -+ -+ if (strncmp (buf, "machine", sizeof ("machine") - 1) == 0 && -+ strstr (buf, "CHRP IBM")) -+ { -+ if (strstr (buf, "qemu")) -+ { -+ machtype = "chrp_ibm_qemu"; -+ break; -+ } -+ else -+ { -+ machtype = "chrp_ibm"; -+ break; -+ } -+ } -+ -+ if (strncmp (buf, "platform", sizeof ("platform") - 1) == 0) -+ { -+ if (strstr (buf, "Maple")) -+ { -+ machtype = "maple"; -+ break; -+ } -+ if (strstr (buf, "Cell")) -+ { -+ machtype = "cell"; -+ break; -+ } -+ } -+ } -+ -+ free (buf); -+ fclose (fp); -+ return machtype; -+} -diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c -index a3fcfcaca..28cb37e15 100644 ---- a/grub-core/osdep/unix/platform.c -+++ b/grub-core/osdep/unix/platform.c -@@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device, - else - boot_device = get_ofpathname (install_device); - -- if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device", -- boot_device, NULL })) -+ if (strcmp (grub_install_get_default_powerpc_machtype (), "chrp_ibm") == 0) - { -- char *cmd = xasprintf ("setenv boot-device %s", boot_device); -- grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), -- cmd); -- free (cmd); -+ char *arg = xasprintf ("boot-device=%s", boot_device); -+ if (grub_util_exec ((const char * []){ "nvram", -+ "--update-config", arg, NULL })) -+ { -+ char *cmd = xasprintf ("setenv boot-device %s", boot_device); -+ grub_util_error (_("`nvram' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), -+ cmd); -+ free (cmd); -+ } -+ free (arg); -+ } -+ else -+ { -+ if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device", -+ boot_device, NULL })) -+ { -+ char *cmd = xasprintf ("setenv boot-device %s", boot_device); -+ grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), -+ cmd); -+ free (cmd); -+ } - } - - free (boot_device); -diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c -index 912269191..c30025b13 100644 ---- a/grub-core/osdep/windows/platform.c -+++ b/grub-core/osdep/windows/platform.c -@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void) - return "i386-efi"; - } - -+const char * -+grub_install_get_default_powerpc_machtype (void) -+{ -+ return "generic"; -+} -+ - static void * - get_efi_variable (const wchar_t *varname, ssize_t *len) - { -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 5ca4811cd..9f517a1bb 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -223,6 +223,9 @@ grub_install_get_default_arm_platform (void); - const char * - grub_install_get_default_x86_platform (void); - -+const char * -+grub_install_get_default_powerpc_machtype (void); -+ - int - grub_install_register_efi (grub_device_t efidir_grub_dev, - const char *efifile_path, -diff --git a/util/grub-install.c b/util/grub-install.c -index e1a0202da..70b22eec4 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1179,7 +1179,18 @@ main (int argc, char *argv[]) - - if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275) - { -+ const char *machtype = grub_install_get_default_powerpc_machtype (); - int is_guess = 0; -+ -+ if (strcmp (machtype, "pmac_oldworld") == 0) -+ update_nvram = 0; -+ else if (strcmp (machtype, "cell") == 0) -+ update_nvram = 0; -+ else if (strcmp (machtype, "generic") == 0) -+ update_nvram = 0; -+ else if (strcmp (machtype, "chrp_ibm_qemu") == 0) -+ update_nvram = 0; -+ - if (!macppcdir) - { - char *d; diff --git a/Plantillas/grub-custom/patches/os-prober-osx86.patch b/Plantillas/grub-custom/patches/os-prober-osx86.patch deleted file mode 100644 index f0357c7..0000000 --- a/Plantillas/grub-custom/patches/os-prober-osx86.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patches OS X detection out of os-prober hook on non-x86 architectures. The -menu entries generated for those are invalid for non-x86 Mac stuff. ---- a/util/grub.d/30_os-prober.in -+++ b/util/grub.d/30_os-prober.in -@@ -45,6 +45,11 @@ if [ -z "${OSPROBED}" ] ; then - fi - - osx_entry() { -+ # GRUB won't load OS X outside of x86, no entry -+ case "x`uname -m`" in -+ xi?86|xx86_64) ;; -+ *) return ;; -+ esac - if [ x$2 = x32 ]; then - # TRANSLATORS: it refers to kernel architecture (32-bit) - bitstr="$(gettext "(32-bit)")" diff --git a/Plantillas/grub-custom/patches/ppc64el-disable-vsx.patch b/Plantillas/grub-custom/patches/ppc64el-disable-vsx.patch deleted file mode 100644 index 67744dd..0000000 --- a/Plantillas/grub-custom/patches/ppc64el-disable-vsx.patch +++ /dev/null @@ -1,52 +0,0 @@ -From efc381a55124b12fc74ed8117283f11367c9372a Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Thu, 25 Sep 2014 19:33:39 -0300 -Subject: Disable VSX instruction - -VSX bit is enabled by default for Power7 and Power8 CPU models, -so we need to disable them in order to avoid instruction exceptions. -Kernel will activate it when necessary. - -* grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX. - -Also-By: Adhemerval Zanella -Also-By: Colin Watson - -Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html -Last-Update: 2015-01-27 - -Patch-Name: ppc64el-disable-vsx.patch ---- - grub-core/kern/powerpc/ieee1275/startup.S | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S -index 21c884b43..de9a9601a 100644 ---- a/grub-core/kern/powerpc/ieee1275/startup.S -+++ b/grub-core/kern/powerpc/ieee1275/startup.S -@@ -20,6 +20,8 @@ - #include - #include - -+#define MSR_VSX 0x80 -+ - .extern __bss_start - .extern _end - -@@ -28,6 +30,16 @@ - .globl start, _start - start: - _start: -+ _start: -+ -+ /* Disable VSX instruction */ -+ mfmsr 0 -+ oris 0,0,MSR_VSX -+ /* The "VSX Available" bit is in the lower half of the MSR, so we -+ don't need mtmsrd, which in any case won't work in 32-bit mode. */ -+ mtmsr 0 -+ isync -+ - li 2, 0 - li 13, 0 - diff --git a/Plantillas/grub-custom/template b/Plantillas/grub-custom/template deleted file mode 100644 index 1926e7b..0000000 --- a/Plantillas/grub-custom/template +++ /dev/null @@ -1,218 +0,0 @@ -# Template file for 'grub' -pkgname=grub -version=2.06 -revision=2 -hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man" -makedepends="libusb-compat-devel ncurses-devel freetype-devel - liblzma-devel device-mapper-devel fuse-devel" -#depends="os-prober" -conf_files="/etc/default/grub /etc/grub.d/*" -short_desc="GRand Unified Bootloader 2" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://www.gnu.org/software/grub/" -distfiles="${GNU_SITE}/grub/grub-${version}.tar.xz" -checksum=b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 - -archs="i686* x86_64* aarch64* ppc ppc-musl ppc64*" -nopie=yes - -subpackages="grub-utils" -# _SUPPLEMENTARY_BUILDS is a list of - version of grub to build -case "$XBPS_TARGET_MACHINE" in - x86_64*) - _NATIVE_PLATFORM=pc - _SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot x86_64-xen" - subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen" - ;; - i686*) - CFLAGS="-D_FILE_OFFSET_BITS=64" - hostmakedepends+=" cross-x86_64-linux-musl" - configure_args+=" ac_cv_sizeof_off_t=8" - _NATIVE_PLATFORM=pc - _SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen" - subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen" - ;; - aarch64*) - _NATIVE_PLATFORM=efi - subpackages+=" grub-arm64-efi" - ;; - ppc*) - _NATIVE_PLATFORM=ieee1275 - subpackages+=" grub-powerpc-ieee1275" - ;; -esac - -do_configure() { - # workaround for https://savannah.gnu.org/bugs/?60458 - # some more info: https://www.linuxquestions.org/questions/showthread.php?p=6257712 - # grub 2.06 reboots immediately when compiled with -O2, - # only affects legacy BIOS - export CFLAGS="${CFLAGS/-O2/-Os}" - export CXXFLAGS="${CXXFLAGS/-O2/-Os}" - - unset CC AS LD RANLIB CPP - local freestanding_cflags="-fno-stack-protector" - - # building with altivec generates broken grub core - case "$XBPS_TARGET_MACHINE" in - ppc*) freestanding_cflags+=" -mno-altivec" ;; - esac - CFLAGS+=" $freestanding_cflags" - - configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls - --enable-grub-mkfont --enable-grub-mount --disable-werror - --sbindir=/usr/bin" - - # build tools - msg_normal "Configuring grub tools...\n" - mkdir $wrksrc/build - cd $wrksrc/build - ../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \ - ${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}} - - for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do - _TARGET=${_SUPP_BUILD%%-*} - _PLATFORM=${_SUPP_BUILD##*-} - msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n" - mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build - cd $wrksrc/${_PLATFORM}_${_TARGET}_build - if [ "$_TARGET" = x86_64 ] && - [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then - _TARGET=x86_64-linux-musl - fi - CFLAGS="$freestanding_cflags" \ - ../configure --host=${XBPS_TARGET_MACHINE} \ - --target=${_TARGET} \ - --with-platform=${_PLATFORM} ${configure_args} \ - --disable-efiemu \ - --libdir=/usr/lib - done -} - -do_build() { - # XXX remove the strip wrapper - rm ${XBPS_WRAPPERDIR}/strip - - msg_normal "Building grub tools...\n" - cd $wrksrc/build - make ${makejobs} - - for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do - _TARGET=${_SUPP_BUILD%%-*} - _PLATFORM=${_SUPP_BUILD##*-} - msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n" - cd $wrksrc/${_PLATFORM}_${_TARGET}_build - make ${makejobs} - done -} - -do_install() { - # XXX remove the strip wrapper - rm ${XBPS_WRAPPERDIR}/strip - - for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do - _TARGET=${_SUPP_BUILD%%-*} - _GRUB_TARGET=${_TARGET} - case "${_GRUB_TARGET}" in - aarch64*) - _GRUB_TARGET=arm64 - ;; - esac - _PLATFORM=${_SUPP_BUILD##*-} - cd $wrksrc/${_PLATFORM}_${_TARGET}_build - make DESTDIR=$DESTDIR/${_PLATFORM}_${_TARGET} install - # Remove non-platform specific files - rm -rf ${DESTDIR}/${_PLATFORM}_${_TARGET}/{boot,etc,usr/{share,bin}} - rm -f ${DESTDIR}/${_PLATFORM}_${_TARGET}/usr/lib/grub/${_GRUB_TARGET}-${_PLATFORM}/${_GRUB_TARGET}-* - rm -f ${DESTDIR}/${_PLATFORM}_${_TARGET}/usr/lib/grub/${_GRUB_TARGET}-${_PLATFORM}/*.{module,image} - cp -r ${DESTDIR}/${_PLATFORM}_${_TARGET}/* ${DESTDIR} - rm -rf ${DESTDIR}/${_PLATFORM}_${_TARGET} - done - - cd $wrksrc/build - make DESTDIR=$DESTDIR install - - # Required to compress info files. - vmkdir usr/share/info - touch -f ${DESTDIR}/usr/share/info/dir - - vinstall ${FILESDIR}/grub.default 644 etc/default grub - # Kernel hooks. - vinstall ${FILESDIR}/kernel.d/grub.post 750 \ - etc/kernel.d/post-install 50-grub - vinstall ${FILESDIR}/kernel.d/grub.post 750 \ - etc/kernel.d/post-remove 50-grub - - # update-grub for noobs. - printf "#!/bin/sh\ngrub-mkconfig -o /boot/grub/grub.cfg\nexit \$?\n" >> \ - ${DESTDIR}/usr/bin/update-grub - chmod 755 ${DESTDIR}/usr/bin/update-grub - - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/etc/bash_completion.d/grub \ - ${DESTDIR}/usr/share/bash-completion/completions - - # Remove useless tools - rm ${DESTDIR}/usr/bin/grub-ofpathname - rm ${DESTDIR}/usr/bin/grub-sparc64-setup -} - -grub-utils_package() { - short_desc+=" - additional utilities" - depends="grub>=${version}" - pkg_install() { - vmove usr/bin/grub-menulst2cfg - vmove usr/bin/grub-fstest - vmove usr/bin/grub-mkfont - } -} -grub-x86_64-efi_package() { - depends="grub>=$version dosfstools efibootmgr" - short_desc+=" - x86_64 EFI support" - pkg_install() { - vmove usr/lib/grub/x86_64-efi - } -} -grub-i386-efi_package() { - depends="grub>=$version dosfstools efibootmgr" - short_desc+=" - i386 EFI support" - pkg_install() { - vmove usr/lib/grub/i386-efi - } -} -grub-i386-coreboot_package() { - depends="grub>=$version" - short_desc+=" - i386 coreboot support" - pkg_install() { - vmove usr/lib/grub/i386-coreboot - } -} -grub-xen_package() { - depends="grub>=$version" - short_desc+=" - Xen PV support" - pkg_install() { - case "$XBPS_TARGET_MACHINE" in - x86_64*) - vmove usr/lib/grub/x86_64-xen - ;; - i686*) - vmove usr/lib/grub/i386-xen - ;; - esac - } -} -grub-arm64-efi_package() { - depends="grub>=$version dosfstools efibootmgr" - short_desc+=" - arm64 EFI support" - pkg_install() { - vmove usr/lib/grub/arm64-efi - } -} -grub-powerpc-ieee1275_package() { - depends="grub>=$version powerpc-utils" - short_desc+=" - powerpc Open Firmware support" - pkg_install() { - vmove usr/lib/grub/powerpc-ieee1275 - } -} diff --git a/Plantillas/mplayer-custom/.template.swp b/Plantillas/mplayer-custom/.template.swp deleted file mode 100644 index 34abcb9..0000000 Binary files a/Plantillas/mplayer-custom/.template.swp and /dev/null differ diff --git a/Plantillas/rxvt-unicode/files/rxvt-unicode.desktop b/Plantillas/rxvt-unicode/files/rxvt-unicode.desktop deleted file mode 100644 index 436e8d1..0000000 --- a/Plantillas/rxvt-unicode/files/rxvt-unicode.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=rxvt-unicode -Comment=An Unicode capable rxvt clone -Exec=urxvt -Icon=rxvt-unicode -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/Plantillas/rxvt-unicode/files/rxvt-unicode.png b/Plantillas/rxvt-unicode/files/rxvt-unicode.png deleted file mode 100644 index 0738a78..0000000 Binary files a/Plantillas/rxvt-unicode/files/rxvt-unicode.png and /dev/null differ diff --git a/Plantillas/rxvt-unicode/patches/font-resizing.patch b/Plantillas/rxvt-unicode/patches/font-resizing.patch deleted file mode 100644 index 352dc38..0000000 --- a/Plantillas/rxvt-unicode/patches/font-resizing.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/main.C -+++ b/src/main.C -@@ -874,9 +874,8 @@ - #endif - } - -- if (parent) - { -- resize_all_windows (0, 0, 0); -+ resize_all_windows (szHint.width, szHint.height, 1); - scr_remap_chars (); - scr_touch (true); - } diff --git a/Plantillas/rxvt-unicode/patches/font-width-fix.patch b/Plantillas/rxvt-unicode/patches/font-width-fix.patch deleted file mode 100644 index b632281..0000000 --- a/Plantillas/rxvt-unicode/patches/font-width-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600 -+++ b/src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600 -@@ -1171,12 +1171,21 @@ - XGlyphInfo g; - XftTextExtents16 (disp, f, &ch, 1, &g); - -+/* -+ * bukind: don't use g.width as a width of a character! -+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial -+ - g.width -= g.x; - - int wcw = WCWIDTH (ch); - if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; - - if (width < g.width ) width = g.width; -+ */ -+ int wcw = WCWIDTH (ch); -+ if (wcw > 1) g.xOff = g.xOff / wcw; -+ if (width < g.xOff) width = g.xOff; -+ - if (height < g.height ) height = g.height; - if (glheight < g.height - g.y) glheight = g.height - g.y; - } - - diff --git a/Plantillas/rxvt-unicode/patches/line-spacing-fix.patch b/Plantillas/rxvt-unicode/patches/line-spacing-fix.patch deleted file mode 100644 index 641468b..0000000 --- a/Plantillas/rxvt-unicode/patches/line-spacing-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/rxvtfont.C 2011-07-20 22:19:29.878012201 -0300 -+++ b/src/rxvtfont.C 2011-07-20 22:19:33.634671723 -0300 -@@ -1237,11 +1237,22 @@ - - FT_Face face = XftLockFace (f); - -+/* -+ * use ascent, descent and height from XftFont *f instead of FT_Face face. -+ * this somehow reproduces the behaviour of the line height as seen on xterm. -+ - ascent = (face->size->metrics.ascender + 63) >> 6; - descent = (-face->size->metrics.descender + 63) >> 6; - height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); - width = 0; - -+ */ -+ -+ ascent = f->ascent; -+ descent = f->descent; -+ height = max (ascent + descent, f->height); -+ width = 0; -+ - bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; - - XftUnlockFace (f); diff --git a/Plantillas/rxvt-unicode/template b/Plantillas/rxvt-unicode/template deleted file mode 100644 index bb6eab1..0000000 --- a/Plantillas/rxvt-unicode/template +++ /dev/null @@ -1,104 +0,0 @@ -# Template file for 'rxvt-unicode' -pkgname=rxvt-unicode -version=9.30 -revision=3 -build_style=gnu-configure -configure_args=" - --enable-xft --enable-xim --disable-fallback --disable-pixbuf --disable-startup-notification - --disable-transparency --disable-rxvt-scroll --disable-next-scroll --disable-xterm-scroll - --disable-keepscrolling --disable-text-blink --disable-pointer-blank --disable-iso14755 - --disable-8bitctrls --without-codesets --disable-smart-resize --enable-256-color - --with-terminfo=/usr/share/terminfo --with-term=rxvt-unicode-256color" -hostmakedepends="pkg-config perl" -makedepends="xorgproto fontconfig-devel libXrender-devel libXft-devel - libSM-devel libXt-devel libptytty-devel perl" -depends="ncurses rxvt-unicode-terminfo-${version}_${revision}" -short_desc="Terminal emulator supporting Xft fonts and Unicode" -maintainer="Tuxliban Torvalds " -license="GPL-3.0-or-later" -homepage="http://software.schmorp.de/pkg/rxvt-unicode.html" -distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d - -##### Lista de funciones ##### -# --with-term: Cambia la variable de entorno de la terminal al nombre -# especificado -# --disable-everything: Desactiva todas las funciones excepto las especificadas -# explícitamente -# --enable-slipwheeling:Agregar soporte para el desplazamiento continuo -# (usando la rueda del mouse como acelerador) mientras se mantiene -# presionada la tecla de control. Esta opción requiere que también -# se especifique --enable-mousewheel. -# --enable.mousewheel: Agregar soporte para el desplazamiento a través de la rueda -# del mouse o los botones 4 y 5 -# --enable-selectionscrolling: Agregar soporte para el desplazamiento cuando la -# selección se mueve a la parte superior o inferior de la pantalla -# --enable-fading: Agregar soporte para atenuar el texto cuando se pierde el enfoque. -# --enable-combining: Habilitar la composición automática de la combinación de caracteres -# en caracteres compuestos. Esto es necesario para ver correctamente el texto -# donde los acentos están codificados como caracteres Unicode separados -# --enable-xim: Agregar soporte para el protocolo XIM (X Input Method). Esto permite utilizar -# métodos de entrada alternativos (por ejemplo, kinput2) y también configurará -# correctamente la entrada para las personas que utilizan teclas muertas o teclas -# de composición -# --enable-font-styles: Agregar soporte para negrita, cursiva y negrita cursiva -# --enable-perl: Activar soporte de plugins perl -# --enable-resources: Activa soporte para la verificación de recursos -# --enable-xft: Agregar soporte para fuentes Xft (anti-aliased, entre otras). Las fuentes -# Xft son más lentas y requieren mucha memoria siempre y cuando no las use -# --without-codesets: desactiva la función de compilar para admitir grupos de conjuntos de códigos -# (codificación) adicionales. Estas tablas de conjuntos de códigos se utilizan para -# controlar las fuentes principales de X11, no son necesarias para las fuentes Xft, -# aunque tenerlas compiladas permite que rxvt-unicode elija fuentes de reemplazo de manera -# más inteligente -# --disable-text-blink: Desactiva el soporte para texto parpadeante -# --enable-256-color: Forza el uso del llamado modo de 256 colores, para evitar aplicaciones con errores -# que no admiten termcap/terminfo - -_cross_perl() { - if [ "$CROSS_BUILD" ]; then - sed -e "s#/usr/lib#${XBPS_CROSS_BASE}\0#g" \ - -e "s#/usr/share#${XBPS_CROSS_BASE}\0#g" \ - -e "s# -m[^ ]*##g" - else - cat - fi -} - -do_configure() { - if [ "$build_option_perl" ]; then - ./configure $configure_args \ - PERL=perl \ - PERL_O=rxvtperl.o \ - PERLFLAGS="$(perl -MExtUtils::Embed -e ccopts | _cross_perl)" \ - PERLLIB="$(perl -MExtUtils::Embed -e ldopts | _cross_perl)" \ - PERLPRIVLIBEXP="$(perl -MConfig -e 'print $Config{privlibexp}' | _cross_perl)" - else - ./configure $configure_args - fi -} - -pre_configure() { - if [ "$build_option_perl" ]; then - sed -i 's/rxvt_perl_link=no/rxvt_perl_link=yes/' configure - sed -i '/PERLFLAGS=/d' configure - fi -} - -pre_install() { - export TERMINFO="${DESTDIR}/usr/share/terminfo" - mkdir -p $TERMINFO -} - -post_install() { - vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r - vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications - vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps -} - -rxvt-unicode-terminfo_package() { - short_desc+=" - terminfo data" - pkg_install() { - vmove usr/share/terminfo - } -} diff --git a/Plantillas/suckless-git/dmenu-git/files/fuzzymatch.patch b/Plantillas/suckless-git/dmenu-git/files/fuzzymatch.patch deleted file mode 100644 index b825d2d..0000000 --- a/Plantillas/suckless-git/dmenu-git/files/fuzzymatch.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/dmenu.c b/dmenu.c ---- a/dmenu.c -+++ b/dmenu.c -@@ -32,6 +32,7 @@ struct item { - char *text; - struct item *left, *right; - int out; -+ int distance; - }; - - static char text[BUFSIZ] = ""; -@@ -264,6 +265,86 @@ match(void) - calcoffsets(); - } - -+int -+compare_distance(const void *a, const void *b) -+{ -+ struct item *da = *(struct item **) a; -+ struct item *db = *(struct item **) b; -+ -+ if (!db) -+ return 1; -+ if (!da) -+ return -1; -+ -+ return da->distance - db->distance; -+} -+ -+void -+fuzzymatch(void) -+{ -+ /* bang - we have so much memory */ -+ struct item *it; -+ struct item **fuzzymatches = NULL; -+ char c; -+ int number_of_matches = 0, i, pidx, sidx, eidx; -+ int text_len = strlen(text), itext_len; -+ -+ matches = matchend = NULL; -+ -+ /* walk through all items */ -+ for (it = items; it && it->text; it++) { -+ if (text_len) { -+ itext_len = strlen(it->text); -+ pidx = 0; -+ sidx = eidx = -1; -+ /* walk through item text */ -+ for (i = 0; i < itext_len && (c = it->text[i]); i++) { -+ /* fuzzy match pattern */ -+ if (text[pidx] == c) { -+ if(sidx == -1) -+ sidx = i; -+ pidx++; -+ if (pidx == text_len) { -+ eidx = i; -+ break; -+ } -+ } -+ } -+ /* build list of matches */ -+ if (eidx != -1) { -+ /* compute distance */ -+ /* factor in 30% of sidx and distance between eidx and total -+ * text length .. let's see how it works */ -+ it->distance = eidx - sidx + (itext_len - eidx + sidx) / 3; -+ appenditem(it, &matches, &matchend); -+ number_of_matches++; -+ } -+ } else { -+ appenditem(it, &matches, &matchend); -+ } -+ } -+ -+ if (number_of_matches) { -+ /* initialize array with matches */ -+ if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*)))) -+ die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*)); -+ for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) { -+ fuzzymatches[i] = it; -+ } -+ /* sort matches according to distance */ -+ qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance); -+ /* rebuild list of matches */ -+ matches = matchend = NULL; -+ for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \ -+ it->text; i++, it = fuzzymatches[i]) { -+ appenditem(it, &matches, &matchend); -+ } -+ free(fuzzymatches); -+ } -+ curr = sel = matches; -+ calcoffsets(); -+} -+ - static void - insert(const char *str, ssize_t n) - { -@@ -274,7 +355,7 @@ insert(const char *str, ssize_t n) - if (n > 0) - memcpy(&text[cursor], str, n); - cursor += n; -- match(); -+ fuzzymatch(); - } - - static size_t -@@ -343,7 +424,7 @@ keypress(XKeyEvent *ev) - - case XK_k: /* delete right */ - text[cursor] = '\0'; -- match(); -+ fuzzymatch(); - break; - case XK_u: /* delete left */ - insert(NULL, 0 - cursor); -@@ -492,7 +573,7 @@ insert: - strncpy(text, sel->text, sizeof text - 1); - text[sizeof text - 1] = '\0'; - cursor = strlen(text); -- match(); -+ fuzzymatch(); - break; - } - -@@ -653,7 +734,7 @@ setup(void) - } - promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; - inputw = MIN(inputw, mw/3); -- match(); -+ fuzzymatch(); - - /* create menu window */ - swa.override_redirect = True; diff --git a/Plantillas/suckless-git/dmenu-git/template b/Plantillas/suckless-git/dmenu-git/template deleted file mode 100644 index f5a90fd..0000000 --- a/Plantillas/suckless-git/dmenu-git/template +++ /dev/null @@ -1,50 +0,0 @@ -# Template file for 'dmenu' git version -pkgname=dmenu-git -version=5.0 -revision=2 -wrksrc="dmenu" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="libXinerama-devel libXft-devel freetype-devel" -short_desc="Generic menu for X" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="https://tools.suckless.org/dmenu/" - -build_options="fuzzymatch" -desc_option_fuzzymatch="Enable Fuzzymatch support" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone git://git.suckless.org/dmenu --depth 1 - cd ${wrksrc} - git checkout master -} - -post_patch() { - if [ "$build_option_fuzzymatch" ]; then - msg_normal "Applying fuzzymatch patches" - patch -slNp1 < "${FILESDIR}/fuzzymatch.patch" - fi - sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \ - -e '/LDFLAGS/{s/-s//;s/=/+=/}' config.mk -} - -do_build() { - # Si existe una configuración custom del usuario se usará - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - - sed -i -e "s|^FREETYPEINC|#FREETYPEINC|g" \ - -e "s|^X11INC|#X11INC|g" \ - -e "s|^X11LIB|#X11LIB|g" config.mk - - x11inc=$XBPS_CROSS_BASE/usr/include/X11 - x11lib=$XBPS_CROSS_BASE/usr/lib - freetypeinc=$XBPS_CROSS_BASE/usr/include/freetype2 - make CC="$CC" ${makejobs} X11INC=$x11inc X11LIB=$x11lib FREETYPEINC=$freetypeinc -} - -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install - vlicense LICENSE -} diff --git a/Plantillas/suckless-git/dwm-git/files/dwm.desktop b/Plantillas/suckless-git/dwm-git/files/dwm.desktop deleted file mode 100644 index b0c3354..0000000 --- a/Plantillas/suckless-git/dwm-git/files/dwm.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dwm -Comment=Dynamic window manager -Exec=dwm -Icon=dwm -Type=XSession diff --git a/Plantillas/suckless-git/dwm-git/template b/Plantillas/suckless-git/dwm-git/template deleted file mode 100644 index 5a01471..0000000 --- a/Plantillas/suckless-git/dwm-git/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'dwm' git version -pkgname=dwm-git -version=6.2 -revision=2 -wrksrc="dwm" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="libXinerama-devel libXft-devel freetype-devel" -short_desc="Dynamic window manager for X" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="http://dwm.suckless.org" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone git://git.suckless.org/dwm ${wrksrc} --depth 1 - cd ${wrksrc} - git checkout master -} - -do_build() { - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - sed -i "/CFLAGS/s|\${CPPFLAGS}|& $CFLAGS|g" config.mk - sed -i "/LDFLAGS/s|\-s|$LDFLAGS|g" config.mk - make CC=$CC INCS="-I. -I${XBPS_CROSS_BASE}/usr/include/freetype2" LIBS="-lX11 -lXinerama -lXft -lfontconfig" -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install - vinstall README 644 usr/share/doc/$pkgname - vinstall ${FILESDIR}/dwm.desktop 644 usr/share/xsessions - vlicense LICENSE -} diff --git a/Plantillas/suckless-git/slock-git/template b/Plantillas/suckless-git/slock-git/template deleted file mode 100644 index d5b7c67..0000000 --- a/Plantillas/suckless-git/slock-git/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'slock' -pkgname=slock-git -version=1.4 -revision=2 -wrksrc="slock" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="libXrandr-devel" -short_desc="Simple screen locker for X" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="http://tools.suckless.org/slock" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone git://git.suckless.org/slock --depth 1 - cd ${wrksrc} - git checkout master -} - -do_build() { - # Si existe una configuración custom del usuario se usará - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk - make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt -lXrandr" ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install - vlicense LICENSE -} diff --git a/Plantillas/suckless-git/slstatus-git/INSTALL.msg b/Plantillas/suckless-git/slstatus-git/INSTALL.msg deleted file mode 100644 index 1f4b97f..0000000 --- a/Plantillas/suckless-git/slstatus-git/INSTALL.msg +++ /dev/null @@ -1,3 +0,0 @@ -Para usar slstatus, poner lo siguiente en tu archivo "$HOME"/.xinitrc (o similar): - - slstatus & diff --git a/Plantillas/suckless-git/slstatus-git/files/config.h b/Plantillas/suckless-git/slstatus-git/files/config.h deleted file mode 100644 index ccc2aee..0000000 --- a/Plantillas/suckless-git/slstatus-git/files/config.h +++ /dev/null @@ -1,65 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* interval between updates (in ms) */ -const unsigned int interval = 1000; - -/* text to show if no value can be retrieved */ -static const char unknown_str[] = "n/a"; - -/* maximum output string length */ -#define MAXLEN 2048 - -/* - * function description argument (example) - * - * battery_perc battery percentage battery name (BAT0) - * NULL on OpenBSD - * battery_state battery charging state battery name (BAT0) - * NULL on OpenBSD - * battery_remaining battery remaining HH:MM battery name (BAT0) - * NULL on OpenBSD - * cpu_perc cpu usage in percent NULL - * cpu_freq cpu frequency in MHz NULL - * datetime date and time format string (%F %T) - * disk_free free disk space in GB mountpoint path (/) - * disk_perc disk usage in percent mountpoint path (/) - * disk_total total disk space in GB mountpoint path (/") - * disk_used used disk space in GB mountpoint path (/) - * entropy available entropy NULL - * gid GID of current user NULL - * hostname hostname NULL - * ipv4 IPv4 address interface name (eth0) - * ipv6 IPv6 address interface name (eth0) - * kernel_release `uname -r` NULL - * keyboard_indicators caps/num lock indicators format string (c?n?) - * see keyboard_indicators.c - * keymap layout (variant) of current NULL - * keymap - * load_avg load average NULL - * netspeed_rx receive network speed interface name (wlan0) - * netspeed_tx transfer network speed interface name (wlan0) - * num_files number of files in a directory path - * (/home/foo/Inbox/cur) - * ram_free free memory in GB NULL - * ram_perc memory usage in percent NULL - * ram_total total memory size in GB NULL - * ram_used used memory in GB NULL - * run_command custom shell command command (echo foo) - * swap_free free swap in GB NULL - * swap_perc swap usage in percent NULL - * swap_total total swap size in GB NULL - * swap_used used swap in GB NULL - * temp temperature in degree celsius sensor file - * (/sys/class/thermal/...) - * NULL on OpenBSD - * uid UID of current user NULL - * uptime system uptime NULL - * username username of current user NULL - * vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer) - * wifi_perc WiFi signal in percent interface name (wlan0) - * wifi_essid WiFi ESSID interface name (wlan0) - */ -static const struct arg args[] = { - /* function format argument */ - { datetime, "%s", "%F %T" }, -}; diff --git a/Plantillas/suckless-git/slstatus-git/template b/Plantillas/suckless-git/slstatus-git/template deleted file mode 100644 index d715ace..0000000 --- a/Plantillas/suckless-git/slstatus-git/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'slstatus' git version -pkgname=slstatus-git -version=20201130 -revision=1 -wrksrc="slstatus" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="alsa-lib-devel libX11-devel" -short_desc="Suckless status monitor for dwm" -maintainer="Tuxliban Torvalds " -license="ISC" -homepage="https://tools.suckless.org/slstatus/" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone git://git.suckless.org/slstatus ${wrksrc} --depth 1 - cd ${wrksrc} - git checkout master -} - -pre_build() { - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - sed -i -e 's|^CFLAGS *=|override CFLAGS +=|g' \ - -e 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk -} - -post_install() { - vlicense LICENSE -} diff --git a/Plantillas/suckless-git/st-git/README.md b/Plantillas/suckless-git/st-git/README.md deleted file mode 100644 index c85c931..0000000 --- a/Plantillas/suckless-git/st-git/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Una ves que se ha copiado el directorio con el contenido de la versión git de st al directorio de plantillas del repositorio de git, se tendrá que crear el siguiente enlace simbólico: - - $ ln -s srcpkgs/st-terminfo_git st-terminfo diff --git a/Plantillas/suckless-git/st-git/st-terminfo_git.INSTALL b/Plantillas/suckless-git/st-git/st-terminfo_git.INSTALL deleted file mode 100644 index 53bfb42..0000000 --- a/Plantillas/suckless-git/st-git/st-terminfo_git.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case "${ACTION}" in -post) - tic -sx usr/share/terminfo/s/st.terminfo - ;; -esac diff --git a/Plantillas/suckless-git/st-git/st-terminfo_git.REMOVE b/Plantillas/suckless-git/st-git/st-terminfo_git.REMOVE deleted file mode 100644 index ad3893f..0000000 --- a/Plantillas/suckless-git/st-git/st-terminfo_git.REMOVE +++ /dev/null @@ -1,11 +0,0 @@ -case "${ACTION}" in -pre) - rm usr/share/terminfo/s/st - rm usr/share/terminfo/s/st-bs - rm usr/share/terminfo/s/st-bs-256color - rm usr/share/terminfo/s/st-mono - rm usr/share/terminfo/s/st-meta - rm usr/share/terminfo/s/st-meta-256color - rm usr/share/terminfo/s/st-256color - ;; -esac diff --git a/Plantillas/suckless-git/st-git/template b/Plantillas/suckless-git/st-git/template deleted file mode 100644 index fc5447b..0000000 --- a/Plantillas/suckless-git/st-git/template +++ /dev/null @@ -1,42 +0,0 @@ -# Template file for 'st' git version -pkgname=st-git -version=0.8.4 -revision=4 -wrksrc="st" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="fontconfig-devel libX11-devel libXft-devel" -depends="ncurses st-terminfo_git-${version}_${revision}" -short_desc="Simple terminal implementation for X" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="https://st.suckless.org" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone https://git.suckless.org/st ${wrksrc} --depth 1 - cd ${wrksrc} - git checkout master -} - -pre_build() { - sed -i 's|Liberation Mono|Monospace|g' config.def.h - # Si existe una configuración custom del usuario se usará - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - # We will use tic after install. See INSTALL. - vsed -i Makefile -e '/tic/d' -} - -post_install() { - vinstall st.info 644 usr/share/terminfo/s st.terminfo - vdoc README - vlicense LICENSE -} - -st-terminfo_git_package() { - short_desc+=" - terminfo data" - depends="ncurses" - pkg_install() { - vmove usr/share/terminfo - } -} diff --git a/Plantillas/suckless-git/surf-git/files/config.h b/Plantillas/suckless-git/surf-git/files/config.h deleted file mode 100644 index 1355ba3..0000000 --- a/Plantillas/suckless-git/surf-git/files/config.h +++ /dev/null @@ -1,194 +0,0 @@ -/* modifier 0 means no modifier */ -static int surfuseragent = 1; /* Append Surf version to default WebKit user agent */ -static char *fulluseragent = ""; /* Or override the whole user agent string */ -static char *scriptfile = "~/.surf/script.js"; -static char *styledir = "~/.surf/styles/"; -static char *certdir = "~/.surf/certificates/"; -static char *cachedir = "~/.surf/cache/"; -static char *cookiefile = "~/.surf/cookies.txt"; - -/* Webkit default features */ -/* Highest priority value will be used. - * Default parameters are priority 0 - * Per-uri parameters are priority 1 - * Command parameters are priority 2 - */ -static Parameter defconfig[ParameterLast] = { - /* parameter Arg value priority */ - [AccessMicrophone] = { { .i = 0 }, }, - [AccessWebcam] = { { .i = 0 }, }, - [Certificate] = { { .i = 0 }, }, - [CaretBrowsing] = { { .i = 0 }, }, - [CookiePolicies] = { { .v = "@Aa" }, }, - [DefaultCharset] = { { .v = "UTF-8" }, }, - [DiskCache] = { { .i = 1 }, }, - [DNSPrefetch] = { { .i = 0 }, }, - [Ephemeral] = { { .i = 0 }, }, - [FileURLsCrossAccess] = { { .i = 0 }, }, - [FontSize] = { { .i = 12 }, }, - [FrameFlattening] = { { .i = 0 }, }, - [Geolocation] = { { .i = 0 }, }, - [HideBackground] = { { .i = 0 }, }, - [Inspector] = { { .i = 0 }, }, - [Java] = { { .i = 1 }, }, - [JavaScript] = { { .i = 1 }, }, - [KioskMode] = { { .i = 0 }, }, - [LoadImages] = { { .i = 1 }, }, - [MediaManualPlay] = { { .i = 1 }, }, - [PreferredLanguages] = { { .v = (char *[]){ NULL } }, }, - [RunInFullscreen] = { { .i = 0 }, }, - [ScrollBars] = { { .i = 1 }, }, - [ShowIndicators] = { { .i = 1 }, }, - [SiteQuirks] = { { .i = 1 }, }, - [SmoothScrolling] = { { .i = 0 }, }, - [SpellChecking] = { { .i = 0 }, }, - [SpellLanguages] = { { .v = ((char *[]){ "en_US", NULL }) }, }, - [StrictTLS] = { { .i = 1 }, }, - [Style] = { { .i = 1 }, }, - [WebGL] = { { .i = 0 }, }, - [ZoomLevel] = { { .f = 1.0 }, }, -}; - -static UriParameters uriparams[] = { - { "(://|\\.)suckless\\.org(/|$)", { - [JavaScript] = { { .i = 0 }, 1 }, - }, }, -}; - -/* default window size: width, height */ -static int winsize[] = { 800, 600 }; - -static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | - WEBKIT_FIND_OPTIONS_WRAP_AROUND; - -#define PROMPT_GO "Go:" -#define PROMPT_FIND "Find:" - -/* SETPROP(readprop, setprop, prompt)*/ -#define SETPROP(r, s, p) { \ - .v = (const char *[]){ "/bin/sh", "-c", \ - "prop=\"$(printf '%b' \"$(xprop -id $1 "r" " \ - "| sed -e 's/^"r"(UTF8_STRING) = \"\\(.*\\)\"/\\1/' " \ - " -e 's/\\\\\\(.\\)/\\1/g')\" " \ - "| dmenu -p '"p"' -w $1)\" " \ - "&& xprop -id $1 -f "s" 8u -set "s" \"$prop\"", \ - "surf-setprop", winid, NULL \ - } \ -} - -/* DOWNLOAD(URI, referer) */ -#define DOWNLOAD(u, r) { \ - .v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\ - "curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \ - " -e \"$3\" \"$4\"; read", \ - "surf-download", useragent, cookiefile, r, u, NULL \ - } \ -} - -/* PLUMB(URI) */ -/* This called when some URI which does not begin with "about:", - * "http://" or "https://" should be opened. - */ -#define PLUMB(u) {\ - .v = (const char *[]){ "/bin/sh", "-c", \ - "xdg-open \"$0\"", u, NULL \ - } \ -} - -/* VIDEOPLAY(URI) */ -#define VIDEOPLAY(u) {\ - .v = (const char *[]){ "/bin/sh", "-c", \ - "mpv --really-quiet \"$0\"", u, NULL \ - } \ -} - -/* styles */ -/* - * The iteration will stop at the first match, beginning at the beginning of - * the list. - */ -static SiteSpecific styles[] = { - /* regexp file in $styledir */ - { ".*", "default.css" }, -}; - -/* certificates */ -/* - * Provide custom certificate for urls - */ -static SiteSpecific certs[] = { - /* regexp file in $certdir */ - { "://suckless\\.org/", "suckless.org.crt" }, -}; - -#define MODKEY GDK_CONTROL_MASK - -/* hotkeys */ -/* - * If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to - * edit the CLEANMASK() macro. - */ -static Key keys[] = { - /* modifier keyval function arg */ - { MODKEY, GDK_KEY_g, spawn, SETPROP("_SURF_URI", "_SURF_GO", PROMPT_GO) }, - { MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, - { MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, - - { 0, GDK_KEY_Escape, stop, { 0 } }, - { MODKEY, GDK_KEY_c, stop, { 0 } }, - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .i = 1 } }, - { MODKEY, GDK_KEY_r, reload, { .i = 0 } }, - - { MODKEY, GDK_KEY_l, navigate, { .i = +1 } }, - { MODKEY, GDK_KEY_h, navigate, { .i = -1 } }, - - /* vertical and horizontal scrolling, in viewport percentage */ - { MODKEY, GDK_KEY_j, scrollv, { .i = +10 } }, - { MODKEY, GDK_KEY_k, scrollv, { .i = -10 } }, - { MODKEY, GDK_KEY_space, scrollv, { .i = +50 } }, - { MODKEY, GDK_KEY_b, scrollv, { .i = -50 } }, - { MODKEY, GDK_KEY_i, scrollh, { .i = +10 } }, - { MODKEY, GDK_KEY_u, scrollh, { .i = -10 } }, - - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_j, zoom, { .i = -1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_k, zoom, { .i = +1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_q, zoom, { .i = 0 } }, - { MODKEY, GDK_KEY_minus, zoom, { .i = -1 } }, - { MODKEY, GDK_KEY_plus, zoom, { .i = +1 } }, - - { MODKEY, GDK_KEY_p, clipboard, { .i = 1 } }, - { MODKEY, GDK_KEY_y, clipboard, { .i = 0 } }, - - { MODKEY, GDK_KEY_n, find, { .i = +1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } }, - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p, print, { 0 } }, - { MODKEY, GDK_KEY_t, showcert, { 0 } }, - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, - { 0, GDK_KEY_F11, togglefullscreen, { 0 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o, toggleinspector, { 0 } }, - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, toggle, { .i = CaretBrowsing } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_f, toggle, { .i = FrameFlattening } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocation } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_s, toggle, { .i = JavaScript } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .i = LoadImages } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } }, -}; - -/* button definitions */ -/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */ -static Button buttons[] = { - /* target event mask button function argument stop event */ - { OnLink, 0, 2, clicknewwindow, { .i = 0 }, 1 }, - { OnLink, MODKEY, 2, clicknewwindow, { .i = 1 }, 1 }, - { OnLink, MODKEY, 1, clicknewwindow, { .i = 1 }, 1 }, - { OnAny, 0, 8, clicknavigate, { .i = -1 }, 1 }, - { OnAny, 0, 9, clicknavigate, { .i = +1 }, 1 }, - { OnMedia, MODKEY, 1, clickexternplayer, { 0 }, 1 }, -}; diff --git a/Plantillas/suckless-git/surf-git/template b/Plantillas/suckless-git/surf-git/template deleted file mode 100644 index f5b89c0..0000000 --- a/Plantillas/suckless-git/surf-git/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'surf' git version -pkgname=surf-git -version=2.1 -revision=2 -wrksrc="surf" -build_style=gnu-makefile -hostmakedepends="git pkg-config" -makedepends="webkit2gtk-devel gcr-devel" -depends="xprop dmenu" -short_desc="Simple web browser based on WebKit/GTK+" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="http://surf.suckless.org" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone git://git.suckless.org/surf --depth 1 - cd ${wrksrc} - git checkout surf-webkit2 -} - -pre_build() { - # Si existe una configuración custom del usuario se usará - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h -} - -post_install() { - vlicense LICENSE -} diff --git a/Plantillas/suckless-git/tabbed-git/template b/Plantillas/suckless-git/tabbed-git/template deleted file mode 100644 index 33c8a19..0000000 --- a/Plantillas/suckless-git/tabbed-git/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'tabbed' git version -pkgname=tabbed-git -version=0.6 -revision=5 -wrksrc="tabbed" -build_style=gnu-makefile -make_build_args="INCS=-I. LIBS=-lX11" -hostmakedepends="git pkg-config" -makedepends="freetype-devel libX11-devel libXft-devel" -short_desc="Tab interface for application supporting Xembed" -maintainer="Tuxliban Torvalds " -license="MIT" -homepage="http://tools.suckless.org/tabbed/" - -# Obtener versión más reciente en upstream -do_fetch(){ - git clone https://git.suckless.org/tabbed --depth 1 - cd ${wrksrc} - git checkout master -} - -pre_build() { - sed -i 's|-O0 ||g' config.mk - sed -i 's|^CPPFLAGS =|override CPPFLAGS +=|g' config.mk - sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk - sed -i 's|^LDFLAGS =|override LDFLAGS +=|g' config.mk - # Remove BSD_SOURCE warning - sed -i 's/-D_BSD_SOURCE/-D_DEFAULT_SOURCE/g' config.mk -} - -do_build() { - # Si existe una configuración custom del usuario se usará - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h - make CC=$CC INCS="-I. -I${XBPS_CROSS_BASE}/usr/include/freetype2" LIBS="-lX11 -lXft -lfontconfig" -} - -post_install() { - vlicense LICENSE -} diff --git a/Plantillas/tiramisu/template b/Plantillas/tiramisu/template deleted file mode 100644 index e0f222c..0000000 --- a/Plantillas/tiramisu/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'tiramisu' -pkgname=tiramisu -version=1.0 -revision=1 -build_style=gnu-makefile -hostmakedepends="pkg-config" -makedepends="libglib-devel" -short_desc="Desktop notifications, the UNIX way" -maintainer="tuxliban " -license="MIT" -homepage="https://github.com/Sweets/tiramisu" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=4681788288c17aa1fd75b972c3d9661a13c164d810520fc838837a748baf669e