Changeset 082a859


Ignore:
Timestamp:
02/28/14 05:36:03 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
cbe0295
Parents:
a07b515 (diff), cfc1c4f (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 'master' of github.com:pcbsd/pcbsd

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    ra4b4e3d r4b65ed1  
    4444ca_root_nss_SET=ETCSYMLINK 
    4545centerim_SET=GG LJ RSS GPGME JABBER IRC AIM YAHOO MSN FRIBIDI MULTIBYTE 
    46 chromium_SET=CUPS CODECS CLANG 
     46chromium_SET=CODECS CLANG PULSEAUDIO 
    4747claws-mail_SET=BOGOFILTER GPGME SPAMASSASSIN 
    4848conky_SET=XFT LUA LUA_CAIRO LUA_IMLIB2 IMLIB2 
     
    5454easytag_SET=WAVEPACK 
    5555evolution_SET=SPAMASSASSIN 
     56firefox_UNSET=ALSA 
     57firefox_SET=PULSEAUDIO 
    5658freeciv_SET=SDL 
    5759freetype2_SET=LCD_FILTERING 
  • src-sh/lpreserver/backend/runsnap.sh

    r37adeaf re9724ed  
    7474     year="`echo $lastSend | cut -d '-' -f 2`" 
    7575     sendEpoc=`date -j -f "%Y %m %d %H %M %S" "$year $mon $day $hour $min $sec" "+%s"` 
     76     # Check that this replication target is still active 
     77     if [ -e "$REPCONF" ] ; then 
     78       cat ${REPCONF} | grep -q "^${LDATA}:" 
     79       if [ $? -ne 0 ] ; then 
     80          unset lastSEND 
     81          unset sendEpoc 
     82       fi 
     83     fi 
    7684  fi 
    7785 
  • src-sh/port-files/Makefile

    r01fcea9 rcfc1c4f  
    2323WRKSRC=         ${WRKDIR}/src-sh 
    2424CONFLICTS?=     pbi-manager-[0-9]* 
     25USES=           fuse 
    2526NO_BUILD=       yes 
    2627USE_BZIP2=      yes 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r4e7809d redece96  
    537537      mmenu->addAction( QIcon(":icons/add-root.png"),tr("Add (All Users)"),this,SLOT(slotActionAddMenuAll()) ); 
    538538  } 
    539   //Paths are always available 
     539  //Paths are always available if actually installed 
     540  if( !PBI->isInstalled(pbiID).isEmpty() ){ 
    540541    QMenu *pmenu = contextActionMenu->addMenu( QIcon(":icons/xdg_paths.png"), tr("Path Links")); 
    541542      pmenu->addAction( QIcon(":icons/add.png"),tr("Add"),this,SLOT(slotActionAddPath()) ); 
    542543      pmenu->addAction( QIcon(":icons/remove.png"),tr("Remove"),this,SLOT(slotActionRemovePath()) );   
    543544      pmenu->addAction( QIcon(":icons/add-root.png"),tr("Add (All Users)"),this,SLOT(slotActionAddPathAll()) ); 
     545  } 
    544546  if(info[2]=="true"){ 
    545547    QMenu *fmenu = contextActionMenu->addMenu( QIcon(":icons/xdg_mime.png"), tr("File Associations")); 
     
    11951197  ui->tool_bapp_download->setEnabled(FALSE); //make sure it cannot be clicked more than once before page refresh 
    11961198  //Now show the Installed tab 
    1197   //ui->tabWidget->setCurrentWidget(ui->tab_installed); 
     1199  ui->tabWidget->setCurrentWidget(ui->tab_installed); 
    11981200} 
    11991201 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    r7e41a70 ra07b515  
    239239  qDebug() << "PBI Upgrades requested for:" << pbiID; 
    240240  for(int i=0; i<pbiID.length(); i++){ 
    241     if( PBIHASH.contains(pbiID[i]) ){ 
     241    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    242242      if( PBIHASH[pbiID[i]].status == InstalledPBI::UPDATEAVAILABLE ){ 
    243243        QString cmd = generateUpdateCMD(pbiID[i]); 
     
    259259  qDebug() << "PBI Removals requested for:" << pbiID; 
    260260  QStringList xdgrem; xdgrem << "remove-desktop" << "remove-menu" << "remove-mime" << "remove-paths"; 
     261  QStringList cancelList; 
    261262  for(int i=0; i<pbiID.length(); i++){ 
     263             
    262264    if(PBIHASH.contains(pbiID[i])){ 
    263       //Remove XDG entries for this app 
    264       PENDINGREMOVAL << pbiID[i]+":::"+generateXDGCMD(pbiID[i],xdgrem, FALSE); 
    265       //Remove the app itself 
    266       PENDINGREMOVAL << pbiID[i]+":::"+generateRemoveCMD(pbiID[i]); 
    267       //Now update the status 
    268       PBIHASH[pbiID[i]].setStatus(InstalledPBI::PENDINGREMOVAL); 
    269       emit PBIStatusChange(pbiID[i]); 
     265      if( isInstalled(pbiID[i]).isEmpty() ){ 
     266        //Not a fully-installed PBI - cancel it instead 
     267        cancelList << pbiID[i]; 
     268      }else{ 
     269        //Remove XDG entries for this app 
     270        PENDINGREMOVAL << pbiID[i]+":::"+generateXDGCMD(pbiID[i],xdgrem, FALSE); 
     271        //Remove the app itself 
     272        PENDINGREMOVAL << pbiID[i]+":::"+generateRemoveCMD(pbiID[i]); 
     273        //Now update the status 
     274        PBIHASH[pbiID[i]].setStatus(InstalledPBI::PENDINGREMOVAL); 
     275        emit PBIStatusChange(pbiID[i]); 
     276      } 
    270277    }else{ 
    271278      qDebug() << pbiID[i] << "not a valid PBI to remove";           
    272279    } 
    273280  } 
     281  //If there are PBIs to cancel, do that too 
     282  if(!cancelList.isEmpty()){ cancelActions(cancelList); } 
    274283  //Now check/start the remove process 
    275284  QTimer::singleShot(0,this,SLOT(checkProcesses()) ); 
     
    325334void PBIBackend::addDesktopIcons(QStringList pbiID, bool allusers){ // add XDG desktop icons 
    326335  for(int i=0; i<pbiID.length(); i++){ 
    327     if(PBIHASH.contains(pbiID[i])){ 
     336    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    328337      //generate the command 
    329338      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"desktop",allusers); 
     
    338347void PBIBackend::addMenuIcons(QStringList pbiID, bool allusers){ // add XDG menu icons 
    339348  for(int i=0; i<pbiID.length(); i++){ 
    340     if(PBIHASH.contains(pbiID[i])){ 
     349    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    341350      //generate the command 
    342351      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"menu",allusers); 
     
    351360void PBIBackend::addPaths(QStringList pbiID, bool allusers){ // create path links 
    352361  for(int i=0; i<pbiID.length(); i++){ 
    353     if(PBIHASH.contains(pbiID[i])){ 
     362    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    354363      //generate the command 
    355364      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"paths",allusers); 
     
    364373void PBIBackend::addMimeTypes(QStringList pbiID, bool allusers){ // remove path links 
    365374  for(int i=0; i<pbiID.length(); i++){ 
    366     if(PBIHASH.contains(pbiID[i])){ 
     375    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    367376      //generate the command 
    368377      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"mime",allusers); 
     
    377386void PBIBackend::rmDesktopIcons(QStringList pbiID, bool allusers){ // remove XDG desktop icons 
    378387  for(int i=0; i<pbiID.length(); i++){ 
    379     if(PBIHASH.contains(pbiID[i])){ 
     388    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    380389      //generate the command 
    381390      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"remove-desktop",allusers); 
     
    390399void PBIBackend::rmMenuIcons(QStringList pbiID, bool allusers){ // remove XDG menu icons 
    391400  for(int i=0; i<pbiID.length(); i++){ 
    392     if(PBIHASH.contains(pbiID[i])){ 
     401    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    393402      //generate the command 
    394403      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"remove-menu",allusers); 
     
    403412void PBIBackend::rmPaths(QStringList pbiID, bool allusers){ // remove path links 
    404413  for(int i=0; i<pbiID.length(); i++){ 
    405     if(PBIHASH.contains(pbiID[i])){ 
     414    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    406415      //generate the command 
    407416      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"remove-paths",allusers); 
     
    416425void PBIBackend::rmMimeTypes(QStringList pbiID, bool allusers){ // remove path links 
    417426  for(int i=0; i<pbiID.length(); i++){ 
    418     if(PBIHASH.contains(pbiID[i])){ 
     427    if( PBIHASH.contains(pbiID[i]) && !isInstalled(pbiID[i]).isEmpty() ){ 
    419428      //generate the command 
    420429      QString cmd = generateXDGCMD(pbiID[i],QStringList()<<"remove-mime",allusers); 
     
    428437 
    429438void PBIBackend::enableAutoUpdate(QString pbiID, bool enable){ 
    430   if(!PBIHASH.contains(pbiID)){return;} 
     439  if(!PBIHASH.contains(pbiID) || isInstalled(pbiID).isEmpty() ){return;} 
    431440  //Generate the command 
    432441  QString cmd = generateAutoUpdateCMD(pbiID,enable); 
Note: See TracChangeset for help on using the changeset viewer.