summaryrefslogtreecommitdiff
path: root/x11-toolkits/qt30/files/patch-aa
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2000-09-12 07:50:45 +0000
committerWill Andrews <will@FreeBSD.org>2000-09-12 07:50:45 +0000
commitce35bfdf180dc0c3252352ed385a44cd1a1ecfa7 (patch)
tree64cafd31604fa0a47f3fdf4b8df2f707b4e5c31a /x11-toolkits/qt30/files/patch-aa
parentBackout previous JIT-related change - it can cause legal problems. (diff)
Update to QT 2.2.0 release. Satoshi will handle the USE_QT2 upgrade, which
should happen sometime later this week. Yes, this is *THE* QT that will be used with KDE2. :-) Submitted by: nra (thanks for making my job easier)
Notes
Notes: svn path=/head/; revision=32538
Diffstat (limited to 'x11-toolkits/qt30/files/patch-aa')
-rw-r--r--x11-toolkits/qt30/files/patch-aa9
1 files changed, 4 insertions, 5 deletions
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
index 3fa5dacea8c5..b95cbe905e2e 100644
--- a/x11-toolkits/qt30/files/patch-aa
+++ b/x11-toolkits/qt30/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Tue Aug 22 03:11:09 2000
-+++ configs/freebsd-g++-shared.new Sat Aug 26 09:50:52 2000
+--- configs/freebsd-g++-shared Sun Sep 10 18:44:24 2000
++++ configs/freebsd-g++-shared.new Sun Sep 10 18:44:53 2000
@@ -21,7 +21,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
@@ -18,7 +18,7 @@
# UI compiler
SYSCONF_UIC = $(QTDIR)/bin/uic
-@@ -55,16 +55,15 @@
+@@ -55,16 +55,14 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
SYSCONF_LINK_SHLIB = g++
@@ -26,7 +26,6 @@
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-+ -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
cd $(DESTDIR) && \
@@ -34,7 +33,7 @@
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+ rm -f lib$(TARGET).so; \
++ rm -f lib$(TARGET).so;\
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
# Linking static libraries