diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
| commit | 978b7973febf9b1fee624681f33c805e4f04f5dd (patch) | |
| tree | 73ae74deb425418dce2090020d169406e71d5b51 /multilib/lib32-libcups/fix-libusb-configure.patch | |
| parent | 6646a7a49f1ff4228204490260b3e0f0e12b5d3c (diff) | |
| parent | a5721a07196cf00c26ea1bfb651aab756d202ccb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxappearance/PKGBUILD
community/menu-cache/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sqlite/PKGBUILD
extra/wireshark/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mdadm/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'multilib/lib32-libcups/fix-libusb-configure.patch')
| -rw-r--r-- | multilib/lib32-libcups/fix-libusb-configure.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/multilib/lib32-libcups/fix-libusb-configure.patch b/multilib/lib32-libcups/fix-libusb-configure.patch deleted file mode 100644 index 02476c0b8..000000000 --- a/multilib/lib32-libcups/fix-libusb-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4 ---- cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 2012-05-20 22:31:15.702071734 +0200 -+++ cups-1.5.3/config-scripts/cups-common.m4 2012-05-20 22:31:29.395622693 +0200 -@@ -216,7 +216,7 @@ - AC_SUBST(LIBUSB) - - if test "x$PKGCONFIG" != x; then -- if test x$enable_libusb = xyes -o $uname != Darwin; then -+ if test x$enable_libusb = xyes -a $uname != Darwin; then - AC_MSG_CHECKING(for libusb-1.0) - if $PKGCONFIG --exists libusb-1.0; then - AC_MSG_RESULT(yes) |