commit orion for openSUSE:Factory

26 Jun 2017

Hello community,

here is the log from the commit of package orion for openSUSE:Factory checked in at 2017-06-26 15:54:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orion (Old)
 and      /work/SRC/openSUSE:Factory/.orion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "orion"

Mon Jun 26 15:54:39 2017 rev:8 rq:506008 version:1.5.1+git~20170622

Changes:
--------

--- /work/SRC/openSUSE:Factory/orion/orion.changes	2017-06-20 09:40:04.466782845 +0200
+++ /work/SRC/openSUSE:Factory/.orion.new/orion.changes	2017-06-26 15:55:03.603998436 +0200
@@ -1,0 +2,14 @@
+Fri Jun 23 07:38:06 UTC 2017 - pousaduarte@gmail.com
+
+- Update to version 1.5.1+git~20170622:
+  * What I needed to do to build on MacOS (#182)
+  * Travis Mac build config (#184)
+
+-------------------------------------------------------------------
+Wed Jun 21 09:01:50 UTC 2017 - pousaduarte@gmail.com
+
+- Update to version 1.5.1+git~20170620:
+  * Build Windows installer on AppVeyor (#181)
+  * Provide "Watch live" menu item even when channel is offline (#176)
+
+-------------------------------------------------------------------

Old:
----
  orion-1.5.1+git~20170612.tar.xz

New:
----
  orion-1.5.1+git~20170622.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ orion.spec ++++++
--- /var/tmp/diff_new_pack.uWjta6/_old	2017-06-26 15:55:04.183916660 +0200
+++ /var/tmp/diff_new_pack.uWjta6/_new	2017-06-26 15:55:04.183916660 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           orion
-Version:        1.5.1+git~20170612
+Version:        1.5.1+git~20170622
 Release:        0
 Summary:        Twitch stream client using Qt
 License:        GPL-3.0

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.uWjta6/_old	2017-06-26 15:55:04.223911020 +0200
+++ /var/tmp/diff_new_pack.uWjta6/_new	2017-06-26 15:55:04.223911020 +0200
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/alamminsalo/orion.git</param>
-              <param name="changesrevision">d61db488c96621d8ffdf0ddf203a12e9966e707a</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">3f7c5df0a3672753567728e10004a84e315cb95f</param></service></servicedata>
\ No newline at end of file

++++++ orion-1.5.1+git~20170612.tar.xz -> orion-1.5.1+git~20170622.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/.travis.yml new/orion-1.5.1+git~20170622/.travis.yml
--- old/orion-1.5.1+git~20170612/.travis.yml	1970-01-01 01:00:00.000000000 +0100
+++ new/orion-1.5.1+git~20170622/.travis.yml	2017-06-22 08:04:12.000000000 +0200
@@ -0,0 +1,58 @@
+os:
+  - osx
+  
+env:
+  - QTBREWVER=5.9
+  
+language: cpp
+  
+compiler:
+  - clang
+  
+cache:
+  directories:
+    - $HOME/Library/Caches/Homebrew
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt@$QTBREWVER jq; fi
+
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(brew info --json=v1 qt | jq -r '.[0].bottle.stable.cellar + "/" + .[0].name + "/" + .[0].installed[0].version'); fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ORIONCONFIG=multimedia; fi
+  - $QTDIR/bin/qmake orion.pro CONFIG+=$ORIONCONFIG
+  - make
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash distfiles/deploy_mac.sh; fi
+  - mkdir -p artifacts
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then zip -vr --symlinks artifacts/orion.app.zip orion.app/; fi
+  
+deploy:
+  - provider: releases
+    # To use this, create a Github token with the "public_repo" permission, and create an env var GITHUB_API_KEY in the Travis' project settings, making sure "Display value in build log" is set to OFF
+    api_key: '$GITHUB_API_KEY'
+    file: 'artifacts/orion.app.zip'
+    skip_cleanup: true
+    on:
+      tags: true
+      all_branches: true
+    # To use this, create an AWS S3 bucket with public read access, create IAM policy with the text below replacing the placeholder with the bucket name, 
+    # create an AWS user for automation (with access key/secret) and give them that IAM policy, and set the env vars indicated in the Travis' project settings, making sure "Display value in build log" is set to OFF
+  - provider: s3
+    access_key_id: "$AWS_ACCESS_KEY_ID"
+    secret_access_key: "$AWS_SECRET_ACCESS_KEY"
+    bucket: "$AWS_S3_BUCKET"
+    region: "$AWS_REGION"
+    # Example policy to allow writes to a bucket
+    # {
+    #     "Version": "2012-10-17",
+    #     "Statement": [
+    #         {
+    #             "Effect": "Allow",
+    #             "Action": "s3:PutObject",
+    #             "Resource": "arn:aws:s3:::BUCKET-NAME-GOES-HERE/*"
+    #         }
+    #     ]
+    # }	
+    local_dir: artifacts
+    skip_cleanup: true
+    on:
+      all_branches: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/README.md new/orion-1.5.1+git~20170622/README.md
--- old/orion-1.5.1+git~20170612/README.md	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/README.md	2017-06-22 08:04:12.000000000 +0200
@@ -54,6 +54,29 @@
 make && sudo make install
 ```
 
+## Building on MacOS
+
+#### Install needed libraries and software
+
+```
+brew install qt mpv
+brew link --force qt
+```
+You need to force link qt to get qmake. Note that this can cause problems with other make tools. For more information see `brew info qt`.
+
+#### Get orion from github and install
+
+```
+git clone https://github.com/alamminsalo/orion
+cd orion
+mkdir build && cd build
+qmake ../
+make
+```
+
+There will now be an orion.app application in the build directory.
+
+
 ## Windows troubleshooting
 
 You need Visual C++ 2015-runtime installed. 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/appveyor.yml new/orion-1.5.1+git~20170622/appveyor.yml
--- old/orion-1.5.1+git~20170612/appveyor.yml	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/appveyor.yml	2017-06-22 08:04:12.000000000 +0200
@@ -1,3 +1,5 @@
+# For info about dev tool paths on Appveyor see https://www.appveyor.com/docs/build-environment/#pre-installed-software
+
 environment:
   matrix:
     - platform: x86
@@ -74,11 +76,19 @@
     dir /s
 
 after_build:
-  - 7z a orion_%configuration%_%platform%_snapshot.zip . -x!.git
+  - 7z a orion_%configuration%_%platform%_snapshot_%APPVEYOR_REPO_COMMIT%.zip . -x!.git
   - copy /y %MPVDIR%\mpv-dev.7z .
+  - del %configuration%\*.obj
+  - del %configuration%\*.cpp
+  - del %configuration%\*.h
+  - del %configuration%\*.res
+  - if %configuration%==release copy "resources\orion-installer.iss" orion-installer.iss
+  - if %configuration%==release "C:\Program Files (x86)\Inno Setup 5\iscc.exe" /F"orion-%APPVEYOR_REPO_COMMIT%-%platform%" "orion-installer.iss"
 
 artifacts:
-  - path: orion_$(configuration)_$(platform)_snapshot.zip
+  - path: orion_$(configuration)_$(platform)_snapshot_$(APPVEYOR_REPO_COMMIT).zip
     name: orion windows $(configuration) $(platform) snapshot zip
   - path: mpv-dev.7z
     name: libmpv dev archive used for build
+  - path: orion-$(APPVEYOR_REPO_COMMIT)-$(platform).exe
+    name: Windows installer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/distfiles/deploy_mac.sh new/orion-1.5.1+git~20170622/distfiles/deploy_mac.sh
--- old/orion-1.5.1+git~20170612/distfiles/deploy_mac.sh	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/distfiles/deploy_mac.sh	2017-06-22 08:04:12.000000000 +0200
@@ -1,24 +1,15 @@
 #!/bin/bash
-
-QTVER=5.5
+set -e -x
 
 # macdeploy
-~/Qt/$QTVER/clang_64/bin/macdeployqt orion.app -qmldir=~/git/orion/src/qml
+$QTDIR/bin/macdeployqt orion.app -qmldir=./src/qml
 
 # qml libs 
-mkdir orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/Enginio orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/Qt orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/QtQml orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/QtQuick orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/QtQuick.2 orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/QtWebEngine orion.app/Contents/Resources/qml
-cp -r ~/Qt/$QTVER/clang_64/qml/Communi orion.app/Contents/Resources/qml
-
-# additional frameworks
-cp -r ~/Qt/$QTVER/clang_64/lib/IrcCore.framework orion.app/Contents/Frameworks/IrcCore.framework
-cp -r ~/Qt/$QTVER/clang_64/lib/IrcModel.framework orion.app/Contents/Frameworks/IrcModel.framework
-cp -r ~/Qt/$QTVER/clang_64/lib/IrcUtil.framework orion.app/Contents/Frameworks/IrcUtil.framework
+mkdir -p orion.app/Contents/Resources/qml
+cp -r $QTDIR/qml/Qt orion.app/Contents/Resources/qml
+cp -r $QTDIR/qml/QtQml orion.app/Contents/Resources/qml
+cp -r $QTDIR/qml/QtQuick orion.app/Contents/Resources/qml
+cp -r $QTDIR/qml/QtQuick.2 orion.app/Contents/Resources/qml
 
-sh fixlibs.sh orion.app
+sh distfiles/fixlibs.sh orion.app
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/distfiles/fixlibs.sh new/orion-1.5.1+git~20170622/distfiles/fixlibs.sh
--- old/orion-1.5.1+git~20170612/distfiles/fixlibs.sh	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/distfiles/fixlibs.sh	2017-06-22 08:04:12.000000000 +0200
@@ -4,52 +4,60 @@
 DIR=$1
 
 #Qt frameworks
-FRAMEWORKS="QtOpenGL QtWidgets QtGui QtCore QtWebEngine QtQuick QtQml QtNetwork QtMultimedia QtWebChannel QtWebEngineCore"
+FRAMEWORKS="QtOpenGL QtWidgets QtGui QtCore QtQuick QtQml QtNetwork QtMultimedia"
 
 echo "Fixing lib paths..."
+
+echo "- orion"
 for FRAMEWORK in $FRAMEWORKS; do
-	echo $FRAMEWORK
+	echo "  $FRAMEWORK"
 	install_name_tool -id @executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	$DIR/Contents/Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK
 
 	install_name_tool -change @rpath/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	$DIR/Contents/MacOS/orion
-done
-
-#QtQuick.2 dylib
-FRAMEWORKS="QtQuick QtQml QtNetwork QtCore QtGui"
-for FRAMEWORK in $FRAMEWORKS; do
-	echo $FRAMEWORK
-	install_name_tool -id @executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
-	$DIR/Contents/Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK
 
-	install_name_tool -change @rpath/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
+	install_name_tool -change $QTDIR/lib/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
-	$DIR/Contents/Resources/qml/QtQuick.2/libqtquick2plugin.dylib
+	$DIR/Contents/MacOS/orion
 done
 
-#QtWebEngine
-FRAMEWORKS="QtWebEngine QtWebEngineCore QtQuick QtQml QtCore QtNetwork QtGui QtWebChannel"
+for ref in Resources/qml/{QtQuick/{Window.2/libwindow,Controls/libqtquickcontrols,Controls/Styles/Flat/libqtquickextrasflat,Controls.2/{libqtquickcontrols2,Material/libqtquickcontrols2materialstyle,Universal/libqtquickcontrols2universalstyle},Dialogs/{libdialog,Private/libdialogsprivate},Extras/libqtquickextras,LocalStorage/libqmllocalstorage,Particles.2/libparticles,PrivateWidgets/libwidgets,Scene2D/libqtquickscene2d,Scene3D/libqtquickscene3d,VirtualKeyboard/Styles/libqtvirtualkeyboardstyles,XmlListModel/libqmlxmllistmodel,Templates.2/libqtquicktemplates2,Layouts/libqquicklayouts},QtQuick.2/libqtquick2,Qt/labs/{calendar/libqtlabscalendar,folderlistmodel/libqmlfolderlistmodel,platform/libqtlabsplatform,settings/libqmlsettings,sharedimage/libsharedimage},QtQml/Models.2/libmodels}plugin.dylib PlugIns/quick/lib{models,qquicklayouts,qtquickcontrols2{material,universal}style,qtquickcontrols{,2},qtquickextrasflat,qtquicktemplates2,widgets,window}plugin.dylib Resources/qml/QtQml/StateMachine/libqtqmlstatemachine.dylib; do
+echo "- $ref"
+
+FRAMEWORKS="QtQuick QtQuickControls2 QtQuickTemplates2 QtQml QtNetwork QtCore QtGui QtWidgets"
 for FRAMEWORK in $FRAMEWORKS; do
-	echo $FRAMEWORK
+	echo "  $FRAMEWORK"
 	install_name_tool -id @executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	$DIR/Contents/Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK
 
 	install_name_tool -change @rpath/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
-	$DIR/Contents/Resources/qml/QtWebEngine/libqtwebengineplugin.dylib
+	$DIR/Contents/$ref
+
+	install_name_tool -change $QTDIR/lib/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
+	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
+	$DIR/Contents/$ref
+done
 done
 
+echo "- multimedia"
+
 #Multimedia libs
 FRAMEWORKS="QtGui QtCore QtQuick QtQml QtNetwork QtMultimedia QtMultimediaQuick_p"
 for FRAMEWORK in $FRAMEWORKS; do
+	echo "  $FRAMEWORK"
 	install_name_tool -id @executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	$DIR/Contents/Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK
 
 	install_name_tool -change @rpath/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
 	$DIR/Contents/Resources/qml/QtMultimedia/libdeclarative_multimedia.dylib
+
+	install_name_tool -change $QTDIR/lib/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
+	@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK \
+	$DIR/Contents/Resources/qml/QtMultimedia/libdeclarative_multimedia.dylib
 done
 	
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/orion.pro new/orion-1.5.1+git~20170622/orion.pro
--- old/orion-1.5.1+git~20170612/orion.pro	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/orion.pro	2017-06-22 08:04:12.000000000 +0200
@@ -73,7 +73,7 @@
 
     unix:!macx: LIBS += -lmpv
     win32: LIBS += -L$$PWD/libs -lmpv
-    macx: LIBS += -L$$PWD/../../../../usr/local/Cellar/mpv/0.17.0/lib -lmpv
+    macx: LIBS += -L$$PWD/../../../../usr/local/Cellar/mpv/0.25.0/lib -lmpv
 }
 
 qtav {
@@ -171,6 +171,7 @@
 
     INCLUDEPATH += /System/Library/Frameworks/Foundation.framework/Versions/C/Headers
     INCLUDEPATH += /System/Library/Frameworks/AppKit.framework/Versions/C/Headers
+    INCLUDEPATH += /usr/local/include
 }
 
 OBJECTIVE_SOURCES += \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/resources/orion-installer.iss new/orion-1.5.1+git~20170622/resources/orion-installer.iss
--- old/orion-1.5.1+git~20170612/resources/orion-installer.iss	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/resources/orion-installer.iss	2017-06-22 08:04:12.000000000 +0200
@@ -3,9 +3,11 @@
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
+#define AppVersion GetFileVersion("release\orion.exe")
+
 [Setup]
 AppName=Orion
-AppVersion=1.0
+AppVersion={#AppVersion}
 DefaultDirName={pf}\Orion
 DefaultGroupName=Orion
 UninstallDisplayIcon={app}\orion.exe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.5.1+git~20170612/src/qml/components/ChannelGrid.qml new/orion-1.5.1+git~20170622/src/qml/components/ChannelGrid.qml
--- old/orion-1.5.1+git~20170612/src/qml/components/ChannelGrid.qml	2017-06-12 22:11:30.000000000 +0200
+++ new/orion-1.5.1+git~20170622/src/qml/components/ChannelGrid.qml	2017-06-22 08:04:12.000000000 +0200
@@ -31,8 +31,6 @@
     onItemRightClicked: {
         _menu.item = clickedItem
 
-        _watchLive.enabled = _menu.item.online
-
         _fav.text = (!allFavourites && !_menu.item.favourite) ? "Follow" : "Unfollow"
         _menu.state = (!allFavourites && !_menu.item.favourite) ? 1 : 2
 
@@ -80,9 +78,7 @@
             text: "Watch live"
             //text: "Watch;play"
             onTriggered: {
-                if (_menu.item.online){
-                    playerView.getStreams(_menu.item)
-                }
+                playerView.getStreams(_menu.item)
             }
         }

    

commit orion for openSUSE:Factory

root＠hilbert.suse.de