aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Yu <isaacyu1@isaacyu1.com>2023-02-22 22:53:17 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-02-25 09:18:04 +0700
commitbec18ea1f5127e501dc758df48c7537980109ca4 (patch)
treee75cd838a0db1ce75cb3349446b390c99a864e31
parentbf905467acca32dbe87dd04bbeee3795d5121dca (diff)
python/python3-three-merge: Added (3-way merge between strings)
Signed-off-by: bedlam <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--python/python3-three-merge/README4
-rw-r--r--python/python3-three-merge/python3-three-merge.SlackBuild94
-rw-r--r--python/python3-three-merge/python3-three-merge.info10
-rw-r--r--python/python3-three-merge/slack-desc19
4 files changed, 127 insertions, 0 deletions
diff --git a/python/python3-three-merge/README b/python/python3-three-merge/README
new file mode 100644
index 0000000000000..f44987d7b57fd
--- /dev/null
+++ b/python/python3-three-merge/README
@@ -0,0 +1,4 @@
+three-merge is a simple Python library to perform a 3-way merge between
+strings, based on diff-match-patch. This library performs merges at a
+character level, as opposed to most VCS systems, which opt for a
+line-based approach.
diff --git a/python/python3-three-merge/python3-three-merge.SlackBuild b/python/python3-three-merge/python3-three-merge.SlackBuild
new file mode 100644
index 0000000000000..92aedf622c856
--- /dev/null
+++ b/python/python3-three-merge/python3-three-merge.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for python3-three-merge
+
+# Copyright 2023 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=python3-three-merge
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=three-merge
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
+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 $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$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 {} \;
+
+python3 setup.py install --root=$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
+cp -a CHANGELOG.md LICENSE README.md $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
diff --git a/python/python3-three-merge/python3-three-merge.info b/python/python3-three-merge/python3-three-merge.info
new file mode 100644
index 0000000000000..b8431de739d8a
--- /dev/null
+++ b/python/python3-three-merge/python3-three-merge.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-three-merge"
+VERSION="0.1.1"
+HOMEPAGE="https://github.com/spyder-ide/three-merge/"
+DOWNLOAD="https://github.com/spyder-ide/three-merge/archive/v0.1.1/three-merge-0.1.1.tar.gz"
+MD5SUM="68fc031ed861316d62b127aa85c9c2c2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-diff-match-patch"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-three-merge/slack-desc b/python/python3-three-merge/slack-desc
new file mode 100644
index 0000000000000..83135d6a200e2
--- /dev/null
+++ b/python/python3-three-merge/slack-desc
@@ -0,0 +1,19 @@
+# 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------------------------------------------------------|
+python3-three-merge: python3-three-merge (perform 3-way merge between strings)
+python3-three-merge:
+python3-three-merge: three-merge is a simple Python library to perform a 3-way merge
+python3-three-merge: between strings, based on diff-match-patch. This library performs
+python3-three-merge: merges at a character level, as opposed to most VCS systems, which
+python3-three-merge: opt for a line-based approach.
+python3-three-merge:
+python3-three-merge:
+python3-three-merge:
+python3-three-merge:
+python3-three-merge: