summaryrefslogtreecommitdiffstats
path: root/source/x/x11
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/build/xcb-proto2
-rw-r--r--source/x/x11/configure/xcb-proto22
-rw-r--r--source/x/x11/make/xcb-proto10
-rw-r--r--source/x/x11/package-blacklist1
4 files changed, 4 insertions, 31 deletions
diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xcb-proto
+++ b/source/x/x11/build/xcb-proto
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
index 2df1aaf74..4074f1583 100644
--- a/source/x/x11/configure/xcb-proto
+++ b/source/x/x11/configure/xcb-proto
@@ -1,26 +1,8 @@
-mkdir python2 python3
-
-cd python2
- CFLAGS=$SLKCFLAGS \
- CXXFLAGS=$SLKCFLAGS \
- PYTHON=python3 \
- ../configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
- --with-udev-rules-dir=/lib/udev/rules.d \
- --disable-static \
- --build=$ARCH-slackware-linux
-cd -
-
+mkdir python3
cd python3
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
- PYTHON=python \
+ PYTHON=python3 \
../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto
index a4c380bbc..b39aa7786 100644
--- a/source/x/x11/make/xcb-proto
+++ b/source/x/x11/make/xcb-proto
@@ -1,17 +1,7 @@
-cd python2
- if ! make $NUMJOBS ; then
- touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
- continue
- fi
-
- make install DESTDIR=$PKG
-cd -
-
cd python3
if ! make $NUMJOBS ; then
touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
continue
fi
-
make install DESTDIR=$PKG
cd -
diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist
index 75a3ace30..51c508d07 100644
--- a/source/x/x11/package-blacklist
+++ b/source/x/x11/package-blacklist
@@ -41,6 +41,7 @@ xf86-video-vboxvideo
xf86-video-voodoo
xf86-video-xgi
xf86-video-xgixp
+xpyb
# CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR!