Changeset 8831fed


Ignore:
Timestamp:
09/04/14 08:48:50 (7 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
releng/10.0.3
Children:
19bab26
Parents:
95f06f0 (diff), 75a0dbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'releng/10.0.3' of github.com:pcbsd/pcbsd into releng/10.0.3

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro

    r1d1ab2e r46138fe  
    66QT      += network 
    77 
    8 LIBS    += -L../../../libpcbsd -lpcbsd-utils -lpcbsd-ui 
     8LIBS    += -L../../../libpcbsd -lpcbsd-utils -lpcbsd-ui -lQtSolutions_SingleApplication-head 
    99 
    1010HEADERS += networkman.h \ 
  • src-qt4/port-files/Makefile

    r0bbbe62 r75a0dbe  
    1111COMMENT=        PC-BSD Qt4 Utilities 
    1212 
    13 RUN_DEPENDS=    pc-metapkgmanager:${PORTSDIR}/sysutils/pcbsd-utils \ 
    14                 ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus 
    15 LIB_DEPENDS=    libQtSolutions_SingleApplication-head.so:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \ 
     13RUN_DEPENDS=    lpreserver:${PORTSDIR}/sysutils/pcbsd-utils \ 
     14                ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ 
    1615                curl:${PORTSDIR}/ftp/curl 
     16LIB_DEPENDS=    libQtSolutions_SingleApplication-head.so:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication 
    1717 
    1818MAKE_JOBS_UNSAFE=yes 
    1919ONLY_FOR_ARCHS= amd64 
    2020USE_CDRTOOLS=   yes 
    21 USE_BZIP2=      yes 
    2221USE_PYTHON=     yes 
    2322USE_LDCONFIG=   yes 
    2423USE_QT4=        corelib gui network svg linguist \ 
    2524                moc_build rcc_build uic_build 
    26 USES=           qmake 
     25USES=           qmake tar:bzip2 
    2726 
    2827WRKSRC=         ${WRKDIR}/src-qt4 
     
    3029QMAKE_ARGS=     CONFIG+="configure" 
    3130 
    32 .include <bsd.port.pre.mk> 
     31.include <bsd.port.options.mk> 
    3332 
    3433.if ${OSVERSION} < 1000000 
     
    3635.endif 
    3736 
    38 .include <bsd.port.post.mk> 
     37.include <bsd.port.mk> 
  • src-qt4/port-files/pkg-plist

    r9934f47 r75a0dbe  
    572572share/pcbsd/pc-controlpanel/items/tools/flash-player-properties.desktop 
    573573share/pcbsd/pc-controlpanel/items/tools/kde-kcmdf.desktop 
     574share/pcbsd/pc-controlpanel/items/software/easypbi.desktop 
    574575share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop 
    575 share/pcbsd/pc-controlpanel/items/software/easypbi.desktop 
     576share/pcbsd/pc-controlpanel/items/software/pkg-q4wine.desktop 
     577share/pcbsd/pc-controlpanel/items/software/pkg-swine.desktop 
     578share/pcbsd/pc-controlpanel/items/software/pkg-winecfg.desktop 
    576579share/pcbsd/pc-controlpanel/items/software/appcafe.desktop 
    577580share/pcbsd/pc-controlpanel/items/de/xfce-wm-settings.desktop 
     
    28692872include/pcbsd-utils.h 
    28702873include/pcbsd-ui.h 
    2871 @dirrmtry etc/xdg/ 
    28722874@dirrm share/apps/ksplash/Themes/pcbsd10/600x400 
    28732875@dirrm share/apps/ksplash/Themes/pcbsd10/800x600 
     
    28842886@dirrmtry share/apps 
    28852887@dirrmtry share/config 
    2886 @dirrm share/warden/bin 
    28872888@dirrm share/warden/images 
    28882889@dirrm share/warden/i18n 
     
    29382939@dirrm share/lifePreserver/scripts 
    29392940@dirrmtry share/lifePreserver 
    2940 @dirrmtry share/warden 
    2941 @dirrmtry share/pcbsd/scripts 
    2942 @dirrmtry share/pcbsd 
    29432941@dirrmtry share/desktop-directories 
    2944 @dirrmtry etc/xdg/menus 
    2945 @dirrmtry etc/xdg/applications-merged 
    2946 @dirrmtry etc/xdg 
     2942@dirrmtry %%QT_ETCDIR%%/applications-merged 
     2943@dirrmtry %%QT_ETCDIR%%/menus 
  • src-sh/port-files/Makefile

    r119afba r46138fe  
    1919CONFLICTS?=     pbi-manager-[0-9]* 
    2020USE_QT4=        corelib network qmake moc_build rcc_build uic_build 
    21 USES=           pkgconfig 
     21USES=           pkgconfig tar:bzip2 
    2222NO_BUILD=       yes 
    23 USE_BZIP2=      yes 
    2423 
    2524.include <bsd.port.pre.mk> 
  • src-sh/port-files/pkg-plist

    re286b67 r75a0dbe  
    226226share/pcbsd/pc-thinclient/resources/webui/index.php 
    227227share/pcbsd/pc-thinclient/resources/webui/login.php 
     228share/pcbsd/de-profiles/lumina.profile 
    228229share/pcbsd/de-profiles/lxde.profile 
    229230share/pcbsd/de-profiles/kde.profile 
     
    275276man/man1/pbi_icon.1.gz 
    276277man/man1/pbi_info.1.gz 
     278man/man1/pc-systemflag.1.gz 
    277279man/man5/pbi.conf.5.gz 
    278280man/man8/pc-sysinstall.8.gz 
     281@dirrmtry etc/sudoers.d 
    279282@dirrm share/pbi-manager/icons 
    280283@dirrm share/pbi-manager 
  • lumina/lumina-config/KeyCatch.h

    r47396367 r95f06f0  
    1414#include <QKeyEvent> 
    1515#include <QString> 
     16#include <QDebug> 
    1617 
    1718#include "ui_KeyCatch.h" 
     
    7475            //Now get the main key 
    7576            qkeys.replace("+"," "); 
    76             if(QKeySequence(event->key()).toString().isEmpty()){ 
     77            if(event->key()==0){ 
    7778              qkeys.append( QString::number(event->nativeVirtualKey()) ); 
    7879            }else{ 
     
    8788              } 
    8889            } 
     90            qDebug() << "Found Key Press:"; 
     91            qDebug() << " - Native Virtual Key:" << event->nativeVirtualKey(); 
     92            qDebug() << " - Qt Key Sequence:" << QKeySequence(event->key()).toString(); 
     93            qDebug() << " - Full Detected Sequence (Display):" << qkeys; 
     94            qDebug() << " - Full Detected Sequence (backend):" << xkeys; 
    8995            //Now close the dialog 
    9096            cancelled=false; 
Note: See TracChangeset for help on using the changeset viewer.