Skip to content

Commit

Permalink
qt5: Update version from 5.4.1 to 5.10.1
Browse files Browse the repository at this point in the history
1. Update the version from Qt 5.4.1 to 5.10.1. This fixes build issues
with GCC 5.

```
make[3]: Entering directory '/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore'
g++ -fdebug-types-section -Wl,-O1 -Wl,-rpath,/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/lib -Wl,-rpath,/usr/local/qt5/lib -o ../../bin/jsc .obj/jsc.o   -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore/ -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/WTF/ -licui18n -licuuc -licudata -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtbase/lib -lQt5Core -lpthread -lpthread
/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore//.obj/runtime/JSArray.o: In function `JSC::JSArray::push(JSC::ExecState*, JSC::JSValue)':
JSArray.cpp:(.text+0x31c1): undefined reference to `void JSC::JSObject::putByIndexBeyondVectorLengthWithoutAttributes<(unsigned char)20>(JSC::ExecState*, unsigned int, JSC::JSValue)'
collect2: error: ld returned 1 exit status
Makefile.jsc:98: recipe for target '../../bin/jsc' failed
make[3]: *** [../../bin/jsc] Error 1
```

2. Rebuild for systemd/udev update.

```
$ readelf -d /usr/local/qt5/plugins/platforms/libqxcb.so | grep udev
 0x0000000000000001 (NEEDED)             Shared library: [libudev.so.0]
```

sousage

```
  /usr/local/qt5/lib/libQt5SerialPort.so.5.4.1                qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/generic/libqevdevkeyboardplugin.so   qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/generic/libqevdevmouseplugin.so      qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/generic/libqevdevtabletplugin.so     qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/generic/libqevdevtouchplugin.so      qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqeglfs.so               qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqkms.so                 qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqlinuxfb.so             qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqminimal.so             qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqminimalegl.so          qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqoffscreen.so           qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platforms/libqxcb.so                 qt5-5.4.1-0.x86_64
  /usr/local/qt5/plugins/platformthemes/libqgtk2.so           qt5-5.4.1-0.x86_64
  /usr/sbin/mount.zfs                                         zfs-0.7.3-0.x86_64
```

[1] https://bugreports.qt.io/browse/QTBUG-44829
[2] https://codereview.qt-project.org/#/c/107921/

qt5: Remove patch

It doesn’t apply anymore.

qt5: Update from 5.4.2 to 5.7.0

5.4 has too many build problems with GCC 5.

Originally it was built with GCC 4.9.
  • Loading branch information
pmenzel committed Mar 12, 2018
1 parent 55b80ec commit 957d558
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions qt5-5.4.1-0.bee → qt5-5.10.1-0.bee
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
#!/usr/bin/env beesh

SRCURL=(https://download.qt.io/official_releases/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-opensource-src-${PKGVERSION}.tar.gz)

PATCHURL[0]="https://bugreports.qt.io/secure/attachment/46929/qtwebkit.diff"
SRCURL=(https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz)

PREFIX=/usr/local/qt5

build_in_sourcedir

# BEE_MAKEFLAGS=-j1

mee_patch() {
perl -i -pe 's"/Source"/qtwebkit/Source"' $F/qtwebkit.diff
bee_patch
}

mee_configure() {
start_cmd ${S}/configure \
-prefix ${PREFIX} \
Expand Down

0 comments on commit 957d558

Please sign in to comment.