aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvl <dvl@FreeBSD.org>2018-12-19 04:18:05 +0800
committerdvl <dvl@FreeBSD.org>2018-12-19 04:18:05 +0800
commit650f53fbdbcc6bdb72f1ec5ec7eea05a529b1ff6 (patch)
tree69a57281ab50fad2453a1ebf8e4914507ae12aa1
parente3f13d06cfeefe627d7be268acb86dfdb2c1ee14 (diff)
downloadfreebsd-ports-gnome-650f53fbdbcc6bdb72f1ec5ec7eea05a529b1ff6.tar.gz
freebsd-ports-gnome-650f53fbdbcc6bdb72f1ec5ec7eea05a529b1ff6.tar.zst
freebsd-ports-gnome-650f53fbdbcc6bdb72f1ec5ec7eea05a529b1ff6.zip
Add graphics/p5-Image-OCR-Tesseract
perform ocr on an image and output text to stdout
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/p5-Image-OCR-Tesseract/Makefile25
-rw-r--r--graphics/p5-Image-OCR-Tesseract/distinfo3
-rw-r--r--graphics/p5-Image-OCR-Tesseract/pkg-descr17
-rw-r--r--graphics/p5-Image-OCR-Tesseract/pkg-plist5
5 files changed, 51 insertions, 0 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index bc737242def2..8569c2fde132 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -763,6 +763,7 @@
SUBDIR += p5-Image-Math-Constrain
SUBDIR += p5-Image-MetaData-GQview
SUBDIR += p5-Image-MetaData-JPEG
+ SUBDIR += p5-Image-OCR-Tesseract
SUBDIR += p5-Image-ObjectDetect
SUBDIR += p5-Image-PBMlib
SUBDIR += p5-Image-PNG-Libpng
diff --git a/graphics/p5-Image-OCR-Tesseract/Makefile b/graphics/p5-Image-OCR-Tesseract/Makefile
new file mode 100644
index 000000000000..679a78689aa9
--- /dev/null
+++ b/graphics/p5-Image-OCR-Tesseract/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME= Image-OCR-Tesseract
+PORTVERSION= 1.24
+CATEGORIES= graphics perl5
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= CPAN:LEOCHARRE
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= dvl@FreeBSD.org
+COMMENT= Read an image with Resseract OCR and get output
+
+LICENSE= GPLv3
+
+MYDEPENDS= tesseract>0:graphics/tesseract \
+ ImageMagick6-nox11>0:graphics/ImageMagick6-nox11
+BUILD_DEPENDS= ${MY_DEPENDS}
+RUN_DEPENDS= ${MY_DEPENDS}
+
+USES= perl5
+USE_PERL5= configure
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/graphics/p5-Image-OCR-Tesseract/distinfo b/graphics/p5-Image-OCR-Tesseract/distinfo
new file mode 100644
index 000000000000..63cdeea3c066
--- /dev/null
+++ b/graphics/p5-Image-OCR-Tesseract/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1545145985
+SHA256 (Image-OCR-Tesseract-1.24.tar.gz) = cd3428eb2aa9d12154bafbaa89e3d32f41a7b3c6c63884b80857643ca1431262
+SIZE (Image-OCR-Tesseract-1.24.tar.gz) = 1468013
diff --git a/graphics/p5-Image-OCR-Tesseract/pkg-descr b/graphics/p5-Image-OCR-Tesseract/pkg-descr
new file mode 100644
index 000000000000..40e818e13d4e
--- /dev/null
+++ b/graphics/p5-Image-OCR-Tesseract/pkg-descr
@@ -0,0 +1,17 @@
+Provides a perl interface to tesseract.
+
+This is just an interface to make it quick an easy to get ocr output from an
+image file. No matter what image type you provide, imagemagick convert is
+called to turn it into the format for tesseract
+
+Also accepts any image input- takes care of converting your imput image to a
+tiff to the required specs, without changing the original.
+
+Example usage:
+
+ocr ./image.jpg > ./savetext.txt
+ocr ./image.png
+ocr ./image1.jpg ./image2.jpg > ./alltext.txt
+ocr ./image*jpg
+
+WWW: https://metacpan.org/release/LEOCHARRE/Image-OCR-Tesseract-1.24
diff --git a/graphics/p5-Image-OCR-Tesseract/pkg-plist b/graphics/p5-Image-OCR-Tesseract/pkg-plist
new file mode 100644
index 000000000000..081969e09495
--- /dev/null
+++ b/graphics/p5-Image-OCR-Tesseract/pkg-plist
@@ -0,0 +1,5 @@
+bin/ocr
+%%SITE_PERL%%/Image/OCR/Tesseract.pm
+%%SITE_PERL%%/Image/OCR/Tesseract.pod
+%%PERL5_MAN1%%/ocr.1.gz
+%%PERL5_MAN3%%/Image::OCR::Tesseract.3.gz
IR%%/10step/DEX10STEPANALYSIS.DP +%%DATADIR%%/10step/DEXARROW.DP +%%DATADIR%%/10step/DEXBP.DP +%%DATADIR%%/10step/DEXCHECK.DP +%%DATADIR%%/10step/DEXCONT.DP +%%DATADIR%%/10step/DEXCP.DP +%%DATADIR%%/10step/DEXCP_WRITE_AUGMENTED_TIC_LABELS.DP +%%DATADIR%%/10step/DEXCRSDP.DP +%%DATADIR%%/10step/DEXCRSDP_BOX.DP +%%DATADIR%%/10step/DEXEP.DP +%%DATADIR%%/10step/DEXEP_BOX.DP +%%DATADIR%%/10step/DEXGETLEVELCODED.DP +%%DATADIR%%/10step/DEXHPP.DP +%%DATADIR%%/10step/DEXIEM.DP +%%DATADIR%%/10step/DEXKNBOX.DP +%%DATADIR%%/10step/DEXKNBOXLEE.DP +%%DATADIR%%/10step/DEXMP.DP +%%DATADIR%%/10step/DEXMP_ANOVA.DP +%%DATADIR%%/10step/DEXMP_LEVENE_TEST.DP +%%DATADIR%%/10step/DEXMP_WRITE_FACTOR_LEVELS.DP +%%DATADIR%%/10step/DEXODP.DP +%%DATADIR%%/10step/DEXPLOTDEFPLOTSET.DP +%%DATADIR%%/10step/DEXPLOTINIT.DP +%%DATADIR%%/10step/DEXRIGHTMARGIN.DP +%%DATADIR%%/10step/DEXSP.DP +%%DATADIR%%/10step/DEXSP_WRITE_FACTOR_LEVELS.DP +%%DATADIR%%/10step/DEXWRITELEVEL.DP +%%DATADIR%%/10step/DEXWRITELEVELCODED.DP +%%DATADIR%%/10step/DEXWRITEPROJECT.DP +%%DATADIR%%/10step/DEXYP.DP +%%DATADIR%%/10step/DPLOGF.TEX +%%DATADIR%%/10step/EST.DP +%%DATADIR%%/10step/EXTRACT_CENTER_POINTS.DP +%%DATADIR%%/10step/FORM_AND_WRITE_DEX_10_STEP_CONCLUSIONS.DP +%%DATADIR%%/10step/GET_RANKED_LIST_OF_FACTORS.DP +%%DATADIR%%/10step/GET_ROBUSTNESS_FACTORS.DP +%%DATADIR%%/10step/INN_8_16.DAT +%%DATADIR%%/10step/INN_8_16.DP +%%DATADIR%%/10step/INN_8_16.PDF +%%DATADIR%%/10step/KNEIFEL_7_128.DAT +%%DATADIR%%/10step/KNEIFEL_7_128.DP +%%DATADIR%%/10step/KNEIFEL_7_128.PDF +%%DATADIR%%/10step/LABEL_LOCATION_AND_SIZE.DP +%%DATADIR%%/10step/MA_10_16.DAT +%%DATADIR%%/10step/MA_10_16.DP +%%DATADIR%%/10step/MA_10_16.PDF +%%DATADIR%%/10step/NUMBER_OF_DIGITS.DP +%%DATADIR%%/10step/PLOTERRORBARS.DP +%%DATADIR%%/10step/SCOTT_8_16.DAT +%%DATADIR%%/10step/SCOTT_8_16.DP +%%DATADIR%%/10step/SCOTT_8_16.PDF +%%DATADIR%%/10step/SDIGIT.DP +%%DATADIR%%/10step/SETCIRCLE.DP +%%DATADIR%%/10step/TAGCORN.DP +%%DATADIR%%/10step/UPPERLEFT.DP +%%DATADIR%%/10step/WASHBURN_4_16.DAT +%%DATADIR%%/10step/WASHBURN_4_16.DP +%%DATADIR%%/10step/WASHBURN_4_16.PDF +%%DATADIR%%/10step/WTC_13_16.DAT +%%DATADIR%%/10step/WTC_13_16.DP +%%DATADIR%%/10step/WTC_13_16.PDF +%%DATADIR%%/10step/readme.txt +%%DATADIR%%/data/100OHM.DAT +%%DATADIR%%/data/ABER17.DAT +%%DATADIR%%/data/ABER35.DAT +%%DATADIR%%/data/ABER43.DAT +%%DATADIR%%/data/ABERN17.DAT +%%DATADIR%%/data/ABERN35.DAT +%%DATADIR%%/data/ABERN43.DAT +%%DATADIR%%/data/ABSORPT.DAT +%%DATADIR%%/data/AC.DAT +%%DATADIR%%/data/AGE18.DAT +%%DATADIR%%/data/AGEBP.DAT +%%DATADIR%%/data/ALARM.DAT +%%DATADIR%%/data/ALLERGEN.DAT +%%DATADIR%%/data/ALVAREZ.DAT +%%DATADIR%%/data/AMRF.DAT +%%DATADIR%%/data/ANSCOMBE.DAT +%%DATADIR%%/data/ANTIBODY.DAT +%%DATADIR%%/data/APRICOTS.DAT +%%DATADIR%%/data/ARSENIC.DAT +%%DATADIR%%/data/ASCO2.DAT +%%DATADIR%%/data/ASF11.DAT +%%DATADIR%%/data/ASF12.DAT +%%DATADIR%%/data/ASN2O.DAT +%%DATADIR%%/data/ASQCSAL.DAT +%%DATADIR%%/data/ASSAY.DAT +%%DATADIR%%/data/ATKINSON.DAT +%%DATADIR%%/data/AUTO79.DAT +%%DATADIR%%/data/AUTO83.DAT +%%DATADIR%%/data/AUTO83B.DAT +%%DATADIR%%/data/BABYWT.DAT +%%DATADIR%%/data/BAKER.DAT +%%DATADIR%%/data/BALLBEAR.DAT +%%DATADIR%%/data/BARNETT.DAT +%%DATADIR%%/data/BASIS.DAT +%%DATADIR%%/data/BATTADD.DAT +%%DATADIR%%/data/BATTADD1.DAT +%%DATADIR%%/data/BATTADD2.DAT +%%DATADIR%%/data/BATTADD3.DAT +%%DATADIR%%/data/BENNET11.DAT +%%DATADIR%%/data/BENNETT.DAT +%%DATADIR%%/data/BENNETT.DAT.OLD +%%DATADIR%%/data/BENNETT2.DAT +%%DATADIR%%/data/BENNETT2.DAT.OLD +%%DATADIR%%/data/BENNETT5.DAT +%%DATADIR%%/data/BENNETT6.DAT +%%DATADIR%%/data/BENNETT7.DAT +%%DATADIR%%/data/BERGER1.DAT +%%DATADIR%%/data/BFR.DAT +%%DATADIR%%/data/BINTAILP.DAT +%%DATADIR%%/data/BIOMED3.DAT +%%DATADIR%%/data/BIRNSAUN.DAT +%%DATADIR%%/data/BIVGAUSS.DAT +%%DATADIR%%/data/BIVNGAUS.DAT +%%DATADIR%%/data/BLAND.DAT +%%DATADIR%%/data/BLOODPRE.DAT +%%DATADIR%%/data/BOETTING.DAT +%%DATADIR%%/data/BOOKS.DAT +%%DATADIR%%/data/BOWEN.DAT +%%DATADIR%%/data/BOX120.DAT +%%DATADIR%%/data/BOXAUTO.DAT +%%DATADIR%%/data/BOXBIKE2.DAT +%%DATADIR%%/data/BOXBIKE3.DAT +%%DATADIR%%/data/BOXBISG.DAT +%%DATADIR%%/data/BOXBLOOD.DAT +%%DATADIR%%/data/BOXBOD.DAT +%%DATADIR%%/data/BOXCAKE.DAT +%%DATADIR%%/data/BOXCAKE2.DAT +%%DATADIR%%/data/BOXCHEM.DAT +%%DATADIR%%/data/BOXCHEM2.DAT +%%DATADIR%%/data/BOXCLEAN.DAT +%%DATADIR%%/data/BOXCLOT2.DAT +%%DATADIR%%/data/BOXCLOTH.DAT +%%DATADIR%%/data/BOXCLOTH.DAT.SAV +%%DATADIR%%/data/BOXCOX.DAT +%%DATADIR%%/data/BOXDR175.DAT +%%DATADIR%%/data/BOXFILT.DAT +%%DATADIR%%/data/BOXFILT2.DAT +%%DATADIR%%/data/BOXINDUS.DAT +%%DATADIR%%/data/BOXJ32.DAT +%%DATADIR%%/data/BOXJE142.DAT +%%DATADIR%%/data/BOXJENK1.DAT +%%DATADIR%%/data/BOXJENK2.DAT +%%DATADIR%%/data/BOXMOLD.DAT +%%DATADIR%%/data/BOXPENIC.DAT +%%DATADIR%%/data/BOXPILOT.DAT +%%DATADIR%%/data/BOXPOISO.DAT +%%DATADIR%%/data/BOXRADAR.DAT +%%DATADIR%%/data/BOXRATS.DAT +%%DATADIR%%/data/BOXREAC2.DAT +%%DATADIR%%/data/BOXREAC3.DAT +%%DATADIR%%/data/BOXREAC4.DAT +%%DATADIR%%/data/BOXREACT.DAT +%%DATADIR%%/data/BOXSHOES.DAT +%%DATADIR%%/data/BOXSOLAR.DAT +%%DATADIR%%/data/BOXSPRAY.DAT +%%DATADIR%%/data/BOXSPRI2.DAT +%%DATADIR%%/data/BOXSPRI3.DAT +%%DATADIR%%/data/BOXSPRIN.DAT +%%DATADIR%%/data/BOXSPRINGS_3_8.DAT +%%DATADIR%%/data/BOXTOMAT.DAT +%%DATADIR%%/data/BOXWELD.DAT +%%DATADIR%%/data/BOXYIEL2.DAT +%%DATADIR%%/data/BOXYIEL3.DAT +%%DATADIR%%/data/BOXYIELD.DAT +%%DATADIR%%/data/BP.DAT +%%DATADIR%%/data/BPWEIGHT.DAT +%%DATADIR%%/data/BRAIN.DAT +%%DATADIR%%/data/BULLET.DAT +%%DATADIR%%/data/CABBAGE.DAT +%%DATADIR%%/data/CALIBRATIONLINE.DAT +%%DATADIR%%/data/CANCER.DAT +%%DATADIR%%/data/CANS.DAT +%%DATADIR%%/data/CAR.DAT +%%DATADIR%%/data/CAR17.DAT +%%DATADIR%%/data/CAR2.DAT +%%DATADIR%%/data/CAR20.DAT +%%DATADIR%%/data/CARBMON.DAT +%%DATADIR%%/data/CASTIL10.DAT +%%DATADIR%%/data/CASTIL11.DAT +%%DATADIR%%/data/CASTIL12.DAT +%%DATADIR%%/data/CASTIL13.DAT +%%DATADIR%%/data/CASTIL14.DAT +%%DATADIR%%/data/CASTILL1.DAT +%%DATADIR%%/data/CASTILL2.DAT +%%DATADIR%%/data/CASTILL3.DAT +%%DATADIR%%/data/CASTILL4.DAT +%%DATADIR%%/data/CASTILL5.DAT +%%DATADIR%%/data/CASTILL6.DAT +%%DATADIR%%/data/CASTILL7.DAT +%%DATADIR%%/data/CASTILL8.DAT +%%DATADIR%%/data/CASTILL9.DAT +%%DATADIR%%/data/CATAPULT.DAT +%%DATADIR%%/data/CC1.DAT +%%DATADIR%%/data/CCC.DAT +%%DATADIR%%/data/CCP.DAT +%%DATADIR%%/data/CCPN.DAT +%%DATADIR%%/data/CCU.DAT +%%DATADIR%%/data/CCXBAR.DAT +%%DATADIR%%/data/CDSTOCK.DAT +%%DATADIR%%/data/CEMENT.DAT +%%DATADIR%%/data/CEREAL.DAT +%%DATADIR%%/data/CHALLENG.DAT +%%DATADIR%%/data/CHAMBER.DAT +%%DATADIR%%/data/CHARACTERIZE-3_2_3_1.DAT +%%DATADIR%%/data/CHARACTERIZE-3_2_3_2.DAT +%%DATADIR%%/data/CHECK_STD.DAT +%%DATADIR%%/data/CHINA.DAT +%%DATADIR%%/data/CHOI.DAT +%%DATADIR%%/data/CHOI2.DAT +%%DATADIR%%/data/CHOL.DAT +%%DATADIR%%/data/CHOLEST1.DAT +%%DATADIR%%/data/CHOLEST2.DAT +%%DATADIR%%/data/CHWIRUT1.DAT +%%DATADIR%%/data/CHWIRUT2.DAT +%%DATADIR%%/data/CIRCLE.DAT +%%DATADIR%%/data/CLARK0.DAT +%%DATADIR%%/data/CLARK1.DAT +%%DATADIR%%/data/CLARK2.DAT +%%DATADIR%%/data/CLARK3.DAT +%%DATADIR%%/data/CLAYTILE.DAT +%%DATADIR%%/data/CLB1.DAT +%%DATADIR%%/data/CLB2.DAT +%%DATADIR%%/data/CLEAR.DAT +%%DATADIR%%/data/CO2.DAT +%%DATADIR%%/data/COIL.DAT +%%DATADIR%%/data/COLUCCI3.DAT +%%DATADIR%%/data/COMPARE-7_1_6.DAT +%%DATADIR%%/data/CONCRETE.DAT +%%DATADIR%%/data/CONSUMPR.DAT +%%DATADIR%%/data/CONTRAST.DAT +%%DATADIR%%/data/CONVFACT.DAT +%%DATADIR%%/data/CONVHULL.DAT +%%DATADIR%%/data/CORNEL23.DAT +%%DATADIR%%/data/CORNEL35.DAT +%%DATADIR%%/data/CORNEL43.DAT +%%DATADIR%%/data/CORNEL62.DAT +%%DATADIR%%/data/CORNEL69.DAT +%%DATADIR%%/data/CORNEL78.DAT +%%DATADIR%%/data/CORNEL81.DAT +%%DATADIR%%/data/CORNELL4.DAT +%%DATADIR%%/data/CORNELL9.DAT +%%DATADIR%%/data/CREAM.DAT +%%DATADIR%%/data/CROARK2.DAT +%%DATADIR%%/data/CROARK3.DAT +%%DATADIR%%/data/CROARK5.DAT +%%DATADIR%%/data/CROARKIN.DAT +%%DATADIR%%/data/CRYSTAL.DAT +%%DATADIR%%/data/CRYSTAL3.DAT +%%DATADIR%%/data/CUBE.DAT +%%DATADIR%%/data/CUMMING4.DAT +%%DATADIR%%/data/CURRIE.DAT +%%DATADIR%%/data/CURRIE3.DAT +%%DATADIR%%/data/CURRIE4.DAT +%%DATADIR%%/data/CURVEBA2.DAT +%%DATADIR%%/data/CURVEBAL.DAT +%%DATADIR%%/data/DANIELWO.DAT +%%DATADIR%%/data/DDS1.DAT +%%DATADIR%%/data/DDS10.DAT +%%DATADIR%%/data/DDS11.DAT +%%DATADIR%%/data/DDS12.DAT +%%DATADIR%%/data/DDS13.DAT +%%DATADIR%%/data/DDS14.DAT +%%DATADIR%%/data/DDS15.DAT +%%DATADIR%%/data/DDS16.DAT +%%DATADIR%%/data/DDS17.DAT +%%DATADIR%%/data/DDS18.DAT +%%DATADIR%%/data/DDS19.DAT +%%DATADIR%%/data/DDS2.DAT +%%DATADIR%%/data/DDS20.DAT +%%DATADIR%%/data/DDS21.DAT +%%DATADIR%%/data/DDS3.DAT +%%DATADIR%%/data/DDS4.DAT +%%DATADIR%%/data/DDS5.DAT +%%DATADIR%%/data/DDS6.DAT +%%DATADIR%%/data/DDS7.DAT +%%DATADIR%%/data/DDS8.DAT +%%DATADIR%%/data/DDS9.DAT +%%DATADIR%%/data/DEFICIT.DAT +%%DATADIR%%/data/DEVANEY.DAT +%%DATADIR%%/data/DEXCUBE.DAT +%%DATADIR%%/data/DONNELL2.DAT +%%DATADIR%%/data/DONNELLY.DAT +%%DATADIR%%/data/DORKO1.DAT +%%DATADIR%%/data/DORKO11.DAT +%%DATADIR%%/data/DORKO12.DAT +%%DATADIR%%/data/DORKO13.DAT +%%DATADIR%%/data/DORKO14.DAT +%%DATADIR%%/data/DORKO17.DAT +%%DATADIR%%/data/DORKO2.DAT +%%DATADIR%%/data/DORKO3.DAT +%%DATADIR%%/data/DORKO4.DAT +%%DATADIR%%/data/DPPL2F.DAT +%%DATADIR%%/data/DRAFT.DAT +%%DATADIR%%/data/DRAFT69.DAT +%%DATADIR%%/data/DRAFT69B.DAT +%%DATADIR%%/data/DRAFT69C.DAT +%%DATADIR%%/data/DRAPER8.DAT +%%DATADIR%%/data/DRAPS518.DAT +%%DATADIR%%/data/DRAPS521.DAT +%%DATADIR%%/data/DRUGCONC.DAT +%%DATADIR%%/data/DS532111.DAT +%%DATADIR%%/data/DUEWER1.DAT +%%DATADIR%%/data/DUTTON.DAT +%%DATADIR%%/data/DZIUBA.DAT +%%DATADIR%%/data/DZIUBA1.DAT +%%DATADIR%%/data/E2489A.DAT +%%DATADIR%%/data/E2489B.DAT +%%DATADIR%%/data/EBERHARD.DAT +%%DATADIR%%/data/ECKERLE4.DAT +%%DATADIR%%/data/EDA1.DAT +%%DATADIR%%/data/EDCOMM.TEX +%%DATADIR%%/data/EFRON251.DAT +%%DATADIR%%/data/EGGSHELL.DAT +%%DATADIR%%/data/EHRLICH.DAT +%%DATADIR%%/data/EHRSTEIN.DAT +%%DATADIR%%/data/ELECT92.DAT +%%DATADIR%%/data/ELECTO92.DAT +%%DATADIR%%/data/ELECTRIC.DAT +%%DATADIR%%/data/ELISA.DAT +%%DATADIR%%/data/ELKINS11.DAT +%%DATADIR%%/data/ELKINS12.DAT +%%DATADIR%%/data/ELLIOTTR.DAT +%%DATADIR%%/data/ELNINO.DAT +%%DATADIR%%/data/ESPINA3.DAT +%%DATADIR%%/data/ESPINA4.DAT +%%DATADIR%%/data/ESSEX.DAT +%%DATADIR%%/data/ETHNIC.DAT +%%DATADIR%%/data/EVANS.DAT +%%DATADIR%%/data/EXAM.DAT +%%DATADIR%%/data/EXP.DAT +%%DATADIR%%/data/EXPCEN.DAT +%%DATADIR%%/data/EXPCEN2.DAT +%%DATADIR%%/data/F2POPNEW.DAT +%%DATADIR%%/data/FAT.DAT +%%DATADIR%%/data/FEDRETIR.DAT +%%DATADIR%%/data/FISH2POP.DAT +%%DATADIR%%/data/FLICKER.DAT +%%DATADIR%%/data/FLURY.DAT +%%DATADIR%%/data/FLURY5.DAT +%%DATADIR%%/data/FRACBRAN.DAT +%%DATADIR%%/data/FRACCHRI.DAT +%%DATADIR%%/data/FRACCLOU.DAT +%%DATADIR%%/data/FRACFERN.DAT +%%DATADIR%%/data/FRACFRON.DAT +%%DATADIR%%/data/FRACGALA.DAT +%%DATADIR%%/data/FRACPENT.DAT +%%DATADIR%%/data/FRACSPIR.DAT +%%DATADIR%%/data/FRACSQUA.DAT +%%DATADIR%%/data/FRACTRIA.DAT +%%DATADIR%%/data/FRECHET.DAT +%%DATADIR%%/data/FREQPRIM.DAT +%%DATADIR%%/data/FREY.DAT +%%DATADIR%%/data/FRIEDMAN.DAT +%%DATADIR%%/data/FULLER.DAT +%%DATADIR%%/data/FULLER2.DAT +%%DATADIR%%/data/FULLODR1.DAT +%%DATADIR%%/data/FULLODR2.DAT +%%DATADIR%%/data/FUNNEL.DAT +%%DATADIR%%/data/FUNNEL1.DAT +%%DATADIR%%/data/FUNNEL11.DAT +%%DATADIR%%/data/FUNNEL2.DAT +%%DATADIR%%/data/FUNNEL3.DAT +%%DATADIR%%/data/FUNNEL5A.DAT +%%DATADIR%%/data/FUNNEL5B.DAT +%%DATADIR%%/data/FUNNEL5C.DAT +%%DATADIR%%/data/FURNACE.DAT +%%DATADIR%%/data/GAM3BURY.DAT +%%DATADIR%%/data/GAMCEN.DAT +%%DATADIR%%/data/GAMMA.DAT +%%DATADIR%%/data/GARBOCZI.DAT +%%DATADIR%%/data/GASTAX86.DAT +%%DATADIR%%/data/GAS_FURNACE.DAT +%%DATADIR%%/data/GEAR.DAT +%%DATADIR%%/data/GI/ABSORPT.DAT +%%DATADIR%%/data/GI/AGE18.DAT +%%DATADIR%%/data/GI/AGEBP.DAT +%%DATADIR%%/data/GI/ARSENIC.DAT +%%DATADIR%%/data/GI/ASSAY.DAT +%%DATADIR%%/data/GI/BABYWT.DAT +%%DATADIR%%/data/GI/BALLBEAR.DAT +%%DATADIR%%/data/GI/BIVGAUSS.DAT +%%DATADIR%%/data/GI/BIVNGAUS.DAT +%%DATADIR%%/data/GI/BP.DAT +%%DATADIR%%/data/GI/BPWEIGHT.DAT +%%DATADIR%%/data/GI/CABBAGE.DAT +%%DATADIR%%/data/GI/CANS.DAT +%%DATADIR%%/data/GI/CAR.DAT +%%DATADIR%%/data/GI/CAR17.DAT +%%DATADIR%%/data/GI/CAR2.DAT +%%DATADIR%%/data/GI/CAR20.DAT +%%DATADIR%%/data/GI/CARBMON.DAT +%%DATADIR%%/data/GI/CEMENT.DAT +%%DATADIR%%/data/GI/CEREAL.DAT +%%DATADIR%%/data/GI/CHAMBER.DAT +%%DATADIR%%/data/GI/CHOL.DAT +%%DATADIR%%/data/GI/COIL.DAT +%%DATADIR%%/data/GI/CONCRETE.DAT +%%DATADIR%%/data/GI/CONTRAST.DAT +%%DATADIR%%/data/GI/CRYSTAL.DAT +%%DATADIR%%/data/GI/CRYSTAL3.DAT +%%DATADIR%%/data/GI/DRUGCONC.DAT +%%DATADIR%%/data/GI/EGGSHELL.DAT +%%DATADIR%%/data/GI/ELECTRIC.DAT +%%DATADIR%%/data/GI/ETHNIC.DAT +%%DATADIR%%/data/GI/EXAM.DAT +%%DATADIR%%/data/GI/FAT.DAT +%%DATADIR%%/data/GI/GIFTED.DAT +%%DATADIR%%/data/GI/GPA.DAT +%%DATADIR%%/data/GI/GRADES.DAT +%%DATADIR%%/data/GI/GRADES26.DAT +%%DATADIR%%/data/GI/GRAVITY.DAT +%%DATADIR%%/data/GI/GROCERY.DAT +%%DATADIR%%/data/GI/HAZE.DAT +%%DATADIR%%/data/GI/LARCH.DAT +%%DATADIR%%/data/GI/LIGHT.DAT +%%DATADIR%%/data/GI/MAMMALWT.DAT +%%DATADIR%%/data/GI/MINIVAN.DAT +%%DATADIR%%/data/GI/MOUSE.DAT +%%DATADIR%%/data/GI/MPG.DAT +%%DATADIR%%/data/GI/NICKEL.DAT +%%DATADIR%%/data/GI/PLANT.DAT +%%DATADIR%%/data/GI/PLASTIC.DAT +%%DATADIR%%/data/GI/PREMIUMS.DAT +%%DATADIR%%/data/GI/PRISON.DAT +%%DATADIR%%/data/GI/PROCESS1.DAT +%%DATADIR%%/data/GI/PROCESS2.DAT +%%DATADIR%%/data/GI/PROFSAL.DAT +%%DATADIR%%/data/GI/PUMPKIN.DAT +%%DATADIR%%/data/GI/RAMUS.DAT +%%DATADIR%%/data/GI/SALARIES.DAT +%%DATADIR%%/data/GI/SALES.DAT +%%DATADIR%%/data/GI/SERUM.DAT +%%DATADIR%%/data/GI/SHELFLIF.DAT +%%DATADIR%%/data/GI/SO2.DAT +%%DATADIR%%/data/GI/SOYBURGR.DAT +%%DATADIR%%/data/GI/SULFURIC.DAT +%%DATADIR%%/data/GI/TABLE161.DAT +%%DATADIR%%/data/GI/TABLE164.DAT +%%DATADIR%%/data/GI/TABLE323.DAT +%%DATADIR%%/data/GI/TABLE324.DAT +%%DATADIR%%/data/GI/TABLE346.DAT +%%DATADIR%%/data/GI/TABLE355.DAT +%%DATADIR%%/data/GI/TABLE423.DAT +%%DATADIR%%/data/GI/TABLE425.DAT +%%DATADIR%%/data/GI/TABLE426.DAT +%%DATADIR%%/data/GI/TABLE442.DAT +%%DATADIR%%/data/GI/TABLE444.DAT +%%DATADIR%%/data/GI/TABLE445.DAT +%%DATADIR%%/data/GI/TABLE541.DAT +%%DATADIR%%/data/GI/TABLE542.DAT +%%DATADIR%%/data/GI/TABLE543.DAT +%%DATADIR%%/data/GI/TABLE561.DAT +%%DATADIR%%/data/GI/TABLE631.DAT +%%DATADIR%%/data/GI/TABLE733.DAT +%%DATADIR%%/data/GI/TABLE742.DAT +%%DATADIR%%/data/GI/THERMOM.DAT +%%DATADIR%%/data/GI/TRACK.DAT +%%DATADIR%%/data/GI/TURKEY.DAT +%%DATADIR%%/data/GI/USEDCARS.DAT +%%DATADIR%%/data/GIFTED.DAT +%%DATADIR%%/data/GLITZ.DAT +%%DATADIR%%/data/GLUCOSE.DAT +%%DATADIR%%/data/GLUCOSE2.DAT +%%DATADIR%%/data/GNP.DAT +%%DATADIR%%/data/GNP2.DAT +%%DATADIR%%/data/GOLD.DAT +%%DATADIR%%/data/GPA.DAT +%%DATADIR%%/data/GRA1326.DAT +%%DATADIR%%/data/GRA1617.DAT +%%DATADIR%%/data/GRADES.DAT +%%DATADIR%%/data/GRADES26.DAT +%%DATADIR%%/data/GRAVITY.DAT +%%DATADIR%%/data/GRAYALL.DAT +%%DATADIR%%/data/GRAYI327.DAT +%%DATADIR%%/data/GRAYI617.DAT +%%DATADIR%%/data/GROCERY.DAT +%%DATADIR%%/data/GUMBEL.DAT +%%DATADIR%%/data/GUNTER.DAT +%%DATADIR%%/data/HABER1.DAT +%%DATADIR%%/data/HAHN.DAT +%%DATADIR%%/data/HAHN1.DAT +%%DATADIR%%/data/HALD647.DAT +%%DATADIR%%/data/HAMAKER.DAT +%%DATADIR%%/data/HAULING.DAT +%%DATADIR%%/data/HAYES1.DAT +%%DATADIR%%/data/HAZE.DAT +%%DATADIR%%/data/HEALY1.DAT +%%DATADIR%%/data/HFNOSMED.DAT +%%DATADIR%%/data/HICHO.DAT +%%DATADIR%%/data/HICHO1.DAT +%%DATADIR%%/data/HICHO4.DAT +%%DATADIR%%/data/HORLICK.DAT +%%DATADIR%%/data/HORLICK1.DAT +%%DATADIR%%/data/HOSPITAL.DAT +%%DATADIR%%/data/HSU12.DAT +%%DATADIR%%/data/HSU5.DAT +%%DATADIR%%/data/HUMPHR11.DAT +%%DATADIR%%/data/HWANG.DAT +%%DATADIR%%/data/IMPROVE-5_4_7_3.DAT +%%DATADIR%%/data/IMPROVE-5_5_3_1_1.DAT +%%DATADIR%%/data/IMPROVE-5_5_3_1_3.DAT +%%DATADIR%%/data/IMPROVE-5_5_3_1_4.DAT +%%DATADIR%%/data/IMPROVE-5_5_3_2_2.DAT +%%DATADIR%%/data/IMPROVE-5_5_6.DAT +%%DATADIR%%/data/INDEX.DAT +%%DATADIR%%/data/INDEX2.DAT +%%DATADIR%%/data/INN.DAT +%%DATADIR%%/data/IRIS.DAT +%%DATADIR%%/data/ISHIK167.DAT +%%DATADIR%%/data/ISHIKA47.DAT +%%DATADIR%%/data/ISHIKA66.DAT +%%DATADIR%%/data/ISHIKA78.DAT +%%DATADIR%%/data/JAHANMI2.DAT +%%DATADIR%%/data/JENK142.DAT +%%DATADIR%%/data/JENK361.DAT +%%DATADIR%%/data/JONES.DAT +%%DATADIR%%/data/KAHN.DAT +%%DATADIR%%/data/KAUL.DAT +%%DATADIR%%/data/KAUL2.DAT +%%DATADIR%%/data/KENDALL.DAT +%%DATADIR%%/data/KENSEI.DAT +%%DATADIR%%/data/KENTON.DAT +%%DATADIR%%/data/KENTON2.DAT +%%DATADIR%%/data/KEYWEST.DAT +%%DATADIR%%/data/KIM.DAT +%%DATADIR%%/data/KIRBY2.DAT +%%DATADIR%%/data/KLOUDA2.DAT +%%DATADIR%%/data/KRASNY1.DAT +%%DATADIR%%/data/KRASNY2.DAT +%%DATADIR%%/data/LARCH.DAT +%%DATADIR%%/data/LASHMORE.DAT +%%DATADIR%%/data/LECHNER.DAT +%%DATADIR%%/data/LEIGH4.DAT +%%DATADIR%%/data/LEIGHFAC.DAT +%%DATADIR%%/data/LEIGHLAB.DAT +%%DATADIR%%/data/LEIGHP3A.DAT +%%DATADIR%%/data/LEVENSO3.DAT +%%DATADIR%%/data/LEW.DAT +%%DATADIR%%/data/LEW11.DAT +%%DATADIR%%/data/LEW3.DAT +%%DATADIR%%/data/LEW4.DAT +%%DATADIR%%/data/LGN.DAT +%%DATADIR%%/data/LGN2.DAT +%%DATADIR%%/data/LGN3PAR.DAT +%%DATADIR%%/data/LGNCEN.DAT +%%DATADIR%%/data/LIEBMILL.DAT +%%DATADIR%%/data/LIGHT.DAT +%%DATADIR%%/data/LIN.DAT +%%DATADIR%%/data/LINEWID.DAT +%%DATADIR%%/data/LITHOGRA.DAT +%%DATADIR%%/data/LIU.DAT +%%DATADIR%%/data/LOADCELL.DAT +%%DATADIR%%/data/LOESSCMP.DAT +%%DATADIR%%/data/LONGLEY.DAT +%%DATADIR%%/data/LOTTERY3.DAT +%%DATADIR%%/data/LOTTERY4.DAT +%%DATADIR%%/data/LUTHER.DAT +%%DATADIR%%/data/MACHINE.DAT +%%DATADIR%%/data/MAMMALWT.DAT +%%DATADIR%%/data/MANDE131.DAT +%%DATADIR%%/data/MANDEL.DAT +%%DATADIR%%/data/MANDEL131.DAT +%%DATADIR%%/data/MANDEL2.DAT +%%DATADIR%%/data/MANDEL2.DAT.OLD +%%DATADIR%%/data/MANDEL3.DAT +%%DATADIR%%/data/MANDEL30.DAT +%%DATADIR%%/data/MANDEL4.DAT +%%DATADIR%%/data/MANDEL6.DAT +%%DATADIR%%/data/MANDEL7.DAT +%%DATADIR%%/data/MANDEL8.DAT +%%DATADIR%%/data/MANSFIELD.DAT +%%DATADIR%%/data/MARSHAK.DAT +%%DATADIR%%/data/MASS.DAT +%%DATADIR%%/data/MATTINGL.DAT +%%DATADIR%%/data/MAVRO.DAT +%%DATADIR%%/data/MCCOOL82.DAT +%%DATADIR%%/data/MICHELSO.DAT +%%DATADIR%%/data/MILLIKAN.DAT +%%DATADIR%%/data/MILLS96.DAT +%%DATADIR%%/data/MINIVAN.DAT +%%DATADIR%%/data/MISRA1.DAT +%%DATADIR%%/data/MITCHEL1.DAT +%%DATADIR%%/data/MITCHEL2.DAT +%%DATADIR%%/data/MLCO2.DAT +%%DATADIR%%/data/MLCO2MON.DAT +%%DATADIR%%/data/MLF11.DAT +%%DATADIR%%/data/MLF12.DAT +%%DATADIR%%/data/MLN2O.DAT +%%DATADIR%%/data/MODEL-4_4_4.DAT +%%DATADIR%%/data/MODEL-4_4_5_2.DAT +%%DATADIR%%/data/MONITOR-6_3_3_1.DAT +%%DATADIR%%/data/MONITOR-6_4_3_6.DAT +%%DATADIR%%/data/MONITOR-6_5_2.DAT +%%DATADIR%%/data/MONITOR-6_6_1_1.DAT +%%DATADIR%%/data/MONTGOME.DAT +%%DATADIR%%/data/MORALES.DAT +%%DATADIR%%/data/MORALES1.DAT +%%DATADIR%%/data/MORALES2.DAT +%%DATADIR%%/data/MOUSE.DAT +%%DATADIR%%/data/MOUSe.DAT +%%DATADIR%%/data/MPC262.DAT +%%DATADIR%%/data/MPC262C.DAT +%%DATADIR%%/data/MPC262D.DAT +%%DATADIR%%/data/MPC262DD.DAT +%%DATADIR%%/data/MPC263.DAT +%%DATADIR%%/data/MPC264.DAT +%%DATADIR%%/data/MPC266A.DAT +%%DATADIR%%/data/MPC266C.DAT +%%DATADIR%%/data/MPC266D.DAT +%%DATADIR%%/data/MPC441.DAT +%%DATADIR%%/data/MPC5312.DAT +%%DATADIR%%/data/MPC536.DAT +%%DATADIR%%/data/MPC61.DAT +%%DATADIR%%/data/MPC61A.DAT +%%DATADIR%%/data/MPC61B.DAT +%%DATADIR%%/data/MPC62.DAT +%%DATADIR%%/data/MPC62C.DAT +%%DATADIR%%/data/MPC62D.DAT +%%DATADIR%%/data/MPC63.DAT +%%DATADIR%%/data/MPC633A.DAT +%%DATADIR%%/data/MPC633K.DAT +%%DATADIR%%/data/MPC633M.DAT +%%DATADIR%%/data/MPC64.DAT +%%DATADIR%%/data/MPG.DAT +%%DATADIR%%/data/MPOST550.DAT +%%DATADIR%%/data/MURDER86.DAT +%%DATADIR%%/data/NAF11.DAT +%%DATADIR%%/data/NAKATAN3.DAT +%%DATADIR%%/data/NATR102.DAT +%%DATADIR%%/data/NATR12.DAT +%%DATADIR%%/data/NATR1219.DAT +%%DATADIR%%/data/NATR124.DAT +%%DATADIR%%/data/NATR1314.DAT +%%DATADIR%%/data/NATR1323.DAT +%%DATADIR%%/data/NATR1333.DAT +%%DATADIR%%/data/NATR134.DAT +%%DATADIR%%/data/NATR1341.DAT +%%DATADIR%%/data/NATR151.DAT +%%DATADIR%%/data/NATR154.DAT +%%DATADIR%%/data/NATR156.DAT +%%DATADIR%%/data/NATR1611.DAT +%%DATADIR%%/data/NATR1613.DAT +%%DATADIR%%/data/NATR162.DAT +%%DATADIR%%/data/NATR164.DAT +%%DATADIR%%/data/NATR166.DAT +%%DATADIR%%/data/NATR168.DAT +%%DATADIR%%/data/NATR169.DAT +%%DATADIR%%/data/NATR21.DAT +%%DATADIR%%/data/NATR26.DAT +%%DATADIR%%/data/NATR323.DAT +%%DATADIR%%/data/NATR326.DAT +%%DATADIR%%/data/NATR332.DAT +%%DATADIR%%/data/NATR334.DAT +%%DATADIR%%/data/NATR338.DAT +%%DATADIR%%/data/NATR341.DAT +%%DATADIR%%/data/NATR41.DAT +%%DATADIR%%/data/NATR45.DAT +%%DATADIR%%/data/NATR48.DAT +%%DATADIR%%/data/NATR511.DAT +%%DATADIR%%/data/NATR522.DAT +%%DATADIR%%/data/NATR527.DAT +%%DATADIR%%/data/NATR533.DAT +%%DATADIR%%/data/NATR540.DAT +%%DATADIR%%/data/NATR627.DAT +%%DATADIR%%/data/NATR65.DAT +%%DATADIR%%/data/NATR92.DAT +%%DATADIR%%/data/NATR94.DAT +%%DATADIR%%/data/NATR96.DAT +%%DATADIR%%/data/NATR99.DAT +%%DATADIR%%/data/NBSACTIV.DAT +%%DATADIR%%/data/NBSPART1.DAT +%%DATADIR%%/data/NBSPOW1.DAT +%%DATADIR%%/data/NBSPOW2.DAT +%%DATADIR%%/data/NBSPOW3.DAT +%%DATADIR%%/data/NBSSOFTW.DAT +%%DATADIR%%/data/NEGIZ3.DAT +%%DATADIR%%/data/NEGIZ4.DAT +%%DATADIR%%/data/NELS105.DAT +%%DATADIR%%/data/NELS138.DAT +%%DATADIR%%/data/NELS144.DAT +%%DATADIR%%/data/NELS28.DAT +%%DATADIR%%/data/NELS393.DAT +%%DATADIR%%/data/NELS421.DAT +%%DATADIR%%/data/NELS6.DAT +%%DATADIR%%/data/NELSNIST.DAT +%%DATADIR%%/data/NELSON.DAT +%%DATADIR%%/data/NELSON2.DAT +%%DATADIR%%/data/NELSON3.DAT +%%DATADIR%%/data/NELSONAL.DAT +%%DATADIR%%/data/NEWCAR.DAT +%%DATADIR%%/data/NEWCOMB.DAT +%%DATADIR%%/data/NICKEL.DAT +%%DATADIR%%/data/NOAAOZO.DAT +%%DATADIR%%/data/NOR.DAT +%%DATADIR%%/data/NORCDF.DAT +%%DATADIR%%/data/NORCEN.DAT +%%DATADIR%%/data/NORM20.DAT +%%DATADIR%%/data/NORMAL.DAT +%%DATADIR%%/data/NOROSMED.DAT +%%DATADIR%%/data/NORPPCCS.DAT +%%DATADIR%%/data/NORR795.DAT +%%DATADIR%%/data/NORRIS.DAT +%%DATADIR%%/data/NORRIS11.DAT +%%DATADIR%%/data/NORRIS12.DAT +%%DATADIR%%/data/NORRIS5.DAT +%%DATADIR%%/data/NORRIS6.DAT +%%DATADIR%%/data/NUT.DAT +%%DATADIR%%/data/NWF11.DAT +%%DATADIR%%/data/NWF12.DAT +%%DATADIR%%/data/NWN2O.DAT +%%DATADIR%%/data/OAKLEY.DAT +%%DATADIR%%/data/OAKLEY2.DAT +%%DATADIR%%/data/OHM5.DAT +%%DATADIR%%/data/OIL.DAT +%%DATADIR%%/data/OLYMPICS.DAT +%%DATADIR%%/data/PAINTS.DAT +%%DATADIR%%/data/PALLETT.DAT +%%DATADIR%%/data/PAPER.DAT +%%DATADIR%%/data/PBCO2.DAT +%%DATADIR%%/data/PBF11.DAT +%%DATADIR%%/data/PBF12.DAT +%%DATADIR%%/data/PBN2O.DAT +%%DATADIR%%/data/PCC.DAT +%%DATADIR%%/data/PENTAGON.DAT +%%DATADIR%%/data/PERIODIC.DAT +%%DATADIR%%/data/PLANETS.DAT +%%DATADIR%%/data/PLANT.DAT +%%DATADIR%%/data/PLASTIC.DAT +%%DATADIR%%/data/PNCC.DAT +%%DATADIR%%/data/PONTIUS.DAT +%%DATADIR%%/data/PR1.DAT +%%DATADIR%%/data/PREMIUMS.DAT +%%DATADIR%%/data/PRIMESM.DAT +%%DATADIR%%/data/PRISON.DAT +%%DATADIR%%/data/PROCESS1.DAT +%%DATADIR%%/data/PROCESS2.DAT +%%DATADIR%%/data/PROFSAL.DAT +%%DATADIR%%/data/PUMPKIN.DAT +%%DATADIR%%/data/PUNCH.DAT +%%DATADIR%%/data/PUNCH2.DAT +%%DATADIR%%/data/QUADE2.DAT +%%DATADIR%%/data/QUASIBIE.DAT +%%DATADIR%%/data/QUINLAN.DAT +%%DATADIR%%/data/RAMUS.DAT +%%DATADIR%%/data/RANDDEX.DAT +%%DATADIR%%/data/RANDN.DAT +%%DATADIR%%/data/RANDU.DAT +%%DATADIR%%/data/RANDWALK.DAT +%%DATADIR%%/data/RANDWEIB.DAT +%%DATADIR%%/data/RATFEED.DAT +%%DATADIR%%/data/REESE.DAT +%%DATADIR%%/data/REFCODE.DAT +%%DATADIR%%/data/REHM.DAT +%%DATADIR%%/data/RENNEX.DAT +%%DATADIR%%/data/RENNEX2.DAT +%%DATADIR%%/data/RINNE1.DAT +%%DATADIR%%/data/RINNE2.DAT +%%DATADIR%%/data/RIPKEN.DAT +%%DATADIR%%/data/ROSNER.DAT +%%DATADIR%%/data/ROSSIT11.DAT +%%DATADIR%%/data/ROSSIT15.DAT +%%DATADIR%%/data/ROSSIT16.DAT +%%DATADIR%%/data/ROSSIT22.DAT +%%DATADIR%%/data/ROSSITE2.DAT +%%DATADIR%%/data/ROSSITER.DAT +%%DATADIR%%/data/ROSZMAN1.DAT +%%DATADIR%%/data/ROUSS1.DAT +%%DATADIR%%/data/SALARIES.DAT +%%DATADIR%%/data/SALES.DAT +%%DATADIR%%/data/SCHANTZ.DAT +%%DATADIR%%/data/SCHAUER.DAT +%%DATADIR%%/data/SCHAUER2.DAT +%%DATADIR%%/data/SCHAUER3.DAT +%%DATADIR%%/data/SCHILL11.DAT +%%DATADIR%%/data/SCHILLER.DAT +%%DATADIR%%/data/SCOTT.DAT +%%DATADIR%%/data/SCOTT_8_16.DAT +%%DATADIR%%/data/SERUM.DAT +%%DATADIR%%/data/SHEESLE2.DAT +%%DATADIR%%/data/SHEESLEY.DAT +%%DATADIR%%/data/SHELFLIF.DAT +%%DATADIR%%/data/SILICON.DAT +%%DATADIR%%/data/SIMIU.DAT +%%DATADIR%%/data/SIMON.DAT +%%DATADIR%%/data/SIMON1.DAT +%%DATADIR%%/data/SIN.DAT +%%DATADIR%%/data/SIN1.DAT +%%DATADIR%%/data/SIN2.DAT +%%DATADIR%%/data/SIN3.DAT +%%DATADIR%%/data/SIN4.DAT +%%DATADIR%%/data/SINHA.DAT +%%DATADIR%%/data/SINNOISE.DAT +%%DATADIR%%/data/SINSIN.DAT +%%DATADIR%%/data/SMALL14.DAT +%%DATADIR%%/data/SMOKERS.DAT +%%DATADIR%%/data/SNAIL.DAT +%%DATADIR%%/data/SNED103.DAT +%%DATADIR%%/data/SNED118.DAT +%%DATADIR%%/data/SNED136.DAT +%%DATADIR%%/data/SNED150.DAT +%%DATADIR%%/data/SNED174.DAT +%%DATADIR%%/data/SNED326.DAT +%%DATADIR%%/data/SNED39.DAT +%%DATADIR%%/data/SO2.DAT +%%DATADIR%%/data/SOULEN.DAT +%%DATADIR%%/data/SOULEN0.DAT +%%DATADIR%%/data/SOYBURGR.DAT +%%DATADIR%%/data/SPAGON1.DAT +%%DATADIR%%/data/SPAGON2.DAT +%%DATADIR%%/data/SPAGON3.DAT +%%DATADIR%%/data/SPAGON4.DAT +%%DATADIR%%/data/SPCO2.DAT +%%DATADIR%%/data/SPF11.DAT +%%DATADIR%%/data/SPF12.DAT +%%DATADIR%%/data/SPIEGEL.DAT +%%DATADIR%%/data/SPLETT.DAT +%%DATADIR%%/data/SPLETT2.DAT +%%DATADIR%%/data/SPLETT3.DAT +%%DATADIR%%/data/SPLETT4.DAT +%%DATADIR%%/data/SPN2O.DAT +%%DATADIR%%/data/SRBSN.DAT +%%DATADIR%%/data/STATEAS2.DAT +%%DATADIR%%/data/STD_LOD.DAT +%%DATADIR%%/data/STENBAK1.DAT +%%DATADIR%%/data/STENBAK2.DAT +%%DATADIR%%/data/STENBAK3.DAT +%%DATADIR%%/data/STENBAKK.DAT +%%DATADIR%%/data/STG.DAT +%%DATADIR%%/data/STUTZ86.DAT +%%DATADIR%%/data/SULFURIC.DAT +%%DATADIR%%/data/SUMMERB.DAT +%%DATADIR%%/data/SUNSPOT.DAT +%%DATADIR%%/data/SUNSPOT2.DAT +%%DATADIR%%/data/SUNSPOT3.DAT +%%DATADIR%%/data/SUPERCON.DAT +%%DATADIR%%/data/SWANSON1.DAT +%%DATADIR%%/data/T2CC.DAT +%%DATADIR%%/data/TAAM.DAT +%%DATADIR%%/data/TAAM2.DAT +%%DATADIR%%/data/TAB.DAT +%%DATADIR%%/data/TABLE161.DAT +%%DATADIR%%/data/TABLE164.DAT +%%DATADIR%%/data/TABLE323.DAT +%%DATADIR%%/data/TABLE324.DAT +%%DATADIR%%/data/TABLE346.DAT +%%DATADIR%%/data/TABLE355.DAT +%%DATADIR%%/data/TABLE423.DAT +%%DATADIR%%/data/TABLE425.DAT +%%DATADIR%%/data/TABLE426.DAT +%%DATADIR%%/data/TABLE442.DAT +%%DATADIR%%/data/TABLE444.DAT +%%DATADIR%%/data/TABLE445.DAT +%%DATADIR%%/data/TABLE541.DAT +%%DATADIR%%/data/TABLE542.DAT +%%DATADIR%%/data/TABLE543.DAT +%%DATADIR%%/data/TABLE561.DAT +%%DATADIR%%/data/TABLE631.DAT +%%DATADIR%%/data/TABLE733.DAT +%%DATADIR%%/data/TABLE742.DAT +%%DATADIR%%/data/TAGINDEX.DAT +%%DATADIR%%/data/TAKASHI.JPG +%%DATADIR%%/data/TANG.DAT +%%DATADIR%%/data/TANG2.DAT +%%DATADIR%%/data/TECHRISK.DAT +%%DATADIR%%/data/TESTDDS.DAT +%%DATADIR%%/data/TEST_CHAR.DAT +%%DATADIR%%/data/TEXAS.DAT +%%DATADIR%%/data/THERMOM.DAT +%%DATADIR%%/data/THURBER.DAT +%%DATADIR%%/data/TIETJEN.DAT +%%DATADIR%%/data/TIETMOO1.DAT +%%DATADIR%%/data/TOB128.DAT +%%DATADIR%%/data/TOB143.DAT +%%DATADIR%%/data/TOB150.DAT +%%DATADIR%%/data/TOB152.DAT +%%DATADIR%%/data/TOB159.DAT +%%DATADIR%%/data/TOB161.DAT +%%DATADIR%%/data/TOB171.DAT +%%DATADIR%%/data/TOB179.DAT +%%DATADIR%%/data/TOB201.DAT +%%DATADIR%%/data/TOB215.DAT +%%DATADIR%%/data/TOB216A.DAT +%%DATADIR%%/data/TOB216B.DAT +%%DATADIR%%/data/TOB3.DAT +%%DATADIR%%/data/TOB305.DAT +%%DATADIR%%/data/TOB312.DAT +%%DATADIR%%/data/TOB332.DAT +%%DATADIR%%/data/TOB335.DAT +%%DATADIR%%/data/TOB336.DAT +%%DATADIR%%/data/TOB346.DAT +%%DATADIR%%/data/TOB351.DAT +%%DATADIR%%/data/TOB354.DAT +%%DATADIR%%/data/TOB360.DAT +%%DATADIR%%/data/TOB365.DAT +%%DATADIR%%/data/TOB366.DAT +%%DATADIR%%/data/TOB375.DAT +%%DATADIR%%/data/TOB384.DAT +%%DATADIR%%/data/TOB50.DAT +%%DATADIR%%/data/TOB62.DAT +%%DATADIR%%/data/TOB99.DAT +%%DATADIR%%/data/TPPF.DAT +%%DATADIR%%/data/TRACK.DAT +%%DATADIR%%/data/TRACY.DAT +%%DATADIR%%/data/TRAFFIC.DAT +%%DATADIR%%/data/TRISH.DAT +%%DATADIR%%/data/TUKEY433.DAT +%%DATADIR%%/data/TUKLAMB.DAT +%%DATADIR%%/data/TUMOR.DAT +%%DATADIR%%/data/TURKEY.DAT +%%DATADIR%%/data/TURNER.DAT +%%DATADIR%%/data/UCC.DAT +%%DATADIR%%/data/UGIANSKY.DAT +%%DATADIR%%/data/USA.DAT +%%DATADIR%%/data/USADEBT.DAT +%%DATADIR%%/data/USADEFIC.DAT +%%DATADIR%%/data/USEDCARS.DAT +%%DATADIR%%/data/VANGEL1.DAT +%%DATADIR%%/data/VANGEL2.DAT +%%DATADIR%%/data/VANGEL31.DAT +%%DATADIR%%/data/VANGEL32.DAT +%%DATADIR%%/data/VANGEL33.DAT +%%DATADIR%%/data/VANGEL34.DAT +%%DATADIR%%/data/VANGEL5.DAT +%%DATADIR%%/data/VANGEL50.DAT +%%DATADIR%%/data/VANGEL6.DAT +%%DATADIR%%/data/VIBRATE.DAT +%%DATADIR%%/data/WALD647.DAT +%%DATADIR%%/data/WAMPLER1.DAT +%%DATADIR%%/data/WAMPLER2.DAT +%%DATADIR%%/data/WASHDC.DAT +%%DATADIR%%/data/WATTERS.DAT +%%DATADIR%%/data/WATTERS1.DAT +%%DATADIR%%/data/WATTODR3.DAT +%%DATADIR%%/data/WEATHER.DAT +%%DATADIR%%/data/WEBER.DAT +%%DATADIR%%/data/WEIB1.DAT +%%DATADIR%%/data/WEIB10.DAT +%%DATADIR%%/data/WEIB2.DAT +%%DATADIR%%/data/WEIB3.DAT +%%DATADIR%%/data/WEIB4.DAT +%%DATADIR%%/data/WEIB5.DAT +%%DATADIR%%/data/WEIB6.DAT +%%DATADIR%%/data/WEIB7.DAT +%%DATADIR%%/data/WEIB8.DAT +%%DATADIR%%/data/WEIB9.DAT +%%DATADIR%%/data/WEIBBURY.DAT +%%DATADIR%%/data/WEICEN.DAT +%%DATADIR%%/data/WILCOX.DAT +%%DATADIR%%/data/WILCOX2.DAT +%%DATADIR%%/data/WILLIAMS.DAT +%%DATADIR%%/data/WINDCHIL.DAT +%%DATADIR%%/data/WOOLLEY.DAT +%%DATADIR%%/data/WRIGHT11.DAT +%%DATADIR%%/data/YOUD31.DAT +%%DATADIR%%/data/YOUDEN31.DAT +%%DATADIR%%/data/YOUDEN44.DAT +%%DATADIR%%/data/YOUDEN94.DAT +%%DATADIR%%/data/ZARR.DAT +%%DATADIR%%/data/ZARR11.DAT +%%DATADIR%%/data/ZARR110.DAT +%%DATADIR%%/data/ZARR13.DAT +%%DATADIR%%/data/ZARR14.DAT +%%DATADIR%%/data/ZARR15.DAT +%%DATADIR%%/data/ZARR15B.DAT +%%DATADIR%%/data/ZARR4.DAT +%%DATADIR%%/data/ZARR93.DAT +%%DATADIR%%/data/ZARR94.DAT +%%DATADIR%%/data/bivgauss.dat +%%DATADIR%%/data/datasets.txt +%%DATADIR%%/data/table161.dat +%%DATADIR%%/data/table164.dat +%%DATADIR%%/dataplot_index.pdf +%%DATADIR%%/dataplot_index.txt +%%DATADIR%%/dex/2KINDEX.TEX +%%DATADIR%%/dex/2TO10.DAT +%%DATADIR%%/dex/2TO10M3.DAT +%%DATADIR%%/dex/2TO10M4.DAT +%%DATADIR%%/dex/2TO10M5.DAT +%%DATADIR%%/dex/2TO10M6.DAT +%%DATADIR%%/dex/2TO11M4.DAT +%%DATADIR%%/dex/2TO11M5.DAT +%%DATADIR%%/dex/2TO11M6.DAT +%%DATADIR%%/dex/2TO11M7.DAT +%%DATADIR%%/dex/2TO15M11.DAT +%%DATADIR%%/dex/2TO2.DAT +%%DATADIR%%/dex/2TO2WCP.DAT +%%DATADIR%%/dex/2TO3.DAT +%%DATADIR%%/dex/2TO3.TEX +%%DATADIR%%/dex/2TO31M26.DAT +%%DATADIR%%/dex/2TO3M1.DAT +%%DATADIR%%/dex/2TO3WCP.DAT +%%DATADIR%%/dex/2TO4.DAT +%%DATADIR%%/dex/2TO4M1.DAT +%%DATADIR%%/dex/2TO5.DAT +%%DATADIR%%/dex/2TO5M1.DAT +%%DATADIR%%/dex/2TO5M2.DAT +%%DATADIR%%/dex/2TO6.DAT +%%DATADIR%%/dex/2TO6M1.DAT +%%DATADIR%%/dex/2TO6M2.DAT +%%DATADIR%%/dex/2TO6M3.DAT +%%DATADIR%%/dex/2TO7.DAT +%%DATADIR%%/dex/2TO7M1.DAT +%%DATADIR%%/dex/2TO7M2.DAT +%%DATADIR%%/dex/2TO7M3.DAT +%%DATADIR%%/dex/2TO7M4.DAT +%%DATADIR%%/dex/2TO8.DAT +%%DATADIR%%/dex/2TO8M1.DAT +%%DATADIR%%/dex/2TO8M2.DAT +%%DATADIR%%/dex/2TO8M3.DAT +%%DATADIR%%/dex/2TO8M4.DAT +%%DATADIR%%/dex/2TO9.DAT +%%DATADIR%%/dex/2TO9M2.DAT +%%DATADIR%%/dex/2TO9M3.DAT +%%DATADIR%%/dex/2TO9M4.DAT +%%DATADIR%%/dex/2TO9M5.DAT +%%DATADIR%%/dex/BARKEREX.TEX +%%DATADIR%%/dex/BOOTHCOX.DAT +%%DATADIR%%/dex/BOXHHEX.TEX +%%DATADIR%%/dex/BOXINDEX.TEX +%%DATADIR%%/dex/CC2.DAT +%%DATADIR%%/dex/CC3.DAT +%%DATADIR%%/dex/DELDEX.BAT +%%DATADIR%%/dex/DEX5.TEX +%%DATADIR%%/dex/DEX7.TEX +%%DATADIR%%/dex/DEXCONT.TEX +%%DATADIR%%/dex/DEXCONT2.TEX +%%DATADIR%%/dex/DEXEXAMP.TEX +%%DATADIR%%/dex/DEXINDEX.TEX +%%DATADIR%%/dex/DEXNIST.TEX +%%DATADIR%%/dex/DEXPLAN.TEX +%%DATADIR%%/dex/DEXPLANS.TEX +%%DATADIR%%/dex/DEXRES4.TEX +%%DATADIR%%/dex/DEXSUMS2.TEX +%%DATADIR%%/dex/DEXSUMSH.TEX +%%DATADIR%%/dex/GRLATSQ3.DAT +%%DATADIR%%/dex/GRLATSQ4.DAT +%%DATADIR%%/dex/GRLATSQ5.DAT +%%DATADIR%%/dex/HGRLATS4.DAT +%%DATADIR%%/dex/HGRLATS5.DAT +%%DATADIR%%/dex/INDEX.DAT +%%DATADIR%%/dex/INDEX2.DAT +%%DATADIR%%/dex/L12.DAT +%%DATADIR%%/dex/L16.DAT +%%DATADIR%%/dex/L16B.DAT +%%DATADIR%%/dex/L18.DAT +%%DATADIR%%/dex/L25.DAT +%%DATADIR%%/dex/L27.DAT +%%DATADIR%%/dex/L32.DAT +%%DATADIR%%/dex/L32B.DAT +%%DATADIR%%/dex/L36.DAT +%%DATADIR%%/dex/L4.DAT +%%DATADIR%%/dex/L50.DAT +%%DATADIR%%/dex/L54.DAT +%%DATADIR%%/dex/L64.DAT +%%DATADIR%%/dex/L64B.DAT +%%DATADIR%%/dex/L64B.DAT.WRONG +%%DATADIR%%/dex/L8.DAT +%%DATADIR%%/dex/L81.DAT +%%DATADIR%%/dex/L9.DAT +%%DATADIR%%/dex/LATSQ3.DAT +%%DATADIR%%/dex/LATSQ4.DAT +%%DATADIR%%/dex/LATSQ5.DAT +%%DATADIR%%/dex/PB12.DAT +%%DATADIR%%/dex/PB12CONF.DAT +%%DATADIR%%/dex/PB12LIN.DAT +%%DATADIR%%/dex/PB20.DAT +%%DATADIR%%/dex/PB20CONF.DAT +%%DATADIR%%/dex/PB24.DAT +%%DATADIR%%/dex/PB28.DAT +%%DATADIR%%/dex/PB36.DAT +%%DATADIR%%/dex/PERM100.DAT +%%DATADIR%%/dex/PERM1000.DAT +%%DATADIR%%/dex/PERM16.DAT +%%DATADIR%%/dex/PERM20.DAT +%%DATADIR%%/dex/PERM200.DAT +%%DATADIR%%/dex/PERM30.DAT +%%DATADIR%%/dex/PERM50.DAT +%%DATADIR%%/dex/PERM500.DAT +%%DATADIR%%/dex/PERM9.DAT +%%DATADIR%%/dex/PLACBURM.DAT +%%DATADIR%%/dex/SIMCENT3.DAT +%%DATADIR%%/dex/SIMCENT4.DAT +%%DATADIR%%/dex/SIMCENT5.DAT +%%DATADIR%%/dex/SIMLAT31.DAT +%%DATADIR%%/dex/SIMLAT32.DAT +%%DATADIR%%/dex/SIMLAT33.DAT +%%DATADIR%%/dex/SIMLAT34.DAT +%%DATADIR%%/dex/SIMLAT41.DAT +%%DATADIR%%/dex/SIMLAT42.DAT +%%DATADIR%%/dex/SIMLAT44.DAT +%%DATADIR%%/dex/SIMLAT51.DAT +%%DATADIR%%/dex/SIMLAT52.DAT +%%DATADIR%%/dex/SIMLAT53.DAT +%%DATADIR%%/dex/SIMLAT61.DAT +%%DATADIR%%/dex/SIMLAT62.DAT +%%DATADIR%%/dex/SIMLAT71.DAT +%%DATADIR%%/dex/SIMLAT72.DAT +%%DATADIR%%/dex/SIMLAT81.DAT +%%DATADIR%%/dex/SIMLAT82.DAT +%%DATADIR%%/dex/STAR2WCP.DAT +%%DATADIR%%/dex/STAR3WCP.DAT +%%DATADIR%%/dex/TAGINDEX.TEX +%%DATADIR%%/dpbugf.tex +%%DATADIR%%/dplogf.tex +%%DATADIR%%/dpmesf.tex +%%DATADIR%%/dpnewf.tex +%%DATADIR%%/dpsysf.tex +%%DATADIR%%/edhelp.tex +%%DATADIR%%/edlogi.tex +%%DATADIR%%/edmess.tex +%%DATADIR%%/edsave.tex +%%DATADIR%%/edsyst.tex +%%DATADIR%%/frmenus/1fac/1facanal.top +%%DATADIR%%/frmenus/1fac/1facanal.top.roadmap +%%DATADIR%%/frmenus/1fac/anovexam.top +%%DATADIR%%/frmenus/1fac/assumpti.top +%%DATADIR%%/frmenus/1fac/blockplo.men +%%DATADIR%%/frmenus/1fac/bootmdpl.men +%%DATADIR%%/frmenus/1fac/bootmepl.men +%%DATADIR%%/frmenus/1fac/bootmmpl.men +%%DATADIR%%/frmenus/1fac/bootrlsd.men +%%DATADIR%%/frmenus/1fac/bootsdpl.men +%%DATADIR%%/frmenus/1fac/boxplot.men +%%DATADIR%%/frmenus/1fac/compmean.men +%%DATADIR%%/frmenus/1fac/compsdme.men +%%DATADIR%%/frmenus/1fac/conflimi.top +%%DATADIR%%/frmenus/1fac/coreques.top +%%DATADIR%%/frmenus/1fac/discussi.top +%%DATADIR%%/frmenus/1fac/distesti.top +%%DATADIR%%/frmenus/1fac/disttest.top +%%DATADIR%%/frmenus/1fac/doall.men +%%DATADIR%%/frmenus/1fac/doallg.men +%%DATADIR%%/frmenus/1fac/estimati.top +%%DATADIR%%/frmenus/1fac/locaassu.top +%%DATADIR%%/frmenus/1fac/locacoli.men +%%DATADIR%%/frmenus/1fac/locaconl.top +%%DATADIR%%/frmenus/1fac/locadisc.top +%%DATADIR%%/frmenus/1fac/locaesti.men +%%DATADIR%%/frmenus/1fac/locaesti.top +%%DATADIR%%/frmenus/1fac/locanore.top +%%DATADIR%%/frmenus/1fac/locarefe.top +%%DATADIR%%/frmenus/1fac/locasdes.top +%%DATADIR%%/frmenus/1fac/locatest.men +%%DATADIR%%/frmenus/1fac/locatest.top +%%DATADIR%%/frmenus/1fac/location.top +%%DATADIR%%/frmenus/1fac/meanplot.men +%%DATADIR%%/frmenus/1fac/mediplot.men +%%DATADIR%%/frmenus/1fac/midmplot.men +%%DATADIR%%/frmenus/1fac/referenc.top +%%DATADIR%%/frmenus/1fac/relscoli.men +%%DATADIR%%/frmenus/1fac/relvaria.top +%%DATADIR%%/frmenus/1fac/relvconl.top +%%DATADIR%%/frmenus/1fac/relvesti.men +%%DATADIR%%/frmenus/1fac/relvesti.top +%%DATADIR%%/frmenus/1fac/relvsdes.top +%%DATADIR%%/frmenus/1fac/relvtest.top +%%DATADIR%%/frmenus/1fac/rlsdplot.men +%%DATADIR%%/frmenus/1fac/roadmap.roo +%%DATADIR%%/frmenus/1fac/sdestima.top +%%DATADIR%%/frmenus/1fac/sdmeplot.men +%%DATADIR%%/frmenus/1fac/sdplot.men +%%DATADIR%%/frmenus/1fac/shifdist.top +%%DATADIR%%/frmenus/1fac/shifloca.top +%%DATADIR%%/frmenus/1fac/shifrelv.top +%%DATADIR%%/frmenus/1fac/shifvari.top +%%DATADIR%%/frmenus/1fac/skewplot.men +%%DATADIR%%/frmenus/1fac/statcate.top +%%DATADIR%%/frmenus/1fac/stattech.top +%%DATADIR%%/frmenus/1fac/tabumean.men +%%DATADIR%%/frmenus/1fac/tabusd.men +%%DATADIR%%/frmenus/1fac/testing.top +%%DATADIR%%/frmenus/1fac/variatio.top +%%DATADIR%%/frmenus/1fac/varicoli.men +%%DATADIR%%/frmenus/1fac/variconl.top +%%DATADIR%%/frmenus/1fac/variesti.men +%%DATADIR%%/frmenus/1fac/variesti.top +%%DATADIR%%/frmenus/1fac/varinore.top +%%DATADIR%%/frmenus/1fac/varirefe.top +%%DATADIR%%/frmenus/1fac/varisdes.top +%%DATADIR%%/frmenus/1fac/varitest.men +%%DATADIR%%/frmenus/1fac/varitest.top +%%DATADIR%%/frmenus/1fac/viewdata.top +%%DATADIR%%/frmenus/1var/1var.top +%%DATADIR%%/frmenus/1var/setpc.men +%%DATADIR%%/frmenus/1var/setvari.men +%%DATADIR%%/frmenus/2fac/2facanal.top +%%DATADIR%%/frmenus/2fac/viewdata.top +%%DATADIR%%/frmenus/2var/2var.top +%%DATADIR%%/frmenus/2var/2varanal.top +%%DATADIR%%/frmenus/2var/setpc.men +%%DATADIR%%/frmenus/2var/setvari.men +%%DATADIR%%/frmenus/3fac/3facanal.top +%%DATADIR%%/frmenus/3fac/viewdata.top +%%DATADIR%%/frmenus/3var/3varanal.top +%%DATADIR%%/frmenus/4fac/4facanal.top +%%DATADIR%%/frmenus/4fac/viewdata.top +%%DATADIR%%/frmenus/4var/4varanal.top +%%DATADIR%%/frmenus/5fac/4facanal.top +%%DATADIR%%/frmenus/5fac/5facanal.top +%%DATADIR%%/frmenus/5fac/viewdata.top +%%DATADIR%%/frmenus/clas/ABERN17.DP +%%DATADIR%%/frmenus/clas/ABERN35.DP +%%DATADIR%%/frmenus/clas/ABERN43.DP +%%DATADIR%%/frmenus/clas/AC.DP +%%DATADIR%%/frmenus/clas/AMRF.DP +%%DATADIR%%/frmenus/clas/ASCO2.DP +%%DATADIR%%/frmenus/clas/ASF11.DP +%%DATADIR%%/frmenus/clas/ASF12.DP +%%DATADIR%%/frmenus/clas/ASN2O.DP +%%DATADIR%%/frmenus/clas/AUTO79.DP +%%DATADIR%%/frmenus/clas/AUTO83.DP +%%DATADIR%%/frmenus/clas/AUTO83B.DP +%%DATADIR%%/frmenus/clas/BAKER.DP +%%DATADIR%%/frmenus/clas/BATTADD2.DP +%%DATADIR%%/frmenus/clas/BATTADD3.DP +%%DATADIR%%/frmenus/clas/BENNETT.DP +%%DATADIR%%/frmenus/clas/BENNETT5.DP +%%DATADIR%%/frmenus/clas/BERGER1.DP +%%DATADIR%%/frmenus/clas/BIOMED3.DP +%%DATADIR%%/frmenus/clas/BOWEN.DP +%%DATADIR%%/frmenus/clas/BOXAUTO.DP +%%DATADIR%%/frmenus/clas/BOXBIKE2.DP +%%DATADIR%%/frmenus/clas/BOXBIKE3.DP +%%DATADIR%%/frmenus/clas/BOXBLOOD.DP +%%DATADIR%%/frmenus/clas/BOXBOD.DP +%%DATADIR%%/frmenus/clas/BOXCAKE.DP +%%DATADIR%%/frmenus/clas/BOXCAKE2.DP +%%DATADIR%%/frmenus/clas/BOXCHEM.DP +%%DATADIR%%/frmenus/clas/BOXCHEM2.DP +%%DATADIR%%/frmenus/clas/BOXCLEA2.DP +%%DATADIR%%/frmenus/clas/BOXCLEAN.DP +%%DATADIR%%/frmenus/clas/BOXCLOTH.DP +%%DATADIR%%/frmenus/clas/BOXFILT.DP +%%DATADIR%%/frmenus/clas/BOXFILT2.DP +%%DATADIR%%/frmenus/clas/BOXINDUS.DP +%%DATADIR%%/frmenus/clas/BOXJE142.DP +%%DATADIR%%/frmenus/clas/BOXJENK1.DP +%%DATADIR%%/frmenus/clas/BOXJENK2.DP +%%DATADIR%%/frmenus/clas/BOXMOLD.DP +%%DATADIR%%/frmenus/clas/BOXPENIC.DP +%%DATADIR%%/frmenus/clas/BOXPILOT.DP +%%DATADIR%%/frmenus/clas/BOXPOISO.DP +%%DATADIR%%/frmenus/clas/BOXRADAR.DP +%%DATADIR%%/frmenus/clas/BOXRATS.DP +%%DATADIR%%/frmenus/clas/BOXREAC2.DP +%%DATADIR%%/frmenus/clas/BOXREACT.DP +%%DATADIR%%/frmenus/clas/BOXSHOES.DP +%%DATADIR%%/frmenus/clas/BOXSOLAR.DP +%%DATADIR%%/frmenus/clas/BOXSPRAY.DP +%%DATADIR%%/frmenus/clas/BOXSPRI2.DP +%%DATADIR%%/frmenus/clas/BOXSPRI3.DP +%%DATADIR%%/frmenus/clas/BOXSPRIN.DP +%%DATADIR%%/frmenus/clas/BOXTOMAT.DP +%%DATADIR%%/frmenus/clas/BOXWELD.DP +%%DATADIR%%/frmenus/clas/BOXYIEL2.DP +%%DATADIR%%/frmenus/clas/BOXYIELD.DP +%%DATADIR%%/frmenus/clas/BRAIN.DP +%%DATADIR%%/frmenus/clas/CASTIL10.DP +%%DATADIR%%/frmenus/clas/CASTIL11.DP +%%DATADIR%%/frmenus/clas/CASTIL12.DP +%%DATADIR%%/frmenus/clas/CASTIL13.DP +%%DATADIR%%/frmenus/clas/CASTIL14.DP +%%DATADIR%%/frmenus/clas/CASTILL1.DP +%%DATADIR%%/frmenus/clas/CASTILL2.DP +%%DATADIR%%/frmenus/clas/CASTILL3.DP +%%DATADIR%%/frmenus/clas/CASTILL4.DP +%%DATADIR%%/frmenus/clas/CASTILL5.DP +%%DATADIR%%/frmenus/clas/CASTILL6.DP +%%DATADIR%%/frmenus/clas/CASTILL7.DP +%%DATADIR%%/frmenus/clas/CASTILL8.DP +%%DATADIR%%/frmenus/clas/CASTILL9.DP +%%DATADIR%%/frmenus/clas/CCC.DP +%%DATADIR%%/frmenus/clas/CCP.DP +%%DATADIR%%/frmenus/clas/CCPN.DP +%%DATADIR%%/frmenus/clas/CCU.DP +%%DATADIR%%/frmenus/clas/CCXBAR.DP +%%DATADIR%%/frmenus/clas/CHOI.DP +%%DATADIR%%/frmenus/clas/CHOI2.DP +%%DATADIR%%/frmenus/clas/CHOLEST1.DP +%%DATADIR%%/frmenus/clas/CHWIRUT1.DP +%%DATADIR%%/frmenus/clas/CHWIRUT2.DP +%%DATADIR%%/frmenus/clas/CLARK0.DP +%%DATADIR%%/frmenus/clas/CLEAR.DP +%%DATADIR%%/frmenus/clas/CONSUMPR.DP +%%DATADIR%%/frmenus/clas/CROARK2.DP +%%DATADIR%%/frmenus/clas/CROARK3.DP +%%DATADIR%%/frmenus/clas/CROARKIN.DP +%%DATADIR%%/frmenus/clas/CUBE.DP +%%DATADIR%%/frmenus/clas/CURRIE.DP +%%DATADIR%%/frmenus/clas/DDS1.DP +%%DATADIR%%/frmenus/clas/DDS10.DP +%%DATADIR%%/frmenus/clas/DDS11.DP +%%DATADIR%%/frmenus/clas/DDS12.DP +%%DATADIR%%/frmenus/clas/DDS13.DP +%%DATADIR%%/frmenus/clas/DDS14.DP +%%DATADIR%%/frmenus/clas/DDS15.DP +%%DATADIR%%/frmenus/clas/DDS16.DP +%%DATADIR%%/frmenus/clas/DDS17.DP +%%DATADIR%%/frmenus/clas/DDS18.DP +%%DATADIR%%/frmenus/clas/DDS19.DP +%%DATADIR%%/frmenus/clas/DDS2.DP +%%DATADIR%%/frmenus/clas/DDS20.DP +%%DATADIR%%/frmenus/clas/DDS21.DP +%%DATADIR%%/frmenus/clas/DDS3.DP +%%DATADIR%%/frmenus/clas/DDS4.DP +%%DATADIR%%/frmenus/clas/DDS5.DP +%%DATADIR%%/frmenus/clas/DDS6.DP +%%DATADIR%%/frmenus/clas/DDS7.DP +%%DATADIR%%/frmenus/clas/DDS8.DP +%%DATADIR%%/frmenus/clas/DDS9.DP +%%DATADIR%%/frmenus/clas/DORKO4.DP +%%DATADIR%%/frmenus/clas/DRAFT69.DAT +%%DATADIR%%/frmenus/clas/DRAFT69.DP +%%DATADIR%%/frmenus/clas/DZIUBA.DP +%%DATADIR%%/frmenus/clas/ECKERLE4.DP +%%DATADIR%%/frmenus/clas/EHRSTEIN.DP +%%DATADIR%%/frmenus/clas/ELNINO.DP +%%DATADIR%%/frmenus/clas/FLICKER.DP +%%DATADIR%%/frmenus/clas/FLURY5.DP +%%DATADIR%%/frmenus/clas/FREQPRIM.DP +%%DATADIR%%/frmenus/clas/FULLER2.DAT +%%DATADIR%%/frmenus/clas/FULLER2.DP +%%DATADIR%%/frmenus/clas/FUNNEL5A.DP +%%DATADIR%%/frmenus/clas/FUNNEL5B.DP +%%DATADIR%%/frmenus/clas/FUNNEL5C.DP +%%DATADIR%%/frmenus/clas/GARBOCZI.DP +%%DATADIR%%/frmenus/clas/GEAR.DP +%%DATADIR%%/frmenus/clas/GNP.DP +%%DATADIR%%/frmenus/clas/GRA1326.DP +%%DATADIR%%/frmenus/clas/GRA1617.DP +%%DATADIR%%/frmenus/clas/HABER1.DP +%%DATADIR%%/frmenus/clas/HAHN.DP +%%DATADIR%%/frmenus/clas/HAHN1.DP +%%DATADIR%%/frmenus/clas/HALD647.DP +%%DATADIR%%/frmenus/clas/HAMAKER.DP +%%DATADIR%%/frmenus/clas/HAYES1.DP +%%DATADIR%%/frmenus/clas/IRIS.DP +%%DATADIR%%/frmenus/clas/KAUL.DP +%%DATADIR%%/frmenus/clas/KEYWEST.DP +%%DATADIR%%/frmenus/clas/KIRBY2.DP +%%DATADIR%%/frmenus/clas/KRASNY1.DP +%%DATADIR%%/frmenus/clas/LEW.DP +%%DATADIR%%/frmenus/clas/LEW3.DP +%%DATADIR%%/frmenus/clas/LIN.DP +%%DATADIR%%/frmenus/clas/LONGLEY.DP +%%DATADIR%%/frmenus/clas/LOTTERY3.DP +%%DATADIR%%/frmenus/clas/LOTTERY4.DP +%%DATADIR%%/frmenus/clas/LUTHER.DP +%%DATADIR%%/frmenus/clas/MANDEL.DP +%%DATADIR%%/frmenus/clas/MARSHAK.DP +%%DATADIR%%/frmenus/clas/MAVRO.DP +%%DATADIR%%/frmenus/clas/MICHELSO.DP +%%DATADIR%%/frmenus/clas/MISRA1.DP +%%DATADIR%%/frmenus/clas/MLCO2.DP +%%DATADIR%%/frmenus/clas/MLCO2MON.DP +%%DATADIR%%/frmenus/clas/MLF11.DP +%%DATADIR%%/frmenus/clas/MLF12.DP +%%DATADIR%%/frmenus/clas/MLN2O.DP +%%DATADIR%%/frmenus/clas/MORALES.DP +%%DATADIR%%/frmenus/clas/MORALES2.DP +%%DATADIR%%/frmenus/clas/NATR21.DP +%%DATADIR%%/frmenus/clas/NATR26.DP +%%DATADIR%%/frmenus/clas/NATR323.DP +%%DATADIR%%/frmenus/clas/NATR326.DP +%%DATADIR%%/frmenus/clas/NATR332.DP +%%DATADIR%%/frmenus/clas/NATR334.DP +%%DATADIR%%/frmenus/clas/NATR338.DP +%%DATADIR%%/frmenus/clas/NATR341.DP +%%DATADIR%%/frmenus/clas/NATR41.DP +%%DATADIR%%/frmenus/clas/NATR45.DP +%%DATADIR%%/frmenus/clas/NATR48.DP +%%DATADIR%%/frmenus/clas/NATR511.DP +%%DATADIR%%/frmenus/clas/NATR522.DP +%%DATADIR%%/frmenus/clas/NATR527.DP +%%DATADIR%%/frmenus/clas/NATR533.DP +%%DATADIR%%/frmenus/clas/NATR540.DP +%%DATADIR%%/frmenus/clas/NATR627.DP +%%DATADIR%%/frmenus/clas/NATR65.DP +%%DATADIR%%/frmenus/clas/NBSPOW1.DP +%%DATADIR%%/frmenus/clas/NBSPOW2.DP +%%DATADIR%%/frmenus/clas/NBSPOW3.DP +%%DATADIR%%/frmenus/clas/NEGIZ3.DP +%%DATADIR%%/frmenus/clas/NELSON.DP +%%DATADIR%%/frmenus/clas/NORMAL.DAT +%%DATADIR%%/frmenus/clas/NORMAL.DP +%%DATADIR%%/frmenus/clas/NORRIS6.DP +%%DATADIR%%/frmenus/clas/NUT.DP +%%DATADIR%%/frmenus/clas/NWF11.DP +%%DATADIR%%/frmenus/clas/NWF12.DP +%%DATADIR%%/frmenus/clas/NWN2O.DP +%%DATADIR%%/frmenus/clas/OIL.DP +%%DATADIR%%/frmenus/clas/PBCO2.DP +%%DATADIR%%/frmenus/clas/PBF11.DP +%%DATADIR%%/frmenus/clas/PBF12.DP +%%DATADIR%%/frmenus/clas/PBN2O.DP +%%DATADIR%%/frmenus/clas/PENTAGON.DP +%%DATADIR%%/frmenus/clas/PERIODIC.DP +%%DATADIR%%/frmenus/clas/PLANETS.DP +%%DATADIR%%/frmenus/clas/PONTIUS.DP +%%DATADIR%%/frmenus/clas/PRIMESM.DP +%%DATADIR%%/frmenus/clas/QUASIBIE.DP +%%DATADIR%%/frmenus/clas/QUINLAN.DP +%%DATADIR%%/frmenus/clas/RANDN.DP +%%DATADIR%%/frmenus/clas/RANDU.DP +%%DATADIR%%/frmenus/clas/RANDWALK.DP +%%DATADIR%%/frmenus/clas/REHM.DP +%%DATADIR%%/frmenus/clas/ROSZMAN1.DP +%%DATADIR%%/frmenus/clas/SHEESLE2.DP +%%DATADIR%%/frmenus/clas/SHEESLEY.DP +%%DATADIR%%/frmenus/clas/SIMIU.DP +%%DATADIR%%/frmenus/clas/SIN1.DP +%%DATADIR%%/frmenus/clas/SIN2.DP +%%DATADIR%%/frmenus/clas/SIN3.DP +%%DATADIR%%/frmenus/clas/SIN4.DP +%%DATADIR%%/frmenus/clas/SINSIN.DP +%%DATADIR%%/frmenus/clas/SMALL14.DP +%%DATADIR%%/frmenus/clas/SOULEN.DP +%%DATADIR%%/frmenus/clas/SOULEN0.DP +%%DATADIR%%/frmenus/clas/SPAGON1.DP +%%DATADIR%%/frmenus/clas/SPAGON2.DP +%%DATADIR%%/frmenus/clas/SPAGON3.DP +%%DATADIR%%/frmenus/clas/SPAGON4.DP +%%DATADIR%%/frmenus/clas/SPCO2.DP +%%DATADIR%%/frmenus/clas/SPF11.DP +%%DATADIR%%/frmenus/clas/SPF12.DP +%%DATADIR%%/frmenus/clas/SPIEGEL.DP +%%DATADIR%%/frmenus/clas/SPLETT2.DP +%%DATADIR%%/frmenus/clas/SPLETT3.DP +%%DATADIR%%/frmenus/clas/SPLETT4.DP +%%DATADIR%%/frmenus/clas/SPN2O.DP +%%DATADIR%%/frmenus/clas/STENBAKK.DP +%%DATADIR%%/frmenus/clas/SUNSPOT.DP +%%DATADIR%%/frmenus/clas/SUNSPOT2.DP +%%DATADIR%%/frmenus/clas/SUPERCON.DP +%%DATADIR%%/frmenus/clas/SWANSON1.DP +%%DATADIR%%/frmenus/clas/THURBER.DP +%%DATADIR%%/frmenus/clas/UGIANSKY.DP +%%DATADIR%%/frmenus/clas/USADEBT.DP +%%DATADIR%%/frmenus/clas/USADEFIC.DP +%%DATADIR%%/frmenus/clas/VANGEL1.DP +%%DATADIR%%/frmenus/clas/VANGEL2.DP +%%DATADIR%%/frmenus/clas/VANGEL5.DAT +%%DATADIR%%/frmenus/clas/VANGEL5.DP +%%DATADIR%%/frmenus/clas/VIBRATE.DP +%%DATADIR%%/frmenus/clas/WAMPLER1.DP +%%DATADIR%%/frmenus/clas/WAMPLER2.DP +%%DATADIR%%/frmenus/clas/WASHDC.DP +%%DATADIR%%/frmenus/clas/WATTERS.DP +%%DATADIR%%/frmenus/clas/WEBER.DP +%%DATADIR%%/frmenus/clas/WOOD.DP +%%DATADIR%%/frmenus/clas/WOOLLEY.DP +%%DATADIR%%/frmenus/clas/WRIGHT11.DP +%%DATADIR%%/frmenus/clas/ZARR13.DP +%%DATADIR%%/frmenus/clas/ZARR14.DP +%%DATADIR%%/frmenus/clas/ZARR15.DP +%%DATADIR%%/frmenus/clas/alldp.dat +%%DATADIR%%/frmenus/clas/anov.top +%%DATADIR%%/frmenus/clas/anov/BOOKS.DP +%%DATADIR%%/frmenus/clas/anov/BOWEN.DP +%%DATADIR%%/frmenus/clas/anov/BOXAUTO.DP +%%DATADIR%%/frmenus/clas/anov/BOXBLOOD.DP +%%DATADIR%%/frmenus/clas/anov/BOXCLOT2.DP +%%DATADIR%%/frmenus/clas/anov/BOXCLOTH.DP +%%DATADIR%%/frmenus/clas/anov/BOXPENIC.DP +%%DATADIR%%/frmenus/clas/anov/BOXPOISO.DP +%%DATADIR%%/frmenus/clas/anov/BOXSHOES.DP +%%DATADIR%%/frmenus/clas/anov/BOXTOMAT.DP +%%DATADIR%%/frmenus/clas/anov/CREAM.DP +%%DATADIR%%/frmenus/clas/anov/DRAFT69.DP +%%DATADIR%%/frmenus/clas/anov/ELISA.DP +%%DATADIR%%/frmenus/clas/anov/FUNNEL.DP +%%DATADIR%%/frmenus/clas/anov/GOLD.DP +%%DATADIR%%/frmenus/clas/anov/HAMAKER.DP +%%DATADIR%%/frmenus/clas/anov/KENTON.DP +%%DATADIR%%/frmenus/clas/anov/MANDEL2.DP +%%DATADIR%%/frmenus/clas/anov/NEWCAR.DP +%%DATADIR%%/frmenus/clas/anov/PAINTS.DP +%%DATADIR%%/frmenus/clas/anov/RATFEED.DP +%%DATADIR%%/frmenus/clas/anov/SHEESLE2.DP +%%DATADIR%%/frmenus/clas/anov/SMOKERS.DP +%%DATADIR%%/frmenus/clas/anov/SRBSN.DP +%%DATADIR%%/frmenus/clas/anov/TECHRISK.DP +%%DATADIR%%/frmenus/clas/anov/TUMOR.DP +%%DATADIR%%/frmenus/clas/anov/anov.top +%%DATADIR%%/frmenus/clas/anov/anovexam.top +%%DATADIR%%/frmenus/clas/anovexam.top +%%DATADIR%%/frmenus/clas/clas.top +%%DATADIR%%/frmenus/clas/datasets.top +%%DATADIR%%/frmenus/clas/dexdata.top +%%DATADIR%%/frmenus/clas/eda.top +%%DATADIR%%/frmenus/clas/eda/ABERN17.DP +%%DATADIR%%/frmenus/clas/eda/ABERN35.DP +%%DATADIR%%/frmenus/clas/eda/ABERN43.DP +%%DATADIR%%/frmenus/clas/eda/AC.DP +%%DATADIR%%/frmenus/clas/eda/AMRF.DP +%%DATADIR%%/frmenus/clas/eda/ASCO2.DP +%%DATADIR%%/frmenus/clas/eda/ASF11.DP +%%DATADIR%%/frmenus/clas/eda/ASF12.DP +%%DATADIR%%/frmenus/clas/eda/ASN2O.DP +%%DATADIR%%/frmenus/clas/eda/AUTO79.DP +%%DATADIR%%/frmenus/clas/eda/AUTO83.DP +%%DATADIR%%/frmenus/clas/eda/AUTO83B.DP +%%DATADIR%%/frmenus/clas/eda/BAKER.DP +%%DATADIR%%/frmenus/clas/eda/BATTADD2.DP +%%DATADIR%%/frmenus/clas/eda/BATTADD3.DP +%%DATADIR%%/frmenus/clas/eda/BENNETT.DP +%%DATADIR%%/frmenus/clas/eda/BENNETT5.DP +%%DATADIR%%/frmenus/clas/eda/BERGER1.DP +%%DATADIR%%/frmenus/clas/eda/BIOMED3.DP +%%DATADIR%%/frmenus/clas/eda/BOWEN.DP +%%DATADIR%%/frmenus/clas/eda/BOXAUTO.DP +%%DATADIR%%/frmenus/clas/eda/BOXBIKE2.DP +%%DATADIR%%/frmenus/clas/eda/BOXBIKE3.DP +%%DATADIR%%/frmenus/clas/eda/BOXBLOOD.DP +%%DATADIR%%/frmenus/clas/eda/BOXBOD.DP +%%DATADIR%%/frmenus/clas/eda/BOXCAKE.DP +%%DATADIR%%/frmenus/clas/eda/BOXCAKE2.DP +%%DATADIR%%/frmenus/clas/eda/BOXCHEM.DP +%%DATADIR%%/frmenus/clas/eda/BOXCHEM2.DP +%%DATADIR%%/frmenus/clas/eda/BOXCLEA2.DP +%%DATADIR%%/frmenus/clas/eda/BOXCLEAN.DP +%%DATADIR%%/frmenus/clas/eda/BOXCLOTH.DP +%%DATADIR%%/frmenus/clas/eda/BOXFILT.DP +%%DATADIR%%/frmenus/clas/eda/BOXFILT2.DP +%%DATADIR%%/frmenus/clas/eda/BOXINDUS.DP +%%DATADIR%%/frmenus/clas/eda/BOXJE142.DP +%%DATADIR%%/frmenus/clas/eda/BOXJENK1.DP +%%DATADIR%%/frmenus/clas/eda/BOXJENK2.DP +%%DATADIR%%/frmenus/clas/eda/BOXMOLD.DP +%%DATADIR%%/frmenus/clas/eda/BOXPENIC.DP +%%DATADIR%%/frmenus/clas/eda/BOXPILOT.DP +%%DATADIR%%/frmenus/clas/eda/BOXPOISO.DP +%%DATADIR%%/frmenus/clas/eda/BOXRADAR.DP +%%DATADIR%%/frmenus/clas/eda/BOXRATS.DP +%%DATADIR%%/frmenus/clas/eda/BOXREAC2.DP +%%DATADIR%%/frmenus/clas/eda/BOXREACT.DP +%%DATADIR%%/frmenus/clas/eda/BOXSHOES.DP +%%DATADIR%%/frmenus/clas/eda/BOXSOLAR.DP +%%DATADIR%%/frmenus/clas/eda/BOXSPRAY.DP +%%DATADIR%%/frmenus/clas/eda/BOXSPRI2.DP +%%DATADIR%%/frmenus/clas/eda/BOXSPRI3.DP +%%DATADIR%%/frmenus/clas/eda/BOXSPRIN.DP +%%DATADIR%%/frmenus/clas/eda/BOXTOMAT.DP +%%DATADIR%%/frmenus/clas/eda/BOXWELD.DP +%%DATADIR%%/frmenus/clas/eda/BOXYIEL2.DP +%%DATADIR%%/frmenus/clas/eda/BOXYIELD.DP +%%DATADIR%%/frmenus/clas/eda/BRAIN.DP +%%DATADIR%%/frmenus/clas/eda/CASTIL10.DP +%%DATADIR%%/frmenus/clas/eda/CASTIL11.DP +%%DATADIR%%/frmenus/clas/eda/CASTIL12.DP +%%DATADIR%%/frmenus/clas/eda/CASTIL13.DP +%%DATADIR%%/frmenus/clas/eda/CASTIL14.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL1.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL2.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL3.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL4.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL5.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL6.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL7.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL8.DP +%%DATADIR%%/frmenus/clas/eda/CASTILL9.DP +%%DATADIR%%/frmenus/clas/eda/CCC.DP +%%DATADIR%%/frmenus/clas/eda/CCP.DP +%%DATADIR%%/frmenus/clas/eda/CCPN.DP +%%DATADIR%%/frmenus/clas/eda/CCU.DP +%%DATADIR%%/frmenus/clas/eda/CCXBAR.DP +%%DATADIR%%/frmenus/clas/eda/CHOI.DP +%%DATADIR%%/frmenus/clas/eda/CHOI2.DP +%%DATADIR%%/frmenus/clas/eda/CHOLEST1.DP +%%DATADIR%%/frmenus/clas/eda/CHWIRUT1.DP +%%DATADIR%%/frmenus/clas/eda/CHWIRUT2.DP +%%DATADIR%%/frmenus/clas/eda/CLARK0.DP +%%DATADIR%%/frmenus/clas/eda/CLEAR.DP +%%DATADIR%%/frmenus/clas/eda/CONSUMPR.DP +%%DATADIR%%/frmenus/clas/eda/CROARK2.DP +%%DATADIR%%/frmenus/clas/eda/CROARK3.DP +%%DATADIR%%/frmenus/clas/eda/CROARKIN.DP +%%DATADIR%%/frmenus/clas/eda/CUBE.DP +%%DATADIR%%/frmenus/clas/eda/CURRIE.DP +%%DATADIR%%/frmenus/clas/eda/DDS1.DP +%%DATADIR%%/frmenus/clas/eda/DDS10.DP +%%DATADIR%%/frmenus/clas/eda/DDS11.DP +%%DATADIR%%/frmenus/clas/eda/DDS12.DP +%%DATADIR%%/frmenus/clas/eda/DDS13.DP +%%DATADIR%%/frmenus/clas/eda/DDS14.DP +%%DATADIR%%/frmenus/clas/eda/DDS15.DP +%%DATADIR%%/frmenus/clas/eda/DDS16.DP +%%DATADIR%%/frmenus/clas/eda/DDS17.DP +%%DATADIR%%/frmenus/clas/eda/DDS18.DP +%%DATADIR%%/frmenus/clas/eda/DDS19.DP +%%DATADIR%%/frmenus/clas/eda/DDS2.DP +%%DATADIR%%/frmenus/clas/eda/DDS20.DP +%%DATADIR%%/frmenus/clas/eda/DDS21.DP +%%DATADIR%%/frmenus/clas/eda/DDS3.DP +%%DATADIR%%/frmenus/clas/eda/DDS4.DP +%%DATADIR%%/frmenus/clas/eda/DDS5.DP +%%DATADIR%%/frmenus/clas/eda/DDS6.DP +%%DATADIR%%/frmenus/clas/eda/DDS7.DP +%%DATADIR%%/frmenus/clas/eda/DDS8.DP +%%DATADIR%%/frmenus/clas/eda/DDS9.DP +%%DATADIR%%/frmenus/clas/eda/DORKO4.DP +%%DATADIR%%/frmenus/clas/eda/DRAFT69.DP +%%DATADIR%%/frmenus/clas/eda/DZIUBA.DP +%%DATADIR%%/frmenus/clas/eda/ECKERLE4.DP +%%DATADIR%%/frmenus/clas/eda/EHRSTEIN.DP +%%DATADIR%%/frmenus/clas/eda/ELECT92.DP +%%DATADIR%%/frmenus/clas/eda/ELNINO.DP +%%DATADIR%%/frmenus/clas/eda/FLICKER.DP +%%DATADIR%%/frmenus/clas/eda/FLURY5.DP +%%DATADIR%%/frmenus/clas/eda/FREQPRIM.DP +%%DATADIR%%/frmenus/clas/eda/FULLER2.DP +%%DATADIR%%/frmenus/clas/eda/FUNNEL5A.DP +%%DATADIR%%/frmenus/clas/eda/FUNNEL5B.DP +%%DATADIR%%/frmenus/clas/eda/FUNNEL5C.DP +%%DATADIR%%/frmenus/clas/eda/GARBOCZI.DP +%%DATADIR%%/frmenus/clas/eda/GEAR.DP +%%DATADIR%%/frmenus/clas/eda/GNP.DP +%%DATADIR%%/frmenus/clas/eda/GRA1326.DP +%%DATADIR%%/frmenus/clas/eda/GRA1617.DP +%%DATADIR%%/frmenus/clas/eda/HABER1.DP +%%DATADIR%%/frmenus/clas/eda/HAHN.DP +%%DATADIR%%/frmenus/clas/eda/HAHN1.DP +%%DATADIR%%/frmenus/clas/eda/HALD647.DP +%%DATADIR%%/frmenus/clas/eda/HAMAKER.DP +%%DATADIR%%/frmenus/clas/eda/HAYES1.DP +%%DATADIR%%/frmenus/clas/eda/HOSPITAL.DP +%%DATADIR%%/frmenus/clas/eda/IRIS.DP +%%DATADIR%%/frmenus/clas/eda/KAUL.DP +%%DATADIR%%/frmenus/clas/eda/KEYWEST.DP +%%DATADIR%%/frmenus/clas/eda/KIRBY2.DP +%%DATADIR%%/frmenus/clas/eda/KRASNY1.DP +%%DATADIR%%/frmenus/clas/eda/LEW.DP +%%DATADIR%%/frmenus/clas/eda/LEW3.DP +%%DATADIR%%/frmenus/clas/eda/LIN.DP +%%DATADIR%%/frmenus/clas/eda/LONGLEY.DP +%%DATADIR%%/frmenus/clas/eda/LOTTERY3.DP +%%DATADIR%%/frmenus/clas/eda/LOTTERY4.DP +%%DATADIR%%/frmenus/clas/eda/LUTHER.DP +%%DATADIR%%/frmenus/clas/eda/MANDEL.DP +%%DATADIR%%/frmenus/clas/eda/MARSHAK.DP +%%DATADIR%%/frmenus/clas/eda/MAVRO.DP +%%DATADIR%%/frmenus/clas/eda/MICHELSO.DP +%%DATADIR%%/frmenus/clas/eda/MISRA1.DP +%%DATADIR%%/frmenus/clas/eda/MLCO2.DP +%%DATADIR%%/frmenus/clas/eda/MLCO2MON.DP +%%DATADIR%%/frmenus/clas/eda/MLF11.DP +%%DATADIR%%/frmenus/clas/eda/MLF12.DP +%%DATADIR%%/frmenus/clas/eda/MLN2O.DP +%%DATADIR%%/frmenus/clas/eda/MORALES.DP +%%DATADIR%%/frmenus/clas/eda/MORALES2.DP +%%DATADIR%%/frmenus/clas/eda/NAKATAN1.OUT +%%DATADIR%%/frmenus/clas/eda/NATR21.DP +%%DATADIR%%/frmenus/clas/eda/NATR26.DP +%%DATADIR%%/frmenus/clas/eda/NATR323.DP +%%DATADIR%%/frmenus/clas/eda/NATR326.DP +%%DATADIR%%/frmenus/clas/eda/NATR332.DP +%%DATADIR%%/frmenus/clas/eda/NATR334.DP +%%DATADIR%%/frmenus/clas/eda/NATR338.DP +%%DATADIR%%/frmenus/clas/eda/NATR341.DP +%%DATADIR%%/frmenus/clas/eda/NATR41.DP +%%DATADIR%%/frmenus/clas/eda/NATR45.DP +%%DATADIR%%/frmenus/clas/eda/NATR48.DP +%%DATADIR%%/frmenus/clas/eda/NATR511.DP +%%DATADIR%%/frmenus/clas/eda/NATR522.DP +%%DATADIR%%/frmenus/clas/eda/NATR527.DP +%%DATADIR%%/frmenus/clas/eda/NATR533.DP +%%DATADIR%%/frmenus/clas/eda/NATR540.DP +%%DATADIR%%/frmenus/clas/eda/NATR627.DP +%%DATADIR%%/frmenus/clas/eda/NATR65.DP +%%DATADIR%%/frmenus/clas/eda/NBSPOW1.DP +%%DATADIR%%/frmenus/clas/eda/NBSPOW2.DP +%%DATADIR%%/frmenus/clas/eda/NBSPOW3.DP +%%DATADIR%%/frmenus/clas/eda/NEGIZ3.DP +%%DATADIR%%/frmenus/clas/eda/NELSON.DP +%%DATADIR%%/frmenus/clas/eda/NORMAL.DP +%%DATADIR%%/frmenus/clas/eda/NORRIS6.DP +%%DATADIR%%/frmenus/clas/eda/NUT.DP +%%DATADIR%%/frmenus/clas/eda/NWF11.DP +%%DATADIR%%/frmenus/clas/eda/NWF12.DP +%%DATADIR%%/frmenus/clas/eda/NWN2O.DP +%%DATADIR%%/frmenus/clas/eda/OIL.DP +%%DATADIR%%/frmenus/clas/eda/OLYMPICS.DP +%%DATADIR%%/frmenus/clas/eda/PBCO2.DP +%%DATADIR%%/frmenus/clas/eda/PBF11.DP +%%DATADIR%%/frmenus/clas/eda/PBF12.DP +%%DATADIR%%/frmenus/clas/eda/PBN2O.DP +%%DATADIR%%/frmenus/clas/eda/PENTAGON.DP +%%DATADIR%%/frmenus/clas/eda/PERIODIC.DP +%%DATADIR%%/frmenus/clas/eda/PLANETS.DP +%%DATADIR%%/frmenus/clas/eda/PONTIUS.DP +%%DATADIR%%/frmenus/clas/eda/PRIMESM.DP +%%DATADIR%%/frmenus/clas/eda/QUASIBIE.DP +%%DATADIR%%/frmenus/clas/eda/QUINLAN.DP +%%DATADIR%%/frmenus/clas/eda/RANDN.DP +%%DATADIR%%/frmenus/clas/eda/RANDU.DP +%%DATADIR%%/frmenus/clas/eda/RANDWALK.DP +%%DATADIR%%/frmenus/clas/eda/REHM.DP +%%DATADIR%%/frmenus/clas/eda/ROSZMAN1.DP +%%DATADIR%%/frmenus/clas/eda/SHEESLE2.DP +%%DATADIR%%/frmenus/clas/eda/SHEESLEY.DP +%%DATADIR%%/frmenus/clas/eda/SIMIU.DP +%%DATADIR%%/frmenus/clas/eda/SIN1.DP +%%DATADIR%%/frmenus/clas/eda/SIN2.DP +%%DATADIR%%/frmenus/clas/eda/SIN3.DP +%%DATADIR%%/frmenus/clas/eda/SIN4.DP +%%DATADIR%%/frmenus/clas/eda/SINSIN.DP +%%DATADIR%%/frmenus/clas/eda/SMALL14.DP +%%DATADIR%%/frmenus/clas/eda/SOULEN.DP +%%DATADIR%%/frmenus/clas/eda/SOULEN0.DP +%%DATADIR%%/frmenus/clas/eda/SPAGON1.DP +%%DATADIR%%/frmenus/clas/eda/SPAGON2.DP +%%DATADIR%%/frmenus/clas/eda/SPAGON3.DP +%%DATADIR%%/frmenus/clas/eda/SPAGON4.DP +%%DATADIR%%/frmenus/clas/eda/SPCO2.DP +%%DATADIR%%/frmenus/clas/eda/SPF11.DP +%%DATADIR%%/frmenus/clas/eda/SPF12.DP +%%DATADIR%%/frmenus/clas/eda/SPIEGEL.DP +%%DATADIR%%/frmenus/clas/eda/SPLETT2.DP +%%DATADIR%%/frmenus/clas/eda/SPLETT3.DP +%%DATADIR%%/frmenus/clas/eda/SPLETT4.DP +%%DATADIR%%/frmenus/clas/eda/SPN2O.DP +%%DATADIR%%/frmenus/clas/eda/STENBAKK.DP +%%DATADIR%%/frmenus/clas/eda/SUNSPOT.DP +%%DATADIR%%/frmenus/clas/eda/SUNSPOT2.DP +%%DATADIR%%/frmenus/clas/eda/SUPERCON.DP +%%DATADIR%%/frmenus/clas/eda/SWANSON1.DP +%%DATADIR%%/frmenus/clas/eda/THURBER.DP +%%DATADIR%%/frmenus/clas/eda/UGIANSKY.DP +%%DATADIR%%/frmenus/clas/eda/USADEBT.DP +%%DATADIR%%/frmenus/clas/eda/USADEFIC.DP +%%DATADIR%%/frmenus/clas/eda/VANGEL1.DP +%%DATADIR%%/frmenus/clas/eda/VANGEL2.DP +%%DATADIR%%/frmenus/clas/eda/VANGEL5.DP +%%DATADIR%%/frmenus/clas/eda/VIBRATE.DP +%%DATADIR%%/frmenus/clas/eda/WAMPLER1.DP +%%DATADIR%%/frmenus/clas/eda/WAMPLER2.DP +%%DATADIR%%/frmenus/clas/eda/WASHDC.DP +%%DATADIR%%/frmenus/clas/eda/WATTERS.DP +%%DATADIR%%/frmenus/clas/eda/WEBER.DP +%%DATADIR%%/frmenus/clas/eda/WOOD.DP +%%DATADIR%%/frmenus/clas/eda/WOOLLEY.DP +%%DATADIR%%/frmenus/clas/eda/WRIGHT11.DP +%%DATADIR%%/frmenus/clas/eda/ZARR13.DP +%%DATADIR%%/frmenus/clas/eda/ZARR14.DP +%%DATADIR%%/frmenus/clas/eda/ZARR15.DP +%%DATADIR%%/frmenus/clas/eda/dppl1f.dat +%%DATADIR%%/frmenus/clas/eda/dppl2f.dat +%%DATADIR%%/frmenus/clas/eda/dpst1f.dat +%%DATADIR%%/frmenus/clas/eda/eda.top +%%DATADIR%%/frmenus/clas/eda/edac.top +%%DATADIR%%/frmenus/clas/eda/edaexam.top +%%DATADIR%%/frmenus/clas/eda/explclas.top +%%DATADIR%%/frmenus/clas/eda/probclas.top +%%DATADIR%%/frmenus/clas/eda/referenc.top +%%DATADIR%%/frmenus/clas/eda/tools.top +%%DATADIR%%/frmenus/clas/eda/undeassu.top +%%DATADIR%%/frmenus/clas/edac.top +%%DATADIR%%/frmenus/clas/edadata.top +%%DATADIR%%/frmenus/clas/edaexam.top +%%DATADIR%%/frmenus/clas/index.dp +%%DATADIR%%/frmenus/clas/junk1.tmp +%%DATADIR%%/frmenus/clas/junk2.tmp +%%DATADIR%%/frmenus/data/aritfunc.top +%%DATADIR%%/frmenus/data/bessfunc.top +%%DATADIR%%/frmenus/data/chebfunc.top +%%DATADIR%%/frmenus/data/chisfunc.top +%%DATADIR%%/frmenus/data/citrfunc.top +%%DATADIR%%/frmenus/data/convfunc.top +%%DATADIR%%/frmenus/data/data.sav +%%DATADIR%%/frmenus/data/data.top +%%DATADIR%%/frmenus/data/delete.men +%%DATADIR%%/frmenus/data/dimensio.men +%%DATADIR%%/frmenus/data/errofunc.top +%%DATADIR%%/frmenus/data/fatlfunc.top +%%DATADIR%%/frmenus/data/ffunc.top +%%DATADIR%%/frmenus/data/gammfunc.top +%%DATADIR%%/frmenus/data/gendata.men +%%DATADIR%%/frmenus/data/genedata.top +%%DATADIR%%/frmenus/data/genpatt.men +%%DATADIR%%/frmenus/data/genseq.men +%%DATADIR%%/frmenus/data/invgfunc.top +%%DATADIR%%/frmenus/data/logfunct.top +%%DATADIR%%/frmenus/data/normfunc.top +%%DATADIR%%/frmenus/data/pack.men +%%DATADIR%%/frmenus/data/reigfunc.top +%%DATADIR%%/frmenus/data/rename.men +%%DATADIR%%/frmenus/data/repstack.men +%%DATADIR%%/frmenus/data/stack.men +%%DATADIR%%/frmenus/data/tfunc.top +%%DATADIR%%/frmenus/data/trandata.top +%%DATADIR%%/frmenus/data/transfor.men +%%DATADIR%%/frmenus/data/trigfunc.top +%%DATADIR%%/frmenus/data/viewdata.top +%%DATADIR%%/frmenus/data/viewmafu.top +%%DATADIR%%/frmenus/data/viewprfu.top +%%DATADIR%%/frmenus/data/weibfunc.top +%%DATADIR%%/frmenus/dataall/1fac.top +%%DATADIR%%/frmenus/dataall/1facnist.top +%%DATADIR%%/frmenus/dataall/2fac.top +%%DATADIR%%/frmenus/dataall/3fac.top +%%DATADIR%%/frmenus/dataall/4fac.top +%%DATADIR%%/frmenus/dataall/5fac.top +%%DATADIR%%/frmenus/dataall/ABERN17.top +%%DATADIR%%/frmenus/dataall/ABERN35.top +%%DATADIR%%/frmenus/dataall/ABERN43.top +%%DATADIR%%/frmenus/dataall/AC.top +%%DATADIR%%/frmenus/dataall/AMRF.top +%%DATADIR%%/frmenus/dataall/ASCO2.top +%%DATADIR%%/frmenus/dataall/ASF11.top +%%DATADIR%%/frmenus/dataall/ASF12.top +%%DATADIR%%/frmenus/dataall/ASN2O.top +%%DATADIR%%/frmenus/dataall/AUTO79.top +%%DATADIR%%/frmenus/dataall/AUTO83.top +%%DATADIR%%/frmenus/dataall/AUTO83B.top +%%DATADIR%%/frmenus/dataall/BAKER.top +%%DATADIR%%/frmenus/dataall/BATTADD2.top +%%DATADIR%%/frmenus/dataall/BATTADD3.top +%%DATADIR%%/frmenus/dataall/BENNETT.top +%%DATADIR%%/frmenus/dataall/BENNETT5.top +%%DATADIR%%/frmenus/dataall/BERGER1.top +%%DATADIR%%/frmenus/dataall/BIOMED3.top +%%DATADIR%%/frmenus/dataall/BOWEN.top +%%DATADIR%%/frmenus/dataall/BOXAUTO.top +%%DATADIR%%/frmenus/dataall/BOXBIKE2.top +%%DATADIR%%/frmenus/dataall/BOXBIKE3.top +%%DATADIR%%/frmenus/dataall/BOXBLOOD.top +%%DATADIR%%/frmenus/dataall/BOXBOD.top +%%DATADIR%%/frmenus/dataall/BOXCAKE.top +%%DATADIR%%/frmenus/dataall/BOXCAKE2.top +%%DATADIR%%/frmenus/dataall/BOXCHEM.top +%%DATADIR%%/frmenus/dataall/BOXCHEM2.top +%%DATADIR%%/frmenus/dataall/BOXCLEA2.top +%%DATADIR%%/frmenus/dataall/BOXCLEAN.top +%%DATADIR%%/frmenus/dataall/BOXCLOTH.top +%%DATADIR%%/frmenus/dataall/BOXFILT.top +%%DATADIR%%/frmenus/dataall/BOXFILT2.top +%%DATADIR%%/frmenus/dataall/BOXINDUS.top +%%DATADIR%%/frmenus/dataall/BOXJE142.top +%%DATADIR%%/frmenus/dataall/BOXJENK1.top +%%DATADIR%%/frmenus/dataall/BOXJENK2.top +%%DATADIR%%/frmenus/dataall/BOXMOLD.top +%%DATADIR%%/frmenus/dataall/BOXPENIC.top +%%DATADIR%%/frmenus/dataall/BOXPILOT.top +%%DATADIR%%/frmenus/dataall/BOXPOISO.top +%%DATADIR%%/frmenus/dataall/BOXRADAR.top +%%DATADIR%%/frmenus/dataall/BOXRATS.top +%%DATADIR%%/frmenus/dataall/BOXREAC2.top +%%DATADIR%%/frmenus/dataall/BOXREACT.top +%%DATADIR%%/frmenus/dataall/BOXSHOES.top +%%DATADIR%%/frmenus/dataall/BOXSOLAR.top +%%DATADIR%%/frmenus/dataall/BOXSPRAY.top +%%DATADIR%%/frmenus/dataall/BOXSPRI2.top +%%DATADIR%%/frmenus/dataall/BOXSPRI3.top +%%DATADIR%%/frmenus/dataall/BOXSPRIN.top +%%DATADIR%%/frmenus/dataall/BOXTOMAT.top +%%DATADIR%%/frmenus/dataall/BOXWELD.top +%%DATADIR%%/frmenus/dataall/BOXYIEL2.top +%%DATADIR%%/frmenus/dataall/BOXYIELD.top +%%DATADIR%%/frmenus/dataall/BRAIN.top +%%DATADIR%%/frmenus/dataall/CASTIL10.top +%%DATADIR%%/frmenus/dataall/CASTIL11.top +%%DATADIR%%/frmenus/dataall/CASTIL12.top +%%DATADIR%%/frmenus/dataall/CASTIL13.top +%%DATADIR%%/frmenus/dataall/CASTIL14.top +%%DATADIR%%/frmenus/dataall/CASTILL1.top +%%DATADIR%%/frmenus/dataall/CASTILL2.top +%%DATADIR%%/frmenus/dataall/CASTILL3.top +%%DATADIR%%/frmenus/dataall/CASTILL4.top +%%DATADIR%%/frmenus/dataall/CASTILL5.top +%%DATADIR%%/frmenus/dataall/CASTILL6.top +%%DATADIR%%/frmenus/dataall/CASTILL7.top +%%DATADIR%%/frmenus/dataall/CASTILL8.top +%%DATADIR%%/frmenus/dataall/CASTILL9.top +%%DATADIR%%/frmenus/dataall/CCC.top +%%DATADIR%%/frmenus/dataall/CCP.top +%%DATADIR%%/frmenus/dataall/CCPN.top +%%DATADIR%%/frmenus/dataall/CCU.top +%%DATADIR%%/frmenus/dataall/CCXBAR.top +%%DATADIR%%/frmenus/dataall/CHOI.top +%%DATADIR%%/frmenus/dataall/CHOI2.top +%%DATADIR%%/frmenus/dataall/CHOLEST1.top +%%DATADIR%%/frmenus/dataall/CHWIRUT1.top +%%DATADIR%%/frmenus/dataall/CHWIRUT2.top +%%DATADIR%%/frmenus/dataall/CLARK0.top +%%DATADIR%%/frmenus/dataall/CLEAR.top +%%DATADIR%%/frmenus/dataall/CONSUMPR.top +%%DATADIR%%/frmenus/dataall/CROARK2.top +%%DATADIR%%/frmenus/dataall/CROARK3.top +%%DATADIR%%/frmenus/dataall/CROARKIN.top +%%DATADIR%%/frmenus/dataall/CUBE.top +%%DATADIR%%/frmenus/dataall/CURRIE.top +%%DATADIR%%/frmenus/dataall/DDS1.top +%%DATADIR%%/frmenus/dataall/DDS10.top +%%DATADIR%%/frmenus/dataall/DDS11.top +%%DATADIR%%/frmenus/dataall/DDS12.top +%%DATADIR%%/frmenus/dataall/DDS13.top +%%DATADIR%%/frmenus/dataall/DDS14.top +%%DATADIR%%/frmenus/dataall/DDS15.top +%%DATADIR%%/frmenus/dataall/DDS16.top +%%DATADIR%%/frmenus/dataall/DDS17.top +%%DATADIR%%/frmenus/dataall/DDS18.top +%%DATADIR%%/frmenus/dataall/DDS19.top +%%DATADIR%%/frmenus/dataall/DDS2.top +%%DATADIR%%/frmenus/dataall/DDS20.top +%%DATADIR%%/frmenus/dataall/DDS21.top +%%DATADIR%%/frmenus/dataall/DDS3.top +%%DATADIR%%/frmenus/dataall/DDS4.top +%%DATADIR%%/frmenus/dataall/DDS5.top +%%DATADIR%%/frmenus/dataall/DDS6.top +%%DATADIR%%/frmenus/dataall/DDS7.top +%%DATADIR%%/frmenus/dataall/DDS8.top +%%DATADIR%%/frmenus/dataall/DDS9.top +%%DATADIR%%/frmenus/dataall/DORKO4.top +%%DATADIR%%/frmenus/dataall/DRAFT69B.top +%%DATADIR%%/frmenus/dataall/DZIUBA.top +%%DATADIR%%/frmenus/dataall/ECKERLE4.top +%%DATADIR%%/frmenus/dataall/EHRSTEIN.top +%%DATADIR%%/frmenus/dataall/ELNINO.top +%%DATADIR%%/frmenus/dataall/FLICKER.top +%%DATADIR%%/frmenus/dataall/FLURY5.top +%%DATADIR%%/frmenus/dataall/FREQPRIM.top +%%DATADIR%%/frmenus/dataall/FULLER2.top +%%DATADIR%%/frmenus/dataall/FUNNEL5A.top +%%DATADIR%%/frmenus/dataall/FUNNEL5B.top +%%DATADIR%%/frmenus/dataall/FUNNEL5C.top +%%DATADIR%%/frmenus/dataall/GARBOCZI.top +%%DATADIR%%/frmenus/dataall/GEAR.top +%%DATADIR%%/frmenus/dataall/GNP.top +%%DATADIR%%/frmenus/dataall/GRA1326.top +%%DATADIR%%/frmenus/dataall/GRA1617.top +%%DATADIR%%/frmenus/dataall/HABER1.top +%%DATADIR%%/frmenus/dataall/HAHN.top +%%DATADIR%%/frmenus/dataall/HAHN1.top +%%DATADIR%%/frmenus/dataall/HALD647.top +%%DATADIR%%/frmenus/dataall/HAMAKER.top +%%DATADIR%%/frmenus/dataall/HAYES1.top +%%DATADIR%%/frmenus/dataall/IRIS.top +%%DATADIR%%/frmenus/dataall/KAUL.top +%%DATADIR%%/frmenus/dataall/KEYWEST.top +%%DATADIR%%/frmenus/dataall/KIRBY2.top +%%DATADIR%%/frmenus/dataall/KRASNY1.top +%%DATADIR%%/frmenus/dataall/LEW.top +%%DATADIR%%/frmenus/dataall/LEW3.top +%%DATADIR%%/frmenus/dataall/LIN.top +%%DATADIR%%/frmenus/dataall/LONGLEY.top +%%DATADIR%%/frmenus/dataall/LOTTERY3.top +%%DATADIR%%/frmenus/dataall/LOTTERY4.top +%%DATADIR%%/frmenus/dataall/LUTHER.top +%%DATADIR%%/frmenus/dataall/MANDEL.top +%%DATADIR%%/frmenus/dataall/MARSHAK.top +%%DATADIR%%/frmenus/dataall/MAVRO.top +%%DATADIR%%/frmenus/dataall/MICHELSO.top +%%DATADIR%%/frmenus/dataall/MISRA1.top +%%DATADIR%%/frmenus/dataall/MLCO2.top +%%DATADIR%%/frmenus/dataall/MLCO2MON.top +%%DATADIR%%/frmenus/dataall/MLF11.top +%%DATADIR%%/frmenus/dataall/MLF12.top +%%DATADIR%%/frmenus/dataall/MLN2O.top +%%DATADIR%%/frmenus/dataall/MORALES.top +%%DATADIR%%/frmenus/dataall/MORALES2.top +%%DATADIR%%/frmenus/dataall/NATR21.top +%%DATADIR%%/frmenus/dataall/NATR26.top +%%DATADIR%%/frmenus/dataall/NATR323.top +%%DATADIR%%/frmenus/dataall/NATR326.top +%%DATADIR%%/frmenus/dataall/NATR332.top +%%DATADIR%%/frmenus/dataall/NATR334.top +%%DATADIR%%/frmenus/dataall/NATR338.top +%%DATADIR%%/frmenus/dataall/NATR341.top +%%DATADIR%%/frmenus/dataall/NATR41.top +%%DATADIR%%/frmenus/dataall/NATR45.top +%%DATADIR%%/frmenus/dataall/NATR48.top +%%DATADIR%%/frmenus/dataall/NATR511.top +%%DATADIR%%/frmenus/dataall/NATR522.top +%%DATADIR%%/frmenus/dataall/NATR527.top +%%DATADIR%%/frmenus/dataall/NATR533.top +%%DATADIR%%/frmenus/dataall/NATR540.top +%%DATADIR%%/frmenus/dataall/NATR627.top +%%DATADIR%%/frmenus/dataall/NATR65.top +%%DATADIR%%/frmenus/dataall/NBSPOW1.top +%%DATADIR%%/frmenus/dataall/NBSPOW2.top +%%DATADIR%%/frmenus/dataall/NBSPOW3.top +%%DATADIR%%/frmenus/dataall/NEGIZ3.top +%%DATADIR%%/frmenus/dataall/NELSON.top +%%DATADIR%%/frmenus/dataall/NORRIS6.top +%%DATADIR%%/frmenus/dataall/NUT.top +%%DATADIR%%/frmenus/dataall/NWF11.top +%%DATADIR%%/frmenus/dataall/NWF12.top +%%DATADIR%%/frmenus/dataall/NWN2O.top +%%DATADIR%%/frmenus/dataall/OIL.top +%%DATADIR%%/frmenus/dataall/PBCO2.top +%%DATADIR%%/frmenus/dataall/PBF11.top +%%DATADIR%%/frmenus/dataall/PBF12.top +%%DATADIR%%/frmenus/dataall/PBN2O.top +%%DATADIR%%/frmenus/dataall/PENTAGON.top +%%DATADIR%%/frmenus/dataall/PERIODIC.top +%%DATADIR%%/frmenus/dataall/PLANETS.top +%%DATADIR%%/frmenus/dataall/PONTIUS.top +%%DATADIR%%/frmenus/dataall/PRIMESM.top +%%DATADIR%%/frmenus/dataall/QUASIBIE.top +%%DATADIR%%/frmenus/dataall/QUINLAN.top +%%DATADIR%%/frmenus/dataall/RANDN.top +%%DATADIR%%/frmenus/dataall/RANDU.top +%%DATADIR%%/frmenus/dataall/RANDWALK.top +%%DATADIR%%/frmenus/dataall/REHM.top +%%DATADIR%%/frmenus/dataall/ROSZMAN1.top +%%DATADIR%%/frmenus/dataall/SHEESLE2.top +%%DATADIR%%/frmenus/dataall/SHEESLEY.top +%%DATADIR%%/frmenus/dataall/SIMIU.top +%%DATADIR%%/frmenus/dataall/SIN1.top +%%DATADIR%%/frmenus/dataall/SIN2.top +%%DATADIR%%/frmenus/dataall/SIN3.top +%%DATADIR%%/frmenus/dataall/SIN4.top +%%DATADIR%%/frmenus/dataall/SINSIN.top +%%DATADIR%%/frmenus/dataall/SMALL14.top +%%DATADIR%%/frmenus/dataall/SOULEN.top +%%DATADIR%%/frmenus/dataall/SOULEN0.top +%%DATADIR%%/frmenus/dataall/SPAGON1.top +%%DATADIR%%/frmenus/dataall/SPAGON2.top +%%DATADIR%%/frmenus/dataall/SPAGON3.top +%%DATADIR%%/frmenus/dataall/SPAGON4.top +%%DATADIR%%/frmenus/dataall/SPCO2.top +%%DATADIR%%/frmenus/dataall/SPF11.top +%%DATADIR%%/frmenus/dataall/SPF12.top +%%DATADIR%%/frmenus/dataall/SPIEGEL.top +%%DATADIR%%/frmenus/dataall/SPLETT2.top +%%DATADIR%%/frmenus/dataall/SPLETT3.top +%%DATADIR%%/frmenus/dataall/SPLETT4.top +%%DATADIR%%/frmenus/dataall/SPN2O.top +%%DATADIR%%/frmenus/dataall/STENBAKK.top +%%DATADIR%%/frmenus/dataall/SUNSPOT.top +%%DATADIR%%/frmenus/dataall/SUNSPOT2.top +%%DATADIR%%/frmenus/dataall/SUPERCON.top +%%DATADIR%%/frmenus/dataall/SWANSON1.top +%%DATADIR%%/frmenus/dataall/THURBER.top +%%DATADIR%%/frmenus/dataall/UGIANSKY.top +%%DATADIR%%/frmenus/dataall/USADEBT.top +%%DATADIR%%/frmenus/dataall/USADEFIC.top +%%DATADIR%%/frmenus/dataall/VANGEL1.top +%%DATADIR%%/frmenus/dataall/VANGEL2.top +%%DATADIR%%/frmenus/dataall/VANGEL5.top +%%DATADIR%%/frmenus/dataall/VIBRATE.top +%%DATADIR%%/frmenus/dataall/WAMPLER1.top +%%DATADIR%%/frmenus/dataall/WAMPLER2.top +%%DATADIR%%/frmenus/dataall/WASHDC.top +%%DATADIR%%/frmenus/dataall/WATTERS.top +%%DATADIR%%/frmenus/dataall/WEBER.top +%%DATADIR%%/frmenus/dataall/WOOLLEY.top +%%DATADIR%%/frmenus/dataall/WRIGHT11.top +%%DATADIR%%/frmenus/dataall/ZARR13.top +%%DATADIR%%/frmenus/dataall/ZARR14.top +%%DATADIR%%/frmenus/dataall/ZARR15.top +%%DATADIR%%/frmenus/dataall/bhh.top +%%DATADIR%%/frmenus/dataall/bhh1.top +%%DATADIR%%/frmenus/dataall/bhh10.top +%%DATADIR%%/frmenus/dataall/bhh11.top +%%DATADIR%%/frmenus/dataall/bhh12.top +%%DATADIR%%/frmenus/dataall/bhh13.top +%%DATADIR%%/frmenus/dataall/bhh14.top +%%DATADIR%%/frmenus/dataall/bhh15.top +%%DATADIR%%/frmenus/dataall/bhh16.top +%%DATADIR%%/frmenus/dataall/bhh17.top +%%DATADIR%%/frmenus/dataall/bhh18.top +%%DATADIR%%/frmenus/dataall/bhh2.top +%%DATADIR%%/frmenus/dataall/bhh3.top +%%DATADIR%%/frmenus/dataall/bhh4.top +%%DATADIR%%/frmenus/dataall/bhh5.top +%%DATADIR%%/frmenus/dataall/bhh6.top +%%DATADIR%%/frmenus/dataall/bhh7.top +%%DATADIR%%/frmenus/dataall/bhh8.top +%%DATADIR%%/frmenus/dataall/bhh9.top +%%DATADIR%%/frmenus/dataall/bhhintro.top +%%DATADIR%%/frmenus/dataall/core.top +%%DATADIR%%/frmenus/dataall/dataall.top +%%DATADIR%%/frmenus/dataall/dex.top +%%DATADIR%%/frmenus/dataall/dex2k.top +%%DATADIR%%/frmenus/dataall/dex2kmp.top +%%DATADIR%%/frmenus/dataall/dexcomp.top +%%DATADIR%%/frmenus/dataall/dexmix.top +%%DATADIR%%/frmenus/dataall/dexopt.top +%%DATADIR%%/frmenus/dataall/dextag.top +%%DATADIR%%/frmenus/dataall/eva.top +%%DATADIR%%/frmenus/dataall/evacast.top +%%DATADIR%%/frmenus/dataall/evanist.top +%%DATADIR%%/frmenus/dataall/evaothe.top +%%DATADIR%%/frmenus/dataall/gra1ch4.top +%%DATADIR%%/frmenus/dataall/gra1ch9.top +%%DATADIR%%/frmenus/dataall/gra1intr.top +%%DATADIR%%/frmenus/dataall/grayiye1.top +%%DATADIR%%/frmenus/dataall/grayiye2.top +%%DATADIR%%/frmenus/dataall/imag.top +%%DATADIR%%/frmenus/dataall/math.top +%%DATADIR%%/frmenus/dataall/mfac.top +%%DATADIR%%/frmenus/dataall/mvar.top +%%DATADIR%%/frmenus/dataall/natr1.top +%%DATADIR%%/frmenus/dataall/natr2.top +%%DATADIR%%/frmenus/dataall/natr3.top +%%DATADIR%%/frmenus/dataall/natr4.top +%%DATADIR%%/frmenus/dataall/natr5.top +%%DATADIR%%/frmenus/dataall/natr6.top +%%DATADIR%%/frmenus/dataall/natrella.top +%%DATADIR%%/frmenus/dataall/natrintr.top +%%DATADIR%%/frmenus/dataall/prob.top +%%DATADIR%%/frmenus/dataall/qual.top +%%DATADIR%%/frmenus/dataall/qual7old.top +%%DATADIR%%/frmenus/dataall/qualcoch.top +%%DATADIR%%/frmenus/dataall/qualewma.top +%%DATADIR%%/frmenus/dataall/qualpci.top +%%DATADIR%%/frmenus/dataall/qualtag.top +%%DATADIR%%/frmenus/dataall/reg.top +%%DATADIR%%/frmenus/dataall/reg1n.top +%%DATADIR%%/frmenus/dataall/reg1p.top +%%DATADIR%%/frmenus/dataall/regmv.top +%%DATADIR%%/frmenus/dataall/reli.top +%%DATADIR%%/frmenus/dataall/relinist.top +%%DATADIR%%/frmenus/dataall/reliothe.top +%%DATADIR%%/frmenus/dataall/sematech.top +%%DATADIR%%/frmenus/dataall/stsc.top +%%DATADIR%%/frmenus/dataall/stscano1.top +%%DATADIR%%/frmenus/dataall/stscano2.top +%%DATADIR%%/frmenus/dataall/stsccomp.top +%%DATADIR%%/frmenus/dataall/stsccont.top +%%DATADIR%%/frmenus/dataall/stscdex1.top +%%DATADIR%%/frmenus/dataall/stscdex2.top +%%DATADIR%%/frmenus/dataall/stsceda1.top +%%DATADIR%%/frmenus/dataall/stsceda2.top +%%DATADIR%%/frmenus/dataall/stscfit1.top +%%DATADIR%%/frmenus/dataall/stscfit2.top +%%DATADIR%%/frmenus/dataall/stschypo.top +%%DATADIR%%/frmenus/dataall/stscinte.top +%%DATADIR%%/frmenus/dataall/stscintr.top +%%DATADIR%%/frmenus/dataall/stscsamp.top +%%DATADIR%%/frmenus/dataall/time.top +%%DATADIR%%/frmenus/dataall/time2var.top +%%DATADIR%%/frmenus/dataall/timebj.top +%%DATADIR%%/frmenus/dataall/timedds.top +%%DATADIR%%/frmenus/dataall/timenist.top +%%DATADIR%%/frmenus/dataall/timenoaa.top +%%DATADIR%%/frmenus/dataall/timeothe.top +%%DATADIR%%/frmenus/dataall/unce.top +%%DATADIR%%/frmenus/dataall/univ.top +%%DATADIR%%/frmenus/dataall/univnatr.top +%%DATADIR%%/frmenus/dataall/univnist.top +%%DATADIR%%/frmenus/dataall/univothe.top +%%DATADIR%%/frmenus/dataall/univsema.top +%%DATADIR%%/frmenus/dataexec/1fac.top +%%DATADIR%%/frmenus/dataexec/1facnist.top +%%DATADIR%%/frmenus/dataexec/2fac.top +%%DATADIR%%/frmenus/dataexec/3fac.top +%%DATADIR%%/frmenus/dataexec/4fac.top +%%DATADIR%%/frmenus/dataexec/5fac.top +%%DATADIR%%/frmenus/dataexec/ABERN17.DP +%%DATADIR%%/frmenus/dataexec/ABERN35.DP +%%DATADIR%%/frmenus/dataexec/ABERN43.DP +%%DATADIR%%/frmenus/dataexec/AC.DP +%%DATADIR%%/frmenus/dataexec/AMRF.DP +%%DATADIR%%/frmenus/dataexec/ASCO2.DP +%%DATADIR%%/frmenus/dataexec/ASF11.DP +%%DATADIR%%/frmenus/dataexec/ASF12.DP +%%DATADIR%%/frmenus/dataexec/ASN2O.DP +%%DATADIR%%/frmenus/dataexec/AUTO79.DP +%%DATADIR%%/frmenus/dataexec/AUTO83.DP +%%DATADIR%%/frmenus/dataexec/AUTO83B.DP +%%DATADIR%%/frmenus/dataexec/BAKER.DP +%%DATADIR%%/frmenus/dataexec/BATTADD2.DP +%%DATADIR%%/frmenus/dataexec/BATTADD3.DP +%%DATADIR%%/frmenus/dataexec/BENNETT.DP +%%DATADIR%%/frmenus/dataexec/BENNETT5.DP +%%DATADIR%%/frmenus/dataexec/BERGER1.DP +%%DATADIR%%/frmenus/dataexec/BIOMED3.DP +%%DATADIR%%/frmenus/dataexec/BOWEN.DP +%%DATADIR%%/frmenus/dataexec/BOXAUTO.DP +%%DATADIR%%/frmenus/dataexec/BOXBIKE2.DP +%%DATADIR%%/frmenus/dataexec/BOXBIKE3.DP +%%DATADIR%%/frmenus/dataexec/BOXBLOOD.DP +%%DATADIR%%/frmenus/dataexec/BOXBOD.DP +%%DATADIR%%/frmenus/dataexec/BOXCAKE.DP +%%DATADIR%%/frmenus/dataexec/BOXCAKE2.DP +%%DATADIR%%/frmenus/dataexec/BOXCHEM.DP +%%DATADIR%%/frmenus/dataexec/BOXCHEM2.DP +%%DATADIR%%/frmenus/dataexec/BOXCLEA2.DP +%%DATADIR%%/frmenus/dataexec/BOXCLEAN.DP +%%DATADIR%%/frmenus/dataexec/BOXCLOTH.DP +%%DATADIR%%/frmenus/dataexec/BOXFILT.DP +%%DATADIR%%/frmenus/dataexec/BOXFILT2.DP +%%DATADIR%%/frmenus/dataexec/BOXINDUS.DP +%%DATADIR%%/frmenus/dataexec/BOXJE142.DP +%%DATADIR%%/frmenus/dataexec/BOXJENK1.DP +%%DATADIR%%/frmenus/dataexec/BOXJENK2.DP +%%DATADIR%%/frmenus/dataexec/BOXMOLD.DP +%%DATADIR%%/frmenus/dataexec/BOXPENIC.DP +%%DATADIR%%/frmenus/dataexec/BOXPILOT.DP +%%DATADIR%%/frmenus/dataexec/BOXPOISO.DP +%%DATADIR%%/frmenus/dataexec/BOXRADAR.DP +%%DATADIR%%/frmenus/dataexec/BOXRATS.DP +%%DATADIR%%/frmenus/dataexec/BOXREAC2.DP +%%DATADIR%%/frmenus/dataexec/BOXREACT.DP +%%DATADIR%%/frmenus/dataexec/BOXSHOES.DP +%%DATADIR%%/frmenus/dataexec/BOXSOLAR.DP +%%DATADIR%%/frmenus/dataexec/BOXSPRAY.DP +%%DATADIR%%/frmenus/dataexec/BOXSPRI2.DP +%%DATADIR%%/frmenus/dataexec/BOXSPRI3.DP +%%DATADIR%%/frmenus/dataexec/BOXSPRIN.DP +%%DATADIR%%/frmenus/dataexec/BOXTOMAT.DP +%%DATADIR%%/frmenus/dataexec/BOXWELD.DP +%%DATADIR%%/frmenus/dataexec/BOXYIEL2.DP +%%DATADIR%%/frmenus/dataexec/BOXYIELD.DP +%%DATADIR%%/frmenus/dataexec/BRAIN.DP +%%DATADIR%%/frmenus/dataexec/CASTIL10.DP +%%DATADIR%%/frmenus/dataexec/CASTIL11.DP +%%DATADIR%%/frmenus/dataexec/CASTIL12.DP +%%DATADIR%%/frmenus/dataexec/CASTIL13.DP +%%DATADIR%%/frmenus/dataexec/CASTIL14.DP +%%DATADIR%%/frmenus/dataexec/CASTILL1.DP +%%DATADIR%%/frmenus/dataexec/CASTILL2.DP +%%DATADIR%%/frmenus/dataexec/CASTILL3.DP +%%DATADIR%%/frmenus/dataexec/CASTILL4.DP +%%DATADIR%%/frmenus/dataexec/CASTILL5.DP +%%DATADIR%%/frmenus/dataexec/CASTILL6.DP +%%DATADIR%%/frmenus/dataexec/CASTILL7.DP +%%DATADIR%%/frmenus/dataexec/CASTILL8.DP +%%DATADIR%%/frmenus/dataexec/CASTILL9.DP +%%DATADIR%%/frmenus/dataexec/CCC.DP +%%DATADIR%%/frmenus/dataexec/CCP.DP +%%DATADIR%%/frmenus/dataexec/CCPN.DP +%%DATADIR%%/frmenus/dataexec/CCU.DP +%%DATADIR%%/frmenus/dataexec/CCXBAR.DP +%%DATADIR%%/frmenus/dataexec/CHOI.DP +%%DATADIR%%/frmenus/dataexec/CHOI2.DP +%%DATADIR%%/frmenus/dataexec/CHOLEST1.DP +%%DATADIR%%/frmenus/dataexec/CHWIRUT1.DP +%%DATADIR%%/frmenus/dataexec/CHWIRUT2.DP +%%DATADIR%%/frmenus/dataexec/CLARK0.DP +%%DATADIR%%/frmenus/dataexec/CLEAR.DP +%%DATADIR%%/frmenus/dataexec/CONSUMPR.DP +%%DATADIR%%/frmenus/dataexec/CROARK2.DP +%%DATADIR%%/frmenus/dataexec/CROARK3.DP +%%DATADIR%%/frmenus/dataexec/CROARKIN.DP +%%DATADIR%%/frmenus/dataexec/CUBE.DP +%%DATADIR%%/frmenus/dataexec/CURRIE.DP +%%DATADIR%%/frmenus/dataexec/DDS1.DP +%%DATADIR%%/frmenus/dataexec/DDS10.DP +%%DATADIR%%/frmenus/dataexec/DDS11.DP +%%DATADIR%%/frmenus/dataexec/DDS12.DP +%%DATADIR%%/frmenus/dataexec/DDS13.DP +%%DATADIR%%/frmenus/dataexec/DDS14.DP +%%DATADIR%%/frmenus/dataexec/DDS15.DP +%%DATADIR%%/frmenus/dataexec/DDS16.DP +%%DATADIR%%/frmenus/dataexec/DDS17.DP +%%DATADIR%%/frmenus/dataexec/DDS18.DP +%%DATADIR%%/frmenus/dataexec/DDS19.DP +%%DATADIR%%/frmenus/dataexec/DDS2.DP +%%DATADIR%%/frmenus/dataexec/DDS20.DP +%%DATADIR%%/frmenus/dataexec/DDS21.DP +%%DATADIR%%/frmenus/dataexec/DDS3.DP +%%DATADIR%%/frmenus/dataexec/DDS4.DP +%%DATADIR%%/frmenus/dataexec/DDS5.DP +%%DATADIR%%/frmenus/dataexec/DDS6.DP +%%DATADIR%%/frmenus/dataexec/DDS7.DP +%%DATADIR%%/frmenus/dataexec/DDS8.DP +%%DATADIR%%/frmenus/dataexec/DDS9.DP +%%DATADIR%%/frmenus/dataexec/DORKO4.DP +%%DATADIR%%/frmenus/dataexec/DRAFT69B.DP +%%DATADIR%%/frmenus/dataexec/DZIUBA.DP +%%DATADIR%%/frmenus/dataexec/ECKERLE4.DP +%%DATADIR%%/frmenus/dataexec/EHRSTEIN.DP +%%DATADIR%%/frmenus/dataexec/ELNINO.DP +%%DATADIR%%/frmenus/dataexec/FLICKER.DP +%%DATADIR%%/frmenus/dataexec/FLURY5.DP +%%DATADIR%%/frmenus/dataexec/FREQPRIM.DP +%%DATADIR%%/frmenus/dataexec/FULLER2.DP +%%DATADIR%%/frmenus/dataexec/FUNNEL5A.DP +%%DATADIR%%/frmenus/dataexec/FUNNEL5B.DP +%%DATADIR%%/frmenus/dataexec/FUNNEL5C.DP +%%DATADIR%%/frmenus/dataexec/GARBOCZI.DP +%%DATADIR%%/frmenus/dataexec/GEAR.DP +%%DATADIR%%/frmenus/dataexec/GNP.DP +%%DATADIR%%/frmenus/dataexec/GRA1326.DP +%%DATADIR%%/frmenus/dataexec/GRA1617.DP +%%DATADIR%%/frmenus/dataexec/HABER1.DP +%%DATADIR%%/frmenus/dataexec/HAHN.DP +%%DATADIR%%/frmenus/dataexec/HAHN1.DP +%%DATADIR%%/frmenus/dataexec/HALD647.DP +%%DATADIR%%/frmenus/dataexec/HAMAKER.DP +%%DATADIR%%/frmenus/dataexec/HAYES1.DP +%%DATADIR%%/frmenus/dataexec/IRIS.DP +%%DATADIR%%/frmenus/dataexec/KAUL.DP +%%DATADIR%%/frmenus/dataexec/KEYWEST.DP +%%DATADIR%%/frmenus/dataexec/KIRBY2.DP +%%DATADIR%%/frmenus/dataexec/KRASNY1.DP +%%DATADIR%%/frmenus/dataexec/LEW.DP +%%DATADIR%%/frmenus/dataexec/LEW3.DP +%%DATADIR%%/frmenus/dataexec/LIN.DP +%%DATADIR%%/frmenus/dataexec/LONGLEY.DP +%%DATADIR%%/frmenus/dataexec/LOTTERY3.DP +%%DATADIR%%/frmenus/dataexec/LOTTERY4.DP +%%DATADIR%%/frmenus/dataexec/LUTHER.DP +%%DATADIR%%/frmenus/dataexec/MANDEL.DP +%%DATADIR%%/frmenus/dataexec/MARSHAK.DP +%%DATADIR%%/frmenus/dataexec/MAVRO.DP +%%DATADIR%%/frmenus/dataexec/MICHELSO.DP +%%DATADIR%%/frmenus/dataexec/MISRA1.DP +%%DATADIR%%/frmenus/dataexec/MLCO2.DP +%%DATADIR%%/frmenus/dataexec/MLCO2MON.DP +%%DATADIR%%/frmenus/dataexec/MLF11.DP +%%DATADIR%%/frmenus/dataexec/MLF12.DP +%%DATADIR%%/frmenus/dataexec/MLN2O.DP +%%DATADIR%%/frmenus/dataexec/MORALES.DP +%%DATADIR%%/frmenus/dataexec/MORALES2.DP +%%DATADIR%%/frmenus/dataexec/NATR21.DP +%%DATADIR%%/frmenus/dataexec/NATR26.DP +%%DATADIR%%/frmenus/dataexec/NATR323.DP +%%DATADIR%%/frmenus/dataexec/NATR326.DP +%%DATADIR%%/frmenus/dataexec/NATR332.DP +%%DATADIR%%/frmenus/dataexec/NATR334.DP +%%DATADIR%%/frmenus/dataexec/NATR338.DP +%%DATADIR%%/frmenus/dataexec/NATR341.DP +%%DATADIR%%/frmenus/dataexec/NATR41.DP +%%DATADIR%%/frmenus/dataexec/NATR45.DP +%%DATADIR%%/frmenus/dataexec/NATR48.DP +%%DATADIR%%/frmenus/dataexec/NATR511.DP +%%DATADIR%%/frmenus/dataexec/NATR522.DP +%%DATADIR%%/frmenus/dataexec/NATR527.DP +%%DATADIR%%/frmenus/dataexec/NATR533.DP +%%DATADIR%%/frmenus/dataexec/NATR540.DP +%%DATADIR%%/frmenus/dataexec/NATR627.DP +%%DATADIR%%/frmenus/dataexec/NATR65.DP +%%DATADIR%%/frmenus/dataexec/NBSPOW1.DP +%%DATADIR%%/frmenus/dataexec/NBSPOW2.DP +%%DATADIR%%/frmenus/dataexec/NBSPOW3.DP +%%DATADIR%%/frmenus/dataexec/NEGIZ3.DP +%%DATADIR%%/frmenus/dataexec/NELSON.DP +%%DATADIR%%/frmenus/dataexec/NORRIS6.DP +%%DATADIR%%/frmenus/dataexec/NUT.DP +%%DATADIR%%/frmenus/dataexec/NWF11.DP +%%DATADIR%%/frmenus/dataexec/NWF12.DP +%%DATADIR%%/frmenus/dataexec/NWN2O.DP +%%DATADIR%%/frmenus/dataexec/OIL.DP +%%DATADIR%%/frmenus/dataexec/OLDTOOLS.DP +%%DATADIR%%/frmenus/dataexec/PBCO2.DP +%%DATADIR%%/frmenus/dataexec/PBF11.DP +%%DATADIR%%/frmenus/dataexec/PBF12.DP +%%DATADIR%%/frmenus/dataexec/PBN2O.DP +%%DATADIR%%/frmenus/dataexec/PENTAGON.DP +%%DATADIR%%/frmenus/dataexec/PERIODIC.DP +%%DATADIR%%/frmenus/dataexec/PLANETS.DP +%%DATADIR%%/frmenus/dataexec/PONTIUS.DP +%%DATADIR%%/frmenus/dataexec/PRIMESM.DP +%%DATADIR%%/frmenus/dataexec/QUASIBIE.DP +%%DATADIR%%/frmenus/dataexec/QUINLAN.DP +%%DATADIR%%/frmenus/dataexec/RANDN.DP +%%DATADIR%%/frmenus/dataexec/RANDU.DP +%%DATADIR%%/frmenus/dataexec/RANDWALK.DP +%%DATADIR%%/frmenus/dataexec/REHM.DP +%%DATADIR%%/frmenus/dataexec/ROSZMAN1.DP +%%DATADIR%%/frmenus/dataexec/SHEESLE2.DP +%%DATADIR%%/frmenus/dataexec/SHEESLEY.DP +%%DATADIR%%/frmenus/dataexec/SIMIU.DP +%%DATADIR%%/frmenus/dataexec/SIN1.DP +%%DATADIR%%/frmenus/dataexec/SIN2.DP +%%DATADIR%%/frmenus/dataexec/SIN3.DP +%%DATADIR%%/frmenus/dataexec/SIN4.DP +%%DATADIR%%/frmenus/dataexec/SINSIN.DP +%%DATADIR%%/frmenus/dataexec/SMALL14.DP +%%DATADIR%%/frmenus/dataexec/SOULEN.DP +%%DATADIR%%/frmenus/dataexec/SOULEN0.DP +%%DATADIR%%/frmenus/dataexec/SPAGON1.DP +%%DATADIR%%/frmenus/dataexec/SPAGON2.DP +%%DATADIR%%/frmenus/dataexec/SPAGON3.DP +%%DATADIR%%/frmenus/dataexec/SPAGON4.DP +%%DATADIR%%/frmenus/dataexec/SPCO2.DP +%%DATADIR%%/frmenus/dataexec/SPF11.DP +%%DATADIR%%/frmenus/dataexec/SPF12.DP +%%DATADIR%%/frmenus/dataexec/SPIEGEL.DP +%%DATADIR%%/frmenus/dataexec/SPLETT2.DP +%%DATADIR%%/frmenus/dataexec/SPLETT3.DP +%%DATADIR%%/frmenus/dataexec/SPLETT4.DP +%%DATADIR%%/frmenus/dataexec/SPN2O.DP +%%DATADIR%%/frmenus/dataexec/STENBAKK.DP +%%DATADIR%%/frmenus/dataexec/SUNSPOT.DP +%%DATADIR%%/frmenus/dataexec/SUNSPOT2.DP +%%DATADIR%%/frmenus/dataexec/SUPERCON.DP +%%DATADIR%%/frmenus/dataexec/SWANSON1.DP +%%DATADIR%%/frmenus/dataexec/THURBER.DP +%%DATADIR%%/frmenus/dataexec/UGIANSKY.DP +%%DATADIR%%/frmenus/dataexec/USADEBT.DP +%%DATADIR%%/frmenus/dataexec/USADEFIC.DP +%%DATADIR%%/frmenus/dataexec/VANGEL1.DP +%%DATADIR%%/frmenus/dataexec/VANGEL2.DP +%%DATADIR%%/frmenus/dataexec/VANGEL5.DP +%%DATADIR%%/frmenus/dataexec/VIBRATE.DP +%%DATADIR%%/frmenus/dataexec/WAMPLER1.DP +%%DATADIR%%/frmenus/dataexec/WAMPLER2.DP +%%DATADIR%%/frmenus/dataexec/WASHDC.DP +%%DATADIR%%/frmenus/dataexec/WATTERS.DP +%%DATADIR%%/frmenus/dataexec/WEBER.DP +%%DATADIR%%/frmenus/dataexec/WOOLLEY.DP +%%DATADIR%%/frmenus/dataexec/WRIGHT11.DP +%%DATADIR%%/frmenus/dataexec/ZARR13.DP +%%DATADIR%%/frmenus/dataexec/ZARR14.DP +%%DATADIR%%/frmenus/dataexec/ZARR15.DP +%%DATADIR%%/frmenus/dataexec/bhh.top +%%DATADIR%%/frmenus/dataexec/bhh1.top +%%DATADIR%%/frmenus/dataexec/bhh10.top +%%DATADIR%%/frmenus/dataexec/bhh11.top +%%DATADIR%%/frmenus/dataexec/bhh12.top +%%DATADIR%%/frmenus/dataexec/bhh13.top +%%DATADIR%%/frmenus/dataexec/bhh14.top +%%DATADIR%%/frmenus/dataexec/bhh15.top +%%DATADIR%%/frmenus/dataexec/bhh16.top +%%DATADIR%%/frmenus/dataexec/bhh17.top +%%DATADIR%%/frmenus/dataexec/bhh18.top +%%DATADIR%%/frmenus/dataexec/bhh2.top +%%DATADIR%%/frmenus/dataexec/bhh3.top +%%DATADIR%%/frmenus/dataexec/bhh4.top +%%DATADIR%%/frmenus/dataexec/bhh5.top +%%DATADIR%%/frmenus/dataexec/bhh6.top +%%DATADIR%%/frmenus/dataexec/bhh7.top +%%DATADIR%%/frmenus/dataexec/bhh8.top +%%DATADIR%%/frmenus/dataexec/bhh9.top +%%DATADIR%%/frmenus/dataexec/bhhintro.top +%%DATADIR%%/frmenus/dataexec/core.top +%%DATADIR%%/frmenus/dataexec/dataexec.top +%%DATADIR%%/frmenus/dataexec/dex.top +%%DATADIR%%/frmenus/dataexec/dex2k.top +%%DATADIR%%/frmenus/dataexec/dex2kmp.top +%%DATADIR%%/frmenus/dataexec/dexcomp.top +%%DATADIR%%/frmenus/dataexec/dexmix.top +%%DATADIR%%/frmenus/dataexec/dexopt.top +%%DATADIR%%/frmenus/dataexec/dextag.top +%%DATADIR%%/frmenus/dataexec/eva.top +%%DATADIR%%/frmenus/dataexec/evacast.top +%%DATADIR%%/frmenus/dataexec/evanist.top +%%DATADIR%%/frmenus/dataexec/evaothe.top +%%DATADIR%%/frmenus/dataexec/gra1ch4.top +%%DATADIR%%/frmenus/dataexec/gra1ch9.top +%%DATADIR%%/frmenus/dataexec/gra1intr.top +%%DATADIR%%/frmenus/dataexec/grayiye1.top +%%DATADIR%%/frmenus/dataexec/grayiye2.top +%%DATADIR%%/frmenus/dataexec/imag.top +%%DATADIR%%/frmenus/dataexec/math.top +%%DATADIR%%/frmenus/dataexec/mfac.top +%%DATADIR%%/frmenus/dataexec/mvar.top +%%DATADIR%%/frmenus/dataexec/natr1.top +%%DATADIR%%/frmenus/dataexec/natr2.top +%%DATADIR%%/frmenus/dataexec/natr3.top +%%DATADIR%%/frmenus/dataexec/natr4.top +%%DATADIR%%/frmenus/dataexec/natr5.top +%%DATADIR%%/frmenus/dataexec/natr6.top +%%DATADIR%%/frmenus/dataexec/natrella.top +%%DATADIR%%/frmenus/dataexec/natrintr.top +%%DATADIR%%/frmenus/dataexec/prob.top +%%DATADIR%%/frmenus/dataexec/qual.top +%%DATADIR%%/frmenus/dataexec/qual7old.top +%%DATADIR%%/frmenus/dataexec/qualcoch.top +%%DATADIR%%/frmenus/dataexec/qualewma.top +%%DATADIR%%/frmenus/dataexec/qualpci.top +%%DATADIR%%/frmenus/dataexec/qualtag.top +%%DATADIR%%/frmenus/dataexec/reg.top +%%DATADIR%%/frmenus/dataexec/reg1n.top +%%DATADIR%%/frmenus/dataexec/reg1p.top +%%DATADIR%%/frmenus/dataexec/regmv.top +%%DATADIR%%/frmenus/dataexec/reli.top +%%DATADIR%%/frmenus/dataexec/relinist.top +%%DATADIR%%/frmenus/dataexec/reliothe.top +%%DATADIR%%/frmenus/dataexec/sematech.top +%%DATADIR%%/frmenus/dataexec/stsc.top +%%DATADIR%%/frmenus/dataexec/stscano1.top +%%DATADIR%%/frmenus/dataexec/stscano2.top +%%DATADIR%%/frmenus/dataexec/stsccomp.top +%%DATADIR%%/frmenus/dataexec/stsccont.top +%%DATADIR%%/frmenus/dataexec/stscdex1.top +%%DATADIR%%/frmenus/dataexec/stscdex2.top +%%DATADIR%%/frmenus/dataexec/stsceda1.top +%%DATADIR%%/frmenus/dataexec/stsceda2.top +%%DATADIR%%/frmenus/dataexec/stscfit1.top +%%DATADIR%%/frmenus/dataexec/stscfit2.top +%%DATADIR%%/frmenus/dataexec/stschypo.top +%%DATADIR%%/frmenus/dataexec/stscinte.top +%%DATADIR%%/frmenus/dataexec/stscintr.top +%%DATADIR%%/frmenus/dataexec/stscsamp.top +%%DATADIR%%/frmenus/dataexec/time.top +%%DATADIR%%/frmenus/dataexec/time2var.top +%%DATADIR%%/frmenus/dataexec/timebj.top +%%DATADIR%%/frmenus/dataexec/timedds.top +%%DATADIR%%/frmenus/dataexec/timenist.top +%%DATADIR%%/frmenus/dataexec/timenoaa.top +%%DATADIR%%/frmenus/dataexec/timeothe.top +%%DATADIR%%/frmenus/dataexec/unce.top +%%DATADIR%%/frmenus/dataexec/univ.top +%%DATADIR%%/frmenus/dataexec/univnatr.top +%%DATADIR%%/frmenus/dataexec/univnist.top +%%DATADIR%%/frmenus/dataexec/univothe.top +%%DATADIR%%/frmenus/dataexec/univsema.top +%%DATADIR%%/frmenus/datalist/ABERN17.top +%%DATADIR%%/frmenus/datalist/ABERN35.top +%%DATADIR%%/frmenus/datalist/ABERN43.top +%%DATADIR%%/frmenus/datalist/AC.top +%%DATADIR%%/frmenus/datalist/AMRF.top +%%DATADIR%%/frmenus/datalist/ASCO2.top +%%DATADIR%%/frmenus/datalist/ASF11.top +%%DATADIR%%/frmenus/datalist/ASF12.top +%%DATADIR%%/frmenus/datalist/ASN2O.top +%%DATADIR%%/frmenus/datalist/AUTO79.top +%%DATADIR%%/frmenus/datalist/AUTO83.top +%%DATADIR%%/frmenus/datalist/AUTO83B.top +%%DATADIR%%/frmenus/datalist/BAKER.top +%%DATADIR%%/frmenus/datalist/BATTADD2.top +%%DATADIR%%/frmenus/datalist/BATTADD3.top +%%DATADIR%%/frmenus/datalist/BENNETT.top +%%DATADIR%%/frmenus/datalist/BENNETT5.top +%%DATADIR%%/frmenus/datalist/BERGER1.top +%%DATADIR%%/frmenus/datalist/BIOMED3.top +%%DATADIR%%/frmenus/datalist/BOWEN.top +%%DATADIR%%/frmenus/datalist/BOXAUTO.top +%%DATADIR%%/frmenus/datalist/BOXBIKE2.top +%%DATADIR%%/frmenus/datalist/BOXBIKE3.top +%%DATADIR%%/frmenus/datalist/BOXBLOOD.top +%%DATADIR%%/frmenus/datalist/BOXBOD.top +%%DATADIR%%/frmenus/datalist/BOXCAKE.top +%%DATADIR%%/frmenus/datalist/BOXCAKE2.top +%%DATADIR%%/frmenus/datalist/BOXCHEM.top +%%DATADIR%%/frmenus/datalist/BOXCHEM2.top +%%DATADIR%%/frmenus/datalist/BOXCLEA2.top +%%DATADIR%%/frmenus/datalist/BOXCLEAN.top +%%DATADIR%%/frmenus/datalist/BOXCLOTH.top +%%DATADIR%%/frmenus/datalist/BOXFILT.top +%%DATADIR%%/frmenus/datalist/BOXFILT2.top +%%DATADIR%%/frmenus/datalist/BOXINDUS.top +%%DATADIR%%/frmenus/datalist/BOXJE142.top +%%DATADIR%%/frmenus/datalist/BOXJENK1.top +%%DATADIR%%/frmenus/datalist/BOXJENK2.top +%%DATADIR%%/frmenus/datalist/BOXMOLD.top +%%DATADIR%%/frmenus/datalist/BOXPENIC.top +%%DATADIR%%/frmenus/datalist/BOXPILOT.top +%%DATADIR%%/frmenus/datalist/BOXPOISO.top +%%DATADIR%%/frmenus/datalist/BOXRADAR.top +%%DATADIR%%/frmenus/datalist/BOXRATS.top +%%DATADIR%%/frmenus/datalist/BOXREAC2.top +%%DATADIR%%/frmenus/datalist/BOXREACT.top +%%DATADIR%%/frmenus/datalist/BOXSHOES.top +%%DATADIR%%/frmenus/datalist/BOXSOLAR.top +%%DATADIR%%/frmenus/datalist/BOXSPRAY.top +%%DATADIR%%/frmenus/datalist/BOXSPRI2.top +%%DATADIR%%/frmenus/datalist/BOXSPRI3.top +%%DATADIR%%/frmenus/datalist/BOXSPRIN.top +%%DATADIR%%/frmenus/datalist/BOXTOMAT.top +%%DATADIR%%/frmenus/datalist/BOXWELD.top +%%DATADIR%%/frmenus/datalist/BOXYIEL2.top +%%DATADIR%%/frmenus/datalist/BOXYIELD.top +%%DATADIR%%/frmenus/datalist/BRAIN.top +%%DATADIR%%/frmenus/datalist/CASTIL10.top +%%DATADIR%%/frmenus/datalist/CASTIL11.top +%%DATADIR%%/frmenus/datalist/CASTIL12.top +%%DATADIR%%/frmenus/datalist/CASTIL13.top +%%DATADIR%%/frmenus/datalist/CASTIL14.top +%%DATADIR%%/frmenus/datalist/CASTILL1.top +%%DATADIR%%/frmenus/datalist/CASTILL2.top +%%DATADIR%%/frmenus/datalist/CASTILL3.top +%%DATADIR%%/frmenus/datalist/CASTILL4.top +%%DATADIR%%/frmenus/datalist/CASTILL5.top +%%DATADIR%%/frmenus/datalist/CASTILL6.top +%%DATADIR%%/frmenus/datalist/CASTILL7.top +%%DATADIR%%/frmenus/datalist/CASTILL8.top +%%DATADIR%%/frmenus/datalist/CASTILL9.top +%%DATADIR%%/frmenus/datalist/CCC.top +%%DATADIR%%/frmenus/datalist/CCP.top +%%DATADIR%%/frmenus/datalist/CCPN.top +%%DATADIR%%/frmenus/datalist/CCU.top +%%DATADIR%%/frmenus/datalist/CCXBAR.top +%%DATADIR%%/frmenus/datalist/CHOI.top +%%DATADIR%%/frmenus/datalist/CHOI2.top +%%DATADIR%%/frmenus/datalist/CHOLEST1.top +%%DATADIR%%/frmenus/datalist/CHWIRUT1.top +%%DATADIR%%/frmenus/datalist/CHWIRUT2.top +%%DATADIR%%/frmenus/datalist/CLARK0.top +%%DATADIR%%/frmenus/datalist/CLEAR.top +%%DATADIR%%/frmenus/datalist/CONSUMPR.top +%%DATADIR%%/frmenus/datalist/CROARK2.top +%%DATADIR%%/frmenus/datalist/CROARK3.top +%%DATADIR%%/frmenus/datalist/CROARKIN.top +%%DATADIR%%/frmenus/datalist/CUBE.top +%%DATADIR%%/frmenus/datalist/CURRIE.top +%%DATADIR%%/frmenus/datalist/DDS1.top +%%DATADIR%%/frmenus/datalist/DDS10.top +%%DATADIR%%/frmenus/datalist/DDS11.top +%%DATADIR%%/frmenus/datalist/DDS12.top +%%DATADIR%%/frmenus/datalist/DDS13.top +%%DATADIR%%/frmenus/datalist/DDS14.top +%%DATADIR%%/frmenus/datalist/DDS15.top +%%DATADIR%%/frmenus/datalist/DDS16.top +%%DATADIR%%/frmenus/datalist/DDS17.top +%%DATADIR%%/frmenus/datalist/DDS18.top +%%DATADIR%%/frmenus/datalist/DDS19.top +%%DATADIR%%/frmenus/datalist/DDS2.top +%%DATADIR%%/frmenus/datalist/DDS20.top +%%DATADIR%%/frmenus/datalist/DDS21.top +%%DATADIR%%/frmenus/datalist/DDS3.top +%%DATADIR%%/frmenus/datalist/DDS4.top +%%DATADIR%%/frmenus/datalist/DDS5.top +%%DATADIR%%/frmenus/datalist/DDS6.top +%%DATADIR%%/frmenus/datalist/DDS7.top +%%DATADIR%%/frmenus/datalist/DDS8.top +%%DATADIR%%/frmenus/datalist/DDS9.top +%%DATADIR%%/frmenus/datalist/DORKO4.top +%%DATADIR%%/frmenus/datalist/DRAFT69B.top +%%DATADIR%%/frmenus/datalist/DZIUBA.top +%%DATADIR%%/frmenus/datalist/ECKERLE4.top +%%DATADIR%%/frmenus/datalist/EHRSTEIN.top +%%DATADIR%%/frmenus/datalist/ELNINO.top +%%DATADIR%%/frmenus/datalist/FLICKER.top +%%DATADIR%%/frmenus/datalist/FLURY5.top +%%DATADIR%%/frmenus/datalist/FREQPRIM.top +%%DATADIR%%/frmenus/datalist/FULLER2.top +%%DATADIR%%/frmenus/datalist/FUNNEL5A.top +%%DATADIR%%/frmenus/datalist/FUNNEL5B.top +%%DATADIR%%/frmenus/datalist/FUNNEL5C.top +%%DATADIR%%/frmenus/datalist/GARBOCZI.top +%%DATADIR%%/frmenus/datalist/GEAR.top +%%DATADIR%%/frmenus/datalist/GNP.top +%%DATADIR%%/frmenus/datalist/GRA1326.top +%%DATADIR%%/frmenus/datalist/GRA1617.top +%%DATADIR%%/frmenus/datalist/HABER1.top +%%DATADIR%%/frmenus/datalist/HAHN.top +%%DATADIR%%/frmenus/datalist/HAHN1.top +%%DATADIR%%/frmenus/datalist/HALD647.top +%%DATADIR%%/frmenus/datalist/HAMAKER.top +%%DATADIR%%/frmenus/datalist/HAYES1.top +%%DATADIR%%/frmenus/datalist/IRIS.top +%%DATADIR%%/frmenus/datalist/KAUL.top +%%DATADIR%%/frmenus/datalist/KEYWEST.top +%%DATADIR%%/frmenus/datalist/KIRBY2.top +%%DATADIR%%/frmenus/datalist/KRASNY1.top +%%DATADIR%%/frmenus/datalist/LEW.top +%%DATADIR%%/frmenus/datalist/LEW3.top +%%DATADIR%%/frmenus/datalist/LIN.top +%%DATADIR%%/frmenus/datalist/LONGLEY.top +%%DATADIR%%/frmenus/datalist/LOTTERY3.top +%%DATADIR%%/frmenus/datalist/LOTTERY4.top +%%DATADIR%%/frmenus/datalist/LUTHER.top +%%DATADIR%%/frmenus/datalist/MANDEL.top +%%DATADIR%%/frmenus/datalist/MARSHAK.top +%%DATADIR%%/frmenus/datalist/MAVRO.top +%%DATADIR%%/frmenus/datalist/MICHELSO.top +%%DATADIR%%/frmenus/datalist/MISRA1.top +%%DATADIR%%/frmenus/datalist/MLCO2.top +%%DATADIR%%/frmenus/datalist/MLCO2MON.top +%%DATADIR%%/frmenus/datalist/MLF11.top +%%DATADIR%%/frmenus/datalist/MLF12.top +%%DATADIR%%/frmenus/datalist/MLN2O.top +%%DATADIR%%/frmenus/datalist/MORALES.top +%%DATADIR%%/frmenus/datalist/MORALES2.top +%%DATADIR%%/frmenus/datalist/NATR21.top +%%DATADIR%%/frmenus/datalist/NATR26.top +%%DATADIR%%/frmenus/datalist/NATR323.top +%%DATADIR%%/frmenus/datalist/NATR326.top +%%DATADIR%%/frmenus/datalist/NATR332.top +%%DATADIR%%/frmenus/datalist/NATR334.top +%%DATADIR%%/frmenus/datalist/NATR338.top +%%DATADIR%%/frmenus/datalist/NATR341.top +%%DATADIR%%/frmenus/datalist/NATR41.top +%%DATADIR%%/frmenus/datalist/NATR45.top +%%DATADIR%%/frmenus/datalist/NATR48.top +%%DATADIR%%/frmenus/datalist/NATR511.top +%%DATADIR%%/frmenus/datalist/NATR522.top +%%DATADIR%%/frmenus/datalist/NATR527.top +%%DATADIR%%/frmenus/datalist/NATR533.top +%%DATADIR%%/frmenus/datalist/NATR540.top +%%DATADIR%%/frmenus/datalist/NATR627.top +%%DATADIR%%/frmenus/datalist/NATR65.top +%%DATADIR%%/frmenus/datalist/NBSPOW1.top +%%DATADIR%%/frmenus/datalist/NBSPOW2.top +%%DATADIR%%/frmenus/datalist/NBSPOW3.top +%%DATADIR%%/frmenus/datalist/NEGIZ3.top +%%DATADIR%%/frmenus/datalist/NELSON.top +%%DATADIR%%/frmenus/datalist/NORRIS6.top +%%DATADIR%%/frmenus/datalist/NUT.top +%%DATADIR%%/frmenus/datalist/NWF11.top +%%DATADIR%%/frmenus/datalist/NWF12.top +%%DATADIR%%/frmenus/datalist/NWN2O.top +%%DATADIR%%/frmenus/datalist/OIL.top +%%DATADIR%%/frmenus/datalist/PBCO2.top +%%DATADIR%%/frmenus/datalist/PBF11.top +%%DATADIR%%/frmenus/datalist/PBF12.top +%%DATADIR%%/frmenus/datalist/PBN2O.top +%%DATADIR%%/frmenus/datalist/PENTAGON.top +%%DATADIR%%/frmenus/datalist/PERIODIC.top +%%DATADIR%%/frmenus/datalist/PLANETS.top +%%DATADIR%%/frmenus/datalist/PONTIUS.top +%%DATADIR%%/frmenus/datalist/PRIMESM.top +%%DATADIR%%/frmenus/datalist/QUASIBIE.top +%%DATADIR%%/frmenus/datalist/QUINLAN.top +%%DATADIR%%/frmenus/datalist/RANDN.top +%%DATADIR%%/frmenus/datalist/RANDU.top +%%DATADIR%%/frmenus/datalist/RANDWALK.top +%%DATADIR%%/frmenus/datalist/REHM.top +%%DATADIR%%/frmenus/datalist/ROSZMAN1.top +%%DATADIR%%/frmenus/datalist/SHEESLE2.top +%%DATADIR%%/frmenus/datalist/SHEESLEY.top +%%DATADIR%%/frmenus/datalist/SIMIU.top +%%DATADIR%%/frmenus/datalist/SIN1.top +%%DATADIR%%/frmenus/datalist/SIN2.top +%%DATADIR%%/frmenus/datalist/SIN3.top +%%DATADIR%%/frmenus/datalist/SIN4.top +%%DATADIR%%/frmenus/datalist/SINSIN.top +%%DATADIR%%/frmenus/datalist/SMALL14.top +%%DATADIR%%/frmenus/datalist/SOULEN.top +%%DATADIR%%/frmenus/datalist/SOULEN0.top +%%DATADIR%%/frmenus/datalist/SPAGON1.top +%%DATADIR%%/frmenus/datalist/SPAGON2.top +%%DATADIR%%/frmenus/datalist/SPAGON3.top +%%DATADIR%%/frmenus/datalist/SPAGON4.top +%%DATADIR%%/frmenus/datalist/SPCO2.top +%%DATADIR%%/frmenus/datalist/SPF11.top +%%DATADIR%%/frmenus/datalist/SPF12.top +%%DATADIR%%/frmenus/datalist/SPIEGEL.top +%%DATADIR%%/frmenus/datalist/SPLETT2.top +%%DATADIR%%/frmenus/datalist/SPLETT3.top +%%DATADIR%%/frmenus/datalist/SPLETT4.top +%%DATADIR%%/frmenus/datalist/SPN2O.top +%%DATADIR%%/frmenus/datalist/STENBAKK.top +%%DATADIR%%/frmenus/datalist/SUNSPOT.top +%%DATADIR%%/frmenus/datalist/SUNSPOT2.top +%%DATADIR%%/frmenus/datalist/SUPERCON.top +%%DATADIR%%/frmenus/datalist/SWANSON1.top +%%DATADIR%%/frmenus/datalist/THURBER.top +%%DATADIR%%/frmenus/datalist/UGIANSKY.top +%%DATADIR%%/frmenus/datalist/USADEBT.top +%%DATADIR%%/frmenus/datalist/USADEFIC.top +%%DATADIR%%/frmenus/datalist/VANGEL1.top +%%DATADIR%%/frmenus/datalist/VANGEL2.top +%%DATADIR%%/frmenus/datalist/VIBRATE.top +%%DATADIR%%/frmenus/datalist/WAMPLER1.top +%%DATADIR%%/frmenus/datalist/WAMPLER2.top +%%DATADIR%%/frmenus/datalist/WASHDC.top +%%DATADIR%%/frmenus/datalist/WATTERS.top +%%DATADIR%%/frmenus/datalist/WEBER.top +%%DATADIR%%/frmenus/datalist/WOOLLEY.top +%%DATADIR%%/frmenus/datalist/WRIGHT11.top +%%DATADIR%%/frmenus/datalist/ZARR13.top +%%DATADIR%%/frmenus/datalist/ZARR14.top +%%DATADIR%%/frmenus/datalist/ZARR15.top +%%DATADIR%%/frmenus/dataload/1fac.top +%%DATADIR%%/frmenus/dataload/1facnatr.top +%%DATADIR%%/frmenus/dataload/1facnist.top +%%DATADIR%%/frmenus/dataload/1facothe.top +%%DATADIR%%/frmenus/dataload/1facsema.top +%%DATADIR%%/frmenus/dataload/2fac.top +%%DATADIR%%/frmenus/dataload/3fac.top +%%DATADIR%%/frmenus/dataload/4fac.top +%%DATADIR%%/frmenus/dataload/5fac.top +%%DATADIR%%/frmenus/dataload/ABERN17.DP +%%DATADIR%%/frmenus/dataload/ABERN35.DP +%%DATADIR%%/frmenus/dataload/ABERN43.DP +%%DATADIR%%/frmenus/dataload/ABSORPT.DP +%%DATADIR%%/frmenus/dataload/AC.DP +%%DATADIR%%/frmenus/dataload/AGE18.DP +%%DATADIR%%/frmenus/dataload/AGEBP.DP +%%DATADIR%%/frmenus/dataload/AMRF.DP +%%DATADIR%%/frmenus/dataload/ANSCOMBE.DP +%%DATADIR%%/frmenus/dataload/ARSENIC.DP +%%DATADIR%%/frmenus/dataload/ASCO2.DP +%%DATADIR%%/frmenus/dataload/ASF11.DP +%%DATADIR%%/frmenus/dataload/ASF12.DP +%%DATADIR%%/frmenus/dataload/ASN2O.DP +%%DATADIR%%/frmenus/dataload/ASSAY.DP +%%DATADIR%%/frmenus/dataload/AUTO79.DP +%%DATADIR%%/frmenus/dataload/AUTO83.DP +%%DATADIR%%/frmenus/dataload/AUTO83B.DP +%%DATADIR%%/frmenus/dataload/BABYWT.DP +%%DATADIR%%/frmenus/dataload/BAKER.DP +%%DATADIR%%/frmenus/dataload/BALLBEAR.DP +%%DATADIR%%/frmenus/dataload/BATTADD1.DP +%%DATADIR%%/frmenus/dataload/BATTADD2.DP +%%DATADIR%%/frmenus/dataload/BATTADD3.DP +%%DATADIR%%/frmenus/dataload/BENNETT.DP +%%DATADIR%%/frmenus/dataload/BENNETT5.DP +%%DATADIR%%/frmenus/dataload/BERGER1.DP +%%DATADIR%%/frmenus/dataload/BIOMED3.DP +%%DATADIR%%/frmenus/dataload/BIVGAUSS.DP +%%DATADIR%%/frmenus/dataload/BIVNGAUS.DP +%%DATADIR%%/frmenus/dataload/BOWEN.DP +%%DATADIR%%/frmenus/dataload/BOXAUTO.DP +%%DATADIR%%/frmenus/dataload/BOXBIKE2.DP +%%DATADIR%%/frmenus/dataload/BOXBIKE3.DP +%%DATADIR%%/frmenus/dataload/BOXBLOOD.DP +%%DATADIR%%/frmenus/dataload/BOXBOD.DP +%%DATADIR%%/frmenus/dataload/BOXCAKE.DP +%%DATADIR%%/frmenus/dataload/BOXCAKE2.DP +%%DATADIR%%/frmenus/dataload/BOXCHEM.DP +%%DATADIR%%/frmenus/dataload/BOXCHEM2.DP +%%DATADIR%%/frmenus/dataload/BOXCLEA2.DP +%%DATADIR%%/frmenus/dataload/BOXCLEAN.DP +%%DATADIR%%/frmenus/dataload/BOXCLOT2.DP +%%DATADIR%%/frmenus/dataload/BOXCLOTH.DP +%%DATADIR%%/frmenus/dataload/BOXDR175.DP +%%DATADIR%%/frmenus/dataload/BOXFILT.DP +%%DATADIR%%/frmenus/dataload/BOXFILT2.DP +%%DATADIR%%/frmenus/dataload/BOXINDUS.DP +%%DATADIR%%/frmenus/dataload/BOXJE142.DP +%%DATADIR%%/frmenus/dataload/BOXJENK1.DP +%%DATADIR%%/frmenus/dataload/BOXJENK2.DP +%%DATADIR%%/frmenus/dataload/BOXMOLD.DP +%%DATADIR%%/frmenus/dataload/BOXPENIC.DP +%%DATADIR%%/frmenus/dataload/BOXPILOT.DP +%%DATADIR%%/frmenus/dataload/BOXPOISO.DP +%%DATADIR%%/frmenus/dataload/BOXRADAR.DP +%%DATADIR%%/frmenus/dataload/BOXRATS.DP +%%DATADIR%%/frmenus/dataload/BOXREAC2.DP +%%DATADIR%%/frmenus/dataload/BOXREACT.DP +%%DATADIR%%/frmenus/dataload/BOXSHOES.DP +%%DATADIR%%/frmenus/dataload/BOXSOLAR.DP +%%DATADIR%%/frmenus/dataload/BOXSPRAY.DP +%%DATADIR%%/frmenus/dataload/BOXSPRI2.DP +%%DATADIR%%/frmenus/dataload/BOXSPRI3.DP +%%DATADIR%%/frmenus/dataload/BOXSPRIN.DP +%%DATADIR%%/frmenus/dataload/BOXTOMAT.DP +%%DATADIR%%/frmenus/dataload/BOXWELD.DP +%%DATADIR%%/frmenus/dataload/BOXYIEL2.DP +%%DATADIR%%/frmenus/dataload/BOXYIEL3.DP +%%DATADIR%%/frmenus/dataload/BOXYIELD.DP +%%DATADIR%%/frmenus/dataload/BP.DP +%%DATADIR%%/frmenus/dataload/BPWEIGHT.DP +%%DATADIR%%/frmenus/dataload/BRAIN.DP +%%DATADIR%%/frmenus/dataload/BULLET.DP +%%DATADIR%%/frmenus/dataload/CABBAGE.DP +%%DATADIR%%/frmenus/dataload/CANS.DP +%%DATADIR%%/frmenus/dataload/CAR17.DP +%%DATADIR%%/frmenus/dataload/CAR2.DP +%%DATADIR%%/frmenus/dataload/CAR20.DP +%%DATADIR%%/frmenus/dataload/CARBMON.DP +%%DATADIR%%/frmenus/dataload/CARS.DP +%%DATADIR%%/frmenus/dataload/CASTIL10.DP +%%DATADIR%%/frmenus/dataload/CASTIL11.DP +%%DATADIR%%/frmenus/dataload/CASTIL12.DP +%%DATADIR%%/frmenus/dataload/CASTIL13.DP +%%DATADIR%%/frmenus/dataload/CASTIL14.DP +%%DATADIR%%/frmenus/dataload/CASTILL1.DP +%%DATADIR%%/frmenus/dataload/CASTILL2.DP +%%DATADIR%%/frmenus/dataload/CASTILL3.DP +%%DATADIR%%/frmenus/dataload/CASTILL4.DP +%%DATADIR%%/frmenus/dataload/CASTILL5.DP +%%DATADIR%%/frmenus/dataload/CASTILL6.DP +%%DATADIR%%/frmenus/dataload/CASTILL7.DP +%%DATADIR%%/frmenus/dataload/CASTILL8.DP +%%DATADIR%%/frmenus/dataload/CASTILL9.DP +%%DATADIR%%/frmenus/dataload/CCC.DP +%%DATADIR%%/frmenus/dataload/CCP.DP +%%DATADIR%%/frmenus/dataload/CCPN.DP +%%DATADIR%%/frmenus/dataload/CCU.DP +%%DATADIR%%/frmenus/dataload/CCXBAR.DP +%%DATADIR%%/frmenus/dataload/CEMENT.DP +%%DATADIR%%/frmenus/dataload/CEREAl.DP +%%DATADIR%%/frmenus/dataload/CHAMBER.DP +%%DATADIR%%/frmenus/dataload/CHOI.DP +%%DATADIR%%/frmenus/dataload/CHOI2.DP +%%DATADIR%%/frmenus/dataload/CHOL.DP +%%DATADIR%%/frmenus/dataload/CHOLEST1.DP +%%DATADIR%%/frmenus/dataload/CHWIRUT1.DP +%%DATADIR%%/frmenus/dataload/CHWIRUT2.DP +%%DATADIR%%/frmenus/dataload/CLARK0.DP +%%DATADIR%%/frmenus/dataload/CLEAR.DP +%%DATADIR%%/frmenus/dataload/CO2.DP +%%DATADIR%%/frmenus/dataload/COIL.DP +%%DATADIR%%/frmenus/dataload/CONCRETE.DP +%%DATADIR%%/frmenus/dataload/CONSUMPR.DP +%%DATADIR%%/frmenus/dataload/CONTRAST.DP +%%DATADIR%%/frmenus/dataload/CORNEL23.DP +%%DATADIR%%/frmenus/dataload/CORNEL35.DP +%%DATADIR%%/frmenus/dataload/CORNEL43.DP +%%DATADIR%%/frmenus/dataload/CORNEL62.DP +%%DATADIR%%/frmenus/dataload/CORNEL69.DP +%%DATADIR%%/frmenus/dataload/CORNEL78.DP +%%DATADIR%%/frmenus/dataload/CORNEL81.DP +%%DATADIR%%/frmenus/dataload/CORNELL4.DP +%%DATADIR%%/frmenus/dataload/CORNELL9.DP +%%DATADIR%%/frmenus/dataload/CROARK2.DP +%%DATADIR%%/frmenus/dataload/CROARK3.DP +%%DATADIR%%/frmenus/dataload/CROARKIN.DP +%%DATADIR%%/frmenus/dataload/CRYSTAL.DP +%%DATADIR%%/frmenus/dataload/CRYSTAL3.DP +%%DATADIR%%/frmenus/dataload/CUBE.DP +%%DATADIR%%/frmenus/dataload/CURRIE.DP +%%DATADIR%%/frmenus/dataload/DDS1.DP +%%DATADIR%%/frmenus/dataload/DDS10.DP +%%DATADIR%%/frmenus/dataload/DDS11.DP +%%DATADIR%%/frmenus/dataload/DDS12.DP +%%DATADIR%%/frmenus/dataload/DDS13.DP +%%DATADIR%%/frmenus/dataload/DDS14.DP +%%DATADIR%%/frmenus/dataload/DDS15.DP +%%DATADIR%%/frmenus/dataload/DDS16.DP +%%DATADIR%%/frmenus/dataload/DDS17.DP +%%DATADIR%%/frmenus/dataload/DDS18.DP +%%DATADIR%%/frmenus/dataload/DDS19.DP +%%DATADIR%%/frmenus/dataload/DDS2.DP +%%DATADIR%%/frmenus/dataload/DDS20.DP +%%DATADIR%%/frmenus/dataload/DDS21.DP +%%DATADIR%%/frmenus/dataload/DDS3.DP +%%DATADIR%%/frmenus/dataload/DDS4.DP +%%DATADIR%%/frmenus/dataload/DDS5.DP +%%DATADIR%%/frmenus/dataload/DDS6.DP +%%DATADIR%%/frmenus/dataload/DDS7.DP +%%DATADIR%%/frmenus/dataload/DDS8.DP +%%DATADIR%%/frmenus/dataload/DDS9.DP +%%DATADIR%%/frmenus/dataload/DORKO4.DP +%%DATADIR%%/frmenus/dataload/DRAFT69.DP +%%DATADIR%%/frmenus/dataload/DRAFT69B.DP +%%DATADIR%%/frmenus/dataload/DRAPS518.DP +%%DATADIR%%/frmenus/dataload/DRAPS521.DP +%%DATADIR%%/frmenus/dataload/DRUGCONC.DP +%%DATADIR%%/frmenus/dataload/DZIUBA.DP +%%DATADIR%%/frmenus/dataload/ECKERLE4.DP +%%DATADIR%%/frmenus/dataload/EGGSHELL.DP +%%DATADIR%%/frmenus/dataload/EHRSTEIN.DP +%%DATADIR%%/frmenus/dataload/ELECT92.DP +%%DATADIR%%/frmenus/dataload/ELECTRIC.DP +%%DATADIR%%/frmenus/dataload/ELNINO.DP +%%DATADIR%%/frmenus/dataload/ETHNIC.DP +%%DATADIR%%/frmenus/dataload/EXAM.DP +%%DATADIR%%/frmenus/dataload/EXP.DP +%%DATADIR%%/frmenus/dataload/EXPCEN.DP +%%DATADIR%%/frmenus/dataload/EXPCEN2.DP +%%DATADIR%%/frmenus/dataload/FAT.DP +%%DATADIR%%/frmenus/dataload/FISH2POP.DP +%%DATADIR%%/frmenus/dataload/FLICKER.DP +%%DATADIR%%/frmenus/dataload/FLURY5.DP +%%DATADIR%%/frmenus/dataload/FREQPRIM.DP +%%DATADIR%%/frmenus/dataload/FULLER2.DP +%%DATADIR%%/frmenus/dataload/FULLODR1.DP +%%DATADIR%%/frmenus/dataload/FULLODR2.DP +%%DATADIR%%/frmenus/dataload/FUNNEL5A.DP +%%DATADIR%%/frmenus/dataload/FUNNEL5B.DP +%%DATADIR%%/frmenus/dataload/FUNNEL5C.DP +%%DATADIR%%/frmenus/dataload/GAMCEN.DP +%%DATADIR%%/frmenus/dataload/GAMMA.DP +%%DATADIR%%/frmenus/dataload/GARBOCZI.DP +%%DATADIR%%/frmenus/dataload/GEAR.DP +%%DATADIR%%/frmenus/dataload/GIFTED.DP +%%DATADIR%%/frmenus/dataload/GNP.DP +%%DATADIR%%/frmenus/dataload/GPA.DP +%%DATADIR%%/frmenus/dataload/GRA1326.DP +%%DATADIR%%/frmenus/dataload/GRA1617.DP +%%DATADIR%%/frmenus/dataload/GRADES.DP +%%DATADIR%%/frmenus/dataload/GRADES26.DP +%%DATADIR%%/frmenus/dataload/GRAVITY.DP +%%DATADIR%%/frmenus/dataload/GROCERY.DP +%%DATADIR%%/frmenus/dataload/HABER1.DP +%%DATADIR%%/frmenus/dataload/HAHN.DP +%%DATADIR%%/frmenus/dataload/HAHN1.DP +%%DATADIR%%/frmenus/dataload/HALD647.DP +%%DATADIR%%/frmenus/dataload/HAMAKER.DP +%%DATADIR%%/frmenus/dataload/HAYES1.DP +%%DATADIR%%/frmenus/dataload/HAZE.DP +%%DATADIR%%/frmenus/dataload/HOSPITAL.DP +%%DATADIR%%/frmenus/dataload/HSU12.DP +%%DATADIR%%/frmenus/dataload/IRIS.DP +%%DATADIR%%/frmenus/dataload/JAHANMI2.DP +%%DATADIR%%/frmenus/dataload/JONES.DP +%%DATADIR%%/frmenus/dataload/KAUL.DP +%%DATADIR%%/frmenus/dataload/KEYWEST.DP +%%DATADIR%%/frmenus/dataload/KIRBY2.DP +%%DATADIR%%/frmenus/dataload/KRASNY1.DP +%%DATADIR%%/frmenus/dataload/LARCH.DP +%%DATADIR%%/frmenus/dataload/LEIGH4.DP +%%DATADIR%%/frmenus/dataload/LEW.DP +%%DATADIR%%/frmenus/dataload/LEW3.DP +%%DATADIR%%/frmenus/dataload/LEW4.DP +%%DATADIR%%/frmenus/dataload/LGN.DP +%%DATADIR%%/frmenus/dataload/LGNCEN.DP +%%DATADIR%%/frmenus/dataload/LIGHT.DP +%%DATADIR%%/frmenus/dataload/LIN.DP +%%DATADIR%%/frmenus/dataload/LITHOGRA.DP +%%DATADIR%%/frmenus/dataload/LONGLEY.DP +%%DATADIR%%/frmenus/dataload/LOTTERY3.DP +%%DATADIR%%/frmenus/dataload/LOTTERY4.DP +%%DATADIR%%/frmenus/dataload/LUTHER.DP +%%DATADIR%%/frmenus/dataload/MAMMALWT.DP +%%DATADIR%%/frmenus/dataload/MANDEL.DP +%%DATADIR%%/frmenus/dataload/MARSHAK.DP +%%DATADIR%%/frmenus/dataload/MAVRO.DP +%%DATADIR%%/frmenus/dataload/MICHELSO.DP +%%DATADIR%%/frmenus/dataload/MINIVAN.DP +%%DATADIR%%/frmenus/dataload/MISRA1.DP +%%DATADIR%%/frmenus/dataload/MLCO2.DP +%%DATADIR%%/frmenus/dataload/MLCO2MON.DP +%%DATADIR%%/frmenus/dataload/MLF11.DP +%%DATADIR%%/frmenus/dataload/MLF12.DP +%%DATADIR%%/frmenus/dataload/MLN2O.DP +%%DATADIR%%/frmenus/dataload/MONTGOME.DP +%%DATADIR%%/frmenus/dataload/MORALES.DP +%%DATADIR%%/frmenus/dataload/MORALES2.DP +%%DATADIR%%/frmenus/dataload/MOUSE.DP +%%DATADIR%%/frmenus/dataload/MPC61.DP +%%DATADIR%%/frmenus/dataload/MPC62.DP +%%DATADIR%%/frmenus/dataload/MPC63.DP +%%DATADIR%%/frmenus/dataload/MPG.DP +%%DATADIR%%/frmenus/dataload/NATR102.DP +%%DATADIR%%/frmenus/dataload/NATR1219.DP +%%DATADIR%%/frmenus/dataload/NATR124.DP +%%DATADIR%%/frmenus/dataload/NATR1314.DP +%%DATADIR%%/frmenus/dataload/NATR1323.DP +%%DATADIR%%/frmenus/dataload/NATR1333.DP +%%DATADIR%%/frmenus/dataload/NATR134.DP +%%DATADIR%%/frmenus/dataload/NATR1341.DP +%%DATADIR%%/frmenus/dataload/NATR151.DP +%%DATADIR%%/frmenus/dataload/NATR154.DP +%%DATADIR%%/frmenus/dataload/NATR156.DP +%%DATADIR%%/frmenus/dataload/NATR156.Dp +%%DATADIR%%/frmenus/dataload/NATR1611.DP +%%DATADIR%%/frmenus/dataload/NATR1613.DP +%%DATADIR%%/frmenus/dataload/NATR162.DP +%%DATADIR%%/frmenus/dataload/NATR164.DP +%%DATADIR%%/frmenus/dataload/NATR166.DP +%%DATADIR%%/frmenus/dataload/NATR168.DP +%%DATADIR%%/frmenus/dataload/NATR169.DP +%%DATADIR%%/frmenus/dataload/NATR21.DP +%%DATADIR%%/frmenus/dataload/NATR26.DP +%%DATADIR%%/frmenus/dataload/NATR323.DP +%%DATADIR%%/frmenus/dataload/NATR326.DP +%%DATADIR%%/frmenus/dataload/NATR332.DP +%%DATADIR%%/frmenus/dataload/NATR334.DP +%%DATADIR%%/frmenus/dataload/NATR338.DP +%%DATADIR%%/frmenus/dataload/NATR341.DP +%%DATADIR%%/frmenus/dataload/NATR41.DP +%%DATADIR%%/frmenus/dataload/NATR45.DP +%%DATADIR%%/frmenus/dataload/NATR48.DP +%%DATADIR%%/frmenus/dataload/NATR511.DP +%%DATADIR%%/frmenus/dataload/NATR522.DP +%%DATADIR%%/frmenus/dataload/NATR527.DP +%%DATADIR%%/frmenus/dataload/NATR533.DP +%%DATADIR%%/frmenus/dataload/NATR540.DP +%%DATADIR%%/frmenus/dataload/NATR627.DP +%%DATADIR%%/frmenus/dataload/NATR65.DP +%%DATADIR%%/frmenus/dataload/NATR92.DP +%%DATADIR%%/frmenus/dataload/NATR94.DP +%%DATADIR%%/frmenus/dataload/NATR96.DP +%%DATADIR%%/frmenus/dataload/NATR99.DP +%%DATADIR%%/frmenus/dataload/NBSPOW1.DP +%%DATADIR%%/frmenus/dataload/NBSPOW2.DP +%%DATADIR%%/frmenus/dataload/NBSPOW3.DP +%%DATADIR%%/frmenus/dataload/NEGIZ3.DP +%%DATADIR%%/frmenus/dataload/NELS105.DP +%%DATADIR%%/frmenus/dataload/NELS138.DP +%%DATADIR%%/frmenus/dataload/NELS144.DP +%%DATADIR%%/frmenus/dataload/NELS28.DP +%%DATADIR%%/frmenus/dataload/NELS393.DP +%%DATADIR%%/frmenus/dataload/NELS421.DP +%%DATADIR%%/frmenus/dataload/NELSNIST.DP +%%DATADIR%%/frmenus/dataload/NELSON.DP +%%DATADIR%%/frmenus/dataload/NICKEL.DP +%%DATADIR%%/frmenus/dataload/NOR.DP +%%DATADIR%%/frmenus/dataload/NORCEN.DP +%%DATADIR%%/frmenus/dataload/NORRIS6.DP +%%DATADIR%%/frmenus/dataload/NUT.DP +%%DATADIR%%/frmenus/dataload/NWF11.DP +%%DATADIR%%/frmenus/dataload/NWF12.DP +%%DATADIR%%/frmenus/dataload/NWN2O.DP +%%DATADIR%%/frmenus/dataload/OIL.DP +%%DATADIR%%/frmenus/dataload/OLDTOOLS.DP +%%DATADIR%%/frmenus/dataload/OLYMPICS.DP +%%DATADIR%%/frmenus/dataload/PBCO2.DP +%%DATADIR%%/frmenus/dataload/PBF11.DP +%%DATADIR%%/frmenus/dataload/PBF12.DP +%%DATADIR%%/frmenus/dataload/PBN2O.DP +%%DATADIR%%/frmenus/dataload/PENTAGON.DP +%%DATADIR%%/frmenus/dataload/PERIODIC.DP +%%DATADIR%%/frmenus/dataload/PLANETS.DP +%%DATADIR%%/frmenus/dataload/PLANT.DP +%%DATADIR%%/frmenus/dataload/PLASTIC.DP +%%DATADIR%%/frmenus/dataload/PONTIUS.DP +%%DATADIR%%/frmenus/dataload/PREMIUMS.DP +%%DATADIR%%/frmenus/dataload/PRIMESM.DP +%%DATADIR%%/frmenus/dataload/PRISON.DP +%%DATADIR%%/frmenus/dataload/PROCESS1.DP +%%DATADIR%%/frmenus/dataload/PROCESS2.DP +%%DATADIR%%/frmenus/dataload/PROFSAL.DP +%%DATADIR%%/frmenus/dataload/PUMPKIN.DP +%%DATADIR%%/frmenus/dataload/PUNCH.DP +%%DATADIR%%/frmenus/dataload/PUNCH2.DP +%%DATADIR%%/frmenus/dataload/QUASIBIE.DP +%%DATADIR%%/frmenus/dataload/QUINLAN.DP +%%DATADIR%%/frmenus/dataload/RAMUS.DP +%%DATADIR%%/frmenus/dataload/RANDN.DP +%%DATADIR%%/frmenus/dataload/RANDU.DP +%%DATADIR%%/frmenus/dataload/RANDWALK.DP +%%DATADIR%%/frmenus/dataload/REHM.DP +%%DATADIR%%/frmenus/dataload/ROSSIT11.DP +%%DATADIR%%/frmenus/dataload/ROSSIT15.DP +%%DATADIR%%/frmenus/dataload/ROSSIT16.DP +%%DATADIR%%/frmenus/dataload/ROSSITE2.DP +%%DATADIR%%/frmenus/dataload/ROSZMAN1.DP +%%DATADIR%%/frmenus/dataload/SALARIES.DP +%%DATADIR%%/frmenus/dataload/SALES.DP +%%DATADIR%%/frmenus/dataload/SCHANTZ.DP +%%DATADIR%%/frmenus/dataload/SCHILL11.DP +%%DATADIR%%/frmenus/dataload/SCOTT.DP +%%DATADIR%%/frmenus/dataload/SERUM.DP +%%DATADIR%%/frmenus/dataload/SHEESLE2.DP +%%DATADIR%%/frmenus/dataload/SHEESLEY.DP +%%DATADIR%%/frmenus/dataload/SHELFLIF.DP +%%DATADIR%%/frmenus/dataload/SIMIU.DP +%%DATADIR%%/frmenus/dataload/SIMON.DP +%%DATADIR%%/frmenus/dataload/SIN1.DP +%%DATADIR%%/frmenus/dataload/SIN2.DP +%%DATADIR%%/frmenus/dataload/SIN3.DP +%%DATADIR%%/frmenus/dataload/SIN4.DP +%%DATADIR%%/frmenus/dataload/SINNOISE.DP +%%DATADIR%%/frmenus/dataload/SINSIN.DP +%%DATADIR%%/frmenus/dataload/SMALL14.DP +%%DATADIR%%/frmenus/dataload/SO2.DP +%%DATADIR%%/frmenus/dataload/SOULEN.DP +%%DATADIR%%/frmenus/dataload/SOULEN0.DP +%%DATADIR%%/frmenus/dataload/SOYBURGR.DP +%%DATADIR%%/frmenus/dataload/SPAGON1.DP +%%DATADIR%%/frmenus/dataload/SPAGON2.DP +%%DATADIR%%/frmenus/dataload/SPAGON3.DP +%%DATADIR%%/frmenus/dataload/SPAGON4.DP +%%DATADIR%%/frmenus/dataload/SPCO2.DP +%%DATADIR%%/frmenus/dataload/SPF11.DP +%%DATADIR%%/frmenus/dataload/SPF12.DP +%%DATADIR%%/frmenus/dataload/SPIEGEL.DP +%%DATADIR%%/frmenus/dataload/SPLETT2.DP +%%DATADIR%%/frmenus/dataload/SPLETT3.DP +%%DATADIR%%/frmenus/dataload/SPLETT4.DP +%%DATADIR%%/frmenus/dataload/SPN2O.DP +%%DATADIR%%/frmenus/dataload/STENBAKK.DP +%%DATADIR%%/frmenus/dataload/SULFURIC.DP +%%DATADIR%%/frmenus/dataload/SUNSPOT.DP +%%DATADIR%%/frmenus/dataload/SUNSPOT2.DP +%%DATADIR%%/frmenus/dataload/SUPERCON.DP +%%DATADIR%%/frmenus/dataload/SWANSON1.DP +%%DATADIR%%/frmenus/dataload/T2CC.DP +%%DATADIR%%/frmenus/dataload/TABLE161.DP +%%DATADIR%%/frmenus/dataload/TABLE164.DP +%%DATADIR%%/frmenus/dataload/TABLE323.DP +%%DATADIR%%/frmenus/dataload/TABLE324.DP +%%DATADIR%%/frmenus/dataload/TABLE346.DP +%%DATADIR%%/frmenus/dataload/TABLE355.DP +%%DATADIR%%/frmenus/dataload/TABLE423.DP +%%DATADIR%%/frmenus/dataload/TABLE425.DP +%%DATADIR%%/frmenus/dataload/TABLE426.DP +%%DATADIR%%/frmenus/dataload/TABLE442.DP +%%DATADIR%%/frmenus/dataload/TABLE444.DP +%%DATADIR%%/frmenus/dataload/TABLE445.DP +%%DATADIR%%/frmenus/dataload/TABLE541.DP +%%DATADIR%%/frmenus/dataload/TABLE542.DP +%%DATADIR%%/frmenus/dataload/TABLE543.DP +%%DATADIR%%/frmenus/dataload/TABLE561.DP +%%DATADIR%%/frmenus/dataload/TABLE631.DP +%%DATADIR%%/frmenus/dataload/TABLE733.DP +%%DATADIR%%/frmenus/dataload/TABLE742.DP +%%DATADIR%%/frmenus/dataload/THERMOM.DP +%%DATADIR%%/frmenus/dataload/THURBER.DP +%%DATADIR%%/frmenus/dataload/TOB128.DP +%%DATADIR%%/frmenus/dataload/TOB143.DP +%%DATADIR%%/frmenus/dataload/TOB150.DP +%%DATADIR%%/frmenus/dataload/TOB152.DP +%%DATADIR%%/frmenus/dataload/TOB159.DP +%%DATADIR%%/frmenus/dataload/TOB161.DP +%%DATADIR%%/frmenus/dataload/TOB171.DP +%%DATADIR%%/frmenus/dataload/TOB179.DP +%%DATADIR%%/frmenus/dataload/TOB201.DP +%%DATADIR%%/frmenus/dataload/TOB215.DP +%%DATADIR%%/frmenus/dataload/TOB216A.DP +%%DATADIR%%/frmenus/dataload/TOB216B.DP +%%DATADIR%%/frmenus/dataload/TOB3.DP +%%DATADIR%%/frmenus/dataload/TOB305.DP +%%DATADIR%%/frmenus/dataload/TOB312.DP +%%DATADIR%%/frmenus/dataload/TOB332.DP +%%DATADIR%%/frmenus/dataload/TOB335.DP +%%DATADIR%%/frmenus/dataload/TOB336.DP +%%DATADIR%%/frmenus/dataload/TOB346.DP +%%DATADIR%%/frmenus/dataload/TOB351.DP +%%DATADIR%%/frmenus/dataload/TOB354.DP +%%DATADIR%%/frmenus/dataload/TOB360.DP +%%DATADIR%%/frmenus/dataload/TOB365.DP +%%DATADIR%%/frmenus/dataload/TOB366.DP +%%DATADIR%%/frmenus/dataload/TOB375.DP +%%DATADIR%%/frmenus/dataload/TOB384.DP +%%DATADIR%%/frmenus/dataload/TOB50.DP +%%DATADIR%%/frmenus/dataload/TOB62.DP +%%DATADIR%%/frmenus/dataload/TOB99.DP +%%DATADIR%%/frmenus/dataload/TRACK.DP +%%DATADIR%%/frmenus/dataload/TRACY.DP +%%DATADIR%%/frmenus/dataload/TURKEY.DP +%%DATADIR%%/frmenus/dataload/UGIANSKY.DP +%%DATADIR%%/frmenus/dataload/USADEBT.DP +%%DATADIR%%/frmenus/dataload/USADEFIC.DP +%%DATADIR%%/frmenus/dataload/USEDCARS.DP +%%DATADIR%%/frmenus/dataload/VANGEL1.DP +%%DATADIR%%/frmenus/dataload/VANGEL2.DP +%%DATADIR%%/frmenus/dataload/VANGEL31.DP +%%DATADIR%%/frmenus/dataload/VANGEL32.DP +%%DATADIR%%/frmenus/dataload/VANGEL33.DP +%%DATADIR%%/frmenus/dataload/VANGEL34.DP +%%DATADIR%%/frmenus/dataload/VANGEL5.DP +%%DATADIR%%/frmenus/dataload/VIBRATE.DP +%%DATADIR%%/frmenus/dataload/WAMPLER1.DP +%%DATADIR%%/frmenus/dataload/WAMPLER2.DP +%%DATADIR%%/frmenus/dataload/WASHDC.DP +%%DATADIR%%/frmenus/dataload/WATTERS.DP +%%DATADIR%%/frmenus/dataload/WEBER.DP +%%DATADIR%%/frmenus/dataload/WEIBBURY.DP +%%DATADIR%%/frmenus/dataload/WEICEN.DP +%%DATADIR%%/frmenus/dataload/WOOLLEY.DP +%%DATADIR%%/frmenus/dataload/WRIGHT11.DP +%%DATADIR%%/frmenus/dataload/ZARR13.DP +%%DATADIR%%/frmenus/dataload/ZARR14.DP +%%DATADIR%%/frmenus/dataload/ZARR15.DP +%%DATADIR%%/frmenus/dataload/ZARR94.DP +%%DATADIR%%/frmenus/dataload/bhh.top +%%DATADIR%%/frmenus/dataload/bhh1.top +%%DATADIR%%/frmenus/dataload/bhh10.top +%%DATADIR%%/frmenus/dataload/bhh11.top +%%DATADIR%%/frmenus/dataload/bhh12.top +%%DATADIR%%/frmenus/dataload/bhh13.top +%%DATADIR%%/frmenus/dataload/bhh14.top +%%DATADIR%%/frmenus/dataload/bhh15.top +%%DATADIR%%/frmenus/dataload/bhh16.top +%%DATADIR%%/frmenus/dataload/bhh17.top +%%DATADIR%%/frmenus/dataload/bhh18.top +%%DATADIR%%/frmenus/dataload/bhh2.top +%%DATADIR%%/frmenus/dataload/bhh3.top +%%DATADIR%%/frmenus/dataload/bhh4.top +%%DATADIR%%/frmenus/dataload/bhh5.top +%%DATADIR%%/frmenus/dataload/bhh6.top +%%DATADIR%%/frmenus/dataload/bhh7.top +%%DATADIR%%/frmenus/dataload/bhh8.top +%%DATADIR%%/frmenus/dataload/bhh9.top +%%DATADIR%%/frmenus/dataload/bhhintro.top +%%DATADIR%%/frmenus/dataload/core.top +%%DATADIR%%/frmenus/dataload/dataload.sav +%%DATADIR%%/frmenus/dataload/dataload.top +%%DATADIR%%/frmenus/dataload/dataload.top.old +%%DATADIR%%/frmenus/dataload/dex.top +%%DATADIR%%/frmenus/dataload/dex2k.top +%%DATADIR%%/frmenus/dataload/dex2kmp.top +%%DATADIR%%/frmenus/dataload/dexcomp.top +%%DATADIR%%/frmenus/dataload/dexmix.top +%%DATADIR%%/frmenus/dataload/dexopt.top +%%DATADIR%%/frmenus/dataload/dexpb.top +%%DATADIR%%/frmenus/dataload/dexreg.top +%%DATADIR%%/frmenus/dataload/dextag.top +%%DATADIR%%/frmenus/dataload/eva.top +%%DATADIR%%/frmenus/dataload/evacast.top +%%DATADIR%%/frmenus/dataload/evanist.top +%%DATADIR%%/frmenus/dataload/evaothe.top +%%DATADIR%%/frmenus/dataload/gra1ch1.top +%%DATADIR%%/frmenus/dataload/gra1ch2.top +%%DATADIR%%/frmenus/dataload/gra1ch3.top +%%DATADIR%%/frmenus/dataload/gra1ch4.top +%%DATADIR%%/frmenus/dataload/gra1ch5.top +%%DATADIR%%/frmenus/dataload/gra1ch6.top +%%DATADIR%%/frmenus/dataload/gra1ch7.top +%%DATADIR%%/frmenus/dataload/gra1ch8.top +%%DATADIR%%/frmenus/dataload/gra1ch9.top +%%DATADIR%%/frmenus/dataload/gra1intr.top +%%DATADIR%%/frmenus/dataload/grayiye1.top +%%DATADIR%%/frmenus/dataload/grayiye2.top +%%DATADIR%%/frmenus/dataload/handbook.top +%%DATADIR%%/frmenus/dataload/imag.top +%%DATADIR%%/frmenus/dataload/math.top +%%DATADIR%%/frmenus/dataload/mfac.top +%%DATADIR%%/frmenus/dataload/mvar.top +%%DATADIR%%/frmenus/dataload/natr1.top +%%DATADIR%%/frmenus/dataload/natr10.top +%%DATADIR%%/frmenus/dataload/natr11.top +%%DATADIR%%/frmenus/dataload/natr12.top +%%DATADIR%%/frmenus/dataload/natr13.top +%%DATADIR%%/frmenus/dataload/natr14.top +%%DATADIR%%/frmenus/dataload/natr15.top +%%DATADIR%%/frmenus/dataload/natr16.top +%%DATADIR%%/frmenus/dataload/natr17.top +%%DATADIR%%/frmenus/dataload/natr18.top +%%DATADIR%%/frmenus/dataload/natr19.top +%%DATADIR%%/frmenus/dataload/natr2.top +%%DATADIR%%/frmenus/dataload/natr20.top +%%DATADIR%%/frmenus/dataload/natr21.top +%%DATADIR%%/frmenus/dataload/natr22.top +%%DATADIR%%/frmenus/dataload/natr23.top +%%DATADIR%%/frmenus/dataload/natr3.top +%%DATADIR%%/frmenus/dataload/natr4.top +%%DATADIR%%/frmenus/dataload/natr5.top +%%DATADIR%%/frmenus/dataload/natr6.top +%%DATADIR%%/frmenus/dataload/natr7.top +%%DATADIR%%/frmenus/dataload/natr8.top +%%DATADIR%%/frmenus/dataload/natr9.top +%%DATADIR%%/frmenus/dataload/natrella.top +%%DATADIR%%/frmenus/dataload/natrintr.top +%%DATADIR%%/frmenus/dataload/orthdist.top +%%DATADIR%%/frmenus/dataload/prob.top +%%DATADIR%%/frmenus/dataload/qual.top +%%DATADIR%%/frmenus/dataload/qual7old.top +%%DATADIR%%/frmenus/dataload/qualcoch.top +%%DATADIR%%/frmenus/dataload/qualewma.top +%%DATADIR%%/frmenus/dataload/qualpci.top +%%DATADIR%%/frmenus/dataload/qualtag.top +%%DATADIR%%/frmenus/dataload/recipe.top +%%DATADIR%%/frmenus/dataload/reg.top +%%DATADIR%%/frmenus/dataload/reg1n.top +%%DATADIR%%/frmenus/dataload/reg1p.top +%%DATADIR%%/frmenus/dataload/regmv.top +%%DATADIR%%/frmenus/dataload/reli.top +%%DATADIR%%/frmenus/dataload/reliacel.top +%%DATADIR%%/frmenus/dataload/relibury.top +%%DATADIR%%/frmenus/dataload/relicens.top +%%DATADIR%%/frmenus/dataload/relinels.top +%%DATADIR%%/frmenus/dataload/relinist.top +%%DATADIR%%/frmenus/dataload/relinonr.top +%%DATADIR%%/frmenus/dataload/reliothe.top +%%DATADIR%%/frmenus/dataload/relirene.top +%%DATADIR%%/frmenus/dataload/relitobi.top +%%DATADIR%%/frmenus/dataload/reliunce.top +%%DATADIR%%/frmenus/dataload/rfrdata.top +%%DATADIR%%/frmenus/dataload/sematech.top +%%DATADIR%%/frmenus/dataload/spline.top +%%DATADIR%%/frmenus/dataload/stsc.top +%%DATADIR%%/frmenus/dataload/stscano1.top +%%DATADIR%%/frmenus/dataload/stscano2.top +%%DATADIR%%/frmenus/dataload/stsccomp.top +%%DATADIR%%/frmenus/dataload/stsccont.top +%%DATADIR%%/frmenus/dataload/stscdex1.top +%%DATADIR%%/frmenus/dataload/stscdex2.top +%%DATADIR%%/frmenus/dataload/stsceda1.top +%%DATADIR%%/frmenus/dataload/stsceda2.top +%%DATADIR%%/frmenus/dataload/stscfit1.top +%%DATADIR%%/frmenus/dataload/stscfit2.top +%%DATADIR%%/frmenus/dataload/stschypo.top +%%DATADIR%%/frmenus/dataload/stscinte.top +%%DATADIR%%/frmenus/dataload/stscintr.top +%%DATADIR%%/frmenus/dataload/stscsamp.top +%%DATADIR%%/frmenus/dataload/time.top +%%DATADIR%%/frmenus/dataload/time2var.top +%%DATADIR%%/frmenus/dataload/timebj.top +%%DATADIR%%/frmenus/dataload/timedds.top +%%DATADIR%%/frmenus/dataload/timenist.top +%%DATADIR%%/frmenus/dataload/timenoaa.top +%%DATADIR%%/frmenus/dataload/timeothe.top +%%DATADIR%%/frmenus/dataload/unce.top +%%DATADIR%%/frmenus/dataload/univ.top +%%DATADIR%%/frmenus/dataload/univnatr.top +%%DATADIR%%/frmenus/dataload/univnist.top +%%DATADIR%%/frmenus/dataload/univothe.top +%%DATADIR%%/frmenus/dataload/univsema.top +%%DATADIR%%/frmenus/dataloex/1fac.top +%%DATADIR%%/frmenus/dataloex/1facnist.top +%%DATADIR%%/frmenus/dataloex/2fac.top +%%DATADIR%%/frmenus/dataloex/3fac.top +%%DATADIR%%/frmenus/dataloex/4fac.top +%%DATADIR%%/frmenus/dataloex/5fac.top +%%DATADIR%%/frmenus/dataloex/ABERN17.DP +%%DATADIR%%/frmenus/dataloex/ABERN35.DP +%%DATADIR%%/frmenus/dataloex/ABERN43.DP +%%DATADIR%%/frmenus/dataloex/AC.DP +%%DATADIR%%/frmenus/dataloex/AMRF.DP +%%DATADIR%%/frmenus/dataloex/ASCO2.DP +%%DATADIR%%/frmenus/dataloex/ASF11.DP +%%DATADIR%%/frmenus/dataloex/ASF12.DP +%%DATADIR%%/frmenus/dataloex/ASN2O.DP +%%DATADIR%%/frmenus/dataloex/AUTO79.DP +%%DATADIR%%/frmenus/dataloex/AUTO83.DP +%%DATADIR%%/frmenus/dataloex/AUTO83B.DP +%%DATADIR%%/frmenus/dataloex/BAKER.DP +%%DATADIR%%/frmenus/dataloex/BATTADD2.DP +%%DATADIR%%/frmenus/dataloex/BATTADD3.DP +%%DATADIR%%/frmenus/dataloex/BENNETT.DP +%%DATADIR%%/frmenus/dataloex/BENNETT5.DP +%%DATADIR%%/frmenus/dataloex/BERGER1.DP +%%DATADIR%%/frmenus/dataloex/BIOMED3.DP +%%DATADIR%%/frmenus/dataloex/BOWEN.DP +%%DATADIR%%/frmenus/dataloex/BOXAUTO.DP +%%DATADIR%%/frmenus/dataloex/BOXBIKE2.DP +%%DATADIR%%/frmenus/dataloex/BOXBIKE3.DP +%%DATADIR%%/frmenus/dataloex/BOXBLOOD.DP +%%DATADIR%%/frmenus/dataloex/BOXBOD.DP +%%DATADIR%%/frmenus/dataloex/BOXCAKE.DP +%%DATADIR%%/frmenus/dataloex/BOXCAKE2.DP +%%DATADIR%%/frmenus/dataloex/BOXCHEM.DP +%%DATADIR%%/frmenus/dataloex/BOXCHEM2.DP +%%DATADIR%%/frmenus/dataloex/BOXCLEA2.DP +%%DATADIR%%/frmenus/dataloex/BOXCLEAN.DP +%%DATADIR%%/frmenus/dataloex/BOXCLOTH.DP +%%DATADIR%%/frmenus/dataloex/BOXFILT.DP +%%DATADIR%%/frmenus/dataloex/BOXFILT2.DP +%%DATADIR%%/frmenus/dataloex/BOXINDUS.DP +%%DATADIR%%/frmenus/dataloex/BOXJE142.DP +%%DATADIR%%/frmenus/dataloex/BOXJENK1.DP +%%DATADIR%%/frmenus/dataloex/BOXJENK2.DP +%%DATADIR%%/frmenus/dataloex/BOXMOLD.DP +%%DATADIR%%/frmenus/dataloex/BOXPENIC.DP +%%DATADIR%%/frmenus/dataloex/BOXPILOT.DP +%%DATADIR%%/frmenus/dataloex/BOXPOISO.DP +%%DATADIR%%/frmenus/dataloex/BOXRADAR.DP +%%DATADIR%%/frmenus/dataloex/BOXRATS.DP +%%DATADIR%%/frmenus/dataloex/BOXREAC2.DP +%%DATADIR%%/frmenus/dataloex/BOXREACT.DP +%%DATADIR%%/frmenus/dataloex/BOXSHOES.DP +%%DATADIR%%/frmenus/dataloex/BOXSOLAR.DP +%%DATADIR%%/frmenus/dataloex/BOXSPRAY.DP +%%DATADIR%%/frmenus/dataloex/BOXSPRI2.DP +%%DATADIR%%/frmenus/dataloex/BOXSPRI3.DP +%%DATADIR%%/frmenus/dataloex/BOXSPRIN.DP +%%DATADIR%%/frmenus/dataloex/BOXTOMAT.DP +%%DATADIR%%/frmenus/dataloex/BOXWELD.DP +%%DATADIR%%/frmenus/dataloex/BOXYIEL2.DP +%%DATADIR%%/frmenus/dataloex/BOXYIEL3.DP +%%DATADIR%%/frmenus/dataloex/BOXYIELD.DP +%%DATADIR%%/frmenus/dataloex/BRAIN.DP +%%DATADIR%%/frmenus/dataloex/CASTIL10.DP +%%DATADIR%%/frmenus/dataloex/CASTIL11.DP +%%DATADIR%%/frmenus/dataloex/CASTIL12.DP +%%DATADIR%%/frmenus/dataloex/CASTIL13.DP +%%DATADIR%%/frmenus/dataloex/CASTIL14.DP +%%DATADIR%%/frmenus/dataloex/CASTILL1.DP +%%DATADIR%%/frmenus/dataloex/CASTILL2.DP +%%DATADIR%%/frmenus/dataloex/CASTILL3.DP +%%DATADIR%%/frmenus/dataloex/CASTILL4.DP +%%DATADIR%%/frmenus/dataloex/CASTILL5.DP +%%DATADIR%%/frmenus/dataloex/CASTILL6.DP +%%DATADIR%%/frmenus/dataloex/CASTILL7.DP +%%DATADIR%%/frmenus/dataloex/CASTILL8.DP +%%DATADIR%%/frmenus/dataloex/CASTILL9.DP +%%DATADIR%%/frmenus/dataloex/CCC.DP +%%DATADIR%%/frmenus/dataloex/CCP.DP +%%DATADIR%%/frmenus/dataloex/CCPN.DP +%%DATADIR%%/frmenus/dataloex/CCU.DP +%%DATADIR%%/frmenus/dataloex/CCXBAR.DP +%%DATADIR%%/frmenus/dataloex/CHOI.DP +%%DATADIR%%/frmenus/dataloex/CHOI2.DP +%%DATADIR%%/frmenus/dataloex/CHOLEST1.DP +%%DATADIR%%/frmenus/dataloex/CHWIRUT1.DP +%%DATADIR%%/frmenus/dataloex/CHWIRUT2.DP +%%DATADIR%%/frmenus/dataloex/CLARK0.DP +%%DATADIR%%/frmenus/dataloex/CLEAR.DP +%%DATADIR%%/frmenus/dataloex/CONSUMPR.DP +%%DATADIR%%/frmenus/dataloex/CROARK2.DP +%%DATADIR%%/frmenus/dataloex/CROARK3.DP +%%DATADIR%%/frmenus/dataloex/CROARKIN.DP +%%DATADIR%%/frmenus/dataloex/CUBE.DP +%%DATADIR%%/frmenus/dataloex/CURRIE.DP +%%DATADIR%%/frmenus/dataloex/DDS1.DP +%%DATADIR%%/frmenus/dataloex/DDS10.DP +%%DATADIR%%/frmenus/dataloex/DDS11.DP +%%DATADIR%%/frmenus/dataloex/DDS12.DP +%%DATADIR%%/frmenus/dataloex/DDS13.DP +%%DATADIR%%/frmenus/dataloex/DDS14.DP +%%DATADIR%%/frmenus/dataloex/DDS15.DP +%%DATADIR%%/frmenus/dataloex/DDS16.DP +%%DATADIR%%/frmenus/dataloex/DDS17.DP +%%DATADIR%%/frmenus/dataloex/DDS18.DP +%%DATADIR%%/frmenus/dataloex/DDS19.DP +%%DATADIR%%/frmenus/dataloex/DDS2.DP +%%DATADIR%%/frmenus/dataloex/DDS20.DP +%%DATADIR%%/frmenus/dataloex/DDS21.DP +%%DATADIR%%/frmenus/dataloex/DDS3.DP +%%DATADIR%%/frmenus/dataloex/DDS4.DP +%%DATADIR%%/frmenus/dataloex/DDS5.DP +%%DATADIR%%/frmenus/dataloex/DDS6.DP +%%DATADIR%%/frmenus/dataloex/DDS7.DP +%%DATADIR%%/frmenus/dataloex/DDS8.DP +%%DATADIR%%/frmenus/dataloex/DDS9.DP +%%DATADIR%%/frmenus/dataloex/DORKO4.DP +%%DATADIR%%/frmenus/dataloex/DRAFT69B.DP +%%DATADIR%%/frmenus/dataloex/DZIUBA.DP +%%DATADIR%%/frmenus/dataloex/ECKERLE4.DP +%%DATADIR%%/frmenus/dataloex/EHRSTEIN.DP +%%DATADIR%%/frmenus/dataloex/ELNINO.DP +%%DATADIR%%/frmenus/dataloex/FLICKER.DP +%%DATADIR%%/frmenus/dataloex/FLURY5.DP +%%DATADIR%%/frmenus/dataloex/FREQPRIM.DP +%%DATADIR%%/frmenus/dataloex/FULLER2.DP +%%DATADIR%%/frmenus/dataloex/FUNNEL5A.DP +%%DATADIR%%/frmenus/dataloex/FUNNEL5B.DP +%%DATADIR%%/frmenus/dataloex/FUNNEL5C.DP +%%DATADIR%%/frmenus/dataloex/GARBOCZI.DP +%%DATADIR%%/frmenus/dataloex/GEAR.DP +%%DATADIR%%/frmenus/dataloex/GNP.DP +%%DATADIR%%/frmenus/dataloex/GRA1326.DP +%%DATADIR%%/frmenus/dataloex/GRA1617.DP +%%DATADIR%%/frmenus/dataloex/HABER1.DP +%%DATADIR%%/frmenus/dataloex/HAHN.DP +%%DATADIR%%/frmenus/dataloex/HAHN1.DP +%%DATADIR%%/frmenus/dataloex/HALD647.DP +%%DATADIR%%/frmenus/dataloex/HAMAKER.DP +%%DATADIR%%/frmenus/dataloex/HAYES1.DP +%%DATADIR%%/frmenus/dataloex/IRIS.DP +%%DATADIR%%/frmenus/dataloex/KAUL.DP +%%DATADIR%%/frmenus/dataloex/KEYWEST.DP +%%DATADIR%%/frmenus/dataloex/KIRBY2.DP +%%DATADIR%%/frmenus/dataloex/KRASNY1.DP +%%DATADIR%%/frmenus/dataloex/LEW.DP +%%DATADIR%%/frmenus/dataloex/LEW3.DP +%%DATADIR%%/frmenus/dataloex/LIN.DP +%%DATADIR%%/frmenus/dataloex/LONGLEY.DP +%%DATADIR%%/frmenus/dataloex/LOTTERY3.DP +%%DATADIR%%/frmenus/dataloex/LOTTERY4.DP +%%DATADIR%%/frmenus/dataloex/LUTHER.DP +%%DATADIR%%/frmenus/dataloex/MANDEL.DP +%%DATADIR%%/frmenus/dataloex/MARSHAK.DP +%%DATADIR%%/frmenus/dataloex/MAVRO.DP +%%DATADIR%%/frmenus/dataloex/MICHELSO.DP +%%DATADIR%%/frmenus/dataloex/MISRA1.DP +%%DATADIR%%/frmenus/dataloex/MLCO2.DP +%%DATADIR%%/frmenus/dataloex/MLCO2MON.DP +%%DATADIR%%/frmenus/dataloex/MLF11.DP +%%DATADIR%%/frmenus/dataloex/MLF12.DP +%%DATADIR%%/frmenus/dataloex/MLN2O.DP +%%DATADIR%%/frmenus/dataloex/MORALES.DP +%%DATADIR%%/frmenus/dataloex/MORALES2.DP +%%DATADIR%%/frmenus/dataloex/NATR21.DP +%%DATADIR%%/frmenus/dataloex/NATR26.DP +%%DATADIR%%/frmenus/dataloex/NATR323.DP +%%DATADIR%%/frmenus/dataloex/NATR326.DP +%%DATADIR%%/frmenus/dataloex/NATR332.DP +%%DATADIR%%/frmenus/dataloex/NATR334.DP +%%DATADIR%%/frmenus/dataloex/NATR338.DP +%%DATADIR%%/frmenus/dataloex/NATR341.DP +%%DATADIR%%/frmenus/dataloex/NATR41.DP +%%DATADIR%%/frmenus/dataloex/NATR45.DP +%%DATADIR%%/frmenus/dataloex/NATR48.DP +%%DATADIR%%/frmenus/dataloex/NATR511.DP +%%DATADIR%%/frmenus/dataloex/NATR522.DP +%%DATADIR%%/frmenus/dataloex/NATR527.DP +%%DATADIR%%/frmenus/dataloex/NATR533.DP +%%DATADIR%%/frmenus/dataloex/NATR540.DP +%%DATADIR%%/frmenus/dataloex/NATR627.DP +%%DATADIR%%/frmenus/dataloex/NATR65.DP +%%DATADIR%%/frmenus/dataloex/NBSPOW1.DP +%%DATADIR%%/frmenus/dataloex/NBSPOW2.DP +%%DATADIR%%/frmenus/dataloex/NBSPOW3.DP +%%DATADIR%%/frmenus/dataloex/NEGIZ3.DP +%%DATADIR%%/frmenus/dataloex/NELSON.DP +%%DATADIR%%/frmenus/dataloex/NORRIS6.DP +%%DATADIR%%/frmenus/dataloex/NUT.DP +%%DATADIR%%/frmenus/dataloex/NWF11.DP +%%DATADIR%%/frmenus/dataloex/NWF12.DP +%%DATADIR%%/frmenus/dataloex/NWN2O.DP +%%DATADIR%%/frmenus/dataloex/OIL.DP +%%DATADIR%%/frmenus/dataloex/OLDTOOLS.DP +%%DATADIR%%/frmenus/dataloex/PBCO2.DP +%%DATADIR%%/frmenus/dataloex/PBF11.DP +%%DATADIR%%/frmenus/dataloex/PBF12.DP +%%DATADIR%%/frmenus/dataloex/PBN2O.DP +%%DATADIR%%/frmenus/dataloex/PENTAGON.DP +%%DATADIR%%/frmenus/dataloex/PERIODIC.DP +%%DATADIR%%/frmenus/dataloex/PLANETS.DP +%%DATADIR%%/frmenus/dataloex/PONTIUS.DP +%%DATADIR%%/frmenus/dataloex/PRIMESM.DP +%%DATADIR%%/frmenus/dataloex/QUASIBIE.DP +%%DATADIR%%/frmenus/dataloex/QUINLAN.DP +%%DATADIR%%/frmenus/dataloex/RANDN.DP +%%DATADIR%%/frmenus/dataloex/RANDU.DP +%%DATADIR%%/frmenus/dataloex/RANDWALK.DP +%%DATADIR%%/frmenus/dataloex/REHM.DP +%%DATADIR%%/frmenus/dataloex/ROSZMAN1.DP +%%DATADIR%%/frmenus/dataloex/SHEESLE2.DP +%%DATADIR%%/frmenus/dataloex/SHEESLEY.DP +%%DATADIR%%/frmenus/dataloex/SIMIU.DP +%%DATADIR%%/frmenus/dataloex/SIN1.DP +%%DATADIR%%/frmenus/dataloex/SIN2.DP +%%DATADIR%%/frmenus/dataloex/SIN3.DP +%%DATADIR%%/frmenus/dataloex/SIN4.DP +%%DATADIR%%/frmenus/dataloex/SINSIN.DP +%%DATADIR%%/frmenus/dataloex/SMALL14.DP +%%DATADIR%%/frmenus/dataloex/SOULEN.DP +%%DATADIR%%/frmenus/dataloex/SOULEN0.DP +%%DATADIR%%/frmenus/dataloex/SPAGON1.DP +%%DATADIR%%/frmenus/dataloex/SPAGON2.DP +%%DATADIR%%/frmenus/dataloex/SPAGON3.DP +%%DATADIR%%/frmenus/dataloex/SPAGON4.DP +%%DATADIR%%/frmenus/dataloex/SPCO2.DP +%%DATADIR%%/frmenus/dataloex/SPF11.DP +%%DATADIR%%/frmenus/dataloex/SPF12.DP +%%DATADIR%%/frmenus/dataloex/SPIEGEL.DP +%%DATADIR%%/frmenus/dataloex/SPLETT2.DP +%%DATADIR%%/frmenus/dataloex/SPLETT3.DP +%%DATADIR%%/frmenus/dataloex/SPLETT4.DP +%%DATADIR%%/frmenus/dataloex/SPN2O.DP +%%DATADIR%%/frmenus/dataloex/STENBAKK.DP +%%DATADIR%%/frmenus/dataloex/SUNSPOT.DP +%%DATADIR%%/frmenus/dataloex/SUNSPOT2.DP +%%DATADIR%%/frmenus/dataloex/SUPERCON.DP +%%DATADIR%%/frmenus/dataloex/SWANSON1.DP +%%DATADIR%%/frmenus/dataloex/THURBER.DP +%%DATADIR%%/frmenus/dataloex/UGIANSKY.DP +%%DATADIR%%/frmenus/dataloex/USADEBT.DP +%%DATADIR%%/frmenus/dataloex/USADEFIC.DP +%%DATADIR%%/frmenus/dataloex/VANGEL1.DP +%%DATADIR%%/frmenus/dataloex/VANGEL2.DP +%%DATADIR%%/frmenus/dataloex/VANGEL5.DP +%%DATADIR%%/frmenus/dataloex/VIBRATE.DP +%%DATADIR%%/frmenus/dataloex/WAMPLER1.DP +%%DATADIR%%/frmenus/dataloex/WAMPLER2.DP +%%DATADIR%%/frmenus/dataloex/WASHDC.DP +%%DATADIR%%/frmenus/dataloex/WATTERS.DP +%%DATADIR%%/frmenus/dataloex/WEBER.DP +%%DATADIR%%/frmenus/dataloex/WOOLLEY.DP +%%DATADIR%%/frmenus/dataloex/WRIGHT11.DP +%%DATADIR%%/frmenus/dataloex/ZARR13.DP +%%DATADIR%%/frmenus/dataloex/ZARR14.DP +%%DATADIR%%/frmenus/dataloex/ZARR15.DP +%%DATADIR%%/frmenus/dataloex/bhh.top +%%DATADIR%%/frmenus/dataloex/bhh1.top +%%DATADIR%%/frmenus/dataloex/bhh10.top +%%DATADIR%%/frmenus/dataloex/bhh11.top +%%DATADIR%%/frmenus/dataloex/bhh12.top +%%DATADIR%%/frmenus/dataloex/bhh13.top +%%DATADIR%%/frmenus/dataloex/bhh14.top +%%DATADIR%%/frmenus/dataloex/bhh15.top +%%DATADIR%%/frmenus/dataloex/bhh16.top +%%DATADIR%%/frmenus/dataloex/bhh17.top +%%DATADIR%%/frmenus/dataloex/bhh18.top +%%DATADIR%%/frmenus/dataloex/bhh2.top +%%DATADIR%%/frmenus/dataloex/bhh3.top +%%DATADIR%%/frmenus/dataloex/bhh4.top +%%DATADIR%%/frmenus/dataloex/bhh5.top +%%DATADIR%%/frmenus/dataloex/bhh6.top +%%DATADIR%%/frmenus/dataloex/bhh7.top +%%DATADIR%%/frmenus/dataloex/bhh8.top +%%DATADIR%%/frmenus/dataloex/bhh9.top +%%DATADIR%%/frmenus/dataloex/bhhintro.top +%%DATADIR%%/frmenus/dataloex/core.top +%%DATADIR%%/frmenus/dataloex/dataloex.top +%%DATADIR%%/frmenus/dataloex/dex.top +%%DATADIR%%/frmenus/dataloex/dex2k.top +%%DATADIR%%/frmenus/dataloex/dex2kmp.top +%%DATADIR%%/frmenus/dataloex/dexcomp.top +%%DATADIR%%/frmenus/dataloex/dexmix.top +%%DATADIR%%/frmenus/dataloex/dexopt.top +%%DATADIR%%/frmenus/dataloex/dextag.top +%%DATADIR%%/frmenus/dataloex/eva.top +%%DATADIR%%/frmenus/dataloex/evacast.top +%%DATADIR%%/frmenus/dataloex/evanist.top +%%DATADIR%%/frmenus/dataloex/evaothe.top +%%DATADIR%%/frmenus/dataloex/gra1ch4.top +%%DATADIR%%/frmenus/dataloex/gra1ch9.top +%%DATADIR%%/frmenus/dataloex/gra1intr.top +%%DATADIR%%/frmenus/dataloex/grayiye1.top +%%DATADIR%%/frmenus/dataloex/grayiye2.top +%%DATADIR%%/frmenus/dataloex/imag.top +%%DATADIR%%/frmenus/dataloex/math.top +%%DATADIR%%/frmenus/dataloex/mfac.top +%%DATADIR%%/frmenus/dataloex/mvar.top +%%DATADIR%%/frmenus/dataloex/natr1.top +%%DATADIR%%/frmenus/dataloex/natr2.top +%%DATADIR%%/frmenus/dataloex/natr3.top +%%DATADIR%%/frmenus/dataloex/natr4.top +%%DATADIR%%/frmenus/dataloex/natr5.top +%%DATADIR%%/frmenus/dataloex/natr6.top +%%DATADIR%%/frmenus/dataloex/natrella.top +%%DATADIR%%/frmenus/dataloex/natrintr.top +%%DATADIR%%/frmenus/dataloex/prob.top +%%DATADIR%%/frmenus/dataloex/qual.top +%%DATADIR%%/frmenus/dataloex/qual7old.top +%%DATADIR%%/frmenus/dataloex/qualcoch.top +%%DATADIR%%/frmenus/dataloex/qualewma.top +%%DATADIR%%/frmenus/dataloex/qualpci.top +%%DATADIR%%/frmenus/dataloex/qualtag.top +%%DATADIR%%/frmenus/dataloex/reg.top +%%DATADIR%%/frmenus/dataloex/reg1n.top +%%DATADIR%%/frmenus/dataloex/reg1p.top +%%DATADIR%%/frmenus/dataloex/regmv.top +%%DATADIR%%/frmenus/dataloex/reli.top +%%DATADIR%%/frmenus/dataloex/relinist.top +%%DATADIR%%/frmenus/dataloex/reliothe.top +%%DATADIR%%/frmenus/dataloex/sematech.top +%%DATADIR%%/frmenus/dataloex/stsc.top +%%DATADIR%%/frmenus/dataloex/stscano1.top +%%DATADIR%%/frmenus/dataloex/stscano2.top +%%DATADIR%%/frmenus/dataloex/stsccomp.top +%%DATADIR%%/frmenus/dataloex/stsccont.top +%%DATADIR%%/frmenus/dataloex/stscdex1.top +%%DATADIR%%/frmenus/dataloex/stscdex2.top +%%DATADIR%%/frmenus/dataloex/stsceda1.top +%%DATADIR%%/frmenus/dataloex/stsceda2.top +%%DATADIR%%/frmenus/dataloex/stscfit1.top +%%DATADIR%%/frmenus/dataloex/stscfit2.top +%%DATADIR%%/frmenus/dataloex/stschypo.top +%%DATADIR%%/frmenus/dataloex/stscinte.top +%%DATADIR%%/frmenus/dataloex/stscintr.top +%%DATADIR%%/frmenus/dataloex/stscsamp.top +%%DATADIR%%/frmenus/dataloex/time.top +%%DATADIR%%/frmenus/dataloex/time2var.top +%%DATADIR%%/frmenus/dataloex/timebj.top +%%DATADIR%%/frmenus/dataloex/timedds.top +%%DATADIR%%/frmenus/dataloex/timenist.top +%%DATADIR%%/frmenus/dataloex/timenoaa.top +%%DATADIR%%/frmenus/dataloex/timeothe.top +%%DATADIR%%/frmenus/dataloex/unce.top +%%DATADIR%%/frmenus/dataloex/univ.top +%%DATADIR%%/frmenus/dataloex/univnatr.top +%%DATADIR%%/frmenus/dataloex/univnist.top +%%DATADIR%%/frmenus/dataloex/univothe.top +%%DATADIR%%/frmenus/dataloex/univsema.top +%%DATADIR%%/frmenus/dataprin/1fac.top +%%DATADIR%%/frmenus/dataprin/1facnist.top +%%DATADIR%%/frmenus/dataprin/2fac.top +%%DATADIR%%/frmenus/dataprin/3fac.top +%%DATADIR%%/frmenus/dataprin/4fac.top +%%DATADIR%%/frmenus/dataprin/5fac.top +%%DATADIR%%/frmenus/dataprin/ABERN17.DP +%%DATADIR%%/frmenus/dataprin/ABERN35.DP +%%DATADIR%%/frmenus/dataprin/ABERN43.DP +%%DATADIR%%/frmenus/dataprin/AC.DP +%%DATADIR%%/frmenus/dataprin/AMRF.DP +%%DATADIR%%/frmenus/dataprin/ASCO2.DP +%%DATADIR%%/frmenus/dataprin/ASF11.DP +%%DATADIR%%/frmenus/dataprin/ASF12.DP +%%DATADIR%%/frmenus/dataprin/ASN2O.DP +%%DATADIR%%/frmenus/dataprin/AUTO79.DP +%%DATADIR%%/frmenus/dataprin/AUTO83.DP +%%DATADIR%%/frmenus/dataprin/AUTO83B.DP +%%DATADIR%%/frmenus/dataprin/BAKER.DP +%%DATADIR%%/frmenus/dataprin/BATTADD2.DP +%%DATADIR%%/frmenus/dataprin/BATTADD3.DP +%%DATADIR%%/frmenus/dataprin/BENNETT.DP +%%DATADIR%%/frmenus/dataprin/BENNETT5.DP +%%DATADIR%%/frmenus/dataprin/BERGER1.DP +%%DATADIR%%/frmenus/dataprin/BIOMED3.DP +%%DATADIR%%/frmenus/dataprin/BOWEN.DP +%%DATADIR%%/frmenus/dataprin/BOXAUTO.DP +%%DATADIR%%/frmenus/dataprin/BOXBIKE2.DP +%%DATADIR%%/frmenus/dataprin/BOXBIKE3.DP +%%DATADIR%%/frmenus/dataprin/BOXBLOOD.DP +%%DATADIR%%/frmenus/dataprin/BOXBOD.DP +%%DATADIR%%/frmenus/dataprin/BOXCAKE.DP +%%DATADIR%%/frmenus/dataprin/BOXCAKE2.DP +%%DATADIR%%/frmenus/dataprin/BOXCHEM.DP +%%DATADIR%%/frmenus/dataprin/BOXCHEM2.DP +%%DATADIR%%/frmenus/dataprin/BOXCLEA2.DP +%%DATADIR%%/frmenus/dataprin/BOXCLEAN.DP +%%DATADIR%%/frmenus/dataprin/BOXCLOTH.DP +%%DATADIR%%/frmenus/dataprin/BOXFILT.DP +%%DATADIR%%/frmenus/dataprin/BOXFILT2.DP +%%DATADIR%%/frmenus/dataprin/BOXINDUS.DP +%%DATADIR%%/frmenus/dataprin/BOXJE142.DP +%%DATADIR%%/frmenus/dataprin/BOXJENK1.DP +%%DATADIR%%/frmenus/dataprin/BOXJENK2.DP +%%DATADIR%%/frmenus/dataprin/BOXMOLD.DP +%%DATADIR%%/frmenus/dataprin/BOXPENIC.DP +%%DATADIR%%/frmenus/dataprin/BOXPILOT.DP +%%DATADIR%%/frmenus/dataprin/BOXPOISO.DP +%%DATADIR%%/frmenus/dataprin/BOXRADAR.DP +%%DATADIR%%/frmenus/dataprin/BOXRATS.DP +%%DATADIR%%/frmenus/dataprin/BOXREAC2.DP +%%DATADIR%%/frmenus/dataprin/BOXREACT.DP +%%DATADIR%%/frmenus/dataprin/BOXSHOES.DP +%%DATADIR%%/frmenus/dataprin/BOXSOLAR.DP +%%DATADIR%%/frmenus/dataprin/BOXSPRAY.DP +%%DATADIR%%/frmenus/dataprin/BOXSPRI2.DP +%%DATADIR%%/frmenus/dataprin/BOXSPRI3.DP +%%DATADIR%%/frmenus/dataprin/BOXSPRIN.DP +%%DATADIR%%/frmenus/dataprin/BOXTOMAT.DP +%%DATADIR%%/frmenus/dataprin/BOXWELD.DP +%%DATADIR%%/frmenus/dataprin/BOXYIEL2.DP +%%DATADIR%%/frmenus/dataprin/BOXYIELD.DP +%%DATADIR%%/frmenus/dataprin/BRAIN.DP +%%DATADIR%%/frmenus/dataprin/CASTIL10.DP +%%DATADIR%%/frmenus/dataprin/CASTIL11.DP +%%DATADIR%%/frmenus/dataprin/CASTIL12.DP +%%DATADIR%%/frmenus/dataprin/CASTIL13.DP +%%DATADIR%%/frmenus/dataprin/CASTIL14.DP +%%DATADIR%%/frmenus/dataprin/CASTILL1.DP +%%DATADIR%%/frmenus/dataprin/CASTILL2.DP +%%DATADIR%%/frmenus/dataprin/CASTILL3.DP +%%DATADIR%%/frmenus/dataprin/CASTILL4.DP +%%DATADIR%%/frmenus/dataprin/CASTILL5.DP +%%DATADIR%%/frmenus/dataprin/CASTILL6.DP +%%DATADIR%%/frmenus/dataprin/CASTILL7.DP +%%DATADIR%%/frmenus/dataprin/CASTILL8.DP +%%DATADIR%%/frmenus/dataprin/CASTILL9.DP +%%DATADIR%%/frmenus/dataprin/CCC.DP +%%DATADIR%%/frmenus/dataprin/CCP.DP +%%DATADIR%%/frmenus/dataprin/CCPN.DP +%%DATADIR%%/frmenus/dataprin/CCU.DP +%%DATADIR%%/frmenus/dataprin/CCXBAR.DP +%%DATADIR%%/frmenus/dataprin/CHOI.DP +%%DATADIR%%/frmenus/dataprin/CHOI2.DP +%%DATADIR%%/frmenus/dataprin/CHOLEST1.DP +%%DATADIR%%/frmenus/dataprin/CHWIRUT1.DP +%%DATADIR%%/frmenus/dataprin/CHWIRUT2.DP +%%DATADIR%%/frmenus/dataprin/CLARK0.DP +%%DATADIR%%/frmenus/dataprin/CLEAR.DP +%%DATADIR%%/frmenus/dataprin/CONSUMPR.DP +%%DATADIR%%/frmenus/dataprin/CROARK2.DP +%%DATADIR%%/frmenus/dataprin/CROARK3.DP +%%DATADIR%%/frmenus/dataprin/CROARKIN.DP +%%DATADIR%%/frmenus/dataprin/CUBE.DP +%%DATADIR%%/frmenus/dataprin/CURRIE.DP +%%DATADIR%%/frmenus/dataprin/DDS1.DP +%%DATADIR%%/frmenus/dataprin/DDS10.DP +%%DATADIR%%/frmenus/dataprin/DDS11.DP +%%DATADIR%%/frmenus/dataprin/DDS12.DP +%%DATADIR%%/frmenus/dataprin/DDS13.DP +%%DATADIR%%/frmenus/dataprin/DDS14.DP +%%DATADIR%%/frmenus/dataprin/DDS15.DP +%%DATADIR%%/frmenus/dataprin/DDS16.DP +%%DATADIR%%/frmenus/dataprin/DDS17.DP +%%DATADIR%%/frmenus/dataprin/DDS18.DP +%%DATADIR%%/frmenus/dataprin/DDS19.DP +%%DATADIR%%/frmenus/dataprin/DDS2.DP +%%DATADIR%%/frmenus/dataprin/DDS20.DP +%%DATADIR%%/frmenus/dataprin/DDS21.DP +%%DATADIR%%/frmenus/dataprin/DDS3.DP +%%DATADIR%%/frmenus/dataprin/DDS4.DP +%%DATADIR%%/frmenus/dataprin/DDS5.DP +%%DATADIR%%/frmenus/dataprin/DDS6.DP +%%DATADIR%%/frmenus/dataprin/DDS7.DP +%%DATADIR%%/frmenus/dataprin/DDS8.DP +%%DATADIR%%/frmenus/dataprin/DDS9.DP +%%DATADIR%%/frmenus/dataprin/DORKO4.DP +%%DATADIR%%/frmenus/dataprin/DRAFT69B.DP +%%DATADIR%%/frmenus/dataprin/DZIUBA.DP +%%DATADIR%%/frmenus/dataprin/ECKERLE4.DP +%%DATADIR%%/frmenus/dataprin/EHRSTEIN.DP +%%DATADIR%%/frmenus/dataprin/ELNINO.DP +%%DATADIR%%/frmenus/dataprin/FLICKER.DP +%%DATADIR%%/frmenus/dataprin/FLURY5.DP +%%DATADIR%%/frmenus/dataprin/FREQPRIM.DP +%%DATADIR%%/frmenus/dataprin/FULLER2.DP +%%DATADIR%%/frmenus/dataprin/FUNNEL5A.DP +%%DATADIR%%/frmenus/dataprin/FUNNEL5B.DP +%%DATADIR%%/frmenus/dataprin/FUNNEL5C.DP +%%DATADIR%%/frmenus/dataprin/GARBOCZI.DP +%%DATADIR%%/frmenus/dataprin/GEAR.DP +%%DATADIR%%/frmenus/dataprin/GNP.DP +%%DATADIR%%/frmenus/dataprin/GRA1326.DP +%%DATADIR%%/frmenus/dataprin/GRA1617.DP +%%DATADIR%%/frmenus/dataprin/HABER1.DP +%%DATADIR%%/frmenus/dataprin/HAHN.DP +%%DATADIR%%/frmenus/dataprin/HAHN1.DP +%%DATADIR%%/frmenus/dataprin/HALD647.DP +%%DATADIR%%/frmenus/dataprin/HAMAKER.DP +%%DATADIR%%/frmenus/dataprin/HAYES1.DP +%%DATADIR%%/frmenus/dataprin/IRIS.DP +%%DATADIR%%/frmenus/dataprin/KAUL.DP +%%DATADIR%%/frmenus/dataprin/KEYWEST.DP +%%DATADIR%%/frmenus/dataprin/KIRBY2.DP +%%DATADIR%%/frmenus/dataprin/KRASNY1.DP +%%DATADIR%%/frmenus/dataprin/LEW.DP +%%DATADIR%%/frmenus/dataprin/LEW3.DP +%%DATADIR%%/frmenus/dataprin/LIN.DP +%%DATADIR%%/frmenus/dataprin/LONGLEY.DP +%%DATADIR%%/frmenus/dataprin/LOTTERY3.DP +%%DATADIR%%/frmenus/dataprin/LOTTERY4.DP +%%DATADIR%%/frmenus/dataprin/LUTHER.DP +%%DATADIR%%/frmenus/dataprin/MANDEL.DP +%%DATADIR%%/frmenus/dataprin/MARSHAK.DP +%%DATADIR%%/frmenus/dataprin/MAVRO.DP +%%DATADIR%%/frmenus/dataprin/MICHELSO.DP +%%DATADIR%%/frmenus/dataprin/MISRA1.DP +%%DATADIR%%/frmenus/dataprin/MLCO2.DP +%%DATADIR%%/frmenus/dataprin/MLCO2MON.DP +%%DATADIR%%/frmenus/dataprin/MLF11.DP +%%DATADIR%%/frmenus/dataprin/MLF12.DP +%%DATADIR%%/frmenus/dataprin/MLN2O.DP +%%DATADIR%%/frmenus/dataprin/MORALES.DP +%%DATADIR%%/frmenus/dataprin/MORALES2.DP +%%DATADIR%%/frmenus/dataprin/NATR21.DP +%%DATADIR%%/frmenus/dataprin/NATR26.DP +%%DATADIR%%/frmenus/dataprin/NATR323.DP +%%DATADIR%%/frmenus/dataprin/NATR326.DP +%%DATADIR%%/frmenus/dataprin/NATR332.DP +%%DATADIR%%/frmenus/dataprin/NATR334.DP +%%DATADIR%%/frmenus/dataprin/NATR338.DP +%%DATADIR%%/frmenus/dataprin/NATR341.DP +%%DATADIR%%/frmenus/dataprin/NATR41.DP +%%DATADIR%%/frmenus/dataprin/NATR45.DP +%%DATADIR%%/frmenus/dataprin/NATR48.DP +%%DATADIR%%/frmenus/dataprin/NATR511.DP +%%DATADIR%%/frmenus/dataprin/NATR522.DP +%%DATADIR%%/frmenus/dataprin/NATR527.DP +%%DATADIR%%/frmenus/dataprin/NATR533.DP +%%DATADIR%%/frmenus/dataprin/NATR540.DP +%%DATADIR%%/frmenus/dataprin/NATR627.DP +%%DATADIR%%/frmenus/dataprin/NATR65.DP +%%DATADIR%%/frmenus/dataprin/NBSPOW1.DP +%%DATADIR%%/frmenus/dataprin/NBSPOW2.DP +%%DATADIR%%/frmenus/dataprin/NBSPOW3.DP +%%DATADIR%%/frmenus/dataprin/NEGIZ3.DP +%%DATADIR%%/frmenus/dataprin/NELSON.DP +%%DATADIR%%/frmenus/dataprin/NORRIS6.DP +%%DATADIR%%/frmenus/dataprin/NUT.DP +%%DATADIR%%/frmenus/dataprin/NWF11.DP +%%DATADIR%%/frmenus/dataprin/NWF12.DP +%%DATADIR%%/frmenus/dataprin/NWN2O.DP +%%DATADIR%%/frmenus/dataprin/OIL.DP +%%DATADIR%%/frmenus/dataprin/PBCO2.DP +%%DATADIR%%/frmenus/dataprin/PBF11.DP +%%DATADIR%%/frmenus/dataprin/PBF12.DP +%%DATADIR%%/frmenus/dataprin/PBN2O.DP +%%DATADIR%%/frmenus/dataprin/PENTAGON.DP +%%DATADIR%%/frmenus/dataprin/PERIODIC.DP +%%DATADIR%%/frmenus/dataprin/PLANETS.DP +%%DATADIR%%/frmenus/dataprin/PONTIUS.DP +%%DATADIR%%/frmenus/dataprin/PRIMESM.DP +%%DATADIR%%/frmenus/dataprin/QUASIBIE.DP +%%DATADIR%%/frmenus/dataprin/QUINLAN.DP +%%DATADIR%%/frmenus/dataprin/RANDN.DP +%%DATADIR%%/frmenus/dataprin/RANDU.DP +%%DATADIR%%/frmenus/dataprin/RANDWALK.DP +%%DATADIR%%/frmenus/dataprin/REHM.DP +%%DATADIR%%/frmenus/dataprin/ROSZMAN1.DP +%%DATADIR%%/frmenus/dataprin/SHEESLE2.DP +%%DATADIR%%/frmenus/dataprin/SHEESLEY.DP +%%DATADIR%%/frmenus/dataprin/SIMIU.DP +%%DATADIR%%/frmenus/dataprin/SIN1.DP +%%DATADIR%%/frmenus/dataprin/SIN2.DP +%%DATADIR%%/frmenus/dataprin/SIN3.DP +%%DATADIR%%/frmenus/dataprin/SIN4.DP +%%DATADIR%%/frmenus/dataprin/SINSIN.DP +%%DATADIR%%/frmenus/dataprin/SMALL14.DP +%%DATADIR%%/frmenus/dataprin/SOULEN.DP +%%DATADIR%%/frmenus/dataprin/SOULEN0.DP +%%DATADIR%%/frmenus/dataprin/SPAGON1.DP +%%DATADIR%%/frmenus/dataprin/SPAGON2.DP +%%DATADIR%%/frmenus/dataprin/SPAGON3.DP +%%DATADIR%%/frmenus/dataprin/SPAGON4.DP +%%DATADIR%%/frmenus/dataprin/SPCO2.DP +%%DATADIR%%/frmenus/dataprin/SPF11.DP +%%DATADIR%%/frmenus/dataprin/SPF12.DP +%%DATADIR%%/frmenus/dataprin/SPIEGEL.DP +%%DATADIR%%/frmenus/dataprin/SPLETT2.DP +%%DATADIR%%/frmenus/dataprin/SPLETT3.DP +%%DATADIR%%/frmenus/dataprin/SPLETT4.DP +%%DATADIR%%/frmenus/dataprin/SPN2O.DP +%%DATADIR%%/frmenus/dataprin/STENBAKK.DP +%%DATADIR%%/frmenus/dataprin/SUNSPOT.DP +%%DATADIR%%/frmenus/dataprin/SUNSPOT2.DP +%%DATADIR%%/frmenus/dataprin/SUPERCON.DP +%%DATADIR%%/frmenus/dataprin/SWANSON1.DP +%%DATADIR%%/frmenus/dataprin/THURBER.DP +%%DATADIR%%/frmenus/dataprin/UGIANSKY.DP +%%DATADIR%%/frmenus/dataprin/USADEBT.DP +%%DATADIR%%/frmenus/dataprin/USADEFIC.DP +%%DATADIR%%/frmenus/dataprin/VANGEL1.DP +%%DATADIR%%/frmenus/dataprin/VANGEL2.DP +%%DATADIR%%/frmenus/dataprin/VANGEL5.DP +%%DATADIR%%/frmenus/dataprin/VIBRATE.DP +%%DATADIR%%/frmenus/dataprin/WAMPLER1.DP +%%DATADIR%%/frmenus/dataprin/WAMPLER2.DP +%%DATADIR%%/frmenus/dataprin/WASHDC.DP +%%DATADIR%%/frmenus/dataprin/WATTERS.DP +%%DATADIR%%/frmenus/dataprin/WEBER.DP +%%DATADIR%%/frmenus/dataprin/WOOLLEY.DP +%%DATADIR%%/frmenus/dataprin/WRIGHT11.DP +%%DATADIR%%/frmenus/dataprin/ZARR13.DP +%%DATADIR%%/frmenus/dataprin/ZARR14.DP +%%DATADIR%%/frmenus/dataprin/ZARR15.DP +%%DATADIR%%/frmenus/dataprin/bhh.top +%%DATADIR%%/frmenus/dataprin/bhh1.top +%%DATADIR%%/frmenus/dataprin/bhh10.top +%%DATADIR%%/frmenus/dataprin/bhh11.top +%%DATADIR%%/frmenus/dataprin/bhh12.top +%%DATADIR%%/frmenus/dataprin/bhh13.top +%%DATADIR%%/frmenus/dataprin/bhh14.top +%%DATADIR%%/frmenus/dataprin/bhh15.top +%%DATADIR%%/frmenus/dataprin/bhh16.top +%%DATADIR%%/frmenus/dataprin/bhh17.top +%%DATADIR%%/frmenus/dataprin/bhh18.top +%%DATADIR%%/frmenus/dataprin/bhh2.top +%%DATADIR%%/frmenus/dataprin/bhh3.top +%%DATADIR%%/frmenus/dataprin/bhh4.top +%%DATADIR%%/frmenus/dataprin/bhh5.top +%%DATADIR%%/frmenus/dataprin/bhh6.top +%%DATADIR%%/frmenus/dataprin/bhh7.top +%%DATADIR%%/frmenus/dataprin/bhh8.top +%%DATADIR%%/frmenus/dataprin/bhh9.top +%%DATADIR%%/frmenus/dataprin/bhhintro.top +%%DATADIR%%/frmenus/dataprin/core.top +%%DATADIR%%/frmenus/dataprin/dataprin.top +%%DATADIR%%/frmenus/dataprin/dex.top +%%DATADIR%%/frmenus/dataprin/dex2k.top +%%DATADIR%%/frmenus/dataprin/dex2kmp.top +%%DATADIR%%/frmenus/dataprin/dexcomp.top +%%DATADIR%%/frmenus/dataprin/dexmix.top +%%DATADIR%%/frmenus/dataprin/dexopt.top +%%DATADIR%%/frmenus/dataprin/dextag.top +%%DATADIR%%/frmenus/dataprin/eva.top +%%DATADIR%%/frmenus/dataprin/evacast.top +%%DATADIR%%/frmenus/dataprin/evanist.top +%%DATADIR%%/frmenus/dataprin/evaothe.top +%%DATADIR%%/frmenus/dataprin/gra1ch4.top +%%DATADIR%%/frmenus/dataprin/gra1ch9.top +%%DATADIR%%/frmenus/dataprin/gra1intr.top +%%DATADIR%%/frmenus/dataprin/grayiye1.top +%%DATADIR%%/frmenus/dataprin/grayiye2.top +%%DATADIR%%/frmenus/dataprin/imag.top +%%DATADIR%%/frmenus/dataprin/math.top +%%DATADIR%%/frmenus/dataprin/mfac.top +%%DATADIR%%/frmenus/dataprin/mvar.top +%%DATADIR%%/frmenus/dataprin/natr1.top +%%DATADIR%%/frmenus/dataprin/natr2.top +%%DATADIR%%/frmenus/dataprin/natr3.top +%%DATADIR%%/frmenus/dataprin/natr4.top +%%DATADIR%%/frmenus/dataprin/natr5.top +%%DATADIR%%/frmenus/dataprin/natr6.top +%%DATADIR%%/frmenus/dataprin/natrella.top +%%DATADIR%%/frmenus/dataprin/natrintr.top +%%DATADIR%%/frmenus/dataprin/prob.top +%%DATADIR%%/frmenus/dataprin/qual.top +%%DATADIR%%/frmenus/dataprin/qual7old.top +%%DATADIR%%/frmenus/dataprin/qualcoch.top +%%DATADIR%%/frmenus/dataprin/qualewma.top +%%DATADIR%%/frmenus/dataprin/qualpci.top +%%DATADIR%%/frmenus/dataprin/qualtag.top +%%DATADIR%%/frmenus/dataprin/reg.top +%%DATADIR%%/frmenus/dataprin/reg1n.top +%%DATADIR%%/frmenus/dataprin/reg1p.top +%%DATADIR%%/frmenus/dataprin/regmv.top +%%DATADIR%%/frmenus/dataprin/reli.top +%%DATADIR%%/frmenus/dataprin/relinist.top +%%DATADIR%%/frmenus/dataprin/reliothe.top +%%DATADIR%%/frmenus/dataprin/sematech.top +%%DATADIR%%/frmenus/dataprin/stsc.top +%%DATADIR%%/frmenus/dataprin/stscano1.top +%%DATADIR%%/frmenus/dataprin/stscano2.top +%%DATADIR%%/frmenus/dataprin/stsccomp.top +%%DATADIR%%/frmenus/dataprin/stsccont.top +%%DATADIR%%/frmenus/dataprin/stscdex1.top +%%DATADIR%%/frmenus/dataprin/stscdex2.top +%%DATADIR%%/frmenus/dataprin/stsceda1.top +%%DATADIR%%/frmenus/dataprin/stsceda2.top +%%DATADIR%%/frmenus/dataprin/stscfit1.top +%%DATADIR%%/frmenus/dataprin/stscfit2.top +%%DATADIR%%/frmenus/dataprin/stschypo.top +%%DATADIR%%/frmenus/dataprin/stscinte.top +%%DATADIR%%/frmenus/dataprin/stscintr.top +%%DATADIR%%/frmenus/dataprin/stscsamp.top +%%DATADIR%%/frmenus/dataprin/time.top +%%DATADIR%%/frmenus/dataprin/time2var.top +%%DATADIR%%/frmenus/dataprin/timebj.top +%%DATADIR%%/frmenus/dataprin/timedds.top +%%DATADIR%%/frmenus/dataprin/timenist.top +%%DATADIR%%/frmenus/dataprin/timenoaa.top +%%DATADIR%%/frmenus/dataprin/timeothe.top +%%DATADIR%%/frmenus/dataprin/unce.top +%%DATADIR%%/frmenus/dataprin/univ.top +%%DATADIR%%/frmenus/dataprin/univnatr.top +%%DATADIR%%/frmenus/dataprin/univnist.top +%%DATADIR%%/frmenus/dataprin/univothe.top +%%DATADIR%%/frmenus/dataprin/univsema.top +%%DATADIR%%/frmenus/dataview/1fac.top +%%DATADIR%%/frmenus/dataview/1facnatr.top +%%DATADIR%%/frmenus/dataview/1facnist.top +%%DATADIR%%/frmenus/dataview/1facothe.top +%%DATADIR%%/frmenus/dataview/1facsema.top +%%DATADIR%%/frmenus/dataview/2fac.top +%%DATADIR%%/frmenus/dataview/3fac.top +%%DATADIR%%/frmenus/dataview/4fac.top +%%DATADIR%%/frmenus/dataview/5fac.top +%%DATADIR%%/frmenus/dataview/ABERN17.DP +%%DATADIR%%/frmenus/dataview/ABERN35.DP +%%DATADIR%%/frmenus/dataview/ABERN43.DP +%%DATADIR%%/frmenus/dataview/ABSORPT.DP +%%DATADIR%%/frmenus/dataview/AC.DP +%%DATADIR%%/frmenus/dataview/AGE18.DP +%%DATADIR%%/frmenus/dataview/AGEBP.DP +%%DATADIR%%/frmenus/dataview/AMRF.DP +%%DATADIR%%/frmenus/dataview/ANSCOMBE.DP +%%DATADIR%%/frmenus/dataview/ARSENIC.DP +%%DATADIR%%/frmenus/dataview/ASCO2.DP +%%DATADIR%%/frmenus/dataview/ASF11.DP +%%DATADIR%%/frmenus/dataview/ASF12.DP +%%DATADIR%%/frmenus/dataview/ASN2O.DP +%%DATADIR%%/frmenus/dataview/ASSAY.DP +%%DATADIR%%/frmenus/dataview/AUTO79.DP +%%DATADIR%%/frmenus/dataview/AUTO83.DP +%%DATADIR%%/frmenus/dataview/AUTO83B.DP +%%DATADIR%%/frmenus/dataview/BABYWT.DP +%%DATADIR%%/frmenus/dataview/BAKER.DP +%%DATADIR%%/frmenus/dataview/BALLBEAR.DP +%%DATADIR%%/frmenus/dataview/BATTADD1.DP +%%DATADIR%%/frmenus/dataview/BATTADD2.DP +%%DATADIR%%/frmenus/dataview/BATTADD3.DP +%%DATADIR%%/frmenus/dataview/BENNETT.DP +%%DATADIR%%/frmenus/dataview/BENNETT5.DP +%%DATADIR%%/frmenus/dataview/BERGER1.DP +%%DATADIR%%/frmenus/dataview/BIOMED3.DP +%%DATADIR%%/frmenus/dataview/BIVGAUSS.DP +%%DATADIR%%/frmenus/dataview/BIVNGAUS.DP +%%DATADIR%%/frmenus/dataview/BOWEN.DP +%%DATADIR%%/frmenus/dataview/BOXAUTO.DP +%%DATADIR%%/frmenus/dataview/BOXBIKE2.DP +%%DATADIR%%/frmenus/dataview/BOXBIKE3.DP +%%DATADIR%%/frmenus/dataview/BOXBLOOD.DP +%%DATADIR%%/frmenus/dataview/BOXBOD.DP +%%DATADIR%%/frmenus/dataview/BOXCAKE.DP +%%DATADIR%%/frmenus/dataview/BOXCAKE2.DP +%%DATADIR%%/frmenus/dataview/BOXCHEM.DP +%%DATADIR%%/frmenus/dataview/BOXCHEM2.DP +%%DATADIR%%/frmenus/dataview/BOXCLEA2.DP +%%DATADIR%%/frmenus/dataview/BOXCLEAN.DP +%%DATADIR%%/frmenus/dataview/BOXCLOT2.DP +%%DATADIR%%/frmenus/dataview/BOXCLOTH.DP +%%DATADIR%%/frmenus/dataview/BOXDR175.DP +%%DATADIR%%/frmenus/dataview/BOXFILT.DP +%%DATADIR%%/frmenus/dataview/BOXFILT2.DP +%%DATADIR%%/frmenus/dataview/BOXINDUS.DP +%%DATADIR%%/frmenus/dataview/BOXJE142.DP +%%DATADIR%%/frmenus/dataview/BOXJENK1.DP +%%DATADIR%%/frmenus/dataview/BOXJENK2.DP +%%DATADIR%%/frmenus/dataview/BOXMOLD.DP +%%DATADIR%%/frmenus/dataview/BOXPENIC.DP +%%DATADIR%%/frmenus/dataview/BOXPILOT.DP +%%DATADIR%%/frmenus/dataview/BOXPOISO.DP +%%DATADIR%%/frmenus/dataview/BOXRADAR.DP +%%DATADIR%%/frmenus/dataview/BOXRATS.DP +%%DATADIR%%/frmenus/dataview/BOXREAC2.DP +%%DATADIR%%/frmenus/dataview/BOXREACT.DP +%%DATADIR%%/frmenus/dataview/BOXSHOES.DP +%%DATADIR%%/frmenus/dataview/BOXSOLAR.DP +%%DATADIR%%/frmenus/dataview/BOXSPRAY.DP +%%DATADIR%%/frmenus/dataview/BOXSPRI2.DP +%%DATADIR%%/frmenus/dataview/BOXSPRI3.DP +%%DATADIR%%/frmenus/dataview/BOXSPRIN.DP +%%DATADIR%%/frmenus/dataview/BOXTOMAT.DP +%%DATADIR%%/frmenus/dataview/BOXWELD.DP +%%DATADIR%%/frmenus/dataview/BOXYIEL2.DP +%%DATADIR%%/frmenus/dataview/BOXYIEL3.DP +%%DATADIR%%/frmenus/dataview/BOXYIELD.DP +%%DATADIR%%/frmenus/dataview/BP.DP +%%DATADIR%%/frmenus/dataview/BPWEIGHT.DP +%%DATADIR%%/frmenus/dataview/BRAIN.DP +%%DATADIR%%/frmenus/dataview/BULLET.DP +%%DATADIR%%/frmenus/dataview/CABBAGE.DP +%%DATADIR%%/frmenus/dataview/CANS.DP +%%DATADIR%%/frmenus/dataview/CAR.DP +%%DATADIR%%/frmenus/dataview/CAR17.DP +%%DATADIR%%/frmenus/dataview/CAR2.DP +%%DATADIR%%/frmenus/dataview/CAR20.DP +%%DATADIR%%/frmenus/dataview/CARBMON.DP +%%DATADIR%%/frmenus/dataview/CASTIL10.DP +%%DATADIR%%/frmenus/dataview/CASTIL11.DP +%%DATADIR%%/frmenus/dataview/CASTIL12.DP +%%DATADIR%%/frmenus/dataview/CASTIL13.DP +%%DATADIR%%/frmenus/dataview/CASTIL14.DP +%%DATADIR%%/frmenus/dataview/CASTILL1.DP +%%DATADIR%%/frmenus/dataview/CASTILL2.DP +%%DATADIR%%/frmenus/dataview/CASTILL3.DP +%%DATADIR%%/frmenus/dataview/CASTILL4.DP +%%DATADIR%%/frmenus/dataview/CASTILL5.DP +%%DATADIR%%/frmenus/dataview/CASTILL6.DP +%%DATADIR%%/frmenus/dataview/CASTILL7.DP +%%DATADIR%%/frmenus/dataview/CASTILL8.DP +%%DATADIR%%/frmenus/dataview/CASTILL9.DP +%%DATADIR%%/frmenus/dataview/CCC.DP +%%DATADIR%%/frmenus/dataview/CCP.DP +%%DATADIR%%/frmenus/dataview/CCPN.DP +%%DATADIR%%/frmenus/dataview/CCU.DP +%%DATADIR%%/frmenus/dataview/CCXBAR.DP +%%DATADIR%%/frmenus/dataview/CEMENT.DP +%%DATADIR%%/frmenus/dataview/CEREAL.DP +%%DATADIR%%/frmenus/dataview/CHAMBER.DP +%%DATADIR%%/frmenus/dataview/CHOI.DP +%%DATADIR%%/frmenus/dataview/CHOI2.DP +%%DATADIR%%/frmenus/dataview/CHOL.DP +%%DATADIR%%/frmenus/dataview/CHOLEST1.DP +%%DATADIR%%/frmenus/dataview/CHWIRUT1.DP +%%DATADIR%%/frmenus/dataview/CHWIRUT2.DP +%%DATADIR%%/frmenus/dataview/CLARK0.DP +%%DATADIR%%/frmenus/dataview/CLEAR.DP +%%DATADIR%%/frmenus/dataview/CO2.DP +%%DATADIR%%/frmenus/dataview/COIL.DP +%%DATADIR%%/frmenus/dataview/CONCRETE.DP +%%DATADIR%%/frmenus/dataview/CONSUMPR.DP +%%DATADIR%%/frmenus/dataview/CONTRAST.DP +%%DATADIR%%/frmenus/dataview/CORNEL23.DP +%%DATADIR%%/frmenus/dataview/CORNEL35.DP +%%DATADIR%%/frmenus/dataview/CORNEL43.DP +%%DATADIR%%/frmenus/dataview/CORNEL62.DP +%%DATADIR%%/frmenus/dataview/CORNEL69.DP +%%DATADIR%%/frmenus/dataview/CORNEL78.DP +%%DATADIR%%/frmenus/dataview/CORNEL81.DP +%%DATADIR%%/frmenus/dataview/CORNELL4.DP +%%DATADIR%%/frmenus/dataview/CORNELL9.DP +%%DATADIR%%/frmenus/dataview/CROARK2.DP +%%DATADIR%%/frmenus/dataview/CROARK3.DP +%%DATADIR%%/frmenus/dataview/CROARKIN.DP +%%DATADIR%%/frmenus/dataview/CRYSTAL.DP +%%DATADIR%%/frmenus/dataview/CRYSTAL3.DP +%%DATADIR%%/frmenus/dataview/CUBE.DP +%%DATADIR%%/frmenus/dataview/CURRIE.DP +%%DATADIR%%/frmenus/dataview/DDS1.DP +%%DATADIR%%/frmenus/dataview/DDS10.DP +%%DATADIR%%/frmenus/dataview/DDS11.DP +%%DATADIR%%/frmenus/dataview/DDS12.DP +%%DATADIR%%/frmenus/dataview/DDS13.DP +%%DATADIR%%/frmenus/dataview/DDS14.DP +%%DATADIR%%/frmenus/dataview/DDS15.DP +%%DATADIR%%/frmenus/dataview/DDS16.DP +%%DATADIR%%/frmenus/dataview/DDS17.DP +%%DATADIR%%/frmenus/dataview/DDS18.DP +%%DATADIR%%/frmenus/dataview/DDS19.DP +%%DATADIR%%/frmenus/dataview/DDS2.DP +%%DATADIR%%/frmenus/dataview/DDS20.DP +%%DATADIR%%/frmenus/dataview/DDS21.DP +%%DATADIR%%/frmenus/dataview/DDS3.DP +%%DATADIR%%/frmenus/dataview/DDS4.DP +%%DATADIR%%/frmenus/dataview/DDS5.DP +%%DATADIR%%/frmenus/dataview/DDS6.DP +%%DATADIR%%/frmenus/dataview/DDS7.DP +%%DATADIR%%/frmenus/dataview/DDS8.DP +%%DATADIR%%/frmenus/dataview/DDS9.DP +%%DATADIR%%/frmenus/dataview/DORKO4.DP +%%DATADIR%%/frmenus/dataview/DPSCRF.TEX +%%DATADIR%%/frmenus/dataview/DRAFT69.DP +%%DATADIR%%/frmenus/dataview/DRAFT69B.DP +%%DATADIR%%/frmenus/dataview/DRAPS518.DP +%%DATADIR%%/frmenus/dataview/DRAPS521.DP +%%DATADIR%%/frmenus/dataview/DRUGCONC.DP +%%DATADIR%%/frmenus/dataview/DZIUBA.DP +%%DATADIR%%/frmenus/dataview/DZUIBA.DP +%%DATADIR%%/frmenus/dataview/ECKERLE4.DP +%%DATADIR%%/frmenus/dataview/EGGSHELL.DP +%%DATADIR%%/frmenus/dataview/EHRSTEIN.DP +%%DATADIR%%/frmenus/dataview/ELECT92.DP +%%DATADIR%%/frmenus/dataview/ELECTRIC.DP +%%DATADIR%%/frmenus/dataview/ELNINO.DP +%%DATADIR%%/frmenus/dataview/ETHNIC.DP +%%DATADIR%%/frmenus/dataview/EXAM.DP +%%DATADIR%%/frmenus/dataview/EXP.DP +%%DATADIR%%/frmenus/dataview/EXPCEN.DP +%%DATADIR%%/frmenus/dataview/EXPCEN2.DP +%%DATADIR%%/frmenus/dataview/FAT.DP +%%DATADIR%%/frmenus/dataview/FISH2POP.DP +%%DATADIR%%/frmenus/dataview/FLICKER.DP +%%DATADIR%%/frmenus/dataview/FLURY5.DP +%%DATADIR%%/frmenus/dataview/FREQPRIM.DP +%%DATADIR%%/frmenus/dataview/FULLER2.DP +%%DATADIR%%/frmenus/dataview/FULLODR1.DP +%%DATADIR%%/frmenus/dataview/FULLODR2.DP +%%DATADIR%%/frmenus/dataview/FUNNEL5A.DP +%%DATADIR%%/frmenus/dataview/FUNNEL5B.DP +%%DATADIR%%/frmenus/dataview/FUNNEL5C.DP +%%DATADIR%%/frmenus/dataview/GAMCEN.DP +%%DATADIR%%/frmenus/dataview/GAMMA.DP +%%DATADIR%%/frmenus/dataview/GARBOCZI.DP +%%DATADIR%%/frmenus/dataview/GEAR.DP +%%DATADIR%%/frmenus/dataview/GIFTED.DP +%%DATADIR%%/frmenus/dataview/GNP.DP +%%DATADIR%%/frmenus/dataview/GPA.DP +%%DATADIR%%/frmenus/dataview/GRA1326.DP +%%DATADIR%%/frmenus/dataview/GRA1617.DP +%%DATADIR%%/frmenus/dataview/GRADES.DP +%%DATADIR%%/frmenus/dataview/GRADES26.Dp +%%DATADIR%%/frmenus/dataview/GRAVITY.DP +%%DATADIR%%/frmenus/dataview/GROCERY.DP +%%DATADIR%%/frmenus/dataview/HABER1.DP +%%DATADIR%%/frmenus/dataview/HAHN.DP +%%DATADIR%%/frmenus/dataview/HAHN1.DP +%%DATADIR%%/frmenus/dataview/HALD647.DP +%%DATADIR%%/frmenus/dataview/HAMAKER.DP +%%DATADIR%%/frmenus/dataview/HAYES1.DP +%%DATADIR%%/frmenus/dataview/HAZE.DP +%%DATADIR%%/frmenus/dataview/HOSPITAL.DP +%%DATADIR%%/frmenus/dataview/HSU12.DP +%%DATADIR%%/frmenus/dataview/IRIS.DP +%%DATADIR%%/frmenus/dataview/JAHANMI2.DP +%%DATADIR%%/frmenus/dataview/JONES.DP +%%DATADIR%%/frmenus/dataview/KAUL.DP +%%DATADIR%%/frmenus/dataview/KEYWEST.DP +%%DATADIR%%/frmenus/dataview/KIRBY2.DP +%%DATADIR%%/frmenus/dataview/KRASNY1.DP +%%DATADIR%%/frmenus/dataview/LARCH.DP +%%DATADIR%%/frmenus/dataview/LEIGH4.DP +%%DATADIR%%/frmenus/dataview/LEW.DP +%%DATADIR%%/frmenus/dataview/LEW3.DP +%%DATADIR%%/frmenus/dataview/LEW4.DP +%%DATADIR%%/frmenus/dataview/LGN.DP +%%DATADIR%%/frmenus/dataview/LGNCEN.DP +%%DATADIR%%/frmenus/dataview/LIGHT.DP +%%DATADIR%%/frmenus/dataview/LIN.DP +%%DATADIR%%/frmenus/dataview/LITHOGRA.DP +%%DATADIR%%/frmenus/dataview/LONGLEY.DP +%%DATADIR%%/frmenus/dataview/LOTTERY3.DP +%%DATADIR%%/frmenus/dataview/LOTTERY4.DP +%%DATADIR%%/frmenus/dataview/LUTHER.DP +%%DATADIR%%/frmenus/dataview/MAMMALWT.DP +%%DATADIR%%/frmenus/dataview/MANDEL.DP +%%DATADIR%%/frmenus/dataview/MARSHAK.DP +%%DATADIR%%/frmenus/dataview/MAVRO.DP +%%DATADIR%%/frmenus/dataview/MICHELSO.DP +%%DATADIR%%/frmenus/dataview/MINIVAN.DP +%%DATADIR%%/frmenus/dataview/MISRA1.DP +%%DATADIR%%/frmenus/dataview/MLCO2.DP +%%DATADIR%%/frmenus/dataview/MLCO2MON.DP +%%DATADIR%%/frmenus/dataview/MLF11.DP +%%DATADIR%%/frmenus/dataview/MLF12.DP +%%DATADIR%%/frmenus/dataview/MLN2O.DP +%%DATADIR%%/frmenus/dataview/MONTGOME.DP +%%DATADIR%%/frmenus/dataview/MORALES.DP +%%DATADIR%%/frmenus/dataview/MORALES2.DP +%%DATADIR%%/frmenus/dataview/MOUSE.DP +%%DATADIR%%/frmenus/dataview/MPC61.DP +%%DATADIR%%/frmenus/dataview/MPC62.DP +%%DATADIR%%/frmenus/dataview/MPC63.DP +%%DATADIR%%/frmenus/dataview/MPG.DP +%%DATADIR%%/frmenus/dataview/NATR102.DP +%%DATADIR%%/frmenus/dataview/NATR1219.DP +%%DATADIR%%/frmenus/dataview/NATR124.DP +%%DATADIR%%/frmenus/dataview/NATR1314.DP +%%DATADIR%%/frmenus/dataview/NATR1323.DP +%%DATADIR%%/frmenus/dataview/NATR1333.DP +%%DATADIR%%/frmenus/dataview/NATR134.DP +%%DATADIR%%/frmenus/dataview/NATR1341.DP +%%DATADIR%%/frmenus/dataview/NATR151.DP +%%DATADIR%%/frmenus/dataview/NATR154.DP +%%DATADIR%%/frmenus/dataview/NATR156.DP +%%DATADIR%%/frmenus/dataview/NATR1611.DP +%%DATADIR%%/frmenus/dataview/NATR1613.DP +%%DATADIR%%/frmenus/dataview/NATR162.DP +%%DATADIR%%/frmenus/dataview/NATR164.DP +%%DATADIR%%/frmenus/dataview/NATR166.DP +%%DATADIR%%/frmenus/dataview/NATR168.DP +%%DATADIR%%/frmenus/dataview/NATR169.DP +%%DATADIR%%/frmenus/dataview/NATR21.DP +%%DATADIR%%/frmenus/dataview/NATR26.DP +%%DATADIR%%/frmenus/dataview/NATR323.DP +%%DATADIR%%/frmenus/dataview/NATR326.DP +%%DATADIR%%/frmenus/dataview/NATR332.DP +%%DATADIR%%/frmenus/dataview/NATR334.DP +%%DATADIR%%/frmenus/dataview/NATR338.DP +%%DATADIR%%/frmenus/dataview/NATR341.DP +%%DATADIR%%/frmenus/dataview/NATR41.DP +%%DATADIR%%/frmenus/dataview/NATR45.DP +%%DATADIR%%/frmenus/dataview/NATR48.DP +%%DATADIR%%/frmenus/dataview/NATR511.DP +%%DATADIR%%/frmenus/dataview/NATR522.DP +%%DATADIR%%/frmenus/dataview/NATR527.DP +%%DATADIR%%/frmenus/dataview/NATR533.DP +%%DATADIR%%/frmenus/dataview/NATR540.DP +%%DATADIR%%/frmenus/dataview/NATR627.DP +%%DATADIR%%/frmenus/dataview/NATR65.DP +%%DATADIR%%/frmenus/dataview/NATR92.DP +%%DATADIR%%/frmenus/dataview/NATR94.DP +%%DATADIR%%/frmenus/dataview/NATR96.DP +%%DATADIR%%/frmenus/dataview/NATR99.DP +%%DATADIR%%/frmenus/dataview/NBSPOW1.DP +%%DATADIR%%/frmenus/dataview/NBSPOW2.DP +%%DATADIR%%/frmenus/dataview/NBSPOW3.DP +%%DATADIR%%/frmenus/dataview/NEGIZ3.DP +%%DATADIR%%/frmenus/dataview/NELS105.DP +%%DATADIR%%/frmenus/dataview/NELS138.DP +%%DATADIR%%/frmenus/dataview/NELS144.DP +%%DATADIR%%/frmenus/dataview/NELS28.DP +%%DATADIR%%/frmenus/dataview/NELS393.DP +%%DATADIR%%/frmenus/dataview/NELS421.DP +%%DATADIR%%/frmenus/dataview/NELSNIST.DP +%%DATADIR%%/frmenus/dataview/NELSON.DP +%%DATADIR%%/frmenus/dataview/NICKEL.DP +%%DATADIR%%/frmenus/dataview/NOR.DP +%%DATADIR%%/frmenus/dataview/NORCEN.DP +%%DATADIR%%/frmenus/dataview/NORRIS6.DP +%%DATADIR%%/frmenus/dataview/NUT.DP +%%DATADIR%%/frmenus/dataview/NWF11.DP +%%DATADIR%%/frmenus/dataview/NWF12.DP +%%DATADIR%%/frmenus/dataview/NWN2O.DP +%%DATADIR%%/frmenus/dataview/OIL.DP +%%DATADIR%%/frmenus/dataview/OLDTOOLS.DP +%%DATADIR%%/frmenus/dataview/OLYMPICS.DP +%%DATADIR%%/frmenus/dataview/PBCO2.DP +%%DATADIR%%/frmenus/dataview/PBF11.DP +%%DATADIR%%/frmenus/dataview/PBF12.DP +%%DATADIR%%/frmenus/dataview/PBN2O.DP +%%DATADIR%%/frmenus/dataview/PENTAGON.DP +%%DATADIR%%/frmenus/dataview/PERIODIC.DP +%%DATADIR%%/frmenus/dataview/PLANETS.DP +%%DATADIR%%/frmenus/dataview/PLANT.DP +%%DATADIR%%/frmenus/dataview/PLASTIC.DP +%%DATADIR%%/frmenus/dataview/PONTIUS.DP +%%DATADIR%%/frmenus/dataview/PREMIUMS.DP +%%DATADIR%%/frmenus/dataview/PRIMESM.DP +%%DATADIR%%/frmenus/dataview/PRISON.DP +%%DATADIR%%/frmenus/dataview/PROCESS1.DP +%%DATADIR%%/frmenus/dataview/PROCESS2.DP +%%DATADIR%%/frmenus/dataview/PROFSAL.DP +%%DATADIR%%/frmenus/dataview/PUMPKIN.DP +%%DATADIR%%/frmenus/dataview/PUNCH.DP +%%DATADIR%%/frmenus/dataview/PUNCH2.DP +%%DATADIR%%/frmenus/dataview/QUASIBIE.DP +%%DATADIR%%/frmenus/dataview/QUINLAN.DP +%%DATADIR%%/frmenus/dataview/RAMUS.DP +%%DATADIR%%/frmenus/dataview/RANDN.DP +%%DATADIR%%/frmenus/dataview/RANDU.DP +%%DATADIR%%/frmenus/dataview/RANDWALK.DP +%%DATADIR%%/frmenus/dataview/REHM.DP +%%DATADIR%%/frmenus/dataview/ROSSIT11.DP +%%DATADIR%%/frmenus/dataview/ROSSIT15.DP +%%DATADIR%%/frmenus/dataview/ROSSIT16.DP +%%DATADIR%%/frmenus/dataview/ROSSITE2.DP +%%DATADIR%%/frmenus/dataview/ROSZMAN1.DP +%%DATADIR%%/frmenus/dataview/SALARIES.DP +%%DATADIR%%/frmenus/dataview/SALES.DP +%%DATADIR%%/frmenus/dataview/SCHANTZ.DP +%%DATADIR%%/frmenus/dataview/SCHILL11.DP +%%DATADIR%%/frmenus/dataview/SCOTT.DP +%%DATADIR%%/frmenus/dataview/SERUM.DP +%%DATADIR%%/frmenus/dataview/SHEESLE2.DP +%%DATADIR%%/frmenus/dataview/SHEESLEY.DP +%%DATADIR%%/frmenus/dataview/SHELFLIF.DP +%%DATADIR%%/frmenus/dataview/SIMIU.DP +%%DATADIR%%/frmenus/dataview/SIMON.DP +%%DATADIR%%/frmenus/dataview/SIN1.DP +%%DATADIR%%/frmenus/dataview/SIN2.DP +%%DATADIR%%/frmenus/dataview/SIN3.DP +%%DATADIR%%/frmenus/dataview/SIN4.DP +%%DATADIR%%/frmenus/dataview/SINNOISE.DP +%%DATADIR%%/frmenus/dataview/SINSIN.DP +%%DATADIR%%/frmenus/dataview/SMALL14.DP +%%DATADIR%%/frmenus/dataview/SO2.DP +%%DATADIR%%/frmenus/dataview/SOULEN.DP +%%DATADIR%%/frmenus/dataview/SOULEN0.DP +%%DATADIR%%/frmenus/dataview/SOYBURGR.DP +%%DATADIR%%/frmenus/dataview/SPAGON1.DP +%%DATADIR%%/frmenus/dataview/SPAGON2.DP +%%DATADIR%%/frmenus/dataview/SPAGON3.DP +%%DATADIR%%/frmenus/dataview/SPAGON4.DP +%%DATADIR%%/frmenus/dataview/SPCO2.DP +%%DATADIR%%/frmenus/dataview/SPF11.DP +%%DATADIR%%/frmenus/dataview/SPF12.DP +%%DATADIR%%/frmenus/dataview/SPIEGEL.DP +%%DATADIR%%/frmenus/dataview/SPLETT2.DP +%%DATADIR%%/frmenus/dataview/SPLETT3.DP +%%DATADIR%%/frmenus/dataview/SPLETT4.DP +%%DATADIR%%/frmenus/dataview/SPN2O.DP +%%DATADIR%%/frmenus/dataview/STENBAKK.DP +%%DATADIR%%/frmenus/dataview/SULFURIC.DP +%%DATADIR%%/frmenus/dataview/SUNSPOT.DP +%%DATADIR%%/frmenus/dataview/SUNSPOT2.DP +%%DATADIR%%/frmenus/dataview/SUPERCON.DP +%%DATADIR%%/frmenus/dataview/SWANSON1.DP +%%DATADIR%%/frmenus/dataview/T2CC.DP +%%DATADIR%%/frmenus/dataview/TABLE161.DP +%%DATADIR%%/frmenus/dataview/TABLE164.DP +%%DATADIR%%/frmenus/dataview/TABLE323.DP +%%DATADIR%%/frmenus/dataview/TABLE324.DP +%%DATADIR%%/frmenus/dataview/TABLE346.DP +%%DATADIR%%/frmenus/dataview/TABLE355.DP +%%DATADIR%%/frmenus/dataview/TABLE423.DP +%%DATADIR%%/frmenus/dataview/TABLE425.DP +%%DATADIR%%/frmenus/dataview/TABLE426.DP +%%DATADIR%%/frmenus/dataview/TABLE442.DP +%%DATADIR%%/frmenus/dataview/TABLE444.DP +%%DATADIR%%/frmenus/dataview/TABLE445.DP +%%DATADIR%%/frmenus/dataview/TABLE541.DP +%%DATADIR%%/frmenus/dataview/TABLE542.DP +%%DATADIR%%/frmenus/dataview/TABLE543.DP +%%DATADIR%%/frmenus/dataview/TABLE561.DP +%%DATADIR%%/frmenus/dataview/TABLE631.DP +%%DATADIR%%/frmenus/dataview/TABLE733.DP +%%DATADIR%%/frmenus/dataview/TABLE742.DP +%%DATADIR%%/frmenus/dataview/THERMOM.DP +%%DATADIR%%/frmenus/dataview/THURBER.DP +%%DATADIR%%/frmenus/dataview/TOB128.DP +%%DATADIR%%/frmenus/dataview/TOB143.DP +%%DATADIR%%/frmenus/dataview/TOB150.DP +%%DATADIR%%/frmenus/dataview/TOB152.DP +%%DATADIR%%/frmenus/dataview/TOB159.DP +%%DATADIR%%/frmenus/dataview/TOB161.DP +%%DATADIR%%/frmenus/dataview/TOB171.DP +%%DATADIR%%/frmenus/dataview/TOB179.DP +%%DATADIR%%/frmenus/dataview/TOB201.DP +%%DATADIR%%/frmenus/dataview/TOB215.DP +%%DATADIR%%/frmenus/dataview/TOB216A.DP +%%DATADIR%%/frmenus/dataview/TOB216B.DP +%%DATADIR%%/frmenus/dataview/TOB3.DP +%%DATADIR%%/frmenus/dataview/TOB305.DP +%%DATADIR%%/frmenus/dataview/TOB312.DP +%%DATADIR%%/frmenus/dataview/TOB332.DP +%%DATADIR%%/frmenus/dataview/TOB335.DP +%%DATADIR%%/frmenus/dataview/TOB336.DP +%%DATADIR%%/frmenus/dataview/TOB346.DP +%%DATADIR%%/frmenus/dataview/TOB351.DP +%%DATADIR%%/frmenus/dataview/TOB354.DP +%%DATADIR%%/frmenus/dataview/TOB360.DP +%%DATADIR%%/frmenus/dataview/TOB365.DP +%%DATADIR%%/frmenus/dataview/TOB366.DP +%%DATADIR%%/frmenus/dataview/TOB375.DP +%%DATADIR%%/frmenus/dataview/TOB384.DP +%%DATADIR%%/frmenus/dataview/TOB50.DP +%%DATADIR%%/frmenus/dataview/TOB62.DP +%%DATADIR%%/frmenus/dataview/TOB99.DP +%%DATADIR%%/frmenus/dataview/TRACK.DP +%%DATADIR%%/frmenus/dataview/TRACY.DP +%%DATADIR%%/frmenus/dataview/TURKEY.DP +%%DATADIR%%/frmenus/dataview/UGIANSKY.DP +%%DATADIR%%/frmenus/dataview/USADEBT.DP +%%DATADIR%%/frmenus/dataview/USADEFIC.DP +%%DATADIR%%/frmenus/dataview/USEDCARS.DP +%%DATADIR%%/frmenus/dataview/VANGEL1.DP +%%DATADIR%%/frmenus/dataview/VANGEL2.DP +%%DATADIR%%/frmenus/dataview/VANGEL31.DP +%%DATADIR%%/frmenus/dataview/VANGEL32.DP +%%DATADIR%%/frmenus/dataview/VANGEL33.DP +%%DATADIR%%/frmenus/dataview/VANGEL34.DP +%%DATADIR%%/frmenus/dataview/VANGEL5.DP +%%DATADIR%%/frmenus/dataview/VIBRATE.DP +%%DATADIR%%/frmenus/dataview/WAMPLER1.DP +%%DATADIR%%/frmenus/dataview/WAMPLER2.DP +%%DATADIR%%/frmenus/dataview/WASHDC.DP +%%DATADIR%%/frmenus/dataview/WATTERS.DP +%%DATADIR%%/frmenus/dataview/WEBER.DP +%%DATADIR%%/frmenus/dataview/WEIBBURY.DP +%%DATADIR%%/frmenus/dataview/WEICEN.DP +%%DATADIR%%/frmenus/dataview/WOOLLEY.DP +%%DATADIR%%/frmenus/dataview/WRIGHT11.DP +%%DATADIR%%/frmenus/dataview/ZARR13.DP +%%DATADIR%%/frmenus/dataview/ZARR14.DP +%%DATADIR%%/frmenus/dataview/ZARR15.DP +%%DATADIR%%/frmenus/dataview/ZARR94.DP +%%DATADIR%%/frmenus/dataview/bhh.top +%%DATADIR%%/frmenus/dataview/bhh1.top +%%DATADIR%%/frmenus/dataview/bhh10.top +%%DATADIR%%/frmenus/dataview/bhh11.top +%%DATADIR%%/frmenus/dataview/bhh12.top +%%DATADIR%%/frmenus/dataview/bhh13.top +%%DATADIR%%/frmenus/dataview/bhh14.top +%%DATADIR%%/frmenus/dataview/bhh15.top +%%DATADIR%%/frmenus/dataview/bhh16.top +%%DATADIR%%/frmenus/dataview/bhh17.top +%%DATADIR%%/frmenus/dataview/bhh18.top +%%DATADIR%%/frmenus/dataview/bhh2.top +%%DATADIR%%/frmenus/dataview/bhh3.top +%%DATADIR%%/frmenus/dataview/bhh4.top +%%DATADIR%%/frmenus/dataview/bhh5.top +%%DATADIR%%/frmenus/dataview/bhh6.top +%%DATADIR%%/frmenus/dataview/bhh7.top +%%DATADIR%%/frmenus/dataview/bhh8.top +%%DATADIR%%/frmenus/dataview/bhh9.top +%%DATADIR%%/frmenus/dataview/bhhintro.top +%%DATADIR%%/frmenus/dataview/calibrat.top +%%DATADIR%%/frmenus/dataview/camlcont.top +%%DATADIR%%/frmenus/dataview/camlcust.top +%%DATADIR%%/frmenus/dataview/camldivi.top +%%DATADIR%%/frmenus/dataview/camlfutu.top +%%DATADIR%%/frmenus/dataview/camlhigh.top +%%DATADIR%%/frmenus/dataview/camlhist.top +%%DATADIR%%/frmenus/dataview/camlmiss.top +%%DATADIR%%/frmenus/dataview/camlrefe.top +%%DATADIR%%/frmenus/dataview/camlstaf.top +%%DATADIR%%/frmenus/dataview/ccanalysi.top +%%DATADIR%%/frmenus/dataview/ccback.top +%%DATADIR%%/frmenus/dataview/ccconclu.top +%%DATADIR%%/frmenus/dataview/ccdex.top +%%DATADIR%%/frmenus/dataview/ccgoals.top +%%DATADIR%%/frmenus/dataview/ccimport.top +%%DATADIR%%/frmenus/dataview/ccmember.top +%%DATADIR%%/frmenus/dataview/ccproj.top +%%DATADIR%%/frmenus/dataview/cctutori.top +%%DATADIR%%/frmenus/dataview/coatcons.top +%%DATADIR%%/frmenus/dataview/core.top +%%DATADIR%%/frmenus/dataview/dataview.top +%%DATADIR%%/frmenus/dataview/deal1bmc.top +%%DATADIR%%/frmenus/dataview/deal1bnc.top +%%DATADIR%%/frmenus/dataview/dealandi.top +%%DATADIR%%/frmenus/dataview/dealappr.top +%%DATADIR%%/frmenus/dataview/dealdisc.top +%%DATADIR%%/frmenus/dataview/dealfaqs.top +%%DATADIR%%/frmenus/dataview/dealglos.top +%%DATADIR%%/frmenus/dataview/dealgoal.top +%%DATADIR%%/frmenus/dataview/dealinpu.top +%%DATADIR%%/frmenus/dataview/dealmbmc.top +%%DATADIR%%/frmenus/dataview/dealmbnc.top +%%DATADIR%%/frmenus/dataview/dealnico.top +%%DATADIR%%/frmenus/dataview/dealoutp.top +%%DATADIR%%/frmenus/dataview/dealrefe.top +%%DATADIR%%/frmenus/dataview/dealtuto.top +%%DATADIR%%/frmenus/dataview/desallst.top +%%DATADIR%%/frmenus/dataview/desalsdo.top +%%DATADIR%%/frmenus/dataview/dex.top +%%DATADIR%%/frmenus/dataview/dex2k.top +%%DATADIR%%/frmenus/dataview/dex2kmp.top +%%DATADIR%%/frmenus/dataview/dexcomp.top +%%DATADIR%%/frmenus/dataview/dexmix.top +%%DATADIR%%/frmenus/dataview/dexopt.top +%%DATADIR%%/frmenus/dataview/dexpb.top +%%DATADIR%%/frmenus/dataview/dexreg.top +%%DATADIR%%/frmenus/dataview/dextag.top +%%DATADIR%%/frmenus/dataview/dexwandi.top +%%DATADIR%%/frmenus/dataview/dexwappr.top +%%DATADIR%%/frmenus/dataview/dexwch1.top +%%DATADIR%%/frmenus/dataview/dexwch10.top +%%DATADIR%%/frmenus/dataview/dexwch11.top +%%DATADIR%%/frmenus/dataview/dexwch12.top +%%DATADIR%%/frmenus/dataview/dexwch13.top +%%DATADIR%%/frmenus/dataview/dexwch2.top +%%DATADIR%%/frmenus/dataview/dexwch3.top +%%DATADIR%%/frmenus/dataview/dexwch4.top +%%DATADIR%%/frmenus/dataview/dexwch5.top +%%DATADIR%%/frmenus/dataview/dexwch6.top +%%DATADIR%%/frmenus/dataview/dexwch7.top +%%DATADIR%%/frmenus/dataview/dexwch8.top +%%DATADIR%%/frmenus/dataview/dexwch9.top +%%DATADIR%%/frmenus/dataview/dexwdisc.top +%%DATADIR%%/frmenus/dataview/dexwfaqs.top +%%DATADIR%%/frmenus/dataview/dexwglos.top +%%DATADIR%%/frmenus/dataview/dexwgoal.top +%%DATADIR%%/frmenus/dataview/dexwinpu.top +%%DATADIR%%/frmenus/dataview/dexwnico.top +%%DATADIR%%/frmenus/dataview/dexworks.top +%%DATADIR%%/frmenus/dataview/dexwoutp.top +%%DATADIR%%/frmenus/dataview/dexwrefe.top +%%DATADIR%%/frmenus/dataview/eva.top +%%DATADIR%%/frmenus/dataview/evacast.top +%%DATADIR%%/frmenus/dataview/evanist.top +%%DATADIR%%/frmenus/dataview/evaothe.top +%%DATADIR%%/frmenus/dataview/gra1ch1.top +%%DATADIR%%/frmenus/dataview/gra1ch2.top +%%DATADIR%%/frmenus/dataview/gra1ch3.top +%%DATADIR%%/frmenus/dataview/gra1ch4.top +%%DATADIR%%/frmenus/dataview/gra1ch5.top +%%DATADIR%%/frmenus/dataview/gra1ch6.top +%%DATADIR%%/frmenus/dataview/gra1ch7.top +%%DATADIR%%/frmenus/dataview/gra1ch8.top +%%DATADIR%%/frmenus/dataview/gra1ch9.top +%%DATADIR%%/frmenus/dataview/gra1intr.top +%%DATADIR%%/frmenus/dataview/grayiye1.top +%%DATADIR%%/frmenus/dataview/grayiye2.top +%%DATADIR%%/frmenus/dataview/guidcaml.top +%%DATADIR%%/frmenus/dataview/guidnist.top +%%DATADIR%%/frmenus/dataview/guidsed.top +%%DATADIR%%/frmenus/dataview/handbook.top +%%DATADIR%%/frmenus/dataview/hpccppap.top +%%DATADIR%%/frmenus/dataview/hpccppdi.top +%%DATADIR%%/frmenus/dataview/hpccppdo.top +%%DATADIR%%/frmenus/dataview/hpccppfa.top +%%DATADIR%%/frmenus/dataview/hpccppgl.top +%%DATADIR%%/frmenus/dataview/hpccppgo.top +%%DATADIR%%/frmenus/dataview/hpccppin.top +%%DATADIR%%/frmenus/dataview/hpccppnc.top +%%DATADIR%%/frmenus/dataview/hpccppou.top +%%DATADIR%%/frmenus/dataview/hpccppre.top +%%DATADIR%%/frmenus/dataview/hpccpptu.top +%%DATADIR%%/frmenus/dataview/hpccprps.top +%%DATADIR%%/frmenus/dataview/imag.top +%%DATADIR%%/frmenus/dataview/math.top +%%DATADIR%%/frmenus/dataview/mfac.top +%%DATADIR%%/frmenus/dataview/mvar.top +%%DATADIR%%/frmenus/dataview/nakatani.men +%%DATADIR%%/frmenus/dataview/natr1.top +%%DATADIR%%/frmenus/dataview/natr10.top +%%DATADIR%%/frmenus/dataview/natr11.top +%%DATADIR%%/frmenus/dataview/natr12.top +%%DATADIR%%/frmenus/dataview/natr13.top +%%DATADIR%%/frmenus/dataview/natr14.top +%%DATADIR%%/frmenus/dataview/natr15.top +%%DATADIR%%/frmenus/dataview/natr16.top +%%DATADIR%%/frmenus/dataview/natr17.top +%%DATADIR%%/frmenus/dataview/natr18.top +%%DATADIR%%/frmenus/dataview/natr19.top +%%DATADIR%%/frmenus/dataview/natr2.top +%%DATADIR%%/frmenus/dataview/natr20.top +%%DATADIR%%/frmenus/dataview/natr21.top +%%DATADIR%%/frmenus/dataview/natr22.top +%%DATADIR%%/frmenus/dataview/natr23.top +%%DATADIR%%/frmenus/dataview/natr3.top +%%DATADIR%%/frmenus/dataview/natr4.top +%%DATADIR%%/frmenus/dataview/natr5.top +%%DATADIR%%/frmenus/dataview/natr6.top +%%DATADIR%%/frmenus/dataview/natr7.top +%%DATADIR%%/frmenus/dataview/natr8.top +%%DATADIR%%/frmenus/dataview/natr9.top +%%DATADIR%%/frmenus/dataview/natrella.top +%%DATADIR%%/frmenus/dataview/natrintr.top +%%DATADIR%%/frmenus/dataview/nist.top +%%DATADIR%%/frmenus/dataview/nistadmd.top +%%DATADIR%%/frmenus/dataview/nistfaci.top +%%DATADIR%%/frmenus/dataview/nistfaqs.top +%%DATADIR%%/frmenus/dataview/nistglan.top +%%DATADIR%%/frmenus/dataview/nistindt.top +%%DATADIR%%/frmenus/dataview/nistlabp.top +%%DATADIR%%/frmenus/dataview/nistmiss.top +%%DATADIR%%/frmenus/dataview/nistoffe.top +%%DATADIR%%/frmenus/dataview/nistphon.top +%%DATADIR%%/frmenus/dataview/nistsubi.top +%%DATADIR%%/frmenus/dataview/orthdist.top +%%DATADIR%%/frmenus/dataview/prob.top +%%DATADIR%%/frmenus/dataview/qual.top +%%DATADIR%%/frmenus/dataview/qual7old.top +%%DATADIR%%/frmenus/dataview/qualcoch.top +%%DATADIR%%/frmenus/dataview/qualewma.top +%%DATADIR%%/frmenus/dataview/qualpci.top +%%DATADIR%%/frmenus/dataview/qualtag.top +%%DATADIR%%/frmenus/dataview/readvafi.men +%%DATADIR%%/frmenus/dataview/recipe.top +%%DATADIR%%/frmenus/dataview/reg.top +%%DATADIR%%/frmenus/dataview/reg1n.top +%%DATADIR%%/frmenus/dataview/reg1p.top +%%DATADIR%%/frmenus/dataview/regmv.top +%%DATADIR%%/frmenus/dataview/reli.top +%%DATADIR%%/frmenus/dataview/reliacel.top +%%DATADIR%%/frmenus/dataview/relibury.top +%%DATADIR%%/frmenus/dataview/relicens.top +%%DATADIR%%/frmenus/dataview/relinels.top +%%DATADIR%%/frmenus/dataview/relinist.top +%%DATADIR%%/frmenus/dataview/relinonr.top +%%DATADIR%%/frmenus/dataview/reliothe.top +%%DATADIR%%/frmenus/dataview/relirene.top +%%DATADIR%%/frmenus/dataview/relitobi.top +%%DATADIR%%/frmenus/dataview/reliunce.top +%%DATADIR%%/frmenus/dataview/rfrdata.top +%%DATADIR%%/frmenus/dataview/sedconta.top +%%DATADIR%%/frmenus/dataview/sedcusto.top +%%DATADIR%%/frmenus/dataview/sedfutur.top +%%DATADIR%%/frmenus/dataview/sedhighl.top +%%DATADIR%%/frmenus/dataview/sedhisto.top +%%DATADIR%%/frmenus/dataview/sedmissi.top +%%DATADIR%%/frmenus/dataview/sedproj.top +%%DATADIR%%/frmenus/dataview/sedrefer.top +%%DATADIR%%/frmenus/dataview/semaandi.top +%%DATADIR%%/frmenus/dataview/semaappr.top +%%DATADIR%%/frmenus/dataview/semach1.top +%%DATADIR%%/frmenus/dataview/semach10.top +%%DATADIR%%/frmenus/dataview/semach11.top +%%DATADIR%%/frmenus/dataview/semach12.top +%%DATADIR%%/frmenus/dataview/semach13.top +%%DATADIR%%/frmenus/dataview/semach14.top +%%DATADIR%%/frmenus/dataview/semach15.top +%%DATADIR%%/frmenus/dataview/semach16.top +%%DATADIR%%/frmenus/dataview/semach17.top +%%DATADIR%%/frmenus/dataview/semach18.top +%%DATADIR%%/frmenus/dataview/semach19.top +%%DATADIR%%/frmenus/dataview/semach2.top +%%DATADIR%%/frmenus/dataview/semach20.top +%%DATADIR%%/frmenus/dataview/semach3.top +%%DATADIR%%/frmenus/dataview/semach4.top +%%DATADIR%%/frmenus/dataview/semach5.top +%%DATADIR%%/frmenus/dataview/semach6.top +%%DATADIR%%/frmenus/dataview/semach7.top +%%DATADIR%%/frmenus/dataview/semach8.top +%%DATADIR%%/frmenus/dataview/semach9.top +%%DATADIR%%/frmenus/dataview/semadisc.top +%%DATADIR%%/frmenus/dataview/semafaqs.top +%%DATADIR%%/frmenus/dataview/semaglos.top +%%DATADIR%%/frmenus/dataview/semagoal.top +%%DATADIR%%/frmenus/dataview/semainpu.top +%%DATADIR%%/frmenus/dataview/semanico.top +%%DATADIR%%/frmenus/dataview/semaoutp.top +%%DATADIR%%/frmenus/dataview/semarefe.top +%%DATADIR%%/frmenus/dataview/sematech.top +%%DATADIR%%/frmenus/dataview/sematuto.top +%%DATADIR%%/frmenus/dataview/split.dat +%%DATADIR%%/frmenus/dataview/srms.top +%%DATADIR%%/frmenus/dataview/statscie.top +%%DATADIR%%/frmenus/dataview/stsc.top +%%DATADIR%%/frmenus/dataview/stscandi.top +%%DATADIR%%/frmenus/dataview/stscano1.top +%%DATADIR%%/frmenus/dataview/stscano2.top +%%DATADIR%%/frmenus/dataview/stscappr.top +%%DATADIR%%/frmenus/dataview/stscch1.top +%%DATADIR%%/frmenus/dataview/stscch10.top +%%DATADIR%%/frmenus/dataview/stscch11.top +%%DATADIR%%/frmenus/dataview/stscch12.top +%%DATADIR%%/frmenus/dataview/stscch2.top +%%DATADIR%%/frmenus/dataview/stscch3.top +%%DATADIR%%/frmenus/dataview/stscch4.top +%%DATADIR%%/frmenus/dataview/stscch5.top +%%DATADIR%%/frmenus/dataview/stscch6.top +%%DATADIR%%/frmenus/dataview/stscch7.top +%%DATADIR%%/frmenus/dataview/stscch8.top +%%DATADIR%%/frmenus/dataview/stscch9.top +%%DATADIR%%/frmenus/dataview/stsccomp.top +%%DATADIR%%/frmenus/dataview/stsccont.top +%%DATADIR%%/frmenus/dataview/stscdex1.top +%%DATADIR%%/frmenus/dataview/stscdex2.top +%%DATADIR%%/frmenus/dataview/stscdisc.top +%%DATADIR%%/frmenus/dataview/stsceda1.top +%%DATADIR%%/frmenus/dataview/stsceda2.top +%%DATADIR%%/frmenus/dataview/stscfaqs.top +%%DATADIR%%/frmenus/dataview/stscfit1.top +%%DATADIR%%/frmenus/dataview/stscfit2.top +%%DATADIR%%/frmenus/dataview/stscglos.top +%%DATADIR%%/frmenus/dataview/stscgoal.top +%%DATADIR%%/frmenus/dataview/stschypo.top +%%DATADIR%%/frmenus/dataview/stscinpu.top +%%DATADIR%%/frmenus/dataview/stscinte.top +%%DATADIR%%/frmenus/dataview/stscintr.top +%%DATADIR%%/frmenus/dataview/stscnico.top +%%DATADIR%%/frmenus/dataview/stscoutp.top +%%DATADIR%%/frmenus/dataview/stscrefe.top +%%DATADIR%%/frmenus/dataview/stscsamp.top +%%DATADIR%%/frmenus/dataview/stsctuto.top +%%DATADIR%%/frmenus/dataview/test3.dp +%%DATADIR%%/frmenus/dataview/time.top +%%DATADIR%%/frmenus/dataview/time2var.top +%%DATADIR%%/frmenus/dataview/timebj.top +%%DATADIR%%/frmenus/dataview/timedds.top +%%DATADIR%%/frmenus/dataview/timenist.top +%%DATADIR%%/frmenus/dataview/timenoaa.top +%%DATADIR%%/frmenus/dataview/timeothe.top +%%DATADIR%%/frmenus/dataview/unce.top +%%DATADIR%%/frmenus/dataview/univ.top +%%DATADIR%%/frmenus/dataview/univnatr.top +%%DATADIR%%/frmenus/dataview/univnist.top +%%DATADIR%%/frmenus/dataview/univothe.top +%%DATADIR%%/frmenus/dataview/univsema.top +%%DATADIR%%/frmenus/definitions/reliabil.top +%%DATADIR%%/frmenus/definitions/reliability.tex +%%DATADIR%%/frmenus/dex/10step.top +%%DATADIR%%/frmenus/dex/2kmpexa1.top +%%DATADIR%%/frmenus/dex/2kmpexa2.top +%%DATADIR%%/frmenus/dex/2kmpfile.top +%%DATADIR%%/frmenus/dex/2kmprefe.top +%%DATADIR%%/frmenus/dex/2kmpres4.top +%%DATADIR%%/frmenus/dex/2terconf.top +%%DATADIR%%/frmenus/dex/2to10m3.top +%%DATADIR%%/frmenus/dex/2to10m4.top +%%DATADIR%%/frmenus/dex/2to10m5.top +%%DATADIR%%/frmenus/dex/2to10m6.top +%%DATADIR%%/frmenus/dex/2to11m4.top +%%DATADIR%%/frmenus/dex/2to11m5.top +%%DATADIR%%/frmenus/dex/2to11m6.top +%%DATADIR%%/frmenus/dex/2to11m7.top +%%DATADIR%%/frmenus/dex/2to15m11.top +%%DATADIR%%/frmenus/dex/2to2.top +%%DATADIR%%/frmenus/dex/2to3.top +%%DATADIR%%/frmenus/dex/2to31m26.top +%%DATADIR%%/frmenus/dex/2to3m1.top +%%DATADIR%%/frmenus/dex/2to4.top +%%DATADIR%%/frmenus/dex/2to4m1.top +%%DATADIR%%/frmenus/dex/2to5.top +%%DATADIR%%/frmenus/dex/2to5m1.top +%%DATADIR%%/frmenus/dex/2to5m2.top +%%DATADIR%%/frmenus/dex/2to6.top +%%DATADIR%%/frmenus/dex/2to6m1.top +%%DATADIR%%/frmenus/dex/2to6m2.top +%%DATADIR%%/frmenus/dex/2to6m3.top +%%DATADIR%%/frmenus/dex/2to7.top +%%DATADIR%%/frmenus/dex/2to7m1.top +%%DATADIR%%/frmenus/dex/2to7m2.top +%%DATADIR%%/frmenus/dex/2to7m3.top +%%DATADIR%%/frmenus/dex/2to7m4.top +%%DATADIR%%/frmenus/dex/2to8m1.top +%%DATADIR%%/frmenus/dex/2to8m2.top +%%DATADIR%%/frmenus/dex/2to8m3.top +%%DATADIR%%/frmenus/dex/2to8m4.top +%%DATADIR%%/frmenus/dex/2to9m2.top +%%DATADIR%%/frmenus/dex/2to9m3.top +%%DATADIR%%/frmenus/dex/2to9m4.top +%%DATADIR%%/frmenus/dex/2to9m5.top +%%DATADIR%%/frmenus/dex/BOXREAC2.DP +%%DATADIR%%/frmenus/dex/BOXSPRAY.DP +%%DATADIR%%/frmenus/dex/BOXYIEL2.DP +%%DATADIR%%/frmenus/dex/a2kbesse.top +%%DATADIR%%/frmenus/dex/a2kdatfi.top +%%DATADIR%%/frmenus/dex/a2kdesig.top +%%DATADIR%%/frmenus/dex/a2kgoals.top +%%DATADIR%%/frmenus/dex/a2kimpfa.top +%%DATADIR%%/frmenus/dex/a2kindda.top +%%DATADIR%%/frmenus/dex/a2kloada.top +%%DATADIR%%/frmenus/dex/a2kmpdes.top +%%DATADIR%%/frmenus/dex/a2kranlf.top +%%DATADIR%%/frmenus/dex/acomdisc.top +%%DATADIR%%/frmenus/dex/amixdesi.top +%%DATADIR%%/frmenus/dex/analdisc.top +%%DATADIR%%/frmenus/dex/analysis.top +%%DATADIR%%/frmenus/dex/aregdesi.top +%%DATADIR%%/frmenus/dex/arsdesig.top +%%DATADIR%%/frmenus/dex/ascrdesi.top +%%DATADIR%%/frmenus/dex/assumpti.top +%%DATADIR%%/frmenus/dex/atagdesi.top +%%DATADIR%%/frmenus/dex/c2kdesig.top +%%DATADIR%%/frmenus/dex/c2kdiscu.top +%%DATADIR%%/frmenus/dex/c2kexam1.top +%%DATADIR%%/frmenus/dex/c2kexam2.top +%%DATADIR%%/frmenus/dex/c2kindde.top +%%DATADIR%%/frmenus/dex/c2kloade.top +%%DATADIR%%/frmenus/dex/c2kmodel.top +%%DATADIR%%/frmenus/dex/c2kmpcon.top +%%DATADIR%%/frmenus/dex/c2kmpdes.top +%%DATADIR%%/frmenus/dex/c2kmpdis.top +%%DATADIR%%/frmenus/dex/c2kmpill.top +%%DATADIR%%/frmenus/dex/c2kmpind.top +%%DATADIR%%/frmenus/dex/c2kmploa.top +%%DATADIR%%/frmenus/dex/c2krefer.top +%%DATADIR%%/frmenus/dex/ccomddis.top +%%DATADIR%%/frmenus/dex/ccomdesi.top +%%DATADIR%%/frmenus/dex/ccrd.top +%%DATADIR%%/frmenus/dex/ccrddisc.top +%%DATADIR%%/frmenus/dex/ccrdex1.top +%%DATADIR%%/frmenus/dex/ccrdex2.top +%%DATADIR%%/frmenus/dex/ccrdfile.top +%%DATADIR%%/frmenus/dex/ccrdinde.top +%%DATADIR%%/frmenus/dex/ccrdmode.top +%%DATADIR%%/frmenus/dex/ccrdrefe.top +%%DATADIR%%/frmenus/dex/choosede.top +%%DATADIR%%/frmenus/dex/clsd.top +%%DATADIR%%/frmenus/dex/clsddisc.top +%%DATADIR%%/frmenus/dex/clsdex1.top +%%DATADIR%%/frmenus/dex/clsdex2.top +%%DATADIR%%/frmenus/dex/clsdfile.top +%%DATADIR%%/frmenus/dex/clsdinde.top +%%DATADIR%%/frmenus/dex/clsdlist.top +%%DATADIR%%/frmenus/dex/clsdmode.top +%%DATADIR%%/frmenus/dex/clsdrefe.top +%%DATADIR%%/frmenus/dex/cmixdesi.top +%%DATADIR%%/frmenus/dex/comdexqu.top +%%DATADIR%%/frmenus/dex/confdesi.top +%%DATADIR%%/frmenus/dex/conffrfd.top +%%DATADIR%%/frmenus/dex/confmatr.top +%%DATADIR%%/frmenus/dex/conftabu.top +%%DATADIR%%/frmenus/dex/consdisc.top +%%DATADIR%%/frmenus/dex/construc.top +%%DATADIR%%/frmenus/dex/cpbdesig.top +%%DATADIR%%/frmenus/dex/cpbindde.top +%%DATADIR%%/frmenus/dex/crbd.top +%%DATADIR%%/frmenus/dex/crbddisc.top +%%DATADIR%%/frmenus/dex/crbdex1.top +%%DATADIR%%/frmenus/dex/crbdex2.top +%%DATADIR%%/frmenus/dex/crbdfile.top +%%DATADIR%%/frmenus/dex/crbdinde.top +%%DATADIR%%/frmenus/dex/crbdlist.top +%%DATADIR%%/frmenus/dex/crbdmode.top +%%DATADIR%%/frmenus/dex/crbdrefe.top +%%DATADIR%%/frmenus/dex/cregdesi.top +%%DATADIR%%/frmenus/dex/crsdesig.top +%%DATADIR%%/frmenus/dex/cs210m3.top +%%DATADIR%%/frmenus/dex/cs210m4.top +%%DATADIR%%/frmenus/dex/cs210m5.top +%%DATADIR%%/frmenus/dex/cs210m6.top +%%DATADIR%%/frmenus/dex/cs211m4.top +%%DATADIR%%/frmenus/dex/cs211m5.top +%%DATADIR%%/frmenus/dex/cs211m6.top +%%DATADIR%%/frmenus/dex/cs211m7.top +%%DATADIR%%/frmenus/dex/cs215m11.top +%%DATADIR%%/frmenus/dex/cs23m1.top +%%DATADIR%%/frmenus/dex/cs24m1.top +%%DATADIR%%/frmenus/dex/cs25m1.top +%%DATADIR%%/frmenus/dex/cs25m2.top +%%DATADIR%%/frmenus/dex/cs26m1.top +%%DATADIR%%/frmenus/dex/cs26m2.top +%%DATADIR%%/frmenus/dex/cs26m3.top +%%DATADIR%%/frmenus/dex/cs27m1.top +%%DATADIR%%/frmenus/dex/cs27m2.top +%%DATADIR%%/frmenus/dex/cs27m3.top +%%DATADIR%%/frmenus/dex/cs27m4.top +%%DATADIR%%/frmenus/dex/cs28m1.top +%%DATADIR%%/frmenus/dex/cs28m2.top +%%DATADIR%%/frmenus/dex/cs28m3.top +%%DATADIR%%/frmenus/dex/cs28m4.top +%%DATADIR%%/frmenus/dex/cs29m2.top +%%DATADIR%%/frmenus/dex/cs29m3.top +%%DATADIR%%/frmenus/dex/cs29m4.top +%%DATADIR%%/frmenus/dex/cs29m5.top +%%DATADIR%%/frmenus/dex/cscrdesi.top +%%DATADIR%%/frmenus/dex/ctagdesi.top +%%DATADIR%%/frmenus/dex/datasets.top +%%DATADIR%%/frmenus/dex/definrel.top +%%DATADIR%%/frmenus/dex/designs.temp +%%DATADIR%%/frmenus/dex/desitabu.top +%%DATADIR%%/frmenus/dex/dex.top +%%DATADIR%%/frmenus/dex/dexexam.top +%%DATADIR%%/frmenus/dex/dexmixqu.top +%%DATADIR%%/frmenus/dex/dexsumsh.top +%%DATADIR%%/frmenus/dex/discussi.top +%%DATADIR%%/frmenus/dex/factdefi.top +%%DATADIR%%/frmenus/dex/frfacdes.top +%%DATADIR%%/frmenus/dex/geomrepr.top +%%DATADIR%%/frmenus/dex/grlatsq3.top +%%DATADIR%%/frmenus/dex/grlatsq4.top +%%DATADIR%%/frmenus/dex/grlatsq5.top +%%DATADIR%%/frmenus/dex/hgrlats4.top +%%DATADIR%%/frmenus/dex/hgrlats5.top +%%DATADIR%%/frmenus/dex/latsq3.top +%%DATADIR%%/frmenus/dex/latsq4.top +%%DATADIR%%/frmenus/dex/latsq5.top +%%DATADIR%%/frmenus/dex/meffconf.top +%%DATADIR%%/frmenus/dex/mixdexqu.top +%%DATADIR%%/frmenus/dex/mod2to2.top +%%DATADIR%%/frmenus/dex/mod2to3.top +%%DATADIR%%/frmenus/dex/mod2to4.top +%%DATADIR%%/frmenus/dex/mod2to5.top +%%DATADIR%%/frmenus/dex/mod2to6.top +%%DATADIR%%/frmenus/dex/mod2to7.top +%%DATADIR%%/frmenus/dex/namedesi.top +%%DATADIR%%/frmenus/dex/numbfact.top +%%DATADIR%%/frmenus/dex/numbobse.top +%%DATADIR%%/frmenus/dex/odesexam.top +%%DATADIR%%/frmenus/dex/other.top +%%DATADIR%%/frmenus/dex/pb12.top +%%DATADIR%%/frmenus/dex/pb20.top +%%DATADIR%%/frmenus/dex/pb24.top +%%DATADIR%%/frmenus/dex/pb28.top +%%DATADIR%%/frmenus/dex/pb36.top +%%DATADIR%%/frmenus/dex/propgood.top +%%DATADIR%%/frmenus/dex/randruns.men +%%DATADIR%%/frmenus/dex/randruns.top +%%DATADIR%%/frmenus/dex/rdesexam.top +%%DATADIR%%/frmenus/dex/regdexqu.top +%%DATADIR%%/frmenus/dex/resolut2.top +%%DATADIR%%/frmenus/dex/resoluti.top +%%DATADIR%%/frmenus/dex/rsdexque.top +%%DATADIR%%/frmenus/dex/scrdexqu.top +%%DATADIR%%/frmenus/dex/screexam.top +%%DATADIR%%/frmenus/dex/stattech.top +%%DATADIR%%/frmenus/dex/thedesig.top +%%DATADIR%%/frmenus/dex/viewdata.top +%%DATADIR%%/frmenus/dex/whatisde.top +%%DATADIR%%/frmenus/dex/which5pq.top +%%DATADIR%%/frmenus/dex/whichdex.top +%%DATADIR%%/frmenus/dex/whichdis.top +%%DATADIR%%/frmenus/dex/workshds.top +%%DATADIR%%/frmenus/dex/wsch1.top +%%DATADIR%%/frmenus/dex/wsch10.top +%%DATADIR%%/frmenus/dex/wsch11.top +%%DATADIR%%/frmenus/dex/wsch12.top +%%DATADIR%%/frmenus/dex/wsch13.top +%%DATADIR%%/frmenus/dex/wsch2.top +%%DATADIR%%/frmenus/dex/wsch3.top +%%DATADIR%%/frmenus/dex/wsch4.top +%%DATADIR%%/frmenus/dex/wsch5.top +%%DATADIR%%/frmenus/dex/wsch6.top +%%DATADIR%%/frmenus/dex/wsch7.top +%%DATADIR%%/frmenus/dex/wsch8.top +%%DATADIR%%/frmenus/dex/wsch9.top +%%DATADIR%%/frmenus/dex2k/10step.top +%%DATADIR%%/frmenus/dex2k/2kexam.top +%%DATADIR%%/frmenus/dex2k/2to2.top +%%DATADIR%%/frmenus/dex2k/2to3.top +%%DATADIR%%/frmenus/dex2k/2to4.top +%%DATADIR%%/frmenus/dex2k/2to5.top +%%DATADIR%%/frmenus/dex2k/2to6.top +%%DATADIR%%/frmenus/dex2k/2to7.top +%%DATADIR%%/frmenus/dex2k/advantag.top +%%DATADIR%%/frmenus/dex2k/analgoal.top +%%DATADIR%%/frmenus/dex2k/analysis.top +%%DATADIR%%/frmenus/dex2k/bestsett.top +%%DATADIR%%/frmenus/dex2k/blocplo3.men +%%DATADIR%%/frmenus/dex2k/blocplot.men +%%DATADIR%%/frmenus/dex2k/confound.top +%%DATADIR%%/frmenus/dex2k/consdisc.top +%%DATADIR%%/frmenus/dex2k/construc.top +%%DATADIR%%/frmenus/dex2k/contmapl.men +%%DATADIR%%/frmenus/dex2k/contplo2.men +%%DATADIR%%/frmenus/dex2k/contplot.men +%%DATADIR%%/frmenus/dex2k/contplot.men.old +%%DATADIR%%/frmenus/dex2k/crsdplot.men +%%DATADIR%%/frmenus/dex2k/crsdplot.sav +%%DATADIR%%/frmenus/dex2k/dafidisc.top +%%DATADIR%%/frmenus/dex2k/datafile.top +%%DATADIR%%/frmenus/dex2k/dex2k.top +%%DATADIR%%/frmenus/dex2k/dextagpl.men +%%DATADIR%%/frmenus/dex2k/disadvan.top +%%DATADIR%%/frmenus/dex2k/discussi.top +%%DATADIR%%/frmenus/dex2k/efclplot.men +%%DATADIR%%/frmenus/dex2k/expgoals.top +%%DATADIR%%/frmenus/dex2k/hanoppef.men +%%DATADIR%%/frmenus/dex2k/impofact.top +%%DATADIR%%/frmenus/dex2k/inteffma.men +%%DATADIR%%/frmenus/dex2k/inteffma.men.old +%%DATADIR%%/frmenus/dex2k/loaddesi.top +%%DATADIR%%/frmenus/dex2k/loaddex8.top +%%DATADIR%%/frmenus/dex2k/meanplot.men +%%DATADIR%%/frmenus/dex2k/mod2to2.top +%%DATADIR%%/frmenus/dex2k/mod2to3.top +%%DATADIR%%/frmenus/dex2k/mod2to4.top +%%DATADIR%%/frmenus/dex2k/mod2to5.top +%%DATADIR%%/frmenus/dex2k/mod2to6.top +%%DATADIR%%/frmenus/dex2k/mod2to7.top +%%DATADIR%%/frmenus/dex2k/models.top +%%DATADIR%%/frmenus/dex2k/normppef.men +%%DATADIR%%/frmenus/dex2k/normppre.men +%%DATADIR%%/frmenus/dex2k/predequa.top +%%DATADIR%%/frmenus/dex2k/preqdisc.top +%%DATADIR%%/frmenus/dex2k/ranklifa.top +%%DATADIR%%/frmenus/dex2k/refer.top +%%DATADIR%%/frmenus/dex2k/scatplot.men +%%DATADIR%%/frmenus/dex2k/sdplot.men +%%DATADIR%%/frmenus/dex2k/snplot.men +%%DATADIR%%/frmenus/dex2k/test2.dp +%%DATADIR%%/frmenus/dex2k/viewdesi.top +%%DATADIR%%/frmenus/dex2k/viewdex8.top +%%DATADIR%%/frmenus/dex2k/yatecub2.men +%%DATADIR%%/frmenus/dex2k/yatecub3.men +%%DATADIR%%/frmenus/dex2k/yatecube.men +%%DATADIR%%/frmenus/dex2k/yates.men +%%DATADIR%%/frmenus/dex2kmp/2kmpexa1.top +%%DATADIR%%/frmenus/dex2kmp/2kmpexa2.top +%%DATADIR%%/frmenus/dex2kmp/2kmpexam.top +%%DATADIR%%/frmenus/dex2kmp/2kmpfile.top +%%DATADIR%%/frmenus/dex2kmp/2kmprefe.top +%%DATADIR%%/frmenus/dex2kmp/2kmpres4.top +%%DATADIR%%/frmenus/dex2kmp/2t210m3.top +%%DATADIR%%/frmenus/dex2kmp/2t210m4.top +%%DATADIR%%/frmenus/dex2kmp/2t210m5.top +%%DATADIR%%/frmenus/dex2kmp/2t210m6.top +%%DATADIR%%/frmenus/dex2kmp/2t211m4.top +%%DATADIR%%/frmenus/dex2kmp/2t211m5.top +%%DATADIR%%/frmenus/dex2kmp/2t211m6.top +%%DATADIR%%/frmenus/dex2kmp/2t211m7.top +%%DATADIR%%/frmenus/dex2kmp/2t215m11.top +%%DATADIR%%/frmenus/dex2kmp/2t231m26.top +%%DATADIR%%/frmenus/dex2kmp/2t24m1.top +%%DATADIR%%/frmenus/dex2kmp/2t25m1.top +%%DATADIR%%/frmenus/dex2kmp/2t25m2.top +%%DATADIR%%/frmenus/dex2kmp/2t26m1.top +%%DATADIR%%/frmenus/dex2kmp/2t26m2.top +%%DATADIR%%/frmenus/dex2kmp/2t26m3.top +%%DATADIR%%/frmenus/dex2kmp/2t27m1.top +%%DATADIR%%/frmenus/dex2kmp/2t27m2.top +%%DATADIR%%/frmenus/dex2kmp/2t27m3.top +%%DATADIR%%/frmenus/dex2kmp/2t27m4.top +%%DATADIR%%/frmenus/dex2kmp/2t28m1.top +%%DATADIR%%/frmenus/dex2kmp/2t28m2.top +%%DATADIR%%/frmenus/dex2kmp/2t28m3.top +%%DATADIR%%/frmenus/dex2kmp/2t28m4.top +%%DATADIR%%/frmenus/dex2kmp/2t29m2.top +%%DATADIR%%/frmenus/dex2kmp/2t29m3.top +%%DATADIR%%/frmenus/dex2kmp/2t29m4.top +%%DATADIR%%/frmenus/dex2kmp/2t29m5.top +%%DATADIR%%/frmenus/dex2kmp/2terconf.top +%%DATADIR%%/frmenus/dex2kmp/2to10m3.top +%%DATADIR%%/frmenus/dex2kmp/2to10m4.top +%%DATADIR%%/frmenus/dex2kmp/2to10m5.top +%%DATADIR%%/frmenus/dex2kmp/2to10m6.top +%%DATADIR%%/frmenus/dex2kmp/2to11m4.top +%%DATADIR%%/frmenus/dex2kmp/2to11m5.top +%%DATADIR%%/frmenus/dex2kmp/2to11m6.top +%%DATADIR%%/frmenus/dex2kmp/2to11m7.top +%%DATADIR%%/frmenus/dex2kmp/2to15m11.top +%%DATADIR%%/frmenus/dex2kmp/2to2.top +%%DATADIR%%/frmenus/dex2kmp/2to3.top +%%DATADIR%%/frmenus/dex2kmp/2to31m26.top +%%DATADIR%%/frmenus/dex2kmp/2to3m1.top +%%DATADIR%%/frmenus/dex2kmp/2to4.top +%%DATADIR%%/frmenus/dex2kmp/2to4m1.top +%%DATADIR%%/frmenus/dex2kmp/2to5m1.top +%%DATADIR%%/frmenus/dex2kmp/2to5m2.top +%%DATADIR%%/frmenus/dex2kmp/2to6m1.top +%%DATADIR%%/frmenus/dex2kmp/2to6m2.top +%%DATADIR%%/frmenus/dex2kmp/2to6m3.top +%%DATADIR%%/frmenus/dex2kmp/2to7m1.top +%%DATADIR%%/frmenus/dex2kmp/2to7m2.top +%%DATADIR%%/frmenus/dex2kmp/2to7m3.top +%%DATADIR%%/frmenus/dex2kmp/2to7m4.top +%%DATADIR%%/frmenus/dex2kmp/2to8m1.top +%%DATADIR%%/frmenus/dex2kmp/2to8m2.top +%%DATADIR%%/frmenus/dex2kmp/2to8m3.top +%%DATADIR%%/frmenus/dex2kmp/2to8m4.top +%%DATADIR%%/frmenus/dex2kmp/2to9m2.top +%%DATADIR%%/frmenus/dex2kmp/2to9m3.top +%%DATADIR%%/frmenus/dex2kmp/2to9m4.top +%%DATADIR%%/frmenus/dex2kmp/2to9m5.top +%%DATADIR%%/frmenus/dex2kmp/advantag.top +%%DATADIR%%/frmenus/dex2kmp/analgoal.top +%%DATADIR%%/frmenus/dex2kmp/analysis.top +%%DATADIR%%/frmenus/dex2kmp/assumpti.top +%%DATADIR%%/frmenus/dex2kmp/bestsett.top +%%DATADIR%%/frmenus/dex2kmp/cmixdesi.top +%%DATADIR%%/frmenus/dex2kmp/confdesi.top +%%DATADIR%%/frmenus/dex2kmp/conffrfd.top +%%DATADIR%%/frmenus/dex2kmp/confmatr.top +%%DATADIR%%/frmenus/dex2kmp/confoun3.top +%%DATADIR%%/frmenus/dex2kmp/confoun9.top +%%DATADIR%%/frmenus/dex2kmp/confound.top +%%DATADIR%%/frmenus/dex2kmp/conftabu.top +%%DATADIR%%/frmenus/dex2kmp/consdisc.top +%%DATADIR%%/frmenus/dex2kmp/construc.top +%%DATADIR%%/frmenus/dex2kmp/cpbdesig.top +%%DATADIR%%/frmenus/dex2kmp/cpbindde.top +%%DATADIR%%/frmenus/dex2kmp/cregdesi.top +%%DATADIR%%/frmenus/dex2kmp/crsdesig.top +%%DATADIR%%/frmenus/dex2kmp/cs210m3.top +%%DATADIR%%/frmenus/dex2kmp/cs210m4.top +%%DATADIR%%/frmenus/dex2kmp/cs210m5.top +%%DATADIR%%/frmenus/dex2kmp/cs210m6.top +%%DATADIR%%/frmenus/dex2kmp/cs211m4.top +%%DATADIR%%/frmenus/dex2kmp/cs211m5.top +%%DATADIR%%/frmenus/dex2kmp/cs211m6.top +%%DATADIR%%/frmenus/dex2kmp/cs211m7.top +%%DATADIR%%/frmenus/dex2kmp/cs215m11.top +%%DATADIR%%/frmenus/dex2kmp/cs231m26.top +%%DATADIR%%/frmenus/dex2kmp/cs23m1.top +%%DATADIR%%/frmenus/dex2kmp/cs24m1.top +%%DATADIR%%/frmenus/dex2kmp/cs25m1.top +%%DATADIR%%/frmenus/dex2kmp/cs25m2.top +%%DATADIR%%/frmenus/dex2kmp/cs26m1.top +%%DATADIR%%/frmenus/dex2kmp/cs26m2.top +%%DATADIR%%/frmenus/dex2kmp/cs26m3.top +%%DATADIR%%/frmenus/dex2kmp/cs27m1.top +%%DATADIR%%/frmenus/dex2kmp/cs27m2.top +%%DATADIR%%/frmenus/dex2kmp/cs27m3.top +%%DATADIR%%/frmenus/dex2kmp/cs27m4.top +%%DATADIR%%/frmenus/dex2kmp/cs28m1.top +%%DATADIR%%/frmenus/dex2kmp/cs28m2.top +%%DATADIR%%/frmenus/dex2kmp/cs28m3.top +%%DATADIR%%/frmenus/dex2kmp/cs28m4.top +%%DATADIR%%/frmenus/dex2kmp/cs29m2.top +%%DATADIR%%/frmenus/dex2kmp/cs29m3.top +%%DATADIR%%/frmenus/dex2kmp/cs29m4.top +%%DATADIR%%/frmenus/dex2kmp/cs29m5.top +%%DATADIR%%/frmenus/dex2kmp/ctagdesi.top +%%DATADIR%%/frmenus/dex2kmp/dafidisc.top +%%DATADIR%%/frmenus/dex2kmp/datafile.top +%%DATADIR%%/frmenus/dex2kmp/definiti.top +%%DATADIR%%/frmenus/dex2kmp/definrel.top +%%DATADIR%%/frmenus/dex2kmp/desitabu.top +%%DATADIR%%/frmenus/dex2kmp/dex2k.top +%%DATADIR%%/frmenus/dex2kmp/dex2kmp.top +%%DATADIR%%/frmenus/dex2kmp/disadvan.top +%%DATADIR%%/frmenus/dex2kmp/discussi.top +%%DATADIR%%/frmenus/dex2kmp/expgoals.top +%%DATADIR%%/frmenus/dex2kmp/factdefi.top +%%DATADIR%%/frmenus/dex2kmp/geomrepr.top +%%DATADIR%%/frmenus/dex2kmp/illustra.top +%%DATADIR%%/frmenus/dex2kmp/impofact.top +%%DATADIR%%/frmenus/dex2kmp/introduc.top +%%DATADIR%%/frmenus/dex2kmp/loaddes3.top +%%DATADIR%%/frmenus/dex2kmp/loaddes9.top +%%DATADIR%%/frmenus/dex2kmp/loaddesi.top +%%DATADIR%%/frmenus/dex2kmp/loaddex8.top +%%DATADIR%%/frmenus/dex2kmp/meffconf.top +%%DATADIR%%/frmenus/dex2kmp/mod2to2.top +%%DATADIR%%/frmenus/dex2kmp/mod2to3.top +%%DATADIR%%/frmenus/dex2kmp/mod2to4.top +%%DATADIR%%/frmenus/dex2kmp/mod2to5.top +%%DATADIR%%/frmenus/dex2kmp/mod2to6.top +%%DATADIR%%/frmenus/dex2kmp/mod2to7.top +%%DATADIR%%/frmenus/dex2kmp/models.top +%%DATADIR%%/frmenus/dex2kmp/namedesi.top +%%DATADIR%%/frmenus/dex2kmp/numbfact.top +%%DATADIR%%/frmenus/dex2kmp/numbobse.top +%%DATADIR%%/frmenus/dex2kmp/pb12.top +%%DATADIR%%/frmenus/dex2kmp/pb20.top +%%DATADIR%%/frmenus/dex2kmp/pb24.top +%%DATADIR%%/frmenus/dex2kmp/pb28.top +%%DATADIR%%/frmenus/dex2kmp/pb36.top +%%DATADIR%%/frmenus/dex2kmp/predequa.top +%%DATADIR%%/frmenus/dex2kmp/preqdisc.top +%%DATADIR%%/frmenus/dex2kmp/propgood.top +%%DATADIR%%/frmenus/dex2kmp/randruns.top +%%DATADIR%%/frmenus/dex2kmp/ranklifa.top +%%DATADIR%%/frmenus/dex2kmp/refer.top +%%DATADIR%%/frmenus/dex2kmp/resolut2.top +%%DATADIR%%/frmenus/dex2kmp/resoluti.top +%%DATADIR%%/frmenus/dex2kmp/thedesig.top +%%DATADIR%%/frmenus/dex2kmp/viewdes3.top +%%DATADIR%%/frmenus/dex2kmp/viewdes9.top +%%DATADIR%%/frmenus/dex2kmp/viewdesi.top +%%DATADIR%%/frmenus/dex2kmp/viewdex8.top +%%DATADIR%%/frmenus/dexcomp/GRLATSQ3.DP +%%DATADIR%%/frmenus/dexcomp/GRLATSQ4.DP +%%DATADIR%%/frmenus/dexcomp/GRLATSQ5.DP +%%DATADIR%%/frmenus/dexcomp/HGRLATS4.DP +%%DATADIR%%/frmenus/dexcomp/HGRLATS5.DP +%%DATADIR%%/frmenus/dexcomp/LATSQ3.DP +%%DATADIR%%/frmenus/dexcomp/LATSQ4.DP +%%DATADIR%%/frmenus/dexcomp/LATSQ5.DP +%%DATADIR%%/frmenus/dexcomp/a2kdatfi.top +%%DATADIR%%/frmenus/dexcomp/a2kindda.top +%%DATADIR%%/frmenus/dexcomp/a2kloada.top +%%DATADIR%%/frmenus/dexcomp/acomdisc.top +%%DATADIR%%/frmenus/dexcomp/ccomdesi.top +%%DATADIR%%/frmenus/dexcomp/ccomdref.top +%%DATADIR%%/frmenus/dexcomp/ccrd.top +%%DATADIR%%/frmenus/dexcomp/ccrdanal.top +%%DATADIR%%/frmenus/dexcomp/ccrddian.top +%%DATADIR%%/frmenus/dexcomp/ccrddisc.top +%%DATADIR%%/frmenus/dexcomp/ccrdex1.top +%%DATADIR%%/frmenus/dexcomp/ccrdex2.top +%%DATADIR%%/frmenus/dexcomp/ccrdexam.top +%%DATADIR%%/frmenus/dexcomp/ccrdfile.top +%%DATADIR%%/frmenus/dexcomp/ccrdind2.top +%%DATADIR%%/frmenus/dexcomp/ccrdind3.top +%%DATADIR%%/frmenus/dexcomp/ccrdinde.top +%%DATADIR%%/frmenus/dexcomp/ccrdload.top +%%DATADIR%%/frmenus/dexcomp/ccrdmode.top +%%DATADIR%%/frmenus/dexcomp/ccrdrefe.top +%%DATADIR%%/frmenus/dexcomp/ccrdview.top +%%DATADIR%%/frmenus/dexcomp/clsd.top +%%DATADIR%%/frmenus/dexcomp/clsdadva.top +%%DATADIR%%/frmenus/dexcomp/clsdanal.top +%%DATADIR%%/frmenus/dexcomp/clsddian.top +%%DATADIR%%/frmenus/dexcomp/clsddisa.top +%%DATADIR%%/frmenus/dexcomp/clsddisc.top +%%DATADIR%%/frmenus/dexcomp/clsdex1.top +%%DATADIR%%/frmenus/dexcomp/clsdex2.top +%%DATADIR%%/frmenus/dexcomp/clsdexam.top +%%DATADIR%%/frmenus/dexcomp/clsdfile.top +%%DATADIR%%/frmenus/dexcomp/clsdinde.top +%%DATADIR%%/frmenus/dexcomp/clsdlist.top +%%DATADIR%%/frmenus/dexcomp/clsdload.top +%%DATADIR%%/frmenus/dexcomp/clsdmode.top +%%DATADIR%%/frmenus/dexcomp/clsdrefe.top +%%DATADIR%%/frmenus/dexcomp/clsdview.top +%%DATADIR%%/frmenus/dexcomp/compexam.top +%%DATADIR%%/frmenus/dexcomp/crbd.top +%%DATADIR%%/frmenus/dexcomp/crbdanal.top +%%DATADIR%%/frmenus/dexcomp/crbddian.top +%%DATADIR%%/frmenus/dexcomp/crbddisc.top +%%DATADIR%%/frmenus/dexcomp/crbdex1.top +%%DATADIR%%/frmenus/dexcomp/crbdex2.top +%%DATADIR%%/frmenus/dexcomp/crbdexam.top +%%DATADIR%%/frmenus/dexcomp/crbdfile.top +%%DATADIR%%/frmenus/dexcomp/crbdinde.top +%%DATADIR%%/frmenus/dexcomp/crbdlist.top +%%DATADIR%%/frmenus/dexcomp/crbdload.top +%%DATADIR%%/frmenus/dexcomp/crbdmode.top +%%DATADIR%%/frmenus/dexcomp/crbdrefe.top +%%DATADIR%%/frmenus/dexcomp/crbdview.top +%%DATADIR%%/frmenus/dexcomp/datasets.top +%%DATADIR%%/frmenus/dexcomp/dexcomp.top +%%DATADIR%%/frmenus/dexcomp/discussi.top +%%DATADIR%%/frmenus/dexcomp/grlatsq3.top +%%DATADIR%%/frmenus/dexcomp/grlatsq4.top +%%DATADIR%%/frmenus/dexcomp/grlatsq5.top +%%DATADIR%%/frmenus/dexcomp/hgrlats4.top +%%DATADIR%%/frmenus/dexcomp/hgrlats5.top +%%DATADIR%%/frmenus/dexcomp/latsq3.top +%%DATADIR%%/frmenus/dexcomp/latsq4.top +%%DATADIR%%/frmenus/dexcomp/latsq5.top +%%DATADIR%%/frmenus/dexcomp/replplot.men +%%DATADIR%%/frmenus/dexcomp/stattech.top +%%DATADIR%%/frmenus/dexcomp/viewdata.top +%%DATADIR%%/frmenus/dexcomp/wsch7.top +%%DATADIR%%/frmenus/dexmix/GPUNCH2.DP +%%DATADIR%%/frmenus/dexmix/HARE.DP +%%DATADIR%%/frmenus/dexmix/PB12.DP +%%DATADIR%%/frmenus/dexmix/PB20.DP +%%DATADIR%%/frmenus/dexmix/PB24.DP +%%DATADIR%%/frmenus/dexmix/PB28.DP +%%DATADIR%%/frmenus/dexmix/PB36.DP +%%DATADIR%%/frmenus/dexmix/PUNCH2.DP +%%DATADIR%%/frmenus/dexmix/SIMCENT3.DP +%%DATADIR%%/frmenus/dexmix/SIMCENT4.DP +%%DATADIR%%/frmenus/dexmix/SIMCENT5.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT31.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT32.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT33.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT34.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT41.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT42.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT43.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT44.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT51.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT52.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT53.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT61.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT62.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT71.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT72.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT81.DP +%%DATADIR%%/frmenus/dexmix/SIMLAT82.DP +%%DATADIR%%/frmenus/dexmix/SIMON.DP +%%DATADIR%%/frmenus/dexmix/advantag.top +%%DATADIR%%/frmenus/dexmix/analysis.top +%%DATADIR%%/frmenus/dexmix/construc.top +%%DATADIR%%/frmenus/dexmix/datafile.top +%%DATADIR%%/frmenus/dexmix/dexmix.top +%%DATADIR%%/frmenus/dexmix/dexpb.top +%%DATADIR%%/frmenus/dexmix/disadvan.top +%%DATADIR%%/frmenus/dexmix/discussi.top +%%DATADIR%%/frmenus/dexmix/expgoals.top +%%DATADIR%%/frmenus/dexmix/loaddesi.top +%%DATADIR%%/frmenus/dexmix/loaddesl.top +%%DATADIR%%/frmenus/dexmix/loadmode.top +%%DATADIR%%/frmenus/dexmix/mdesexam.top +%%DATADIR%%/frmenus/dexmix/refer.top +%%DATADIR%%/frmenus/dexmix/scmodel3.men +%%DATADIR%%/frmenus/dexmix/scmodel3.top +%%DATADIR%%/frmenus/dexmix/scmodel4.men +%%DATADIR%%/frmenus/dexmix/scmodel4.top +%%DATADIR%%/frmenus/dexmix/scmodel5.top +%%DATADIR%%/frmenus/dexmix/simplex.men +%%DATADIR%%/frmenus/dexmix/simplex.top +%%DATADIR%%/frmenus/dexmix/simplex1.men +%%DATADIR%%/frmenus/dexmix/simplexd.men +%%DATADIR%%/frmenus/dexmix/simplexr.men +%%DATADIR%%/frmenus/dexmix/slmod31.men +%%DATADIR%%/frmenus/dexmix/slmod31.top +%%DATADIR%%/frmenus/dexmix/slmod32.men +%%DATADIR%%/frmenus/dexmix/slmod32.top +%%DATADIR%%/frmenus/dexmix/slmod33.men +%%DATADIR%%/frmenus/dexmix/slmod33.top +%%DATADIR%%/frmenus/dexmix/slmod34.top +%%DATADIR%%/frmenus/dexmix/slmod41.men +%%DATADIR%%/frmenus/dexmix/slmod41.top +%%DATADIR%%/frmenus/dexmix/slmod42.men +%%DATADIR%%/frmenus/dexmix/slmod42.top +%%DATADIR%%/frmenus/dexmix/slmod43.top +%%DATADIR%%/frmenus/dexmix/slmod44.top +%%DATADIR%%/frmenus/dexmix/slmod51.men +%%DATADIR%%/frmenus/dexmix/slmod51.top +%%DATADIR%%/frmenus/dexmix/slmod52.men +%%DATADIR%%/frmenus/dexmix/slmod52.top +%%DATADIR%%/frmenus/dexmix/slmod53.top +%%DATADIR%%/frmenus/dexmix/slmod61.men +%%DATADIR%%/frmenus/dexmix/slmod61.top +%%DATADIR%%/frmenus/dexmix/slmod62.men +%%DATADIR%%/frmenus/dexmix/slmod62.top +%%DATADIR%%/frmenus/dexmix/slmod71.men +%%DATADIR%%/frmenus/dexmix/slmod71.top +%%DATADIR%%/frmenus/dexmix/slmod72.men +%%DATADIR%%/frmenus/dexmix/slmod72.top +%%DATADIR%%/frmenus/dexmix/slmod81.men +%%DATADIR%%/frmenus/dexmix/slmod81.top +%%DATADIR%%/frmenus/dexmix/slmod82.men +%%DATADIR%%/frmenus/dexmix/slmod82.top +%%DATADIR%%/frmenus/dexmix/viewdesi.top +%%DATADIR%%/frmenus/dexmix/viewmode.top +%%DATADIR%%/frmenus/dexopt/2FACTVIE.MEN +%%DATADIR%%/frmenus/dexopt/2TO2WCP.DP +%%DATADIR%%/frmenus/dexopt/2TO3WCP.DP +%%DATADIR%%/frmenus/dexopt/2factdis.top +%%DATADIR%%/frmenus/dexopt/2factlin.men +%%DATADIR%%/frmenus/dexopt/2factqua.men +%%DATADIR%%/frmenus/dexopt/2factvie.men +%%DATADIR%%/frmenus/dexopt/3factlin.men +%%DATADIR%%/frmenus/dexopt/3factqua.men +%%DATADIR%%/frmenus/dexopt/CC2.DP +%%DATADIR%%/frmenus/dexopt/CC3.DP +%%DATADIR%%/frmenus/dexopt/CONTQPLO.MEN +%%DATADIR%%/frmenus/dexopt/STAR2WCP.DP +%%DATADIR%%/frmenus/dexopt/STAR3WCP.DP +%%DATADIR%%/frmenus/dexopt/advantag.top +%%DATADIR%%/frmenus/dexopt/analysis.top +%%DATADIR%%/frmenus/dexopt/contqplo.men +%%DATADIR%%/frmenus/dexopt/datafile.top +%%DATADIR%%/frmenus/dexopt/dexopt.top +%%DATADIR%%/frmenus/dexopt/disadvan.top +%%DATADIR%%/frmenus/dexopt/discussi.top +%%DATADIR%%/frmenus/dexopt/effework.men +%%DATADIR%%/frmenus/dexopt/expgoals.top +%%DATADIR%%/frmenus/dexopt/loaddesi.top +%%DATADIR%%/frmenus/dexopt/refer.top +%%DATADIR%%/frmenus/dexopt/viewdesi.top +%%DATADIR%%/frmenus/dexpb/PB12.DP +%%DATADIR%%/frmenus/dexpb/PB20.DP +%%DATADIR%%/frmenus/dexpb/PB24.DP +%%DATADIR%%/frmenus/dexpb/PB28.DP +%%DATADIR%%/frmenus/dexpb/PB36.DP +%%DATADIR%%/frmenus/dexpb/analgoal.top +%%DATADIR%%/frmenus/dexpb/analysis.top +%%DATADIR%%/frmenus/dexpb/bestsett.top +%%DATADIR%%/frmenus/dexpb/construc.top +%%DATADIR%%/frmenus/dexpb/dexpb.top +%%DATADIR%%/frmenus/dexpb/discussi.top +%%DATADIR%%/frmenus/dexpb/impofact.top +%%DATADIR%%/frmenus/dexpb/loaddesi.top +%%DATADIR%%/frmenus/dexpb/loaddesl.top +%%DATADIR%%/frmenus/dexpb/predequa.top +%%DATADIR%%/frmenus/dexpb/ranklifa.top +%%DATADIR%%/frmenus/dexpb/refer.top +%%DATADIR%%/frmenus/dexpb/viewdesi.top +%%DATADIR%%/frmenus/dexreg/advantag.top +%%DATADIR%%/frmenus/dexreg/construc.top +%%DATADIR%%/frmenus/dexreg/datafile.top +%%DATADIR%%/frmenus/dexreg/dexreg.top +%%DATADIR%%/frmenus/dexreg/disadvan.top +%%DATADIR%%/frmenus/dexreg/discussi.top +%%DATADIR%%/frmenus/dexreg/expgoals.top +%%DATADIR%%/frmenus/dexreg/refer.top +%%DATADIR%%/frmenus/dexscr/dexscr.top +%%DATADIR%%/frmenus/dextag/L12.DP +%%DATADIR%%/frmenus/dextag/L16.DP +%%DATADIR%%/frmenus/dextag/L16B.DP +%%DATADIR%%/frmenus/dextag/L18.DP +%%DATADIR%%/frmenus/dextag/L25.DP +%%DATADIR%%/frmenus/dextag/L27.DP +%%DATADIR%%/frmenus/dextag/L32.DP +%%DATADIR%%/frmenus/dextag/L32B.DP +%%DATADIR%%/frmenus/dextag/L36.DP +%%DATADIR%%/frmenus/dextag/L36B.DP +%%DATADIR%%/frmenus/dextag/L4.DP +%%DATADIR%%/frmenus/dextag/L50.DP +%%DATADIR%%/frmenus/dextag/L54.DP +%%DATADIR%%/frmenus/dextag/L64.DP +%%DATADIR%%/frmenus/dextag/L64B.DP +%%DATADIR%%/frmenus/dextag/L8.DP +%%DATADIR%%/frmenus/dextag/L81.DP +%%DATADIR%%/frmenus/dextag/L9.DP +%%DATADIR%%/frmenus/dextag/advantag.top +%%DATADIR%%/frmenus/dextag/analysis.top +%%DATADIR%%/frmenus/dextag/confound.top +%%DATADIR%%/frmenus/dextag/construc.top +%%DATADIR%%/frmenus/dextag/dextag.top +%%DATADIR%%/frmenus/dextag/disadvan.top +%%DATADIR%%/frmenus/dextag/discussi.top +%%DATADIR%%/frmenus/dextag/expgoals.top +%%DATADIR%%/frmenus/dextag/loaddesf.top +%%DATADIR%%/frmenus/dextag/loaddesl.top +%%DATADIR%%/frmenus/dextag/loaddesr.top +%%DATADIR%%/frmenus/dextag/refer.top +%%DATADIR%%/frmenus/dextag/viewdesf.top +%%DATADIR%%/frmenus/dextag/viewdesl.top +%%DATADIR%%/frmenus/dextag/viewdesr.top +%%DATADIR%%/frmenus/dp/3corecom.top +%%DATADIR%%/frmenus/dp/cal.top +%%DATADIR%%/frmenus/dp/commands.top +%%DATADIR%%/frmenus/dp/customer.top +%%DATADIR%%/frmenus/dp/cv.top +%%DATADIR%%/frmenus/dp/dataobje.top +%%DATADIR%%/frmenus/dp/dp.top +%%DATADIR%%/frmenus/dp/dpfiles.top +%%DATADIR%%/frmenus/dp/dpprojec.top +%%DATADIR%%/frmenus/dp/dprun.top +%%DATADIR%%/frmenus/dp/enhancem.top +%%DATADIR%%/frmenus/dp/files.top +%%DATADIR%%/frmenus/dp/function.top +%%DATADIR%%/frmenus/dp/glossary.top +%%DATADIR%%/frmenus/dp/grapdevd.top +%%DATADIR%%/frmenus/dp/grapdevi.top +%%DATADIR%%/frmenus/dp/guicmdl.top +%%DATADIR%%/frmenus/dp/guicomm.top +%%DATADIR%%/frmenus/dp/guicust.top +%%DATADIR%%/frmenus/dp/guidesi.top +%%DATADIR%%/frmenus/dp/guigrap.top +%%DATADIR%%/frmenus/dp/guihelp.top +%%DATADIR%%/frmenus/dp/guiimpl.top +%%DATADIR%%/frmenus/dp/guimain.top +%%DATADIR%%/frmenus/dp/guioutp.top +%%DATADIR%%/frmenus/dp/guiperf.top +%%DATADIR%%/frmenus/dp/guiphilo.top +%%DATADIR%%/frmenus/dp/guispecs.top +%%DATADIR%%/frmenus/dp/guispre.top +%%DATADIR%%/frmenus/dp/help.men +%%DATADIR%%/frmenus/dp/help.top +%%DATADIR%%/frmenus/dp/helpfile.top +%%DATADIR%%/frmenus/dp/humahelp.top +%%DATADIR%%/frmenus/dp/installa.top +%%DATADIR%%/frmenus/dp/intework.top +%%DATADIR%%/frmenus/dp/introduc.top +%%DATADIR%%/frmenus/dp/jjf.top +%%DATADIR%%/frmenus/dp/lisaeric.top +%%DATADIR%%/frmenus/dp/loginfil.top +%%DATADIR%%/frmenus/dp/macrprog.top +%%DATADIR%%/frmenus/dp/mathoper.top +%%DATADIR%%/frmenus/dp/menusubs.top +%%DATADIR%%/frmenus/dp/modeoper.top +%%DATADIR%%/frmenus/dp/nistmiss.top +%%DATADIR%%/frmenus/dp/offlhelp.top +%%DATADIR%%/frmenus/dp/onlihelp.top +%%DATADIR%%/frmenus/dp/operfile.top +%%DATADIR%%/frmenus/dp/other.top +%%DATADIR%%/frmenus/dp/outputfi.top +%%DATADIR%%/frmenus/dp/overview.top +%%DATADIR%%/frmenus/dp/plots.top +%%DATADIR%%/frmenus/dp/portplot.top +%%DATADIR%%/frmenus/dp/referenc.top +%%DATADIR%%/frmenus/dp/resewoch.top +%%DATADIR%%/frmenus/dp/scope.top +%%DATADIR%%/frmenus/dp/screen.top +%%DATADIR%%/frmenus/dp/specs.top +%%DATADIR%%/frmenus/dp/subclet.top +%%DATADIR%%/frmenus/dp/subctext.top +%%DATADIR%%/frmenus/dp/subexcfo.top +%%DATADIR%%/frmenus/dp/timedate.top +%%DATADIR%%/frmenus/dp/todo.top +%%DATADIR%%/frmenus/dp/typehelp.top +%%DATADIR%%/frmenus/dp/typicomm.top +%%DATADIR%%/frmenus/file/CAPTOFF.DP +%%DATADIR%%/frmenus/file/CAPTVIEW.DP +%%DATADIR%%/frmenus/file/CLEAR.DP +%%DATADIR%%/frmenus/file/asciion.men +%%DATADIR%%/frmenus/file/captasci.top +%%DATADIR%%/frmenus/file/capthtml.top +%%DATADIR%%/frmenus/file/captlate.top +%%DATADIR%%/frmenus/file/charact.men +%%DATADIR%%/frmenus/file/collimi2.men +%%DATADIR%%/frmenus/file/collimit.men +%%DATADIR%%/frmenus/file/commchar.men +%%DATADIR%%/frmenus/file/commchec.men +%%DATADIR%%/frmenus/file/copyfile.men +%%DATADIR%%/frmenus/file/delefile.men +%%DATADIR%%/frmenus/file/delimit.men +%%DATADIR%%/frmenus/file/dirfile.men +%%DATADIR%%/frmenus/file/discauto.top +%%DATADIR%%/frmenus/file/discchar.top +%%DATADIR%%/frmenus/file/disccomm.top +%%DATADIR%%/frmenus/file/discexce.top +%%DATADIR%%/frmenus/file/discfile.top +%%DATADIR%%/frmenus/file/discfixc.top +%%DATADIR%%/frmenus/file/dischead.top +%%DATADIR%%/frmenus/file/disclong.top +%%DATADIR%%/frmenus/file/discname.top +%%DATADIR%%/frmenus/file/discout.top +%%DATADIR%%/frmenus/file/discrowd.top +%%DATADIR%%/frmenus/file/discspre.top +%%DATADIR%%/frmenus/file/discuneq.top +%%DATADIR%%/frmenus/file/discview.top +%%DATADIR%%/frmenus/file/discwork.top +%%DATADIR%%/frmenus/file/editfile.men +%%DATADIR%%/frmenus/file/file.top +%%DATADIR%%/frmenus/file/htmlon.men +%%DATADIR%%/frmenus/file/latexon.men +%%DATADIR%%/frmenus/file/letdata.men +%%DATADIR%%/frmenus/file/maxrcl.men +%%DATADIR%%/frmenus/file/missvalu.men +%%DATADIR%%/frmenus/file/options.top +%%DATADIR%%/frmenus/file/prinfile.men +%%DATADIR%%/frmenus/file/readform.men +%%DATADIR%%/frmenus/file/readvaf2.men +%%DATADIR%%/frmenus/file/readvafi.men +%%DATADIR%%/frmenus/file/rowlimit.men +%%DATADIR%%/frmenus/file/searfile.men +%%DATADIR%%/frmenus/file/skip.men +%%DATADIR%%/frmenus/file/varlabel.men +%%DATADIR%%/frmenus/file/viewfile.men +%%DATADIR%%/frmenus/file/writdata.men +%%DATADIR%%/frmenus/file/writvafi.men +%%DATADIR%%/frmenus/file/writvpsf.men +%%DATADIR%%/frmenus/fit/6plot.men +%%DATADIR%%/frmenus/fit/BERGER1.DP +%%DATADIR%%/frmenus/fit/CHWIRUT.DP +%%DATADIR%%/frmenus/fit/HAHN1.DP +%%DATADIR%%/frmenus/fit/HALD.DP +%%DATADIR%%/frmenus/fit/HAYES1.DP +%%DATADIR%%/frmenus/fit/LEW.DP +%%DATADIR%%/frmenus/fit/LEW11.DP +%%DATADIR%%/frmenus/fit/LEW4.DP +%%DATADIR%%/frmenus/fit/MAVRO.DP +%%DATADIR%%/frmenus/fit/MISRA.DP +%%DATADIR%%/frmenus/fit/NORR795.DAT +%%DATADIR%%/frmenus/fit/NUMSUM.DP +%%DATADIR%%/frmenus/fit/PONTIUS.DP +%%DATADIR%%/frmenus/fit/PREFIT.DP +%%DATADIR%%/frmenus/fit/RESVPRED.DP +%%DATADIR%%/frmenus/fit/ROSZMAN.DP +%%DATADIR%%/frmenus/fit/SPIEGEL.DP +%%DATADIR%%/frmenus/fit/SPIEGEL2.DP +%%DATADIR%%/frmenus/fit/SWANSON1.DP +%%DATADIR%%/frmenus/fit/anocov.men +%%DATADIR%%/frmenus/fit/anova.men +%%DATADIR%%/frmenus/fit/assucons.top +%%DATADIR%%/frmenus/fit/assucorr.top +%%DATADIR%%/frmenus/fit/assudisc.top +%%DATADIR%%/frmenus/fit/assulist.top +%%DATADIR%%/frmenus/fit/assumpti.top +%%DATADIR%%/frmenus/fit/avecoefs.men +%%DATADIR%%/frmenus/fit/bestcp.men +%%DATADIR%%/frmenus/fit/bonfer.men +%%DATADIR%%/frmenus/fit/bycriter.top +%%DATADIR%%/frmenus/fit/bydata.top +%%DATADIR%%/frmenus/fit/bymodel.top +%%DATADIR%%/frmenus/fit/calidisc.top +%%DATADIR%%/frmenus/fit/calihowf.top +%%DATADIR%%/frmenus/fit/catcher.men +%%DATADIR%%/frmenus/fit/catcher.top +%%DATADIR%%/frmenus/fit/colisigm.men +%%DATADIR%%/frmenus/fit/condind.men +%%DATADIR%%/frmenus/fit/corrcoli.men +%%DATADIR%%/frmenus/fit/creatdes.men +%%DATADIR%%/frmenus/fit/critdisc.top +%%DATADIR%%/frmenus/fit/critls.top +%%DATADIR%%/frmenus/fit/critnls.top +%%DATADIR%%/frmenus/fit/critodr.top +%%DATADIR%%/frmenus/fit/data1var.top +%%DATADIR%%/frmenus/fit/datadisc.top +%%DATADIR%%/frmenus/fit/datamres.top +%%DATADIR%%/frmenus/fit/datamvar.top +%%DATADIR%%/frmenus/fit/dataprli.men +%%DATADIR%%/frmenus/fit/datatoli.men +%%DATADIR%%/frmenus/fit/datatran.top +%%DATADIR%%/frmenus/fit/dfbeta.men +%%DATADIR%%/frmenus/fit/diagnost.top +%%DATADIR%%/frmenus/fit/disccatc.top +%%DATADIR%%/frmenus/fit/discirls.top +%%DATADIR%%/frmenus/fit/disclowe.top +%%DATADIR%%/frmenus/fit/discorth.top +%%DATADIR%%/frmenus/fit/discratf.top +%%DATADIR%%/frmenus/fit/discregd.top +%%DATADIR%%/frmenus/fit/discspli.top +%%DATADIR%%/frmenus/fit/discussi.top +%%DATADIR%%/frmenus/fit/dolicali.men +%%DATADIR%%/frmenus/fit/drifcali.top +%%DATADIR%%/frmenus/fit/elp.top +%%DATADIR%%/frmenus/fit/elpref.top +%%DATADIR%%/frmenus/fit/esticorr.men +%%DATADIR%%/frmenus/fit/fit.top +%%DATADIR%%/frmenus/fit/fitexam.top +%%DATADIR%%/frmenus/fit/fitline.men +%%DATADIR%%/frmenus/fit/fitmult.men +%%DATADIR%%/frmenus/fit/fitnl.men +%%DATADIR%%/frmenus/fit/fitnn.men +%%DATADIR%%/frmenus/fit/fitnum.men +%%DATADIR%%/frmenus/fit/fitpc.men +%%DATADIR%%/frmenus/fit/fitpoly.men +%%DATADIR%%/frmenus/fit/fitquad.men +%%DATADIR%%/frmenus/fit/fitrat.men +%%DATADIR%%/frmenus/fit/fitrawda.men +%%DATADIR%%/frmenus/fit/fitrr.men +%%DATADIR%%/frmenus/fit/fitsplin.men +%%DATADIR%%/frmenus/fit/flowOutp.top +%%DATADIR%%/frmenus/fit/flowdata.top +%%DATADIR%%/frmenus/fit/flowl0v0.top +%%DATADIR%%/frmenus/fit/flowl0v1.top +%%DATADIR%%/frmenus/fit/flowl1v0.top +%%DATADIR%%/frmenus/fit/flowl1v1.top +%%DATADIR%%/frmenus/fit/flowmode.top +%%DATADIR%%/frmenus/fit/flowruns.top +%%DATADIR%%/frmenus/fit/geomfitt.top +%%DATADIR%%/frmenus/fit/grcadete.top +%%DATADIR%%/frmenus/fit/grcadisc.top +%%DATADIR%%/frmenus/fit/grcaindi.top +%%DATADIR%%/frmenus/fit/grcaoudi.top +%%DATADIR%%/frmenus/fit/groucali.top +%%DATADIR%%/frmenus/fit/handbook.top +%%DATADIR%%/frmenus/fit/help.top +%%DATADIR%%/frmenus/fit/helpref.top +%%DATADIR%%/frmenus/fit/inferenc.top +%%DATADIR%%/frmenus/fit/intecoli.men +%%DATADIR%%/frmenus/fit/invecali.top +%%DATADIR%%/frmenus/fit/irls.men +%%DATADIR%%/frmenus/fit/irls.top +%%DATADIR%%/frmenus/fit/linecali.men +%%DATADIR%%/frmenus/fit/linecali.top +%%DATADIR%%/frmenus/fit/linecali.top.old +%%DATADIR%%/frmenus/fit/linreg.top +%%DATADIR%%/frmenus/fit/lowess.top +%%DATADIR%%/frmenus/fit/lrdisc.top +%%DATADIR%%/frmenus/fit/modedisc.top +%%DATADIR%%/frmenus/fit/modelcyc.top +%%DATADIR%%/frmenus/fit/modelfit.top +%%DATADIR%%/frmenus/fit/modelsel.top +%%DATADIR%%/frmenus/fit/modelval.top +%%DATADIR%%/frmenus/fit/mrdisc.top +%%DATADIR%%/frmenus/fit/multreg.top +%%DATADIR%%/frmenus/fit/newptcl.men +%%DATADIR%%/frmenus/fit/newpts.men +%%DATADIR%%/frmenus/fit/newptscl.men +%%DATADIR%%/frmenus/fit/nlrdisc.top +%%DATADIR%%/frmenus/fit/nlreg.top +%%DATADIR%%/frmenus/fit/nnreg.top +%%DATADIR%%/frmenus/fit/noiscali.top +%%DATADIR%%/frmenus/fit/norppres.men +%%DATADIR%%/frmenus/fit/norrdecp.top +%%DATADIR%%/frmenus/fit/norrdecr.top +%%DATADIR%%/frmenus/fit/norrdepr.top +%%DATADIR%%/frmenus/fit/norrdequ.top +%%DATADIR%%/frmenus/fit/norrdere.top +%%DATADIR%%/frmenus/fit/norrderq.top +%%DATADIR%%/frmenus/fit/norrdex.top +%%DATADIR%%/frmenus/fit/norrfita.dp +%%DATADIR%%/frmenus/fit/norrfitr.dp +%%DATADIR%%/frmenus/fit/norrflow.top +%%DATADIR%%/frmenus/fit/norrgeaa.top +%%DATADIR%%/frmenus/fit/norroutp.top +%%DATADIR%%/frmenus/fit/norrplr1.dp +%%DATADIR%%/frmenus/fit/norrplr2.dp +%%DATADIR%%/frmenus/fit/norrplr3.dp +%%DATADIR%%/frmenus/fit/norrplr4.dp +%%DATADIR%%/frmenus/fit/norrplri.dp +%%DATADIR%%/frmenus/fit/norrredf.dp +%%DATADIR%%/frmenus/fit/norrspdf.men +%%DATADIR%%/frmenus/fit/norrsppl.men +%%DATADIR%%/frmenus/fit/norrspru.men +%%DATADIR%%/frmenus/fit/norrstep.top +%%DATADIR%%/frmenus/fit/norrstra.dp +%%DATADIR%%/frmenus/fit/norrstre.dp +%%DATADIR%%/frmenus/fit/norrtest.top +%%DATADIR%%/frmenus/fit/orth1.men +%%DATADIR%%/frmenus/fit/orth2.men +%%DATADIR%%/frmenus/fit/orthdist.top +%%DATADIR%%/frmenus/fit/othecali.top +%%DATADIR%%/frmenus/fit/ozoncali.top +%%DATADIR%%/frmenus/fit/ozoncapr.top +%%DATADIR%%/frmenus/fit/ozondisc.top +%%DATADIR%%/frmenus/fit/ozonmoni.top +%%DATADIR%%/frmenus/fit/parcl.men +%%DATADIR%%/frmenus/fit/parcov.men +%%DATADIR%%/frmenus/fit/partlevp.men +%%DATADIR%%/frmenus/fit/partregr.men +%%DATADIR%%/frmenus/fit/partresp.men +%%DATADIR%%/frmenus/fit/pcdisc.top +%%DATADIR%%/frmenus/fit/pcreg.top +%%DATADIR%%/frmenus/fit/plotprcl.men +%%DATADIR%%/frmenus/fit/plotpred.men +%%DATADIR%%/frmenus/fit/plotres.men +%%DATADIR%%/frmenus/fit/plsreg.top +%%DATADIR%%/frmenus/fit/polyreg.top +%%DATADIR%%/frmenus/fit/polyregr.men +%%DATADIR%%/frmenus/fit/prdisc.top +%%DATADIR%%/frmenus/fit/prefit.men +%%DATADIR%%/frmenus/fit/prefit.top +%%DATADIR%%/frmenus/fit/prefitti.top +%%DATADIR%%/frmenus/fit/prreg.top +%%DATADIR%%/frmenus/fit/qrdisc.top +%%DATADIR%%/frmenus/fit/quadreg.top +%%DATADIR%%/frmenus/fit/ratfreg.top +%%DATADIR%%/frmenus/fit/readcook.men +%%DATADIR%%/frmenus/fit/readcoov.men +%%DATADIR%%/frmenus/fit/readdfft.men +%%DATADIR%%/frmenus/fit/readdres.men +%%DATADIR%%/frmenus/fit/readeres.men +%%DATADIR%%/frmenus/fit/readhii.men +%%DATADIR%%/frmenus/fit/readires.men +%%DATADIR%%/frmenus/fit/readmaha.men +%%DATADIR%%/frmenus/fit/readpres.men +%%DATADIR%%/frmenus/fit/readresv.men +%%DATADIR%%/frmenus/fit/readsres.men +%%DATADIR%%/frmenus/fit/referenc.top +%%DATADIR%%/frmenus/fit/refnonli.top +%%DATADIR%%/frmenus/fit/refpcreg.top +%%DATADIR%%/frmenus/fit/refridge.top +%%DATADIR%%/frmenus/fit/regrdiag.top +%%DATADIR%%/frmenus/fit/res4plot.men +%%DATADIR%%/frmenus/fit/residisc.top +%%DATADIR%%/frmenus/fit/resvsx.men +%%DATADIR%%/frmenus/fit/rrdisc.top +%%DATADIR%%/frmenus/fit/rreg.top +%%DATADIR%%/frmenus/fit/slopcoli.men +%%DATADIR%%/frmenus/fit/smooth.top +%%DATADIR%%/frmenus/fit/splinreg.top +%%DATADIR%%/frmenus/fit/svdreg.top +%%DATADIR%%/frmenus/fit/testcorr.men +%%DATADIR%%/frmenus/fit/transfor.top +%%DATADIR%%/frmenus/fit/vif.men +%%DATADIR%%/frmenus/fit/weilinfi.men +%%DATADIR%%/frmenus/fit/xhatcoli.men +%%DATADIR%%/frmenus/fit/xhatwhcl.men +%%DATADIR%%/frmenus/fit/xtxinv.men +%%DATADIR%%/frmenus/fit/yhatcoli.men +%%DATADIR%%/frmenus/fit/yhatwhcl.men +%%DATADIR%%/frmenus/fit/yscatplm.men +%%DATADIR%%/frmenus/fit/yvspred.men +%%DATADIR%%/frmenus/handbook/apr.top +%%DATADIR%%/frmenus/handbook/eda.top +%%DATADIR%%/frmenus/handbook/graphtec.top +%%DATADIR%%/frmenus/handbook/handbook.top +%%DATADIR%%/frmenus/handbook/keyword.men +%%DATADIR%%/frmenus/handbook/pmc.top +%%DATADIR%%/frmenus/handbook/pmd.top +%%DATADIR%%/frmenus/handbook/pmd_anal.top +%%DATADIR%%/frmenus/handbook/pmd_desi.top +%%DATADIR%%/frmenus/handbook/pmd_meth.top +%%DATADIR%%/frmenus/handbook/ppc.top +%%DATADIR%%/frmenus/handbook/ppc_anal.top +%%DATADIR%%/frmenus/handbook/prc.top +%%DATADIR%%/frmenus/handbook/prc_comm.top +%%DATADIR%%/frmenus/handbook/prc_intr.top +%%DATADIR%%/frmenus/handbook/prc_one.top +%%DATADIR%%/frmenus/handbook/prc_thre.top +%%DATADIR%%/frmenus/handbook/prc_two.top +%%DATADIR%%/frmenus/handbook/pri.top +%%DATADIR%%/frmenus/handbook/probcat.top +%%DATADIR%%/frmenus/handbook/probdist.top +%%DATADIR%%/frmenus/handbook/quanttec.top +%%DATADIR%%/frmenus/handbook/testassu.top +%%DATADIR%%/frmenus/help/4typical.top +%%DATADIR%%/frmenus/help/KEYWORDS.DP +%%DATADIR%%/frmenus/help/LETSUBC.DP +%%DATADIR%%/frmenus/help/TEXTSUBC.DP +%%DATADIR%%/frmenus/help/arith.top +%%DATADIR%%/frmenus/help/ascifile.top +%%DATADIR%%/frmenus/help/builtin.top +%%DATADIR%%/frmenus/help/charvari.top +%%DATADIR%%/frmenus/help/commands.top +%%DATADIR%%/frmenus/help/comp.top +%%DATADIR%%/frmenus/help/compnumb.top +%%DATADIR%%/frmenus/help/custom.top +%%DATADIR%%/frmenus/help/datatype.top +%%DATADIR%%/frmenus/help/declare.top +%%DATADIR%%/frmenus/help/discfile.top +%%DATADIR%%/frmenus/help/dpproc1.top +%%DATADIR%%/frmenus/help/dpproc2.top +%%DATADIR%%/frmenus/help/dpproc3.top +%%DATADIR%%/frmenus/help/english.top +%%DATADIR%%/frmenus/help/entdata.top +%%DATADIR%%/frmenus/help/epsproc.top +%%DATADIR%%/frmenus/help/evalfunc.top +%%DATADIR%%/frmenus/help/extproc.top +%%DATADIR%%/frmenus/help/filerefe.top +%%DATADIR%%/frmenus/help/freeform.top +%%DATADIR%%/frmenus/help/function.top +%%DATADIR%%/frmenus/help/generate.top +%%DATADIR%%/frmenus/help/graphdev.top +%%DATADIR%%/frmenus/help/import.top +%%DATADIR%%/frmenus/help/intro.top +%%DATADIR%%/frmenus/help/latproc.top +%%DATADIR%%/frmenus/help/matrices.top +%%DATADIR%%/frmenus/help/nonafile.top +%%DATADIR%%/frmenus/help/numbers.top +%%DATADIR%%/frmenus/help/od.top +%%DATADIR%%/frmenus/help/param.top +%%DATADIR%%/frmenus/help/print.top +%%DATADIR%%/frmenus/help/program.top +%%DATADIR%%/frmenus/help/punct.top +%%DATADIR%%/frmenus/help/relat.top +%%DATADIR%%/frmenus/help/simpcomm.top +%%DATADIR%%/frmenus/help/simpexam.top +%%DATADIR%%/frmenus/help/simpgui.top +%%DATADIR%%/frmenus/help/strings.top +%%DATADIR%%/frmenus/help/structur.top +%%DATADIR%%/frmenus/help/suppform.top +%%DATADIR%%/frmenus/help/tutorial.top +%%DATADIR%%/frmenus/help/variable.top +%%DATADIR%%/frmenus/imag/imaganal.top +%%DATADIR%%/frmenus/inte/discussi.top +%%DATADIR%%/frmenus/inte/interlab.top +%%DATADIR%%/frmenus/inte/stattech.top +%%DATADIR%%/frmenus/interp/README.DOC +%%DATADIR%%/frmenus/interp/dummy.top +%%DATADIR%%/frmenus/interp/interp.roo +%%DATADIR%%/frmenus/interp/interp.top +%%DATADIR%%/frmenus/math/VANGEL31.DP +%%DATADIR%%/frmenus/math/VANGEL32.DP +%%DATADIR%%/frmenus/math/VANGEL33.DP +%%DATADIR%%/frmenus/math/VANGEL34.DP +%%DATADIR%%/frmenus/math/aad.men +%%DATADIR%%/frmenus/math/abram.men +%%DATADIR%%/frmenus/math/airy.men +%%DATADIR%%/frmenus/math/allmen.dat +%%DATADIR%%/frmenus/math/arithm.men +%%DATADIR%%/frmenus/math/arithm1.men +%%DATADIR%%/frmenus/math/arithm2.men +%%DATADIR%%/frmenus/math/assign.men +%%DATADIR%%/frmenus/math/autocorr.men +%%DATADIR%%/frmenus/math/autocova.men +%%DATADIR%%/frmenus/math/bernnum2.men +%%DATADIR%%/frmenus/math/bernnumb.men +%%DATADIR%%/frmenus/math/bernpoly.men +%%DATADIR%%/frmenus/math/bernpoly.top +%%DATADIR%%/frmenus/math/bessel.men +%%DATADIR%%/frmenus/math/bessel.top +%%DATADIR%%/frmenus/math/bessel_c.men +%%DATADIR%%/frmenus/math/bessel_r.men +%%DATADIR%%/frmenus/math/beta.men +%%DATADIR%%/frmenus/math/binom.men +%%DATADIR%%/frmenus/math/bivarin2.men +%%DATADIR%%/frmenus/math/bivarint.men +%%DATADIR%%/frmenus/math/biweight.men +%%DATADIR%%/frmenus/math/biwemdcr.men +%%DATADIR%%/frmenus/math/biwemdcv.men +%%DATADIR%%/frmenus/math/biwemean.men +%%DATADIR%%/frmenus/math/biwemidv.men +%%DATADIR%%/frmenus/math/biwescal.men +%%DATADIR%%/frmenus/math/cabs.men +%%DATADIR%%/frmenus/math/cbeta.men +%%DATADIR%%/frmenus/math/cc.men +%%DATADIR%%/frmenus/math/cgamma.men +%%DATADIR%%/frmenus/math/cheby.men +%%DATADIR%%/frmenus/math/clausn.men +%%DATADIR%%/frmenus/math/clog.men +%%DATADIR%%/frmenus/math/cn.men +%%DATADIR%%/frmenus/math/cnpk.men +%%DATADIR%%/frmenus/math/code.men +%%DATADIR%%/frmenus/math/coefvar.men +%%DATADIR%%/frmenus/math/comb_fun.men +%%DATADIR%%/frmenus/math/comove.men +%%DATADIR%%/frmenus/math/comp_add.men +%%DATADIR%%/frmenus/math/comp_con.men +%%DATADIR%%/frmenus/math/comp_dis.top +%%DATADIR%%/frmenus/math/comp_div.men +%%DATADIR%%/frmenus/math/comp_exp.men +%%DATADIR%%/frmenus/math/comp_mul.men +%%DATADIR%%/frmenus/math/comp_roo.men +%%DATADIR%%/frmenus/math/comp_squ.men +%%DATADIR%%/frmenus/math/comp_sub.men +%%DATADIR%%/frmenus/math/compdata.top +%%DATADIR%%/frmenus/math/complex.top +%%DATADIR%%/frmenus/math/contour.men +%%DATADIR%%/frmenus/math/convol.men +%%DATADIR%%/frmenus/math/correlat.men +%%DATADIR%%/frmenus/math/corrtran.top +%%DATADIR%%/frmenus/math/cos_tran.men +%%DATADIR%%/frmenus/math/covarian.men +%%DATADIR%%/frmenus/math/cp.men +%%DATADIR%%/frmenus/math/cpk.men +%%DATADIR%%/frmenus/math/cpm.men +%%DATADIR%%/frmenus/math/crea_fun.men +%%DATADIR%%/frmenus/math/csin.men +%%DATADIR%%/frmenus/math/csqrt.men +%%DATADIR%%/frmenus/math/cum_prod.men +%%DATADIR%%/frmenus/math/cum_sum.men +%%DATADIR%%/frmenus/math/cummean.men +%%DATADIR%%/frmenus/math/datatran.top +%%DATADIR%%/frmenus/math/debye.men +%%DATADIR%%/frmenus/math/decile.men +%%DATADIR%%/frmenus/math/deconvol.men +%%DATADIR%%/frmenus/math/deriv_d.men +%%DATADIR%%/frmenus/math/deriv_f.men +%%DATADIR%%/frmenus/math/derivati.top +%%DATADIR%%/frmenus/math/diffaad.men +%%DATADIR%%/frmenus/math/diffbwlo.men +%%DATADIR%%/frmenus/math/diffbwmv.men +%%DATADIR%%/frmenus/math/diffbwsc.men +%%DATADIR%%/frmenus/math/diffcoef.men +%%DATADIR%%/frmenus/math/differ.men +%%DATADIR%%/frmenus/math/diffextr.men +%%DATADIR%%/frmenus/math/diffgeme.men +%%DATADIR%%/frmenus/math/diffh10.men +%%DATADIR%%/frmenus/math/diffh10s.men +%%DATADIR%%/frmenus/math/diffh12.men +%%DATADIR%%/frmenus/math/diffh12s.men +%%DATADIR%%/frmenus/math/diffh15.men +%%DATADIR%%/frmenus/math/diffh15s.men +%%DATADIR%%/frmenus/math/diffh17.men +%%DATADIR%%/frmenus/math/diffh17s.men +%%DATADIR%%/frmenus/math/diffh20.men +%%DATADIR%%/frmenus/math/diffh20s.men +%%DATADIR%%/frmenus/math/diffharm.men +%%DATADIR%%/frmenus/math/diffhodg.men +%%DATADIR%%/frmenus/math/diffiqra.men +%%DATADIR%%/frmenus/math/diffkurt.men +%%DATADIR%%/frmenus/math/difflplo.men +%%DATADIR%%/frmenus/math/difflpsd.men +%%DATADIR%%/frmenus/math/diffmad.men +%%DATADIR%%/frmenus/math/diffmaxi.men +%%DATADIR%%/frmenus/math/diffmean.men +%%DATADIR%%/frmenus/math/diffmedi.men +%%DATADIR%%/frmenus/math/diffmidm.men +%%DATADIR%%/frmenus/math/diffmidr.men +%%DATADIR%%/frmenus/math/diffmini.men +%%DATADIR%%/frmenus/math/diffpbmv.men +%%DATADIR%%/frmenus/math/diffqn.men +%%DATADIR%%/frmenus/math/diffquan.men +%%DATADIR%%/frmenus/math/diffrang.men +%%DATADIR%%/frmenus/math/diffrelv.men +%%DATADIR%%/frmenus/math/diffrlsd.men +%%DATADIR%%/frmenus/math/diffrms.men +%%DATADIR%%/frmenus/math/diffsd.men +%%DATADIR%%/frmenus/math/diffsdme.men +%%DATADIR%%/frmenus/math/diffsize.men +%%DATADIR%%/frmenus/math/diffskew.men +%%DATADIR%%/frmenus/math/diffsn.men +%%DATADIR%%/frmenus/math/diffsum.men +%%DATADIR%%/frmenus/math/difftrim.men +%%DATADIR%%/frmenus/math/diffvari.men +%%DATADIR%%/frmenus/math/diffvarm.men +%%DATADIR%%/frmenus/math/diffwime.men +%%DATADIR%%/frmenus/math/diffwisd.men +%%DATADIR%%/frmenus/math/diffwvar.men +%%DATADIR%%/frmenus/math/disc_der.top +%%DATADIR%%/frmenus/math/distinct.men +%%DATADIR%%/frmenus/math/dn.men +%%DATADIR%%/frmenus/math/ellip1.men +%%DATADIR%%/frmenus/math/ellip2.men +%%DATADIR%%/frmenus/math/ellip3.men +%%DATADIR%%/frmenus/math/ellipc1.men +%%DATADIR%%/frmenus/math/ellipc2.men +%%DATADIR%%/frmenus/math/elliptic.top +%%DATADIR%%/frmenus/math/error.men +%%DATADIR%%/frmenus/math/eulenum2.men +%%DATADIR%%/frmenus/math/eulenumb.men +%%DATADIR%%/frmenus/math/eulepoly.men +%%DATADIR%%/frmenus/math/eva1_fun.men +%%DATADIR%%/frmenus/math/eva2_fun.men +%%DATADIR%%/frmenus/math/exp3.men +%%DATADIR%%/frmenus/math/exp_loss.men +%%DATADIR%%/frmenus/math/extreme.men +%%DATADIR%%/frmenus/math/fft.men +%%DATADIR%%/frmenus/math/fibonn.men +%%DATADIR%%/frmenus/math/freqtabl.men +%%DATADIR%%/frmenus/math/frequenc.men +%%DATADIR%%/frmenus/math/gamma.men +%%DATADIR%%/frmenus/math/geommean.men +%%DATADIR%%/frmenus/math/geomsd.men +%%DATADIR%%/frmenus/math/goodst.men +%%DATADIR%%/frmenus/math/h10loca.men +%%DATADIR%%/frmenus/math/h10scal.men +%%DATADIR%%/frmenus/math/h12loca.men +%%DATADIR%%/frmenus/math/h12scal.men +%%DATADIR%%/frmenus/math/h15loca.men +%%DATADIR%%/frmenus/math/h15scal.men +%%DATADIR%%/frmenus/math/h17loca.men +%%DATADIR%%/frmenus/math/h17scal.men +%%DATADIR%%/frmenus/math/h20loca.men +%%DATADIR%%/frmenus/math/h20scal.men +%%DATADIR%%/frmenus/math/harmmean.men +%%DATADIR%%/frmenus/math/hermite.men +%%DATADIR%%/frmenus/math/hodglehm.men +%%DATADIR%%/frmenus/math/hype_fun.men +%%DATADIR%%/frmenus/math/ibeta.men +%%DATADIR%%/frmenus/math/ifft.men +%%DATADIR%%/frmenus/math/igamma.men +%%DATADIR%%/frmenus/math/index.men +%%DATADIR%%/frmenus/math/intarr.men +%%DATADIR%%/frmenus/math/inte_fun.men +%%DATADIR%%/frmenus/math/integra2.men +%%DATADIR%%/frmenus/math/integral.men +%%DATADIR%%/frmenus/math/interpol.men +%%DATADIR%%/frmenus/math/iqrange.men +%%DATADIR%%/frmenus/math/jacobi.men +%%DATADIR%%/frmenus/math/junk1.tmp +%%DATADIR%%/frmenus/math/junk2.tmp +%%DATADIR%%/frmenus/math/kelvin.men +%%DATADIR%%/frmenus/math/kurtosis.men +%%DATADIR%%/frmenus/math/l +%%DATADIR%%/frmenus/math/laguerre.men +%%DATADIR%%/frmenus/math/laguerrl.men +%%DATADIR%%/frmenus/math/legendr2.men +%%DATADIR%%/frmenus/math/legendre.men +%%DATADIR%%/frmenus/math/lin_fit.men +%%DATADIR%%/frmenus/math/lininter.men +%%DATADIR%%/frmenus/math/lobach.men +%%DATADIR%%/frmenus/math/locadiff.top +%%DATADIR%%/frmenus/math/locatran.top +%%DATADIR%%/frmenus/math/log.men +%%DATADIR%%/frmenus/math/logistic.men +%%DATADIR%%/frmenus/math/low_hing.men +%%DATADIR%%/frmenus/math/low_quar.men +%%DATADIR%%/frmenus/math/lowess.men +%%DATADIR%%/frmenus/math/lploca.men +%%DATADIR%%/frmenus/math/lpscale.men +%%DATADIR%%/frmenus/math/mad.men +%%DATADIR%%/frmenus/math/math.top +%%DATADIR%%/frmenus/math/mathtran.top +%%DATADIR%%/frmenus/math/matr_1ho.men +%%DATADIR%%/frmenus/math/matr_2ho.men +%%DATADIR%%/frmenus/math/matr_add.men +%%DATADIR%%/frmenus/math/matr_adj.men +%%DATADIR%%/frmenus/math/matr_adr.men +%%DATADIR%%/frmenus/math/matr_aug.men +%%DATADIR%%/frmenus/math/matr_bld.men +%%DATADIR%%/frmenus/math/matr_chd.men +%%DATADIR%%/frmenus/math/matr_cho.men +%%DATADIR%%/frmenus/math/matr_cof.men +%%DATADIR%%/frmenus/math/matr_cor.men +%%DATADIR%%/frmenus/math/matr_cov.men +%%DATADIR%%/frmenus/math/matr_cre.men +%%DATADIR%%/frmenus/math/matr_cst.men +%%DATADIR%%/frmenus/math/matr_der.men +%%DATADIR%%/frmenus/math/matr_det.men +%%DATADIR%%/frmenus/math/matr_dia.men +%%DATADIR%%/frmenus/math/matr_dim.men +%%DATADIR%%/frmenus/math/matr_dis.top +%%DATADIR%%/frmenus/math/matr_dme.men +%%DATADIR%%/frmenus/math/matr_edi.men +%%DATADIR%%/frmenus/math/matr_eig.men +%%DATADIR%%/frmenus/math/matr_eiv.men +%%DATADIR%%/frmenus/math/matr_euc.men +%%DATADIR%%/frmenus/math/matr_eud.men +%%DATADIR%%/frmenus/math/matr_exe.men +%%DATADIR%%/frmenus/math/matr_ext.men +%%DATADIR%%/frmenus/math/matr_inv.men +%%DATADIR%%/frmenus/math/matr_itr.men +%%DATADIR%%/frmenus/math/matr_lco.men +%%DATADIR%%/frmenus/math/matr_mad.men +%%DATADIR%%/frmenus/math/matr_mea.men +%%DATADIR%%/frmenus/math/matr_mid.men +%%DATADIR%%/frmenus/math/matr_min.men +%%DATADIR%%/frmenus/math/matr_mul.men +%%DATADIR%%/frmenus/math/matr_pco.men +%%DATADIR%%/frmenus/math/matr_prc.men +%%DATADIR%%/frmenus/math/matr_qfo.men +%%DATADIR%%/frmenus/math/matr_ran.men +%%DATADIR%%/frmenus/math/matr_rea.men +%%DATADIR%%/frmenus/math/matr_ree.men +%%DATADIR%%/frmenus/math/matr_rep.men +%%DATADIR%%/frmenus/math/matr_row.men +%%DATADIR%%/frmenus/math/matr_rst.men +%%DATADIR%%/frmenus/math/matr_sca.men +%%DATADIR%%/frmenus/math/matr_sim.men +%%DATADIR%%/frmenus/math/matr_sol.men +%%DATADIR%%/frmenus/math/matr_sva.men +%%DATADIR%%/frmenus/math/matr_svd.men +%%DATADIR%%/frmenus/math/matr_svf.men +%%DATADIR%%/frmenus/math/matr_tdi.men +%%DATADIR%%/frmenus/math/matr_tra.men +%%DATADIR%%/frmenus/math/matr_tri.men +%%DATADIR%%/frmenus/math/matr_trn.men +%%DATADIR%%/frmenus/math/matr_vtt.men +%%DATADIR%%/frmenus/math/matrix.top +%%DATADIR%%/frmenus/math/maximum.men +%%DATADIR%%/frmenus/math/mean.men +%%DATADIR%%/frmenus/math/median.men +%%DATADIR%%/frmenus/math/midmean.men +%%DATADIR%%/frmenus/math/midrange.men +%%DATADIR%%/frmenus/math/minimum.men +%%DATADIR%%/frmenus/math/miscfunc.top +%%DATADIR%%/frmenus/math/nl_fit.men +%%DATADIR%%/frmenus/math/normppcc.men +%%DATADIR%%/frmenus/math/opt-1.men +%%DATADIR%%/frmenus/math/optimize.men +%%DATADIR%%/frmenus/math/ord_stat.men +%%DATADIR%%/frmenus/math/orthpoly.top +%%DATADIR%%/frmenus/math/parabol.men +%%DATADIR%%/frmenus/math/pbendcr.men +%%DATADIR%%/frmenus/math/pbendmv.men +%%DATADIR%%/frmenus/math/percdefe.men +%%DATADIR%%/frmenus/math/percent.men +%%DATADIR%%/frmenus/math/plotfun2.men +%%DATADIR%%/frmenus/math/plotfunc.men +%%DATADIR%%/frmenus/math/poly_add.men +%%DATADIR%%/frmenus/math/poly_dis.top +%%DATADIR%%/frmenus/math/poly_div.men +%%DATADIR%%/frmenus/math/poly_eva.men +%%DATADIR%%/frmenus/math/poly_mul.men +%%DATADIR%%/frmenus/math/poly_squ.men +%%DATADIR%%/frmenus/math/poly_sub.men +%%DATADIR%%/frmenus/math/polynomi.top +%%DATADIR%%/frmenus/math/prime.men +%%DATADIR%%/frmenus/math/probfunc.top +%%DATADIR%%/frmenus/math/product.men +%%DATADIR%%/frmenus/math/qnscale.men +%%DATADIR%%/frmenus/math/quantile.men +%%DATADIR%%/frmenus/math/quantse.men +%%DATADIR%%/frmenus/math/range.men +%%DATADIR%%/frmenus/math/rank.men +%%DATADIR%%/frmenus/math/rankcomo.men +%%DATADIR%%/frmenus/math/rankcorr.men +%%DATADIR%%/frmenus/math/rankcova.men +%%DATADIR%%/frmenus/math/rc.men +%%DATADIR%%/frmenus/math/rd.men +%%DATADIR%%/frmenus/math/recipe.top +%%DATADIR%%/frmenus/math/recipe_a.men +%%DATADIR%%/frmenus/math/recipe_d.top +%%DATADIR%%/frmenus/math/recipe_f.men +%%DATADIR%%/frmenus/math/recipe_m.men +%%DATADIR%%/frmenus/math/relsd.men +%%DATADIR%%/frmenus/math/relvar.men +%%DATADIR%%/frmenus/math/reverse.men +%%DATADIR%%/frmenus/math/rf.men +%%DATADIR%%/frmenus/math/rj.men +%%DATADIR%%/frmenus/math/rms.men +%%DATADIR%%/frmenus/math/roots.men +%%DATADIR%%/frmenus/math/rungkut1.men +%%DATADIR%%/frmenus/math/rungkut2.men +%%DATADIR%%/frmenus/math/sample.men +%%DATADIR%%/frmenus/math/scaldiff.top +%%DATADIR%%/frmenus/math/scaltran.top +%%DATADIR%%/frmenus/math/sd.men +%%DATADIR%%/frmenus/math/sd_mean.men +%%DATADIR%%/frmenus/math/sdlploca.men +%%DATADIR%%/frmenus/math/sequence.men +%%DATADIR%%/frmenus/math/sin_tran.men +%%DATADIR%%/frmenus/math/skewness.men +%%DATADIR%%/frmenus/math/smoothls.men +%%DATADIR%%/frmenus/math/smoothst.men +%%DATADIR%%/frmenus/math/smoothtu.men +%%DATADIR%%/frmenus/math/sn.men +%%DATADIR%%/frmenus/math/snscale.men +%%DATADIR%%/frmenus/math/sort.men +%%DATADIR%%/frmenus/math/spline.men +%%DATADIR%%/frmenus/math/spretran.top +%%DATADIR%%/frmenus/math/stattran.top +%%DATADIR%%/frmenus/math/strom.men +%%DATADIR%%/frmenus/math/sum.men +%%DATADIR%%/frmenus/math/summary.men +%%DATADIR%%/frmenus/math/synch.men +%%DATADIR%%/frmenus/math/tag_sn+.men +%%DATADIR%%/frmenus/math/tag_sn-.men +%%DATADIR%%/frmenus/math/tag_sn0.men +%%DATADIR%%/frmenus/math/tag_sn00.men +%%DATADIR%%/frmenus/math/trans.men +%%DATADIR%%/frmenus/math/tricube.men +%%DATADIR%%/frmenus/math/trig.men +%%DATADIR%%/frmenus/math/trimmean.men +%%DATADIR%%/frmenus/math/trimmese.men +%%DATADIR%%/frmenus/math/ultrasp.men +%%DATADIR%%/frmenus/math/upp_hing.men +%%DATADIR%%/frmenus/math/upp_quar.men +%%DATADIR%%/frmenus/math/uscore.men +%%DATADIR%%/frmenus/math/user_fun.top +%%DATADIR%%/frmenus/math/userfu_d.top +%%DATADIR%%/frmenus/math/valploca.men +%%DATADIR%%/frmenus/math/variance.men +%%DATADIR%%/frmenus/math/varmean.men +%%DATADIR%%/frmenus/math/vect_add.men +%%DATADIR%%/frmenus/math/vect_ang.men +%%DATADIR%%/frmenus/math/vect_cro.men +%%DATADIR%%/frmenus/math/vect_dis.men +%%DATADIR%%/frmenus/math/vect_dot.men +%%DATADIR%%/frmenus/math/vect_len.men +%%DATADIR%%/frmenus/math/vect_sub.men +%%DATADIR%%/frmenus/math/vector.top +%%DATADIR%%/frmenus/math/weigmean.men +%%DATADIR%%/frmenus/math/weigsd.men +%%DATADIR%%/frmenus/math/weigvar.men +%%DATADIR%%/frmenus/math/winscorr.men +%%DATADIR%%/frmenus/math/winscova.men +%%DATADIR%%/frmenus/math/winsmean.men +%%DATADIR%%/frmenus/math/winssd.men +%%DATADIR%%/frmenus/math/winsvari.men +%%DATADIR%%/frmenus/math/zscore.men +%%DATADIR%%/frmenus/mfac/anovexam.top +%%DATADIR%%/frmenus/mfac/charplot.men +%%DATADIR%%/frmenus/mfac/discussi.top +%%DATADIR%%/frmenus/mfac/engiques.top +%%DATADIR%%/frmenus/mfac/ganova.men +%%DATADIR%%/frmenus/mfac/lineplot.men +%%DATADIR%%/frmenus/mfac/mfacanal.top +%%DATADIR%%/frmenus/mfac/referenc.top +%%DATADIR%%/frmenus/mfac/stattech.top +%%DATADIR%%/frmenus/mfac/viewdata.top +%%DATADIR%%/frmenus/mvar/assumpti.top +%%DATADIR%%/frmenus/mvar/bartlett.men +%%DATADIR%%/frmenus/mvar/canncorr.debug +%%DATADIR%%/frmenus/mvar/canncorr.men +%%DATADIR%%/frmenus/mvar/canncorr.top +%%DATADIR%%/frmenus/mvar/disccann.top +%%DATADIR%%/frmenus/mvar/discclas.top +%%DATADIR%%/frmenus/mvar/discdisc.top +%%DATADIR%%/frmenus/mvar/discdist.top +%%DATADIR%%/frmenus/mvar/discfdis.top +%%DATADIR%%/frmenus/mvar/discfish.top +%%DATADIR%%/frmenus/mvar/discgrap.top +%%DATADIR%%/frmenus/mvar/discussi.top +%%DATADIR%%/frmenus/mvar/distance.top +%%DATADIR%%/frmenus/mvar/ecmdisc.top +%%DATADIR%%/frmenus/mvar/ecmdiscr.top +%%DATADIR%%/frmenus/mvar/fishclas.debug +%%DATADIR%%/frmenus/mvar/fishdisc.men +%%DATADIR%%/frmenus/mvar/fishdisc.top +%%DATADIR%%/frmenus/mvar/groupmea.men +%%DATADIR%%/frmenus/mvar/groupsd.men +%%DATADIR%%/frmenus/mvar/inferenc.top +%%DATADIR%%/frmenus/mvar/matr_pc2.men +%%DATADIR%%/frmenus/mvar/matrarit.top +%%DATADIR%%/frmenus/mvar/multplot.top +%%DATADIR%%/frmenus/mvar/mvaranal.top +%%DATADIR%%/frmenus/mvar/mvarnorm.men +%%DATADIR%%/frmenus/mvar/pooled.men +%%DATADIR%%/frmenus/mvar/referenc.top +%%DATADIR%%/frmenus/mvar/stattech.top +%%DATADIR%%/frmenus/mvar/tech2var.top +%%DATADIR%%/frmenus/mvar/workexam.top +%%DATADIR%%/frmenus/mvar/youdplot.men +%%DATADIR%%/frmenus/nist/E691GLUC.DP +%%DATADIR%%/frmenus/nist/E691MAN6.DP +%%DATADIR%%/frmenus/nist/GLUCOSE.DP +%%DATADIR%%/frmenus/nist/MANDEL6.DP +%%DATADIR%%/frmenus/nist/STUTZ86.DP +%%DATADIR%%/frmenus/nist/calib.top +%%DATADIR%%/frmenus/nist/calibrat.top +%%DATADIR%%/frmenus/nist/calidisc.top +%%DATADIR%%/frmenus/nist/camlcont.top +%%DATADIR%%/frmenus/nist/camlcust.top +%%DATADIR%%/frmenus/nist/camldivi.top +%%DATADIR%%/frmenus/nist/camlfutu.top +%%DATADIR%%/frmenus/nist/camlhigh.top +%%DATADIR%%/frmenus/nist/camlhist.top +%%DATADIR%%/frmenus/nist/camlmiss.top +%%DATADIR%%/frmenus/nist/camlrefe.top +%%DATADIR%%/frmenus/nist/camlstaf.top +%%DATADIR%%/frmenus/nist/ccanalysi.top +%%DATADIR%%/frmenus/nist/ccback.top +%%DATADIR%%/frmenus/nist/ccconclu.top +%%DATADIR%%/frmenus/nist/ccdex.top +%%DATADIR%%/frmenus/nist/ccgoals.top +%%DATADIR%%/frmenus/nist/ccimport.top +%%DATADIR%%/frmenus/nist/ccmember.top +%%DATADIR%%/frmenus/nist/ccproj.top +%%DATADIR%%/frmenus/nist/cctutori.top +%%DATADIR%%/frmenus/nist/coatcons.top +%%DATADIR%%/frmenus/nist/consdata.top +%%DATADIR%%/frmenus/nist/consdisc.top +%%DATADIR%%/frmenus/nist/consensu.men +%%DATADIR%%/frmenus/nist/consmean.top +%%DATADIR%%/frmenus/nist/consplo2.men +%%DATADIR%%/frmenus/nist/consplot.men +%%DATADIR%%/frmenus/nist/conssumm.men +%%DATADIR%%/frmenus/nist/deal1bmc.top +%%DATADIR%%/frmenus/nist/deal1bnc.top +%%DATADIR%%/frmenus/nist/dealandi.top +%%DATADIR%%/frmenus/nist/dealappr.top +%%DATADIR%%/frmenus/nist/dealdisc.top +%%DATADIR%%/frmenus/nist/dealfaqs.top +%%DATADIR%%/frmenus/nist/dealglos.top +%%DATADIR%%/frmenus/nist/dealgoal.top +%%DATADIR%%/frmenus/nist/dealinpu.top +%%DATADIR%%/frmenus/nist/dealmbmc.top +%%DATADIR%%/frmenus/nist/dealmbnc.top +%%DATADIR%%/frmenus/nist/dealnico.top +%%DATADIR%%/frmenus/nist/dealoutp.top +%%DATADIR%%/frmenus/nist/dealrefe.top +%%DATADIR%%/frmenus/nist/dealtuto.top +%%DATADIR%%/frmenus/nist/desallst.top +%%DATADIR%%/frmenus/nist/desalsdo.top +%%DATADIR%%/frmenus/nist/dexwandi.top +%%DATADIR%%/frmenus/nist/dexwappr.top +%%DATADIR%%/frmenus/nist/dexwch1.top +%%DATADIR%%/frmenus/nist/dexwch10.top +%%DATADIR%%/frmenus/nist/dexwch11.top +%%DATADIR%%/frmenus/nist/dexwch12.top +%%DATADIR%%/frmenus/nist/dexwch13.top +%%DATADIR%%/frmenus/nist/dexwch2.top +%%DATADIR%%/frmenus/nist/dexwch3.top +%%DATADIR%%/frmenus/nist/dexwch4.top +%%DATADIR%%/frmenus/nist/dexwch5.top +%%DATADIR%%/frmenus/nist/dexwch6.top +%%DATADIR%%/frmenus/nist/dexwch7.top +%%DATADIR%%/frmenus/nist/dexwch8.top +%%DATADIR%%/frmenus/nist/dexwch9.top +%%DATADIR%%/frmenus/nist/dexwdisc.top +%%DATADIR%%/frmenus/nist/dexwfaqs.top +%%DATADIR%%/frmenus/nist/dexwglos.top +%%DATADIR%%/frmenus/nist/dexwgoal.top +%%DATADIR%%/frmenus/nist/dexwinpu.top +%%DATADIR%%/frmenus/nist/dexwnico.top +%%DATADIR%%/frmenus/nist/dexworks.top +%%DATADIR%%/frmenus/nist/dexwoutp.top +%%DATADIR%%/frmenus/nist/dexwrefe.top +%%DATADIR%%/frmenus/nist/e691.top +%%DATADIR%%/frmenus/nist/e691asci.men +%%DATADIR%%/frmenus/nist/e691bph1.men +%%DATADIR%%/frmenus/nist/e691bph2.men +%%DATADIR%%/frmenus/nist/e691bpk1.men +%%DATADIR%%/frmenus/nist/e691bpk2.men +%%DATADIR%%/frmenus/nist/e691data.top +%%DATADIR%%/frmenus/nist/e691disc.top +%%DATADIR%%/frmenus/nist/e691doh1.men +%%DATADIR%%/frmenus/nist/e691doh2.men +%%DATADIR%%/frmenus/nist/e691dok1.men +%%DATADIR%%/frmenus/nist/e691dok2.men +%%DATADIR%%/frmenus/nist/e691html.men +%%DATADIR%%/frmenus/nist/e691late.men +%%DATADIR%%/frmenus/nist/e691plo1.men +%%DATADIR%%/frmenus/nist/e691plo2.men +%%DATADIR%%/frmenus/nist/e691plo3.men +%%DATADIR%%/frmenus/nist/e691plo4.men +%%DATADIR%%/frmenus/nist/e691plo5.men +%%DATADIR%%/frmenus/nist/e691plo6.men +%%DATADIR%%/frmenus/nist/e691plo7.men +%%DATADIR%%/frmenus/nist/e691tabl.men +%%DATADIR%%/frmenus/nist/guidcaml.top +%%DATADIR%%/frmenus/nist/guidnist.top +%%DATADIR%%/frmenus/nist/guidsed.top +%%DATADIR%%/frmenus/nist/hpccppap.top +%%DATADIR%%/frmenus/nist/hpccppdi.top +%%DATADIR%%/frmenus/nist/hpccppdo.top +%%DATADIR%%/frmenus/nist/hpccppfa.top +%%DATADIR%%/frmenus/nist/hpccppgl.top +%%DATADIR%%/frmenus/nist/hpccppgo.top +%%DATADIR%%/frmenus/nist/hpccppin.top +%%DATADIR%%/frmenus/nist/hpccppnc.top +%%DATADIR%%/frmenus/nist/hpccppou.top +%%DATADIR%%/frmenus/nist/hpccppre.top +%%DATADIR%%/frmenus/nist/hpccpptu.top +%%DATADIR%%/frmenus/nist/hpccprps.top +%%DATADIR%%/frmenus/nist/letdata.men +%%DATADIR%%/frmenus/nist/lincalib.men +%%DATADIR%%/frmenus/nist/naka/NAKATAN1.DAT +%%DATADIR%%/frmenus/nist/naka/NAKATAN1.DP +%%DATADIR%%/frmenus/nist/naka/NAKATAN1.OUT +%%DATADIR%%/frmenus/nist/naka/NAKATAN2.DAT +%%DATADIR%%/frmenus/nist/naka/NAKATAN2.DP +%%DATADIR%%/frmenus/nist/naka/NAKATAN2.OUT +%%DATADIR%%/frmenus/nist/naka/NAKATAN2.SAV +%%DATADIR%%/frmenus/nist/naka/NAKATAN3.DAT +%%DATADIR%%/frmenus/nist/naka/NAKATAN3.DP +%%DATADIR%%/frmenus/nist/naka/NAKATANI.DP +%%DATADIR%%/frmenus/nist/naka/fit.top +%%DATADIR%%/frmenus/nist/naka/fitline.men +%%DATADIR%%/frmenus/nist/naka/fitmodel.men +%%DATADIR%%/frmenus/nist/naka/fitnl.men +%%DATADIR%%/frmenus/nist/naka/fitnn.men +%%DATADIR%%/frmenus/nist/naka/fitpoly.men +%%DATADIR%%/frmenus/nist/naka/fitquad.men +%%DATADIR%%/frmenus/nist/naka/fitrat.men +%%DATADIR%%/frmenus/nist/naka/fitrawda.men +%%DATADIR%%/frmenus/nist/naka/fitsplin.men +%%DATADIR%%/frmenus/nist/naka/listdata.men +%%DATADIR%%/frmenus/nist/naka/modelcyc.top +%%DATADIR%%/frmenus/nist/naka/modelfit.top +%%DATADIR%%/frmenus/nist/naka/modelsel.top +%%DATADIR%%/frmenus/nist/naka/modelval.top +%%DATADIR%%/frmenus/nist/naka/naka.top +%%DATADIR%%/frmenus/nist/naka/nakatan1.dat +%%DATADIR%%/frmenus/nist/naka/nakatan1.dp +%%DATADIR%%/frmenus/nist/naka/nakatan2.dat +%%DATADIR%%/frmenus/nist/naka/nakatan2.dp +%%DATADIR%%/frmenus/nist/naka/plotdata.men +%%DATADIR%%/frmenus/nist/naka/readdata.men +%%DATADIR%%/frmenus/nist/naka/readvafi.men +%%DATADIR%%/frmenus/nist/naka/scatplot.men +%%DATADIR%%/frmenus/nist/naka/selmodel.men +%%DATADIR%%/frmenus/nist/naka/setparam.men +%%DATADIR%%/frmenus/nist/naka/setweigh.men +%%DATADIR%%/frmenus/nist/naka/valmodel.men +%%DATADIR%%/frmenus/nist/nakatani.men +%%DATADIR%%/frmenus/nist/nist.top +%%DATADIR%%/frmenus/nist/nistadmd.top +%%DATADIR%%/frmenus/nist/nistfaci.top +%%DATADIR%%/frmenus/nist/nistfaqs.top +%%DATADIR%%/frmenus/nist/nistglan.top +%%DATADIR%%/frmenus/nist/nistindt.top +%%DATADIR%%/frmenus/nist/nistlabp.top +%%DATADIR%%/frmenus/nist/nistmiss.top +%%DATADIR%%/frmenus/nist/nistoffe.top +%%DATADIR%%/frmenus/nist/nistphon.top +%%DATADIR%%/frmenus/nist/nistsubi.top +%%DATADIR%%/frmenus/nist/quacalib.men +%%DATADIR%%/frmenus/nist/readvafi.men +%%DATADIR%%/frmenus/nist/sedconta.top +%%DATADIR%%/frmenus/nist/sedcusto.top +%%DATADIR%%/frmenus/nist/sedfutur.top +%%DATADIR%%/frmenus/nist/sedhighl.top +%%DATADIR%%/frmenus/nist/sedhisto.top +%%DATADIR%%/frmenus/nist/sedmissi.top +%%DATADIR%%/frmenus/nist/sedproj.top +%%DATADIR%%/frmenus/nist/sedrefer.top +%%DATADIR%%/frmenus/nist/semaandi.top +%%DATADIR%%/frmenus/nist/semaappr.top +%%DATADIR%%/frmenus/nist/semach1.top +%%DATADIR%%/frmenus/nist/semach10.top +%%DATADIR%%/frmenus/nist/semach11.top +%%DATADIR%%/frmenus/nist/semach12.top +%%DATADIR%%/frmenus/nist/semach13.top +%%DATADIR%%/frmenus/nist/semach14.top +%%DATADIR%%/frmenus/nist/semach15.top +%%DATADIR%%/frmenus/nist/semach16.top +%%DATADIR%%/frmenus/nist/semach17.top +%%DATADIR%%/frmenus/nist/semach18.top +%%DATADIR%%/frmenus/nist/semach19.top +%%DATADIR%%/frmenus/nist/semach2.top +%%DATADIR%%/frmenus/nist/semach20.top +%%DATADIR%%/frmenus/nist/semach3.top +%%DATADIR%%/frmenus/nist/semach4.top +%%DATADIR%%/frmenus/nist/semach5.top +%%DATADIR%%/frmenus/nist/semach6.top +%%DATADIR%%/frmenus/nist/semach7.top +%%DATADIR%%/frmenus/nist/semach8.top +%%DATADIR%%/frmenus/nist/semach9.top +%%DATADIR%%/frmenus/nist/semadisc.top +%%DATADIR%%/frmenus/nist/semafaqs.top +%%DATADIR%%/frmenus/nist/semaglos.top +%%DATADIR%%/frmenus/nist/semagoal.top +%%DATADIR%%/frmenus/nist/semainpu.top +%%DATADIR%%/frmenus/nist/semanico.top +%%DATADIR%%/frmenus/nist/semaoutp.top +%%DATADIR%%/frmenus/nist/semarefe.top +%%DATADIR%%/frmenus/nist/sematech.top +%%DATADIR%%/frmenus/nist/sematuto.top +%%DATADIR%%/frmenus/nist/srms.top +%%DATADIR%%/frmenus/nist/stack.men +%%DATADIR%%/frmenus/nist/statscie.top +%%DATADIR%%/frmenus/nist/stscandi.top +%%DATADIR%%/frmenus/nist/stscappr.top +%%DATADIR%%/frmenus/nist/stscch1.top +%%DATADIR%%/frmenus/nist/stscch10.top +%%DATADIR%%/frmenus/nist/stscch11.top +%%DATADIR%%/frmenus/nist/stscch12.top +%%DATADIR%%/frmenus/nist/stscch2.top +%%DATADIR%%/frmenus/nist/stscch3.top +%%DATADIR%%/frmenus/nist/stscch4.top +%%DATADIR%%/frmenus/nist/stscch5.top +%%DATADIR%%/frmenus/nist/stscch6.top +%%DATADIR%%/frmenus/nist/stscch7.top +%%DATADIR%%/frmenus/nist/stscch8.top +%%DATADIR%%/frmenus/nist/stscch9.top +%%DATADIR%%/frmenus/nist/stscdisc.top +%%DATADIR%%/frmenus/nist/stscfaqs.top +%%DATADIR%%/frmenus/nist/stscglos.top +%%DATADIR%%/frmenus/nist/stscgoal.top +%%DATADIR%%/frmenus/nist/stscinpu.top +%%DATADIR%%/frmenus/nist/stscnico.top +%%DATADIR%%/frmenus/nist/stscoutp.top +%%DATADIR%%/frmenus/nist/stscrefe.top +%%DATADIR%%/frmenus/nist/stsctuto.top +%%DATADIR%%/frmenus/plmo/DEFAGRAP.DP +%%DATADIR%%/frmenus/plmo/REFPLOT.DP +%%DATADIR%%/frmenus/plmo/barbase.men +%%DATADIR%%/frmenus/plmo/barbcolo.men +%%DATADIR%%/frmenus/plmo/barbline.men +%%DATADIR%%/frmenus/plmo/barbthic.men +%%DATADIR%%/frmenus/plmo/bardime.men +%%DATADIR%%/frmenus/plmo/bardire.men +%%DATADIR%%/frmenus/plmo/barfill.men +%%DATADIR%%/frmenus/plmo/barfillc.men +%%DATADIR%%/frmenus/plmo/barpatt.men +%%DATADIR%%/frmenus/plmo/barpcolo.men +%%DATADIR%%/frmenus/plmo/barpline.men +%%DATADIR%%/frmenus/plmo/barpspac.men +%%DATADIR%%/frmenus/plmo/barpthic.men +%%DATADIR%%/frmenus/plmo/barwidt.men +%%DATADIR%%/frmenus/plmo/charangl.men +%%DATADIR%%/frmenus/plmo/charauto.men +%%DATADIR%%/frmenus/plmo/charcase.men +%%DATADIR%%/frmenus/plmo/charcolo.men +%%DATADIR%%/frmenus/plmo/charfill.men +%%DATADIR%%/frmenus/plmo/charfont.men +%%DATADIR%%/frmenus/plmo/charhw.men +%%DATADIR%%/frmenus/plmo/charjust.men +%%DATADIR%%/frmenus/plmo/charmapp.men +%%DATADIR%%/frmenus/plmo/charoffs.men +%%DATADIR%%/frmenus/plmo/charsize.men +%%DATADIR%%/frmenus/plmo/charthic.men +%%DATADIR%%/frmenus/plmo/charwidt.men +%%DATADIR%%/frmenus/plmo/copyplot.top +%%DATADIR%%/frmenus/plmo/defagrap.men +%%DATADIR%%/frmenus/plmo/defaults.top +%%DATADIR%%/frmenus/plmo/linecolo.men +%%DATADIR%%/frmenus/plmo/linethic.men +%%DATADIR%%/frmenus/plmo/modianno.men +%%DATADIR%%/frmenus/plmo/modiaxis.top +%%DATADIR%%/frmenus/plmo/modibar.men +%%DATADIR%%/frmenus/plmo/modichar.men +%%DATADIR%%/frmenus/plmo/modiline.men +%%DATADIR%%/frmenus/plmo/modispik.men +%%DATADIR%%/frmenus/plmo/moditrac.top +%%DATADIR%%/frmenus/plmo/other.top +%%DATADIR%%/frmenus/plmo/plmo.arg +%%DATADIR%%/frmenus/plmo/plmo.top +%%DATADIR%%/frmenus/plmo/plotiden.men +%%DATADIR%%/frmenus/plmo/saveallp.men +%%DATADIR%%/frmenus/plmo/saveplot.men +%%DATADIR%%/frmenus/plmo/setalarr.men +%%DATADIR%%/frmenus/plmo/setalbox.men +%%DATADIR%%/frmenus/plmo/setallab.men +%%DATADIR%%/frmenus/plmo/setalleg.men +%%DATADIR%%/frmenus/plmo/setalseg.men +%%DATADIR%%/frmenus/plmo/setaltcl.men +%%DATADIR%%/frmenus/plmo/setaltcm.men +%%DATADIR%%/frmenus/plmo/setannot.top +%%DATADIR%%/frmenus/plmo/setarr1.men +%%DATADIR%%/frmenus/plmo/setarrow.top +%%DATADIR%%/frmenus/plmo/setaxis.men +%%DATADIR%%/frmenus/plmo/setbackc.men +%%DATADIR%%/frmenus/plmo/setbar.top +%%DATADIR%%/frmenus/plmo/setbox.top +%%DATADIR%%/frmenus/plmo/setbox1.men +%%DATADIR%%/frmenus/plmo/setchar.top +%%DATADIR%%/frmenus/plmo/setframe.men +%%DATADIR%%/frmenus/plmo/setframe.top +%%DATADIR%%/frmenus/plmo/setgrid.men +%%DATADIR%%/frmenus/plmo/setgrid.top +%%DATADIR%%/frmenus/plmo/setlabel.men +%%DATADIR%%/frmenus/plmo/setlabel.top +%%DATADIR%%/frmenus/plmo/setlabx1.men +%%DATADIR%%/frmenus/plmo/setlabx2.men +%%DATADIR%%/frmenus/plmo/setlabx3.men +%%DATADIR%%/frmenus/plmo/setlaby1.men +%%DATADIR%%/frmenus/plmo/setlaby2.men +%%DATADIR%%/frmenus/plmo/setleg1.men +%%DATADIR%%/frmenus/plmo/setlegen.men +%%DATADIR%%/frmenus/plmo/setlegen.top +%%DATADIR%%/frmenus/plmo/setline.top +%%DATADIR%%/frmenus/plmo/setscal.men +%%DATADIR%%/frmenus/plmo/setscal1.men +%%DATADIR%%/frmenus/plmo/setscal2.men +%%DATADIR%%/frmenus/plmo/setscal3.men +%%DATADIR%%/frmenus/plmo/setscal4.men +%%DATADIR%%/frmenus/plmo/setscala.men +%%DATADIR%%/frmenus/plmo/setscale.top +%%DATADIR%%/frmenus/plmo/setscalx.men +%%DATADIR%%/frmenus/plmo/setscaly.men +%%DATADIR%%/frmenus/plmo/setseg1.men +%%DATADIR%%/frmenus/plmo/setsegm.top +%%DATADIR%%/frmenus/plmo/setspike.top +%%DATADIR%%/frmenus/plmo/setticl.top +%%DATADIR%%/frmenus/plmo/setticm.top +%%DATADIR%%/frmenus/plmo/setticof.men +%%DATADIR%%/frmenus/plmo/settila.men +%%DATADIR%%/frmenus/plmo/settitle.men +%%DATADIR%%/frmenus/plmo/settitle.top +%%DATADIR%%/frmenus/plmo/setx1lab.men +%%DATADIR%%/frmenus/plmo/setx1tcl.men +%%DATADIR%%/frmenus/plmo/setx1tcm.men +%%DATADIR%%/frmenus/plmo/setx2lab.men +%%DATADIR%%/frmenus/plmo/setx2tcl.men +%%DATADIR%%/frmenus/plmo/setx2tcm.men +%%DATADIR%%/frmenus/plmo/setx3lab.men +%%DATADIR%%/frmenus/plmo/setxtcm.men +%%DATADIR%%/frmenus/plmo/sety1lab.men +%%DATADIR%%/frmenus/plmo/sety1tcl.men +%%DATADIR%%/frmenus/plmo/sety1tcm.men +%%DATADIR%%/frmenus/plmo/sety2lab.men +%%DATADIR%%/frmenus/plmo/sety2tcl.men +%%DATADIR%%/frmenus/plmo/sety2tcm.men +%%DATADIR%%/frmenus/plmo/setytcm.men +%%DATADIR%%/frmenus/plmo/showanno.top +%%DATADIR%%/frmenus/plmo/showaxis.top +%%DATADIR%%/frmenus/plmo/showtrac.top +%%DATADIR%%/frmenus/plmo/spikbase.men +%%DATADIR%%/frmenus/plmo/spikcolo.men +%%DATADIR%%/frmenus/plmo/spikdire.men +%%DATADIR%%/frmenus/plmo/spikthic.men +%%DATADIR%%/frmenus/plmo/windowcc.men +%%DATADIR%%/frmenus/plot/2dplotda.top +%%DATADIR%%/frmenus/plot/2dplotfu.top +%%DATADIR%%/frmenus/plot/3dplot.men +%%DATADIR%%/frmenus/plot/3dplotda.top +%%DATADIR%%/frmenus/plot/3dplotfu.top +%%DATADIR%%/frmenus/plot/CHINA.DP +%%DATADIR%%/frmenus/plot/KENTON2.DAT +%%DATADIR%%/frmenus/plot/NBSPART1.DP +%%DATADIR%%/frmenus/plot/PLOT25.DP +%%DATADIR%%/frmenus/plot/TEXAS.DP +%%DATADIR%%/frmenus/plot/USA.DP +%%DATADIR%%/frmenus/plot/USA3.DP +%%DATADIR%%/frmenus/plot/andrplot.men +%%DATADIR%%/frmenus/plot/anopplot.men +%%DATADIR%%/frmenus/plot/asdplot.men +%%DATADIR%%/frmenus/plot/autoplot.men +%%DATADIR%%/frmenus/plot/avplot.men +%%DATADIR%%/frmenus/plot/bar.top +%%DATADIR%%/frmenus/plot/barplot.men +%%DATADIR%%/frmenus/plot/barplot.top +%%DATADIR%%/frmenus/plot/bchoplot.men +%%DATADIR%%/frmenus/plot/bcliplot.men +%%DATADIR%%/frmenus/plot/bcnoplot.men +%%DATADIR%%/frmenus/plot/bihist.men +%%DATADIR%%/frmenus/plot/biplot.men +%%DATADIR%%/frmenus/plot/bootdisc.top +%%DATADIR%%/frmenus/plot/bootlodi.men +%%DATADIR%%/frmenus/plot/bootplco.men +%%DATADIR%%/frmenus/plot/bootpllo.men +%%DATADIR%%/frmenus/plot/bootplms.men +%%DATADIR%%/frmenus/plot/bootplot.men +%%DATADIR%%/frmenus/plot/bootplpe.men +%%DATADIR%%/frmenus/plot/bootplqc.men +%%DATADIR%%/frmenus/plot/bootplsc.men +%%DATADIR%%/frmenus/plot/bootqudi.men +%%DATADIR%%/frmenus/plot/bootscdi.men +%%DATADIR%%/frmenus/plot/bootstra.top +%%DATADIR%%/frmenus/plot/cmeplot.men +%%DATADIR%%/frmenus/plot/compdemo.men +%%DATADIR%%/frmenus/plot/condplot.top +%%DATADIR%%/frmenus/plot/condplot.top.2_2000 +%%DATADIR%%/frmenus/plot/contplda.top +%%DATADIR%%/frmenus/plot/contplfu.top +%%DATADIR%%/frmenus/plot/coplot.men +%%DATADIR%%/frmenus/plot/coplot1.men +%%DATADIR%%/frmenus/plot/coplot_d.top +%%DATADIR%%/frmenus/plot/crosplot.men +%%DATADIR%%/frmenus/plot/crosplot.top +%%DATADIR%%/frmenus/plot/crspplot.men +%%DATADIR%%/frmenus/plot/dexcubep.men +%%DATADIR%%/frmenus/plot/dexcubep.men.old +%%DATADIR%%/frmenus/plot/dexeffep.men +%%DATADIR%%/frmenus/plot/dexmeanp.men +%%DATADIR%%/frmenus/plot/dexplots.top +%%DATADIR%%/frmenus/plot/dexscatp.men +%%DATADIR%%/frmenus/plot/dexsdplo.men +%%DATADIR%%/frmenus/plot/dexsignp.men +%%DATADIR%%/frmenus/plot/dexsnplo.men +%%DATADIR%%/frmenus/plot/dexstatp.men +%%DATADIR%%/frmenus/plot/dexsumsh.men +%%DATADIR%%/frmenus/plot/dexyoudp.men +%%DATADIR%%/frmenus/plot/distplot.top +%%DATADIR%%/frmenus/plot/dot1plot.men +%%DATADIR%%/frmenus/plot/duanplot.men +%%DATADIR%%/frmenus/plot/ecdfplot.men +%%DATADIR%%/frmenus/plot/ehazplot.men +%%DATADIR%%/frmenus/plot/equalwid.men +%%DATADIR%%/frmenus/plot/errorbar.men +%%DATADIR%%/frmenus/plot/fact.top +%%DATADIR%%/frmenus/plot/factpl_d.top +%%DATADIR%%/frmenus/plot/factplo1.men +%%DATADIR%%/frmenus/plot/factplot.men +%%DATADIR%%/frmenus/plot/fitplots.top +%%DATADIR%%/frmenus/plot/freqplot.men +%%DATADIR%%/frmenus/plot/gbarplot.men +%%DATADIR%%/frmenus/plot/homoplot.men +%%DATADIR%%/frmenus/plot/jacklodi.men +%%DATADIR%%/frmenus/plot/jackplco.men +%%DATADIR%%/frmenus/plot/jackpllo.men +%%DATADIR%%/frmenus/plot/jackplms.men +%%DATADIR%%/frmenus/plot/jackplot.men +%%DATADIR%%/frmenus/plot/jackplpe.men +%%DATADIR%%/frmenus/plot/jackplqc.men +%%DATADIR%%/frmenus/plot/jackplsc.men +%%DATADIR%%/frmenus/plot/jackqudi.men +%%DATADIR%%/frmenus/plot/jackscdi.men +%%DATADIR%%/frmenus/plot/kaplplot.men +%%DATADIR%%/frmenus/plot/kernplot.men +%%DATADIR%%/frmenus/plot/lag2plot.men +%%DATADIR%%/frmenus/plot/lagplot.men +%%DATADIR%%/frmenus/plot/level_d.top +%%DATADIR%%/frmenus/plot/lhazplot.men +%%DATADIR%%/frmenus/plot/m-dplot.men +%%DATADIR%%/frmenus/plot/m-dplot.men.old +%%DATADIR%%/frmenus/plot/map.men +%%DATADIR%%/frmenus/plot/map.top +%%DATADIR%%/frmenus/plot/map_disc.top +%%DATADIR%%/frmenus/plot/mapfiles.top +%%DATADIR%%/frmenus/plot/matrpl_d.top +%%DATADIR%%/frmenus/plot/matrplot.top +%%DATADIR%%/frmenus/plot/mp_disc.top +%%DATADIR%%/frmenus/plot/multfact.top +%%DATADIR%%/frmenus/plot/multfapl.top +%%DATADIR%%/frmenus/plot/multplot.top +%%DATADIR%%/frmenus/plot/multplpp.men +%%DATADIR%%/frmenus/plot/multplpp.top +%%DATADIR%%/frmenus/plot/nhazplot.men +%%DATADIR%%/frmenus/plot/normplot.men +%%DATADIR%%/frmenus/plot/od.top +%%DATADIR%%/frmenus/plot/od_disc.top +%%DATADIR%%/frmenus/plot/parcplot.men +%%DATADIR%%/frmenus/plot/pareplot.men +%%DATADIR%%/frmenus/plot/partplot.men +%%DATADIR%%/frmenus/plot/pcorplot.men +%%DATADIR%%/frmenus/plot/percplot.men +%%DATADIR%%/frmenus/plot/periodgr.men +%%DATADIR%%/frmenus/plot/periodog.men +%%DATADIR%%/frmenus/plot/piechart.men +%%DATADIR%%/frmenus/plot/plot.top +%%DATADIR%%/frmenus/plot/plotda2d.men +%%DATADIR%%/frmenus/plot/plotdafu.top +%%DATADIR%%/frmenus/plot/plotdapr.men +%%DATADIR%%/frmenus/plot/plotdf2d.men +%%DATADIR%%/frmenus/plot/plotdm2d.men +%%DATADIR%%/frmenus/plot/plotfm2d.men +%%DATADIR%%/frmenus/plot/plotfu2d.men +%%DATADIR%%/frmenus/plot/plotfu3d.men +%%DATADIR%%/frmenus/plot/ploty1y2.men +%%DATADIR%%/frmenus/plot/prinplot.men +%%DATADIR%%/frmenus/plot/probplot.top +%%DATADIR%%/frmenus/plot/profplot.men +%%DATADIR%%/frmenus/plot/q-qplot.men +%%DATADIR%%/frmenus/plot/reliplot.top +%%DATADIR%%/frmenus/plot/rfplot.men +%%DATADIR%%/frmenus/plot/rootogra.men +%%DATADIR%%/frmenus/plot/runsplot.men +%%DATADIR%%/frmenus/plot/scatplma.men +%%DATADIR%%/frmenus/plot/scatplma.men.old +%%DATADIR%%/frmenus/plot/scatplo1.men +%%DATADIR%%/frmenus/plot/scatplo2.men +%%DATADIR%%/frmenus/plot/setghost.men +%%DATADIR%%/frmenus/plot/setprint.men +%%DATADIR%%/frmenus/plot/shiftplo.men +%%DATADIR%%/frmenus/plot/slplot.men +%%DATADIR%%/frmenus/plot/specplot.men +%%DATADIR%%/frmenus/plot/starplot.men +%%DATADIR%%/frmenus/plot/statplot.top +%%DATADIR%%/frmenus/plot/stemleaf.men +%%DATADIR%%/frmenus/plot/subsetda.men +%%DATADIR%%/frmenus/plot/symbplot.men +%%DATADIR%%/frmenus/plot/symmplot.men +%%DATADIR%%/frmenus/plot/tailplot.men +%%DATADIR%%/frmenus/plot/timeplot.top +%%DATADIR%%/frmenus/plot/trenplot.men +%%DATADIR%%/frmenus/plot/univplot.top +%%DATADIR%%/frmenus/plot/vectplot.men +%%DATADIR%%/frmenus/plot/violin.men +%%DATADIR%%/frmenus/plot/weibplot.men +%%DATADIR%%/frmenus/plot/whazplot.men +%%DATADIR%%/frmenus/plot/xyplot.top +%%DATADIR%%/frmenus/prob/a +%%DATADIR%%/frmenus/prob/a. +%%DATADIR%%/frmenus/prob/ad.top +%%DATADIR%%/frmenus/prob/addex.men +%%DATADIR%%/frmenus/prob/adecdf.men +%%DATADIR%%/frmenus/prob/adehispd.men +%%DATADIR%%/frmenus/prob/ademle.men +%%DATADIR%%/frmenus/prob/adepdf.men +%%DATADIR%%/frmenus/prob/adeppcc.men +%%DATADIR%%/frmenus/prob/adeppccc.men +%%DATADIR%%/frmenus/prob/adeppf.men +%%DATADIR%%/frmenus/prob/adeprob.men +%%DATADIR%%/frmenus/prob/adlog.men +%%DATADIR%%/frmenus/prob/aduni.men +%%DATADIR%%/frmenus/prob/alpcdf.men +%%DATADIR%%/frmenus/prob/alpchaz.men +%%DATADIR%%/frmenus/prob/alphaz.men +%%DATADIR%%/frmenus/prob/alphispd.men +%%DATADIR%%/frmenus/prob/alppdf.men +%%DATADIR%%/frmenus/prob/alpppf.men +%%DATADIR%%/frmenus/prob/andedarl.top +%%DATADIR%%/frmenus/prob/angcdf.men +%%DATADIR%%/frmenus/prob/anghispd.men +%%DATADIR%%/frmenus/prob/angpdf.men +%%DATADIR%%/frmenus/prob/angppf.men +%%DATADIR%%/frmenus/prob/arscdf.men +%%DATADIR%%/frmenus/prob/arshispd.men +%%DATADIR%%/frmenus/prob/arspdf.men +%%DATADIR%%/frmenus/prob/arsppf.men +%%DATADIR%%/frmenus/prob/axisorde.men +%%DATADIR%%/frmenus/prob/b10cdf.men +%%DATADIR%%/frmenus/prob/b10hispd.men +%%DATADIR%%/frmenus/prob/b10pdf.men +%%DATADIR%%/frmenus/prob/b10ppcc.men +%%DATADIR%%/frmenus/prob/b10ppccc.men +%%DATADIR%%/frmenus/prob/b10ppf.men +%%DATADIR%%/frmenus/prob/b10prob.men +%%DATADIR%%/frmenus/prob/b11cdf.men +%%DATADIR%%/frmenus/prob/b11hispd.men +%%DATADIR%%/frmenus/prob/b11pdf.men +%%DATADIR%%/frmenus/prob/b11ppcc.men +%%DATADIR%%/frmenus/prob/b11ppccc.men +%%DATADIR%%/frmenus/prob/b11ppf.men +%%DATADIR%%/frmenus/prob/b11prob.men +%%DATADIR%%/frmenus/prob/b12cdf.men +%%DATADIR%%/frmenus/prob/b12hispd.men +%%DATADIR%%/frmenus/prob/b12pdf.men +%%DATADIR%%/frmenus/prob/b12ppf.men +%%DATADIR%%/frmenus/prob/bbncdf.men +%%DATADIR%%/frmenus/prob/bbnhispd.men +%%DATADIR%%/frmenus/prob/bbnpdf.men +%%DATADIR%%/frmenus/prob/bbnppcc.men +%%DATADIR%%/frmenus/prob/bbnppf.men +%%DATADIR%%/frmenus/prob/betcdf.men +%%DATADIR%%/frmenus/prob/betdesc.top +%%DATADIR%%/frmenus/prob/bethispd.men +%%DATADIR%%/frmenus/prob/betpdf.men +%%DATADIR%%/frmenus/prob/betppf.men +%%DATADIR%%/frmenus/prob/bgecdf.men +%%DATADIR%%/frmenus/prob/bgehispd.men +%%DATADIR%%/frmenus/prob/bgepdf.men +%%DATADIR%%/frmenus/prob/bgeppcc.men +%%DATADIR%%/frmenus/prob/bgeppf.men +%%DATADIR%%/frmenus/prob/bihistma.men +%%DATADIR%%/frmenus/prob/bincdf.men +%%DATADIR%%/frmenus/prob/bindesc.top +%%DATADIR%%/frmenus/prob/binhispd.men +%%DATADIR%%/frmenus/prob/binmle.men +%%DATADIR%%/frmenus/prob/binpdf.men +%%DATADIR%%/frmenus/prob/binppf.men +%%DATADIR%%/frmenus/prob/bivcdf.top +%%DATADIR%%/frmenus/prob/bivpdf.top +%%DATADIR%%/frmenus/prob/biweight.men +%%DATADIR%%/frmenus/prob/bnbcdf.men +%%DATADIR%%/frmenus/prob/bnbhispd.men +%%DATADIR%%/frmenus/prob/bnbpdf.men +%%DATADIR%%/frmenus/prob/bnbppf.men +%%DATADIR%%/frmenus/prob/bnocdf.men +%%DATADIR%%/frmenus/prob/bnohispd.men +%%DATADIR%%/frmenus/prob/bnopdf.men +%%DATADIR%%/frmenus/prob/bnoppf.men +%%DATADIR%%/frmenus/prob/bootade.men +%%DATADIR%%/frmenus/prob/bootalp.men +%%DATADIR%%/frmenus/prob/bootang.men +%%DATADIR%%/frmenus/prob/bootars.men +%%DATADIR%%/frmenus/prob/bootb10.men +%%DATADIR%%/frmenus/prob/bootb11.men +%%DATADIR%%/frmenus/prob/bootbra.men +%%DATADIR%%/frmenus/prob/bootbu2.men +%%DATADIR%%/frmenus/prob/bootbu7.men +%%DATADIR%%/frmenus/prob/bootbu8.men +%%DATADIR%%/frmenus/prob/bootcau.men +%%DATADIR%%/frmenus/prob/bootch.men +%%DATADIR%%/frmenus/prob/bootchs.men +%%DATADIR%%/frmenus/prob/bootcos.men +%%DATADIR%%/frmenus/prob/bootdex.men +%%DATADIR%%/frmenus/prob/bootdga.men +%%DATADIR%%/frmenus/prob/bootdwe.men +%%DATADIR%%/frmenus/prob/bootft.men +%%DATADIR%%/frmenus/prob/bootghfl.men +%%DATADIR%%/frmenus/prob/bootgl2.men +%%DATADIR%%/frmenus/prob/bootgl3.men +%%DATADIR%%/frmenus/prob/bootgl5.men +%%DATADIR%%/frmenus/prob/bootglo.men +%%DATADIR%%/frmenus/prob/boothfc.men +%%DATADIR%%/frmenus/prob/boothfl.men +%%DATADIR%%/frmenus/prob/boothfn.men +%%DATADIR%%/frmenus/prob/boothse.men +%%DATADIR%%/frmenus/prob/bootlam.men +%%DATADIR%%/frmenus/prob/bootlde.men +%%DATADIR%%/frmenus/prob/bootlex.men +%%DATADIR%%/frmenus/prob/bootllg.men +%%DATADIR%%/frmenus/prob/bootlog.men +%%DATADIR%%/frmenus/prob/bootmax.men +%%DATADIR%%/frmenus/prob/bootmcl.men +%%DATADIR%%/frmenus/prob/bootmut.men +%%DATADIR%%/frmenus/prob/bootogi.men +%%DATADIR%%/frmenus/prob/bootpex.men +%%DATADIR%%/frmenus/prob/bootpnr.men +%%DATADIR%%/frmenus/prob/bootpow.men +%%DATADIR%%/frmenus/prob/bootray.men +%%DATADIR%%/frmenus/prob/bootrec.men +%%DATADIR%%/frmenus/prob/bootrpo.men +%%DATADIR%%/frmenus/prob/bootsde.men +%%DATADIR%%/frmenus/prob/bootsem.men +%%DATADIR%%/frmenus/prob/bootsla.men +%%DATADIR%%/frmenus/prob/bootslo.men +%%DATADIR%%/frmenus/prob/bootsn.men +%%DATADIR%%/frmenus/prob/bootsub.men +%%DATADIR%%/frmenus/prob/boott.men +%%DATADIR%%/frmenus/prob/boottop.men +%%DATADIR%%/frmenus/prob/boottri.men +%%DATADIR%%/frmenus/prob/bootuni.men +%%DATADIR%%/frmenus/prob/bootvon.men +%%DATADIR%%/frmenus/prob/bootwca.men +%%DATADIR%%/frmenus/prob/bracdf.men +%%DATADIR%%/frmenus/prob/brahispd.men +%%DATADIR%%/frmenus/prob/brapdf.men +%%DATADIR%%/frmenus/prob/brappcc.men +%%DATADIR%%/frmenus/prob/brappccc.men +%%DATADIR%%/frmenus/prob/brappf.men +%%DATADIR%%/frmenus/prob/braprob.men +%%DATADIR%%/frmenus/prob/browmoti.top +%%DATADIR%%/frmenus/prob/btacdf.men +%%DATADIR%%/frmenus/prob/btahispd.men +%%DATADIR%%/frmenus/prob/btapdf.men +%%DATADIR%%/frmenus/prob/btappcc.men +%%DATADIR%%/frmenus/prob/btappf.men +%%DATADIR%%/frmenus/prob/bu2cdf.men +%%DATADIR%%/frmenus/prob/bu2hispd.men +%%DATADIR%%/frmenus/prob/bu2pdf.men +%%DATADIR%%/frmenus/prob/bu2ppcc.men +%%DATADIR%%/frmenus/prob/bu2ppccc.men +%%DATADIR%%/frmenus/prob/bu2ppf.men +%%DATADIR%%/frmenus/prob/bu2prob.men +%%DATADIR%%/frmenus/prob/bu3cdf.men +%%DATADIR%%/frmenus/prob/bu3hispd.men +%%DATADIR%%/frmenus/prob/bu3pdf.men +%%DATADIR%%/frmenus/prob/bu3ppf.men +%%DATADIR%%/frmenus/prob/bu4cdf.men +%%DATADIR%%/frmenus/prob/bu4hispd.men +%%DATADIR%%/frmenus/prob/bu4pdf.men +%%DATADIR%%/frmenus/prob/bu4ppf.men +%%DATADIR%%/frmenus/prob/bu5cdf.men +%%DATADIR%%/frmenus/prob/bu5hispd.men +%%DATADIR%%/frmenus/prob/bu5pdf.men +%%DATADIR%%/frmenus/prob/bu5ppf.men +%%DATADIR%%/frmenus/prob/bu6cdf.men +%%DATADIR%%/frmenus/prob/bu6hispd.men +%%DATADIR%%/frmenus/prob/bu6pdf.men +%%DATADIR%%/frmenus/prob/bu6ppf.men +%%DATADIR%%/frmenus/prob/bu7cdf.men +%%DATADIR%%/frmenus/prob/bu7hispd.men +%%DATADIR%%/frmenus/prob/bu7pdf.men +%%DATADIR%%/frmenus/prob/bu7ppcc.men +%%DATADIR%%/frmenus/prob/bu7ppccc.men +%%DATADIR%%/frmenus/prob/bu7ppf.men +%%DATADIR%%/frmenus/prob/bu7prob.men +%%DATADIR%%/frmenus/prob/bu8cdf.men +%%DATADIR%%/frmenus/prob/bu8hispd.men +%%DATADIR%%/frmenus/prob/bu8pdf.men +%%DATADIR%%/frmenus/prob/bu8ppcc.men +%%DATADIR%%/frmenus/prob/bu8ppccc.men +%%DATADIR%%/frmenus/prob/bu8ppf.men +%%DATADIR%%/frmenus/prob/bu8prob.men +%%DATADIR%%/frmenus/prob/bu9cdf.men +%%DATADIR%%/frmenus/prob/bu9hispd.men +%%DATADIR%%/frmenus/prob/bu9pdf.men +%%DATADIR%%/frmenus/prob/bu9ppf.men +%%DATADIR%%/frmenus/prob/bvncdf.men +%%DATADIR%%/frmenus/prob/bvnpdf.men +%%DATADIR%%/frmenus/prob/bwecdf.men +%%DATADIR%%/frmenus/prob/bwechaz.men +%%DATADIR%%/frmenus/prob/bwehaz.men +%%DATADIR%%/frmenus/prob/bwehispd.men +%%DATADIR%%/frmenus/prob/bwepdf.men +%%DATADIR%%/frmenus/prob/bweppf.men +%%DATADIR%%/frmenus/prob/caucdf.men +%%DATADIR%%/frmenus/prob/caudesc.top +%%DATADIR%%/frmenus/prob/cauhispd.men +%%DATADIR%%/frmenus/prob/caumle.men +%%DATADIR%%/frmenus/prob/caupdf.men +%%DATADIR%%/frmenus/prob/cauppf.men +%%DATADIR%%/frmenus/prob/cdf.top +%%DATADIR%%/frmenus/prob/cdfplots.top +%%DATADIR%%/frmenus/prob/cdftail.top +%%DATADIR%%/frmenus/prob/chcdf.men +%%DATADIR%%/frmenus/prob/chhispd.men +%%DATADIR%%/frmenus/prob/chiscdf.top +%%DATADIR%%/frmenus/prob/chispdf.top +%%DATADIR%%/frmenus/prob/chisppf.top +%%DATADIR%%/frmenus/prob/chpdf.men +%%DATADIR%%/frmenus/prob/chppcc.men +%%DATADIR%%/frmenus/prob/chppccc.men +%%DATADIR%%/frmenus/prob/chppf.men +%%DATADIR%%/frmenus/prob/chprob.men +%%DATADIR%%/frmenus/prob/chscdf.men +%%DATADIR%%/frmenus/prob/chsdesc.top +%%DATADIR%%/frmenus/prob/chshispd.men +%%DATADIR%%/frmenus/prob/chspdf.men +%%DATADIR%%/frmenus/prob/chsppcc.men +%%DATADIR%%/frmenus/prob/chsppccc.men +%%DATADIR%%/frmenus/prob/chsppf.men +%%DATADIR%%/frmenus/prob/chsprob.men +%%DATADIR%%/frmenus/prob/comp2dis.top +%%DATADIR%%/frmenus/prob/comp3dis.top +%%DATADIR%%/frmenus/prob/compchaz.top +%%DATADIR%%/frmenus/prob/comphaz.top +%%DATADIR%%/frmenus/prob/comppdf.top +%%DATADIR%%/frmenus/prob/con1cdf.men +%%DATADIR%%/frmenus/prob/con1hisp.men +%%DATADIR%%/frmenus/prob/con1pdf.men +%%DATADIR%%/frmenus/prob/con1ppcc.men +%%DATADIR%%/frmenus/prob/con1ppf.men +%%DATADIR%%/frmenus/prob/con2cdf.men +%%DATADIR%%/frmenus/prob/con2hisp.men +%%DATADIR%%/frmenus/prob/con2pdf.men +%%DATADIR%%/frmenus/prob/con2ppcc.men +%%DATADIR%%/frmenus/prob/con2ppf.men +%%DATADIR%%/frmenus/prob/coscdf.men +%%DATADIR%%/frmenus/prob/coshispd.men +%%DATADIR%%/frmenus/prob/cospdf.men +%%DATADIR%%/frmenus/prob/cosppf.men +%%DATADIR%%/frmenus/prob/cppccb12.men +%%DATADIR%%/frmenus/prob/cppccbet.men +%%DATADIR%%/frmenus/prob/cppccbno.men +%%DATADIR%%/frmenus/prob/cppccbu3.men +%%DATADIR%%/frmenus/prob/cppccbu5.men +%%DATADIR%%/frmenus/prob/cppccbu6.men +%%DATADIR%%/frmenus/prob/cppccbu9.men +%%DATADIR%%/frmenus/prob/cppccdpu.men +%%DATADIR%%/frmenus/prob/cppccewe.men +%%DATADIR%%/frmenus/prob/cppccf.men +%%DATADIR%%/frmenus/prob/cppccfca.men +%%DATADIR%%/frmenus/prob/cppccfnr.men +%%DATADIR%%/frmenus/prob/cppccgh.men +%%DATADIR%%/frmenus/prob/cppccgld.men +%%DATADIR%%/frmenus/prob/cppccgom.men +%%DATADIR%%/frmenus/prob/cppccgtl.men +%%DATADIR%%/frmenus/prob/cppccig.men +%%DATADIR%%/frmenus/prob/cppccjsb.men +%%DATADIR%%/frmenus/prob/cppccjsu.men +%%DATADIR%%/frmenus/prob/cppcckum.men +%%DATADIR%%/frmenus/prob/cppccpln.men +%%DATADIR%%/frmenus/prob/cppccrgt.men +%%DATADIR%%/frmenus/prob/cppccrig.men +%%DATADIR%%/frmenus/prob/cppcctnr.men +%%DATADIR%%/frmenus/prob/cppcctso.men +%%DATADIR%%/frmenus/prob/cppcctsp.men +%%DATADIR%%/frmenus/prob/cppcctss.men +%%DATADIR%%/frmenus/prob/dexcdf.men +%%DATADIR%%/frmenus/prob/dexdesc.top +%%DATADIR%%/frmenus/prob/dexhispd.men +%%DATADIR%%/frmenus/prob/dexmle.men +%%DATADIR%%/frmenus/prob/dexpdf.men +%%DATADIR%%/frmenus/prob/dexppf.men +%%DATADIR%%/frmenus/prob/dfitdisc.top +%%DATADIR%%/frmenus/prob/dgacdf.men +%%DATADIR%%/frmenus/prob/dgahispd.men +%%DATADIR%%/frmenus/prob/dgapdf.men +%%DATADIR%%/frmenus/prob/dgappcc.men +%%DATADIR%%/frmenus/prob/dgappccc.men +%%DATADIR%%/frmenus/prob/dgappf.men +%%DATADIR%%/frmenus/prob/dgaprob.men +%%DATADIR%%/frmenus/prob/disc.top +%%DATADIR%%/frmenus/prob/disccdf.top +%%DATADIR%%/frmenus/prob/discchsq.top +%%DATADIR%%/frmenus/prob/discdesc.top +%%DATADIR%%/frmenus/prob/discdf.men +%%DATADIR%%/frmenus/prob/dischisp.top +%%DATADIR%%/frmenus/prob/discks.top +%%DATADIR%%/frmenus/prob/discmle.top +%%DATADIR%%/frmenus/prob/discmle2.top +%%DATADIR%%/frmenus/prob/discpdf.top +%%DATADIR%%/frmenus/prob/discpp.top +%%DATADIR%%/frmenus/prob/discppcc.top +%%DATADIR%%/frmenus/prob/discppf.top +%%DATADIR%%/frmenus/prob/discprob.top +%%DATADIR%%/frmenus/prob/discran.top +%%DATADIR%%/frmenus/prob/dishispd.men +%%DATADIR%%/frmenus/prob/dispdf.men +%%DATADIR%%/frmenus/prob/disppf.men +%%DATADIR%%/frmenus/prob/distdesc.top +%%DATADIR%%/frmenus/prob/diwcdf.men +%%DATADIR%%/frmenus/prob/diwhispd.men +%%DATADIR%%/frmenus/prob/diwpdf.men +%%DATADIR%%/frmenus/prob/diwppcc.men +%%DATADIR%%/frmenus/prob/diwppf.men +%%DATADIR%%/frmenus/prob/dlgcdf.men +%%DATADIR%%/frmenus/prob/dlghispd.men +%%DATADIR%%/frmenus/prob/dlgpdf.men +%%DATADIR%%/frmenus/prob/dlgppcc.men +%%DATADIR%%/frmenus/prob/dlgppf.men +%%DATADIR%%/frmenus/prob/dnfcdf.men +%%DATADIR%%/frmenus/prob/dnfhispd.men +%%DATADIR%%/frmenus/prob/dnfpdf.men +%%DATADIR%%/frmenus/prob/dnfppf.men +%%DATADIR%%/frmenus/prob/dntcdf.men +%%DATADIR%%/frmenus/prob/dnthispd.men +%%DATADIR%%/frmenus/prob/dntpdf.men +%%DATADIR%%/frmenus/prob/dntppf.men +%%DATADIR%%/frmenus/prob/dpucdf.men +%%DATADIR%%/frmenus/prob/dpuhispd.men +%%DATADIR%%/frmenus/prob/dpupdf.men +%%DATADIR%%/frmenus/prob/dpuppf.men +%%DATADIR%%/frmenus/prob/dwecdf.men +%%DATADIR%%/frmenus/prob/dwehispd.men +%%DATADIR%%/frmenus/prob/dwepdf.men +%%DATADIR%%/frmenus/prob/dweppcc.men +%%DATADIR%%/frmenus/prob/dweppccc.men +%%DATADIR%%/frmenus/prob/dweppf.men +%%DATADIR%%/frmenus/prob/dweprob.men +%%DATADIR%%/frmenus/prob/est_disc.top +%%DATADIR%%/frmenus/prob/ev11cdf.men +%%DATADIR%%/frmenus/prob/ev11chaz.men +%%DATADIR%%/frmenus/prob/ev11desc.top +%%DATADIR%%/frmenus/prob/ev11haz.men +%%DATADIR%%/frmenus/prob/ev11hisp.men +%%DATADIR%%/frmenus/prob/ev11pdf.men +%%DATADIR%%/frmenus/prob/ev11ppf.men +%%DATADIR%%/frmenus/prob/ev12cdf.men +%%DATADIR%%/frmenus/prob/ev12chaz.men +%%DATADIR%%/frmenus/prob/ev12desc.top +%%DATADIR%%/frmenus/prob/ev12haz.men +%%DATADIR%%/frmenus/prob/ev12hisp.men +%%DATADIR%%/frmenus/prob/ev12pdf.men +%%DATADIR%%/frmenus/prob/ev12ppf.men +%%DATADIR%%/frmenus/prob/ev21cdf.men +%%DATADIR%%/frmenus/prob/ev21chaz.men +%%DATADIR%%/frmenus/prob/ev21desc.top +%%DATADIR%%/frmenus/prob/ev21haz.men +%%DATADIR%%/frmenus/prob/ev21hisp.men +%%DATADIR%%/frmenus/prob/ev21pdf.men +%%DATADIR%%/frmenus/prob/ev21ppf.men +%%DATADIR%%/frmenus/prob/ev22cdf.men +%%DATADIR%%/frmenus/prob/ev22chaz.men +%%DATADIR%%/frmenus/prob/ev22desc.top +%%DATADIR%%/frmenus/prob/ev22haz.men +%%DATADIR%%/frmenus/prob/ev22hisp.men +%%DATADIR%%/frmenus/prob/ev22pdf.men +%%DATADIR%%/frmenus/prob/ev22ppf.men +%%DATADIR%%/frmenus/prob/ewecdf.men +%%DATADIR%%/frmenus/prob/ewechaz.men +%%DATADIR%%/frmenus/prob/ewehaz.men +%%DATADIR%%/frmenus/prob/ewehispd.men +%%DATADIR%%/frmenus/prob/ewehispdf.men +%%DATADIR%%/frmenus/prob/ewepdf.men +%%DATADIR%%/frmenus/prob/eweppf.men +%%DATADIR%%/frmenus/prob/expcdf.men +%%DATADIR%%/frmenus/prob/expchaz.men +%%DATADIR%%/frmenus/prob/expdesc.top +%%DATADIR%%/frmenus/prob/exphaz.men +%%DATADIR%%/frmenus/prob/exphispd.men +%%DATADIR%%/frmenus/prob/expocdf.top +%%DATADIR%%/frmenus/prob/expomle.men +%%DATADIR%%/frmenus/prob/expopdf.top +%%DATADIR%%/frmenus/prob/expoppf.top +%%DATADIR%%/frmenus/prob/exppdf.men +%%DATADIR%%/frmenus/prob/expppf.men +%%DATADIR%%/frmenus/prob/fcacdf.men +%%DATADIR%%/frmenus/prob/fcahispd.men +%%DATADIR%%/frmenus/prob/fcapdf.men +%%DATADIR%%/frmenus/prob/fcappf.men +%%DATADIR%%/frmenus/prob/fcdf.men +%%DATADIR%%/frmenus/prob/fdesc.top +%%DATADIR%%/frmenus/prob/fhispd.men +%%DATADIR%%/frmenus/prob/flcdf.men +%%DATADIR%%/frmenus/prob/flchaz.men +%%DATADIR%%/frmenus/prob/flhaz.men +%%DATADIR%%/frmenus/prob/flhispd.men +%%DATADIR%%/frmenus/prob/flpdf.men +%%DATADIR%%/frmenus/prob/flppf.men +%%DATADIR%%/frmenus/prob/fnrcdf.men +%%DATADIR%%/frmenus/prob/fnrhispd.men +%%DATADIR%%/frmenus/prob/fnrpdf.men +%%DATADIR%%/frmenus/prob/fnrppf.men +%%DATADIR%%/frmenus/prob/fpdf.men +%%DATADIR%%/frmenus/prob/fppf.men +%%DATADIR%%/frmenus/prob/ftcdf.men +%%DATADIR%%/frmenus/prob/fthispd.men +%%DATADIR%%/frmenus/prob/ftldesc.top +%%DATADIR%%/frmenus/prob/ftpdf.men +%%DATADIR%%/frmenus/prob/ftppcc.men +%%DATADIR%%/frmenus/prob/ftppccc.men +%%DATADIR%%/frmenus/prob/ftppf.men +%%DATADIR%%/frmenus/prob/ftprob.men +%%DATADIR%%/frmenus/prob/galcdf.men +%%DATADIR%%/frmenus/prob/galhispd.men +%%DATADIR%%/frmenus/prob/galpdf.men +%%DATADIR%%/frmenus/prob/galppf.men +%%DATADIR%%/frmenus/prob/gamcdf.men +%%DATADIR%%/frmenus/prob/gamchaz.men +%%DATADIR%%/frmenus/prob/gamdesc.top +%%DATADIR%%/frmenus/prob/gamhaz.men +%%DATADIR%%/frmenus/prob/gamhispd.men +%%DATADIR%%/frmenus/prob/gampdf.men +%%DATADIR%%/frmenus/prob/gamppf.men +%%DATADIR%%/frmenus/prob/geecdf.men +%%DATADIR%%/frmenus/prob/geechaz.men +%%DATADIR%%/frmenus/prob/geehaz.men +%%DATADIR%%/frmenus/prob/geehispd.men +%%DATADIR%%/frmenus/prob/geepdf.men +%%DATADIR%%/frmenus/prob/geeppf.men +%%DATADIR%%/frmenus/prob/genadera.men +%%DATADIR%%/frmenus/prob/genalpra.men +%%DATADIR%%/frmenus/prob/genangra.men +%%DATADIR%%/frmenus/prob/genarsra.men +%%DATADIR%%/frmenus/prob/genb10ra.men +%%DATADIR%%/frmenus/prob/genb11ra.men +%%DATADIR%%/frmenus/prob/genb12ra.men +%%DATADIR%%/frmenus/prob/genbbnra.men +%%DATADIR%%/frmenus/prob/genbetra.men +%%DATADIR%%/frmenus/prob/genbgera.men +%%DATADIR%%/frmenus/prob/genbinra.men +%%DATADIR%%/frmenus/prob/genbnbra.men +%%DATADIR%%/frmenus/prob/genbnora.men +%%DATADIR%%/frmenus/prob/genbrara.men +%%DATADIR%%/frmenus/prob/genbtara.men +%%DATADIR%%/frmenus/prob/genbu2ra.men +%%DATADIR%%/frmenus/prob/genbu3ra.men +%%DATADIR%%/frmenus/prob/genbu4ra.men +%%DATADIR%%/frmenus/prob/genbu5ra.men +%%DATADIR%%/frmenus/prob/genbu6ra.men +%%DATADIR%%/frmenus/prob/genbu7ra.men +%%DATADIR%%/frmenus/prob/genbu8ra.men +%%DATADIR%%/frmenus/prob/genbu9ra.men +%%DATADIR%%/frmenus/prob/genbwera.men +%%DATADIR%%/frmenus/prob/gencaura.men +%%DATADIR%%/frmenus/prob/genchra.men +%%DATADIR%%/frmenus/prob/genchsra.men +%%DATADIR%%/frmenus/prob/gencon1r.men +%%DATADIR%%/frmenus/prob/gencon2r.men +%%DATADIR%%/frmenus/prob/gencosra.men +%%DATADIR%%/frmenus/prob/gendexra.men +%%DATADIR%%/frmenus/prob/gendgara.men +%%DATADIR%%/frmenus/prob/gendisra.men +%%DATADIR%%/frmenus/prob/gendisrn.men +%%DATADIR%%/frmenus/prob/gendiwra.men +%%DATADIR%%/frmenus/prob/gendlgra.men +%%DATADIR%%/frmenus/prob/gendnfra.men +%%DATADIR%%/frmenus/prob/gendntra.men +%%DATADIR%%/frmenus/prob/gendpura.men +%%DATADIR%%/frmenus/prob/gendwera.men +%%DATADIR%%/frmenus/prob/genev11r.men +%%DATADIR%%/frmenus/prob/genev12r.men +%%DATADIR%%/frmenus/prob/genev21r.men +%%DATADIR%%/frmenus/prob/genev22r.men +%%DATADIR%%/frmenus/prob/genewera.men +%%DATADIR%%/frmenus/prob/genexpra.men +%%DATADIR%%/frmenus/prob/genfcara.men +%%DATADIR%%/frmenus/prob/genfibon.men +%%DATADIR%%/frmenus/prob/genflra.men +%%DATADIR%%/frmenus/prob/genfnrra.men +%%DATADIR%%/frmenus/prob/genfra.men +%%DATADIR%%/frmenus/prob/genftra.men +%%DATADIR%%/frmenus/prob/gengalra.men +%%DATADIR%%/frmenus/prob/gengamra.men +%%DATADIR%%/frmenus/prob/gengeera.men +%%DATADIR%%/frmenus/prob/gengeo2r.men +%%DATADIR%%/frmenus/prob/gengeora.men +%%DATADIR%%/frmenus/prob/gengep2r.men +%%DATADIR%%/frmenus/prob/gengepra.men +%%DATADIR%%/frmenus/prob/genget1r.men +%%DATADIR%%/frmenus/prob/genget2r.men +%%DATADIR%%/frmenus/prob/gengev1r.men +%%DATADIR%%/frmenus/prob/gengev2r.men +%%DATADIR%%/frmenus/prob/gengevra.men +%%DATADIR%%/frmenus/prob/gengexra.men +%%DATADIR%%/frmenus/prob/genggdra.men +%%DATADIR%%/frmenus/prob/genghlra.men +%%DATADIR%%/frmenus/prob/genghra.men +%%DATADIR%%/frmenus/prob/gengigra.men +%%DATADIR%%/frmenus/prob/gengl2ra.men +%%DATADIR%%/frmenus/prob/gengl3ra.men +%%DATADIR%%/frmenus/prob/gengl4ra.men +%%DATADIR%%/frmenus/prob/gengl5ra.men +%%DATADIR%%/frmenus/prob/gengldra.men +%%DATADIR%%/frmenus/prob/genglgra.men +%%DATADIR%%/frmenus/prob/genglora.men +%%DATADIR%%/frmenus/prob/genglsra.men +%%DATADIR%%/frmenus/prob/gengmcra.men +%%DATADIR%%/frmenus/prob/gengnbra.men +%%DATADIR%%/frmenus/prob/gengomra.men +%%DATADIR%%/frmenus/prob/gengtlra.men +%%DATADIR%%/frmenus/prob/gengtrra.men +%%DATADIR%%/frmenus/prob/genherra.men +%%DATADIR%%/frmenus/prob/genhfcra.men +%%DATADIR%%/frmenus/prob/genhflra.men +%%DATADIR%%/frmenus/prob/genhfnra.men +%%DATADIR%%/frmenus/prob/genhsera.men +%%DATADIR%%/frmenus/prob/genhypra.men +%%DATADIR%%/frmenus/prob/genibra.men +%%DATADIR%%/frmenus/prob/genigara.men +%%DATADIR%%/frmenus/prob/genigra.men +%%DATADIR%%/frmenus/prob/geniwera.men +%%DATADIR%%/frmenus/prob/genjsbra.men +%%DATADIR%%/frmenus/prob/genjsura.men +%%DATADIR%%/frmenus/prob/genkapra.men +%%DATADIR%%/frmenus/prob/genkatra.men +%%DATADIR%%/frmenus/prob/genkumra.men +%%DATADIR%%/frmenus/prob/genlamra.men +%%DATADIR%%/frmenus/prob/genlbera.men +%%DATADIR%%/frmenus/prob/genlctra.men +%%DATADIR%%/frmenus/prob/genldera.men +%%DATADIR%%/frmenus/prob/genlexra.men +%%DATADIR%%/frmenus/prob/genlgara.men +%%DATADIR%%/frmenus/prob/genlgnra.men +%%DATADIR%%/frmenus/prob/genllgra.men +%%DATADIR%%/frmenus/prob/genlogra.men +%%DATADIR%%/frmenus/prob/genlosra.men +%%DATADIR%%/frmenus/prob/genlpora.men +%%DATADIR%%/frmenus/prob/genlsnra.men +%%DATADIR%%/frmenus/prob/genlstra.men +%%DATADIR%%/frmenus/prob/genmakar.men +%%DATADIR%%/frmenus/prob/genmakbr.men +%%DATADIR%%/frmenus/prob/genmakra.men +%%DATADIR%%/frmenus/prob/genmatra.men +%%DATADIR%%/frmenus/prob/genmaxra.men +%%DATADIR%%/frmenus/prob/genmclra.men +%%DATADIR%%/frmenus/prob/genmixrn.men +%%DATADIR%%/frmenus/prob/genmulrn.men +%%DATADIR%%/frmenus/prob/genmutra.men +%%DATADIR%%/frmenus/prob/genmvnrn.men +%%DATADIR%%/frmenus/prob/gennbra.men +%%DATADIR%%/frmenus/prob/genncbra.men +%%DATADIR%%/frmenus/prob/gennccra.men +%%DATADIR%%/frmenus/prob/genncfra.men +%%DATADIR%%/frmenus/prob/gennctra.men +%%DATADIR%%/frmenus/prob/gennmxra.men +%%DATADIR%%/frmenus/prob/gennorra.men +%%DATADIR%%/frmenus/prob/gennorrn.men +%%DATADIR%%/frmenus/prob/genogira.men +%%DATADIR%%/frmenus/prob/genpa2ra.men +%%DATADIR%%/frmenus/prob/genpapra.men +%%DATADIR%%/frmenus/prob/genparra.men +%%DATADIR%%/frmenus/prob/genpexra.men +%%DATADIR%%/frmenus/prob/genplnra.men +%%DATADIR%%/frmenus/prob/genpnrra.men +%%DATADIR%%/frmenus/prob/genpoira.men +%%DATADIR%%/frmenus/prob/genpowra.men +%%DATADIR%%/frmenus/prob/genprime.men +%%DATADIR%%/frmenus/prob/genqbira.men +%%DATADIR%%/frmenus/prob/genranpe.men +%%DATADIR%%/frmenus/prob/genrayra.men +%%DATADIR%%/frmenus/prob/genrecra.men +%%DATADIR%%/frmenus/prob/genrgtra.men +%%DATADIR%%/frmenus/prob/genrigra.men +%%DATADIR%%/frmenus/prob/genrpora.men +%%DATADIR%%/frmenus/prob/gensdera.men +%%DATADIR%%/frmenus/prob/gensemra.men +%%DATADIR%%/frmenus/prob/gensk2rn.men +%%DATADIR%%/frmenus/prob/genskern.men +%%DATADIR%%/frmenus/prob/genslara.men +%%DATADIR%%/frmenus/prob/genslora.men +%%DATADIR%%/frmenus/prob/gensnra.men +%%DATADIR%%/frmenus/prob/genstra.men +%%DATADIR%%/frmenus/prob/gensubra.men +%%DATADIR%%/frmenus/prob/gensymrn.men +%%DATADIR%%/frmenus/prob/gentnera.men +%%DATADIR%%/frmenus/prob/gentnrra.men +%%DATADIR%%/frmenus/prob/gentopra.men +%%DATADIR%%/frmenus/prob/gentra.men +%%DATADIR%%/frmenus/prob/gentrara.men +%%DATADIR%%/frmenus/prob/gentrira.men +%%DATADIR%%/frmenus/prob/gentsora.men +%%DATADIR%%/frmenus/prob/gentspra.men +%%DATADIR%%/frmenus/prob/gentssra.men +%%DATADIR%%/frmenus/prob/genunira.men +%%DATADIR%%/frmenus/prob/genutsra.men +%%DATADIR%%/frmenus/prob/genvonra.men +%%DATADIR%%/frmenus/prob/genwakra.men +%%DATADIR%%/frmenus/prob/genwalra.men +%%DATADIR%%/frmenus/prob/genwarra.men +%%DATADIR%%/frmenus/prob/genwcara.men +%%DATADIR%%/frmenus/prob/genwe1ra.men +%%DATADIR%%/frmenus/prob/genwe2ra.men +%%DATADIR%%/frmenus/prob/genyulra.men +%%DATADIR%%/frmenus/prob/genzetra.men +%%DATADIR%%/frmenus/prob/genzipra.men +%%DATADIR%%/frmenus/prob/geo1ppcc.men +%%DATADIR%%/frmenus/prob/geo2ppcc.men +%%DATADIR%%/frmenus/prob/geoahisp.men +%%DATADIR%%/frmenus/prob/geobhisp.men +%%DATADIR%%/frmenus/prob/geocdf.men +%%DATADIR%%/frmenus/prob/geodesc.top +%%DATADIR%%/frmenus/prob/geohispd.men +%%DATADIR%%/frmenus/prob/geopdf.men +%%DATADIR%%/frmenus/prob/geoppf.men +%%DATADIR%%/frmenus/prob/gep2cdf.men +%%DATADIR%%/frmenus/prob/gep2pdf.men +%%DATADIR%%/frmenus/prob/gep2ppf.men +%%DATADIR%%/frmenus/prob/gep2prob.men +%%DATADIR%%/frmenus/prob/gepcdf.men +%%DATADIR%%/frmenus/prob/gepchaz.men +%%DATADIR%%/frmenus/prob/gephaz.men +%%DATADIR%%/frmenus/prob/gephisp2.men +%%DATADIR%%/frmenus/prob/gephispd.men +%%DATADIR%%/frmenus/prob/geppdf.men +%%DATADIR%%/frmenus/prob/gepppf.men +%%DATADIR%%/frmenus/prob/get1cdf.men +%%DATADIR%%/frmenus/prob/get1hisp.men +%%DATADIR%%/frmenus/prob/get1pdf.men +%%DATADIR%%/frmenus/prob/get1ppcc.men +%%DATADIR%%/frmenus/prob/get1ppf.men +%%DATADIR%%/frmenus/prob/get2cdf.men +%%DATADIR%%/frmenus/prob/get2hisp.men +%%DATADIR%%/frmenus/prob/get2pdf.men +%%DATADIR%%/frmenus/prob/get2ppcc.men +%%DATADIR%%/frmenus/prob/get2ppf.men +%%DATADIR%%/frmenus/prob/gev1cdf.men +%%DATADIR%%/frmenus/prob/gev1hisp.men +%%DATADIR%%/frmenus/prob/gev1pdf.men +%%DATADIR%%/frmenus/prob/gev1ppf.men +%%DATADIR%%/frmenus/prob/gev2cdf.men +%%DATADIR%%/frmenus/prob/gev2hisp.men +%%DATADIR%%/frmenus/prob/gev2pdf.men +%%DATADIR%%/frmenus/prob/gev2ppf.men +%%DATADIR%%/frmenus/prob/gevcdf.men +%%DATADIR%%/frmenus/prob/gevhispd.men +%%DATADIR%%/frmenus/prob/gevpdf.men +%%DATADIR%%/frmenus/prob/gevppf.men +%%DATADIR%%/frmenus/prob/gexcdf.men +%%DATADIR%%/frmenus/prob/gexhispd.men +%%DATADIR%%/frmenus/prob/gexpdf.men +%%DATADIR%%/frmenus/prob/gexppf.men +%%DATADIR%%/frmenus/prob/ggdcdf.men +%%DATADIR%%/frmenus/prob/ggdchaz.men +%%DATADIR%%/frmenus/prob/ggdhaz.men +%%DATADIR%%/frmenus/prob/ggdhispd.men +%%DATADIR%%/frmenus/prob/ggdpdf.men +%%DATADIR%%/frmenus/prob/ggdppf.men +%%DATADIR%%/frmenus/prob/ghcdf.men +%%DATADIR%%/frmenus/prob/ghfhispd.men +%%DATADIR%%/frmenus/prob/ghflcdf.men +%%DATADIR%%/frmenus/prob/ghflpdf.men +%%DATADIR%%/frmenus/prob/ghflppcc.men +%%DATADIR%%/frmenus/prob/ghflppf.men +%%DATADIR%%/frmenus/prob/ghflprob.men +%%DATADIR%%/frmenus/prob/ghfppccc.men +%%DATADIR%%/frmenus/prob/ghhispd.men +%%DATADIR%%/frmenus/prob/ghpdf.men +%%DATADIR%%/frmenus/prob/ghppf.men +%%DATADIR%%/frmenus/prob/gigcdf.men +%%DATADIR%%/frmenus/prob/gighispd.men +%%DATADIR%%/frmenus/prob/gigpdf.men +%%DATADIR%%/frmenus/prob/gigppf.men +%%DATADIR%%/frmenus/prob/gl2cdf.men +%%DATADIR%%/frmenus/prob/gl2hispd.men +%%DATADIR%%/frmenus/prob/gl2pdf.men +%%DATADIR%%/frmenus/prob/gl2ppcc.men +%%DATADIR%%/frmenus/prob/gl2ppccc.men +%%DATADIR%%/frmenus/prob/gl2ppf.men +%%DATADIR%%/frmenus/prob/gl2prob.men +%%DATADIR%%/frmenus/prob/gl3cdf.men +%%DATADIR%%/frmenus/prob/gl3hispd.men +%%DATADIR%%/frmenus/prob/gl3pdf.men +%%DATADIR%%/frmenus/prob/gl3ppcc.men +%%DATADIR%%/frmenus/prob/gl3ppccc.men +%%DATADIR%%/frmenus/prob/gl3ppf.men +%%DATADIR%%/frmenus/prob/gl3prob.men +%%DATADIR%%/frmenus/prob/gl4cdf.men +%%DATADIR%%/frmenus/prob/gl4hispd.men +%%DATADIR%%/frmenus/prob/gl4pdf.men +%%DATADIR%%/frmenus/prob/gl4ppf.men +%%DATADIR%%/frmenus/prob/gl5cdf.men +%%DATADIR%%/frmenus/prob/gl5hispd.men +%%DATADIR%%/frmenus/prob/gl5pdf.men +%%DATADIR%%/frmenus/prob/gl5ppcc.men +%%DATADIR%%/frmenus/prob/gl5ppccc.men +%%DATADIR%%/frmenus/prob/gl5ppf.men +%%DATADIR%%/frmenus/prob/gl5prob.men +%%DATADIR%%/frmenus/prob/gldcdf.men +%%DATADIR%%/frmenus/prob/gldhispd.men +%%DATADIR%%/frmenus/prob/gldpdf.men +%%DATADIR%%/frmenus/prob/gldppf.men +%%DATADIR%%/frmenus/prob/glgcdf.men +%%DATADIR%%/frmenus/prob/glghispd.men +%%DATADIR%%/frmenus/prob/glgpdf.men +%%DATADIR%%/frmenus/prob/glgppcc.men +%%DATADIR%%/frmenus/prob/glgppf.men +%%DATADIR%%/frmenus/prob/glocdf.men +%%DATADIR%%/frmenus/prob/glohispd.men +%%DATADIR%%/frmenus/prob/glopdf.men +%%DATADIR%%/frmenus/prob/gloppcc.men +%%DATADIR%%/frmenus/prob/gloppccc.men +%%DATADIR%%/frmenus/prob/gloppf.men +%%DATADIR%%/frmenus/prob/gloprob.men +%%DATADIR%%/frmenus/prob/glscdf.men +%%DATADIR%%/frmenus/prob/glshispd.men +%%DATADIR%%/frmenus/prob/glspdf.men +%%DATADIR%%/frmenus/prob/glsppcc.men +%%DATADIR%%/frmenus/prob/glsppf.men +%%DATADIR%%/frmenus/prob/gmccdf.men +%%DATADIR%%/frmenus/prob/gmchispd.men +%%DATADIR%%/frmenus/prob/gmcpdf.men +%%DATADIR%%/frmenus/prob/gmcppf.men +%%DATADIR%%/frmenus/prob/gnbcdf.men +%%DATADIR%%/frmenus/prob/gnbhispd.men +%%DATADIR%%/frmenus/prob/gnbpdf.men +%%DATADIR%%/frmenus/prob/gnbppf.men +%%DATADIR%%/frmenus/prob/gomcdf.men +%%DATADIR%%/frmenus/prob/gomhispd.men +%%DATADIR%%/frmenus/prob/gompdf.men +%%DATADIR%%/frmenus/prob/gomppf.men +%%DATADIR%%/frmenus/prob/gtlcdf.men +%%DATADIR%%/frmenus/prob/gtlhispd.men +%%DATADIR%%/frmenus/prob/gtlpdf.men +%%DATADIR%%/frmenus/prob/gtlppf.men +%%DATADIR%%/frmenus/prob/gtrcdf.men +%%DATADIR%%/frmenus/prob/gtrhispd.men +%%DATADIR%%/frmenus/prob/gtrpdf.men +%%DATADIR%%/frmenus/prob/gtrppf.men +%%DATADIR%%/frmenus/prob/hercdf.men +%%DATADIR%%/frmenus/prob/herhispd.men +%%DATADIR%%/frmenus/prob/herpdf.men +%%DATADIR%%/frmenus/prob/herppcc.men +%%DATADIR%%/frmenus/prob/herppf.men +%%DATADIR%%/frmenus/prob/hfccdf.men +%%DATADIR%%/frmenus/prob/hfchispd.men +%%DATADIR%%/frmenus/prob/hfcpdf.men +%%DATADIR%%/frmenus/prob/hfcppf.men +%%DATADIR%%/frmenus/prob/hflcdf.men +%%DATADIR%%/frmenus/prob/hflhispd.men +%%DATADIR%%/frmenus/prob/hflpdf.men +%%DATADIR%%/frmenus/prob/hflppf.men +%%DATADIR%%/frmenus/prob/hfncdf.men +%%DATADIR%%/frmenus/prob/hfndesc.top +%%DATADIR%%/frmenus/prob/hfnhispd.men +%%DATADIR%%/frmenus/prob/hfnpdf.men +%%DATADIR%%/frmenus/prob/hfnppf.men +%%DATADIR%%/frmenus/prob/histpdfp.top +%%DATADIR%%/frmenus/prob/hsecdf.men +%%DATADIR%%/frmenus/prob/hsehispd.men +%%DATADIR%%/frmenus/prob/hsepdf.men +%%DATADIR%%/frmenus/prob/hseppf.men +%%DATADIR%%/frmenus/prob/hypcdf.men +%%DATADIR%%/frmenus/prob/hyphispd.men +%%DATADIR%%/frmenus/prob/hyppdf.men +%%DATADIR%%/frmenus/prob/hypppf.men +%%DATADIR%%/frmenus/prob/ibcdf.men +%%DATADIR%%/frmenus/prob/ibhispd.men +%%DATADIR%%/frmenus/prob/ibpdf.men +%%DATADIR%%/frmenus/prob/ibppf.men +%%DATADIR%%/frmenus/prob/igacdf.men +%%DATADIR%%/frmenus/prob/igachaz.men +%%DATADIR%%/frmenus/prob/igahaz.men +%%DATADIR%%/frmenus/prob/igahispd.men +%%DATADIR%%/frmenus/prob/igapdf.men +%%DATADIR%%/frmenus/prob/igappf.men +%%DATADIR%%/frmenus/prob/igcdf.men +%%DATADIR%%/frmenus/prob/igchaz.men +%%DATADIR%%/frmenus/prob/ighaz.men +%%DATADIR%%/frmenus/prob/ighispd.men +%%DATADIR%%/frmenus/prob/igmle.men +%%DATADIR%%/frmenus/prob/igpdf.men +%%DATADIR%%/frmenus/prob/igppf.men +%%DATADIR%%/frmenus/prob/ingdesc.top +%%DATADIR%%/frmenus/prob/iwecdf.men +%%DATADIR%%/frmenus/prob/iwechaz.men +%%DATADIR%%/frmenus/prob/iwehaz.men +%%DATADIR%%/frmenus/prob/iwehispd.men +%%DATADIR%%/frmenus/prob/iwepdf.men +%%DATADIR%%/frmenus/prob/iweppf.men +%%DATADIR%%/frmenus/prob/jsbcdf.men +%%DATADIR%%/frmenus/prob/jsbhispd.men +%%DATADIR%%/frmenus/prob/jsbpdf.men +%%DATADIR%%/frmenus/prob/jsbppf.men +%%DATADIR%%/frmenus/prob/jsucdf.men +%%DATADIR%%/frmenus/prob/jsuhispd.men +%%DATADIR%%/frmenus/prob/jsupdf.men +%%DATADIR%%/frmenus/prob/jsuppf.men +%%DATADIR%%/frmenus/prob/kapcdf.men +%%DATADIR%%/frmenus/prob/kaphispd.men +%%DATADIR%%/frmenus/prob/kappdf.men +%%DATADIR%%/frmenus/prob/kapppf.men +%%DATADIR%%/frmenus/prob/katcdf.men +%%DATADIR%%/frmenus/prob/kathispd.men +%%DATADIR%%/frmenus/prob/katpdf.men +%%DATADIR%%/frmenus/prob/katppcc.men +%%DATADIR%%/frmenus/prob/katppf.men +%%DATADIR%%/frmenus/prob/ks.top +%%DATADIR%%/frmenus/prob/ksade.men +%%DATADIR%%/frmenus/prob/ksalp.men +%%DATADIR%%/frmenus/prob/ksang.men +%%DATADIR%%/frmenus/prob/ksars.men +%%DATADIR%%/frmenus/prob/ksb10.men +%%DATADIR%%/frmenus/prob/ksb11.men +%%DATADIR%%/frmenus/prob/ksbbn.men +%%DATADIR%%/frmenus/prob/ksbet.men +%%DATADIR%%/frmenus/prob/ksbge.men +%%DATADIR%%/frmenus/prob/ksbin.men +%%DATADIR%%/frmenus/prob/ksbnb.men +%%DATADIR%%/frmenus/prob/ksbno.men +%%DATADIR%%/frmenus/prob/ksbra.men +%%DATADIR%%/frmenus/prob/ksbta.men +%%DATADIR%%/frmenus/prob/ksbu2.men +%%DATADIR%%/frmenus/prob/ksbu7.men +%%DATADIR%%/frmenus/prob/ksbu8.men +%%DATADIR%%/frmenus/prob/kscau.men +%%DATADIR%%/frmenus/prob/ksch.men +%%DATADIR%%/frmenus/prob/kschs.men +%%DATADIR%%/frmenus/prob/kscon1.men +%%DATADIR%%/frmenus/prob/kscon2.men +%%DATADIR%%/frmenus/prob/kscos.men +%%DATADIR%%/frmenus/prob/ksdex.men +%%DATADIR%%/frmenus/prob/ksdga.men +%%DATADIR%%/frmenus/prob/ksdiw.men +%%DATADIR%%/frmenus/prob/ksdlg.men +%%DATADIR%%/frmenus/prob/ksdnf.men +%%DATADIR%%/frmenus/prob/ksdnt.men +%%DATADIR%%/frmenus/prob/ksdun.men +%%DATADIR%%/frmenus/prob/ksdwe.men +%%DATADIR%%/frmenus/prob/ksewe.men +%%DATADIR%%/frmenus/prob/ksf.men +%%DATADIR%%/frmenus/prob/ksfca.men +%%DATADIR%%/frmenus/prob/ksfnr.men +%%DATADIR%%/frmenus/prob/ksft.men +%%DATADIR%%/frmenus/prob/ksgal.men +%%DATADIR%%/frmenus/prob/ksgeoa.men +%%DATADIR%%/frmenus/prob/ksgeob.men +%%DATADIR%%/frmenus/prob/ksget1.men +%%DATADIR%%/frmenus/prob/ksget2.men +%%DATADIR%%/frmenus/prob/ksgex.men +%%DATADIR%%/frmenus/prob/ksggd.men +%%DATADIR%%/frmenus/prob/ksgh.men +%%DATADIR%%/frmenus/prob/ksghfl.men +%%DATADIR%%/frmenus/prob/ksgig.men +%%DATADIR%%/frmenus/prob/ksgl2.men +%%DATADIR%%/frmenus/prob/ksgl3.men +%%DATADIR%%/frmenus/prob/ksgl5.men +%%DATADIR%%/frmenus/prob/ksgld.men +%%DATADIR%%/frmenus/prob/ksglg.men +%%DATADIR%%/frmenus/prob/ksglo.men +%%DATADIR%%/frmenus/prob/ksgls.men +%%DATADIR%%/frmenus/prob/ksgmc.men +%%DATADIR%%/frmenus/prob/ksgnb.men +%%DATADIR%%/frmenus/prob/ksgom.men +%%DATADIR%%/frmenus/prob/ksgtl.men +%%DATADIR%%/frmenus/prob/ksgtr.men +%%DATADIR%%/frmenus/prob/ksher.men +%%DATADIR%%/frmenus/prob/kshfc.men +%%DATADIR%%/frmenus/prob/kshfl.men +%%DATADIR%%/frmenus/prob/kshfn.men +%%DATADIR%%/frmenus/prob/kshse.men +%%DATADIR%%/frmenus/prob/kshyp.men +%%DATADIR%%/frmenus/prob/ksib.men +%%DATADIR%%/frmenus/prob/ksig.men +%%DATADIR%%/frmenus/prob/ksjsb.men +%%DATADIR%%/frmenus/prob/ksjsu.men +%%DATADIR%%/frmenus/prob/kskap.men +%%DATADIR%%/frmenus/prob/kskat.men +%%DATADIR%%/frmenus/prob/kskum.men +%%DATADIR%%/frmenus/prob/kslam.men +%%DATADIR%%/frmenus/prob/kslbe.men +%%DATADIR%%/frmenus/prob/kslct.men +%%DATADIR%%/frmenus/prob/kslde.men +%%DATADIR%%/frmenus/prob/kslex.men +%%DATADIR%%/frmenus/prob/ksllg.men +%%DATADIR%%/frmenus/prob/kslocsca.men +%%DATADIR%%/frmenus/prob/kslog.men +%%DATADIR%%/frmenus/prob/kslos.men +%%DATADIR%%/frmenus/prob/kslpo.men +%%DATADIR%%/frmenus/prob/kslsn.men +%%DATADIR%%/frmenus/prob/kslst.men +%%DATADIR%%/frmenus/prob/ksmak.men +%%DATADIR%%/frmenus/prob/ksmaka.men +%%DATADIR%%/frmenus/prob/ksmakb.men +%%DATADIR%%/frmenus/prob/ksmat.men +%%DATADIR%%/frmenus/prob/ksmax.men +%%DATADIR%%/frmenus/prob/ksmcl.men +%%DATADIR%%/frmenus/prob/ksmut.men +%%DATADIR%%/frmenus/prob/ksnb.men +%%DATADIR%%/frmenus/prob/ksncb.men +%%DATADIR%%/frmenus/prob/ksncc.men +%%DATADIR%%/frmenus/prob/ksncf.men +%%DATADIR%%/frmenus/prob/ksnct.men +%%DATADIR%%/frmenus/prob/ksogi.men +%%DATADIR%%/frmenus/prob/kspa2.men +%%DATADIR%%/frmenus/prob/kspap.men +%%DATADIR%%/frmenus/prob/kspar.men +%%DATADIR%%/frmenus/prob/kspex.men +%%DATADIR%%/frmenus/prob/kspln.men +%%DATADIR%%/frmenus/prob/kspnr.men +%%DATADIR%%/frmenus/prob/kspoi.men +%%DATADIR%%/frmenus/prob/kspow.men +%%DATADIR%%/frmenus/prob/ksqbi.men +%%DATADIR%%/frmenus/prob/ksray.men +%%DATADIR%%/frmenus/prob/ksrec.men +%%DATADIR%%/frmenus/prob/ksrgt.men +%%DATADIR%%/frmenus/prob/ksrig.men +%%DATADIR%%/frmenus/prob/ksrpo.men +%%DATADIR%%/frmenus/prob/kssde.men +%%DATADIR%%/frmenus/prob/kssem.men +%%DATADIR%%/frmenus/prob/kssla.men +%%DATADIR%%/frmenus/prob/ksslo.men +%%DATADIR%%/frmenus/prob/kssn.men +%%DATADIR%%/frmenus/prob/ksst.men +%%DATADIR%%/frmenus/prob/kssub.men +%%DATADIR%%/frmenus/prob/kst.men +%%DATADIR%%/frmenus/prob/kstne.men +%%DATADIR%%/frmenus/prob/kstnr.men +%%DATADIR%%/frmenus/prob/kstop.men +%%DATADIR%%/frmenus/prob/kstra.men +%%DATADIR%%/frmenus/prob/kstri.men +%%DATADIR%%/frmenus/prob/kstso.men +%%DATADIR%%/frmenus/prob/kstsp.men +%%DATADIR%%/frmenus/prob/ksuni.men +%%DATADIR%%/frmenus/prob/ksuts.men +%%DATADIR%%/frmenus/prob/ksvon.men +%%DATADIR%%/frmenus/prob/kswak.men +%%DATADIR%%/frmenus/prob/kswar.men +%%DATADIR%%/frmenus/prob/kswca.men +%%DATADIR%%/frmenus/prob/ksyul.men +%%DATADIR%%/frmenus/prob/kszet.men +%%DATADIR%%/frmenus/prob/kszip.men +%%DATADIR%%/frmenus/prob/kumcdf.men +%%DATADIR%%/frmenus/prob/kumhispd.men +%%DATADIR%%/frmenus/prob/kumpdf.men +%%DATADIR%%/frmenus/prob/kumppf.men +%%DATADIR%%/frmenus/prob/lamcdf.men +%%DATADIR%%/frmenus/prob/lamhispd.men +%%DATADIR%%/frmenus/prob/lampdf.men +%%DATADIR%%/frmenus/prob/lamppcc.men +%%DATADIR%%/frmenus/prob/lamppccc.men +%%DATADIR%%/frmenus/prob/lamppf.men +%%DATADIR%%/frmenus/prob/lamprob.men +%%DATADIR%%/frmenus/prob/lbecdf.men +%%DATADIR%%/frmenus/prob/lbehispd.men +%%DATADIR%%/frmenus/prob/lbepdf.men +%%DATADIR%%/frmenus/prob/lbeppf.men +%%DATADIR%%/frmenus/prob/lctcdf.men +%%DATADIR%%/frmenus/prob/lcthispd.men +%%DATADIR%%/frmenus/prob/lctpdf.men +%%DATADIR%%/frmenus/prob/lctppf.men +%%DATADIR%%/frmenus/prob/ldecdf.men +%%DATADIR%%/frmenus/prob/ldehispd.men +%%DATADIR%%/frmenus/prob/ldepdf.men +%%DATADIR%%/frmenus/prob/ldeppcc.men +%%DATADIR%%/frmenus/prob/ldeppccc.men +%%DATADIR%%/frmenus/prob/ldeppf.men +%%DATADIR%%/frmenus/prob/ldeprob.men +%%DATADIR%%/frmenus/prob/lexcdf.men +%%DATADIR%%/frmenus/prob/lexchaz.men +%%DATADIR%%/frmenus/prob/lexhaz.men +%%DATADIR%%/frmenus/prob/lexhispd.men +%%DATADIR%%/frmenus/prob/lexpdf.men +%%DATADIR%%/frmenus/prob/lexppcc.men +%%DATADIR%%/frmenus/prob/lexppccc.men +%%DATADIR%%/frmenus/prob/lexppf.men +%%DATADIR%%/frmenus/prob/lexprob.men +%%DATADIR%%/frmenus/prob/lgacdf.men +%%DATADIR%%/frmenus/prob/lgahispd.men +%%DATADIR%%/frmenus/prob/lgapdf.men +%%DATADIR%%/frmenus/prob/lgappf.men +%%DATADIR%%/frmenus/prob/lgncdf.men +%%DATADIR%%/frmenus/prob/lgnchaz.men +%%DATADIR%%/frmenus/prob/lgndesc.top +%%DATADIR%%/frmenus/prob/lgnhaz.men +%%DATADIR%%/frmenus/prob/lgnhispd.men +%%DATADIR%%/frmenus/prob/lgnmle.men +%%DATADIR%%/frmenus/prob/lgnpdf.men +%%DATADIR%%/frmenus/prob/lgnppf.men +%%DATADIR%%/frmenus/prob/limitthe.top +%%DATADIR%%/frmenus/prob/llgcdf.men +%%DATADIR%%/frmenus/prob/llghispd.men +%%DATADIR%%/frmenus/prob/llgpdf.men +%%DATADIR%%/frmenus/prob/llgppcc.men +%%DATADIR%%/frmenus/prob/llgppccc.men +%%DATADIR%%/frmenus/prob/llgppf.men +%%DATADIR%%/frmenus/prob/llgprob.men +%%DATADIR%%/frmenus/prob/loccppcc.top +%%DATADIR%%/frmenus/prob/locsad.top +%%DATADIR%%/frmenus/prob/locsccdf.top +%%DATADIR%%/frmenus/prob/locscmle.top +%%DATADIR%%/frmenus/prob/locscpdf.top +%%DATADIR%%/frmenus/prob/locscppf.top +%%DATADIR%%/frmenus/prob/locscran.top +%%DATADIR%%/frmenus/prob/locshisp.top +%%DATADIR%%/frmenus/prob/locsks.top +%%DATADIR%%/frmenus/prob/locsppcc.top +%%DATADIR%%/frmenus/prob/logcdf.men +%%DATADIR%%/frmenus/prob/logdesc.top +%%DATADIR%%/frmenus/prob/loghispd.men +%%DATADIR%%/frmenus/prob/logmle.men +%%DATADIR%%/frmenus/prob/logpdf.men +%%DATADIR%%/frmenus/prob/logppf.men +%%DATADIR%%/frmenus/prob/loscdf.men +%%DATADIR%%/frmenus/prob/loshispd.men +%%DATADIR%%/frmenus/prob/lospdf.men +%%DATADIR%%/frmenus/prob/losppcc.men +%%DATADIR%%/frmenus/prob/losppf.men +%%DATADIR%%/frmenus/prob/lpocdf.men +%%DATADIR%%/frmenus/prob/lpohispd.men +%%DATADIR%%/frmenus/prob/lpopdf.men +%%DATADIR%%/frmenus/prob/lpoppcc.men +%%DATADIR%%/frmenus/prob/lpoppf.men +%%DATADIR%%/frmenus/prob/lsncdf.men +%%DATADIR%%/frmenus/prob/lsnhispd.men +%%DATADIR%%/frmenus/prob/lsnpdf.men +%%DATADIR%%/frmenus/prob/lsnppf.men +%%DATADIR%%/frmenus/prob/lsppccbo.top +%%DATADIR%%/frmenus/prob/lsq.top +%%DATADIR%%/frmenus/prob/lsq_skew.men +%%DATADIR%%/frmenus/prob/lsq_sym.men +%%DATADIR%%/frmenus/prob/lstcdf.men +%%DATADIR%%/frmenus/prob/lsthispd.men +%%DATADIR%%/frmenus/prob/lstpdf.men +%%DATADIR%%/frmenus/prob/lstppf.men +%%DATADIR%%/frmenus/prob/makacdf.men +%%DATADIR%%/frmenus/prob/makahisp.men +%%DATADIR%%/frmenus/prob/makapdf.men +%%DATADIR%%/frmenus/prob/makappf.men +%%DATADIR%%/frmenus/prob/makbcdf.men +%%DATADIR%%/frmenus/prob/makbhisp.men +%%DATADIR%%/frmenus/prob/makbpdf.men +%%DATADIR%%/frmenus/prob/makbppf.men +%%DATADIR%%/frmenus/prob/makcdf.men +%%DATADIR%%/frmenus/prob/makhispd.men +%%DATADIR%%/frmenus/prob/makpdf.men +%%DATADIR%%/frmenus/prob/makppf.men +%%DATADIR%%/frmenus/prob/markchai.top +%%DATADIR%%/frmenus/prob/matcdf.men +%%DATADIR%%/frmenus/prob/mathispd.men +%%DATADIR%%/frmenus/prob/matpdf.men +%%DATADIR%%/frmenus/prob/matppf.men +%%DATADIR%%/frmenus/prob/max2mle.men +%%DATADIR%%/frmenus/prob/maxcdf.men +%%DATADIR%%/frmenus/prob/maxhispd.men +%%DATADIR%%/frmenus/prob/maxmle.men +%%DATADIR%%/frmenus/prob/maxpdf.men +%%DATADIR%%/frmenus/prob/maxppcc.men +%%DATADIR%%/frmenus/prob/maxppf.men +%%DATADIR%%/frmenus/prob/maxprob.men +%%DATADIR%%/frmenus/prob/mclcdf.men +%%DATADIR%%/frmenus/prob/mclhispd.men +%%DATADIR%%/frmenus/prob/mclpdf.men +%%DATADIR%%/frmenus/prob/mclppcc.men +%%DATADIR%%/frmenus/prob/mclppccc.men +%%DATADIR%%/frmenus/prob/mclppf.men +%%DATADIR%%/frmenus/prob/mclprob.men +%%DATADIR%%/frmenus/prob/mixcdf.top +%%DATADIR%%/frmenus/prob/mixpdf.top +%%DATADIR%%/frmenus/prob/mixppf.top +%%DATADIR%%/frmenus/prob/mixran.top +%%DATADIR%%/frmenus/prob/mle.top +%%DATADIR%%/frmenus/prob/mle_disc.top +%%DATADIR%%/frmenus/prob/mleb10.men +%%DATADIR%%/frmenus/prob/mlebbn.men +%%DATADIR%%/frmenus/prob/mlebe4.men +%%DATADIR%%/frmenus/prob/mlebet.men +%%DATADIR%%/frmenus/prob/mlebet4.men +%%DATADIR%%/frmenus/prob/mlebge.men +%%DATADIR%%/frmenus/prob/mlebin.men +%%DATADIR%%/frmenus/prob/mlebno.men +%%DATADIR%%/frmenus/prob/mlebnobo.men +%%DATADIR%%/frmenus/prob/mlebta.men +%%DATADIR%%/frmenus/prob/mlebta2.men +%%DATADIR%%/frmenus/prob/mlecon.men +%%DATADIR%%/frmenus/prob/mlecon2.men +%%DATADIR%%/frmenus/prob/mledlg.men +%%DATADIR%%/frmenus/prob/mlefnr.men +%%DATADIR%%/frmenus/prob/mlegee.men +%%DATADIR%%/frmenus/prob/mlegeo.men +%%DATADIR%%/frmenus/prob/mleget.men +%%DATADIR%%/frmenus/prob/mleget2.men +%%DATADIR%%/frmenus/prob/mlegl5.men +%%DATADIR%%/frmenus/prob/mlegls.men +%%DATADIR%%/frmenus/prob/mlegls2.men +%%DATADIR%%/frmenus/prob/mlegnb2.men +%%DATADIR%%/frmenus/prob/mlegom.men +%%DATADIR%%/frmenus/prob/mlegom2.men +%%DATADIR%%/frmenus/prob/mleher.men +%%DATADIR%%/frmenus/prob/mlehypa.men +%%DATADIR%%/frmenus/prob/mlehypb.men +%%DATADIR%%/frmenus/prob/mlejsb.men +%%DATADIR%%/frmenus/prob/mlejsu.men +%%DATADIR%%/frmenus/prob/mlelbe.men +%%DATADIR%%/frmenus/prob/mlelex.men +%%DATADIR%%/frmenus/prob/mlelos.men +%%DATADIR%%/frmenus/prob/mlelos2.men +%%DATADIR%%/frmenus/prob/mlelpo.men +%%DATADIR%%/frmenus/prob/mlelpo2.men +%%DATADIR%%/frmenus/prob/mlenb.men +%%DATADIR%%/frmenus/prob/mlenormx.men +%%DATADIR%%/frmenus/prob/mlepap.men +%%DATADIR%%/frmenus/prob/mlepar.men +%%DATADIR%%/frmenus/prob/mleperc.men +%%DATADIR%%/frmenus/prob/mlepoi.men +%%DATADIR%%/frmenus/prob/mlepow.men +%%DATADIR%%/frmenus/prob/mleqbi.men +%%DATADIR%%/frmenus/prob/mlergt.men +%%DATADIR%%/frmenus/prob/mlergt2.men +%%DATADIR%%/frmenus/prob/mlesla.men +%%DATADIR%%/frmenus/prob/mletri.men +%%DATADIR%%/frmenus/prob/mletsp.men +%%DATADIR%%/frmenus/prob/mleyul.men +%%DATADIR%%/frmenus/prob/mlezet.men +%%DATADIR%%/frmenus/prob/mlezet2.men +%%DATADIR%%/frmenus/prob/mskecdf.top +%%DATADIR%%/frmenus/prob/mskepdf.top +%%DATADIR%%/frmenus/prob/mskeppf.top +%%DATADIR%%/frmenus/prob/mutcdf.men +%%DATADIR%%/frmenus/prob/mutchaz.men +%%DATADIR%%/frmenus/prob/muthaz.men +%%DATADIR%%/frmenus/prob/muthispd.men +%%DATADIR%%/frmenus/prob/mutpdf.men +%%DATADIR%%/frmenus/prob/mutppcc.men +%%DATADIR%%/frmenus/prob/mutppccc.men +%%DATADIR%%/frmenus/prob/mutppf.men +%%DATADIR%%/frmenus/prob/mutprob.men +%%DATADIR%%/frmenus/prob/nbcdf.men +%%DATADIR%%/frmenus/prob/nbhispd.men +%%DATADIR%%/frmenus/prob/nbpdf.men +%%DATADIR%%/frmenus/prob/nbppcc.men +%%DATADIR%%/frmenus/prob/nbppf.men +%%DATADIR%%/frmenus/prob/ncbcdf.men +%%DATADIR%%/frmenus/prob/ncbhispd.men +%%DATADIR%%/frmenus/prob/ncbpdf.men +%%DATADIR%%/frmenus/prob/ncbppf.men +%%DATADIR%%/frmenus/prob/ncccdf.men +%%DATADIR%%/frmenus/prob/ncchispd.men +%%DATADIR%%/frmenus/prob/nccpdf.men +%%DATADIR%%/frmenus/prob/nccppf.men +%%DATADIR%%/frmenus/prob/ncdicdf.top +%%DATADIR%%/frmenus/prob/ncdipdf.top +%%DATADIR%%/frmenus/prob/ncdippf.top +%%DATADIR%%/frmenus/prob/ncfcdf.men +%%DATADIR%%/frmenus/prob/ncfhispd.men +%%DATADIR%%/frmenus/prob/ncfpdf.men +%%DATADIR%%/frmenus/prob/ncfppf.men +%%DATADIR%%/frmenus/prob/nctcdf.men +%%DATADIR%%/frmenus/prob/ncthispd.men +%%DATADIR%%/frmenus/prob/nctpdf.men +%%DATADIR%%/frmenus/prob/nctppf.men +%%DATADIR%%/frmenus/prob/ngbdesc.top +%%DATADIR%%/frmenus/prob/norcdf.men +%%DATADIR%%/frmenus/prob/norchaz.men +%%DATADIR%%/frmenus/prob/nordesc.top +%%DATADIR%%/frmenus/prob/norhaz.men +%%DATADIR%%/frmenus/prob/norhispd.men +%%DATADIR%%/frmenus/prob/normcdf.top +%%DATADIR%%/frmenus/prob/normmle.men +%%DATADIR%%/frmenus/prob/normpdf.top +%%DATADIR%%/frmenus/prob/normppf.top +%%DATADIR%%/frmenus/prob/normxcdf.men +%%DATADIR%%/frmenus/prob/normxpdf.men +%%DATADIR%%/frmenus/prob/normxppf.men +%%DATADIR%%/frmenus/prob/norpdf.men +%%DATADIR%%/frmenus/prob/norppf.men +%%DATADIR%%/frmenus/prob/ntcfcdf.top +%%DATADIR%%/frmenus/prob/ntcfhisp.top +%%DATADIR%%/frmenus/prob/ntcfpdf.top +%%DATADIR%%/frmenus/prob/ntcfppf.top +%%DATADIR%%/frmenus/prob/ogicdf.men +%%DATADIR%%/frmenus/prob/ogihispd.men +%%DATADIR%%/frmenus/prob/ogipdf.men +%%DATADIR%%/frmenus/prob/ogippcc.men +%%DATADIR%%/frmenus/prob/ogippccc.men +%%DATADIR%%/frmenus/prob/ogippf.men +%%DATADIR%%/frmenus/prob/ogiprob.men +%%DATADIR%%/frmenus/prob/pa2cdf.men +%%DATADIR%%/frmenus/prob/pa2hispd.men +%%DATADIR%%/frmenus/prob/pa2pdf.men +%%DATADIR%%/frmenus/prob/pa2ppcc.men +%%DATADIR%%/frmenus/prob/pa2ppccc.men +%%DATADIR%%/frmenus/prob/pa2ppf.men +%%DATADIR%%/frmenus/prob/padecdf.men +%%DATADIR%%/frmenus/prob/padepdf.men +%%DATADIR%%/frmenus/prob/padeppf.men +%%DATADIR%%/frmenus/prob/palpcdf.men +%%DATADIR%%/frmenus/prob/palpchaz.men +%%DATADIR%%/frmenus/prob/palphaz.men +%%DATADIR%%/frmenus/prob/palppdf.men +%%DATADIR%%/frmenus/prob/palpppf.men +%%DATADIR%%/frmenus/prob/pangcdf.men +%%DATADIR%%/frmenus/prob/pangpdf.men +%%DATADIR%%/frmenus/prob/pangppf.men +%%DATADIR%%/frmenus/prob/papcdf.men +%%DATADIR%%/frmenus/prob/paphispd.men +%%DATADIR%%/frmenus/prob/pappdf.men +%%DATADIR%%/frmenus/prob/papppcc.men +%%DATADIR%%/frmenus/prob/papppf.men +%%DATADIR%%/frmenus/prob/parcdf.men +%%DATADIR%%/frmenus/prob/parchaz.men +%%DATADIR%%/frmenus/prob/pardesc.top +%%DATADIR%%/frmenus/prob/parecdf.top +%%DATADIR%%/frmenus/prob/paremle.men +%%DATADIR%%/frmenus/prob/parepdf.top +%%DATADIR%%/frmenus/prob/pareppf.top +%%DATADIR%%/frmenus/prob/parhaz.men +%%DATADIR%%/frmenus/prob/parhispd.men +%%DATADIR%%/frmenus/prob/parpdf.men +%%DATADIR%%/frmenus/prob/parppcc.men +%%DATADIR%%/frmenus/prob/parppccc.men +%%DATADIR%%/frmenus/prob/parppf.men +%%DATADIR%%/frmenus/prob/parscdf.men +%%DATADIR%%/frmenus/prob/parspdf.men +%%DATADIR%%/frmenus/prob/parsppf.men +%%DATADIR%%/frmenus/prob/pb10cdf.men +%%DATADIR%%/frmenus/prob/pb10pdf.men +%%DATADIR%%/frmenus/prob/pb10ppf.men +%%DATADIR%%/frmenus/prob/pb11cdf.men +%%DATADIR%%/frmenus/prob/pb11pdf.men +%%DATADIR%%/frmenus/prob/pb11ppf.men +%%DATADIR%%/frmenus/prob/pb12cdf.men +%%DATADIR%%/frmenus/prob/pb12pdf.men +%%DATADIR%%/frmenus/prob/pb12ppf.men +%%DATADIR%%/frmenus/prob/pbbncdf.men +%%DATADIR%%/frmenus/prob/pbbnpdf.men +%%DATADIR%%/frmenus/prob/pbbnppf.men +%%DATADIR%%/frmenus/prob/pbetcdf.men +%%DATADIR%%/frmenus/prob/pbetpdf.men +%%DATADIR%%/frmenus/prob/pbetppf.men +%%DATADIR%%/frmenus/prob/pbgecdf.men +%%DATADIR%%/frmenus/prob/pbgepdf.men +%%DATADIR%%/frmenus/prob/pbgeppf.men +%%DATADIR%%/frmenus/prob/pbincdf.men +%%DATADIR%%/frmenus/prob/pbinpdf.men +%%DATADIR%%/frmenus/prob/pbinppf.men +%%DATADIR%%/frmenus/prob/pbivcdf.top +%%DATADIR%%/frmenus/prob/pbivpdf.top +%%DATADIR%%/frmenus/prob/pbnbcdf.men +%%DATADIR%%/frmenus/prob/pbnbpdf.men +%%DATADIR%%/frmenus/prob/pbnbppf.men +%%DATADIR%%/frmenus/prob/pbnocdf.men +%%DATADIR%%/frmenus/prob/pbnopdf.men +%%DATADIR%%/frmenus/prob/pbnoppf.men +%%DATADIR%%/frmenus/prob/pbracdf.men +%%DATADIR%%/frmenus/prob/pbrapdf.men +%%DATADIR%%/frmenus/prob/pbrappf.men +%%DATADIR%%/frmenus/prob/pbtacdf.men +%%DATADIR%%/frmenus/prob/pbtapdf.men +%%DATADIR%%/frmenus/prob/pbtappf.men +%%DATADIR%%/frmenus/prob/pbu2cdf.men +%%DATADIR%%/frmenus/prob/pbu2pdf.men +%%DATADIR%%/frmenus/prob/pbu2ppf.men +%%DATADIR%%/frmenus/prob/pbu3cdf.men +%%DATADIR%%/frmenus/prob/pbu3pdf.men +%%DATADIR%%/frmenus/prob/pbu3ppf.men +%%DATADIR%%/frmenus/prob/pbu4cdf.men +%%DATADIR%%/frmenus/prob/pbu4pdf.men +%%DATADIR%%/frmenus/prob/pbu4ppf.men +%%DATADIR%%/frmenus/prob/pbu5cdf.men +%%DATADIR%%/frmenus/prob/pbu5pdf.men +%%DATADIR%%/frmenus/prob/pbu5ppf.men +%%DATADIR%%/frmenus/prob/pbu6cdf.men +%%DATADIR%%/frmenus/prob/pbu6pdf.men +%%DATADIR%%/frmenus/prob/pbu6ppf.men +%%DATADIR%%/frmenus/prob/pbu7cdf.men +%%DATADIR%%/frmenus/prob/pbu7pdf.men +%%DATADIR%%/frmenus/prob/pbu7ppf.men +%%DATADIR%%/frmenus/prob/pbu8cdf.men +%%DATADIR%%/frmenus/prob/pbu8pdf.men +%%DATADIR%%/frmenus/prob/pbu8ppf.men +%%DATADIR%%/frmenus/prob/pbu9cdf.men +%%DATADIR%%/frmenus/prob/pbu9pdf.men +%%DATADIR%%/frmenus/prob/pbu9ppf.men +%%DATADIR%%/frmenus/prob/pbwecdf.men +%%DATADIR%%/frmenus/prob/pbwechaz.men +%%DATADIR%%/frmenus/prob/pbwehaz.men +%%DATADIR%%/frmenus/prob/pbwepdf.men +%%DATADIR%%/frmenus/prob/pbweppf.men +%%DATADIR%%/frmenus/prob/pcaucdf.men +%%DATADIR%%/frmenus/prob/pcaupdf.men +%%DATADIR%%/frmenus/prob/pcauppf.men +%%DATADIR%%/frmenus/prob/pcausf.men +%%DATADIR%%/frmenus/prob/pcdfchis.top +%%DATADIR%%/frmenus/prob/pcdfdisc.top +%%DATADIR%%/frmenus/prob/pcdfexpo.top +%%DATADIR%%/frmenus/prob/pcdfmix.top +%%DATADIR%%/frmenus/prob/pcdfmske.top +%%DATADIR%%/frmenus/prob/pcdfncdi.top +%%DATADIR%%/frmenus/prob/pcdfnorm.top +%%DATADIR%%/frmenus/prob/pcdfpare.top +%%DATADIR%%/frmenus/prob/pcdfskew.top +%%DATADIR%%/frmenus/prob/pcdfsymm.top +%%DATADIR%%/frmenus/prob/pchcdf.men +%%DATADIR%%/frmenus/prob/pchpdf.men +%%DATADIR%%/frmenus/prob/pchppf.men +%%DATADIR%%/frmenus/prob/pchscdf.men +%%DATADIR%%/frmenus/prob/pchspdf.men +%%DATADIR%%/frmenus/prob/pchsppf.men +%%DATADIR%%/frmenus/prob/pcon1cdf.men +%%DATADIR%%/frmenus/prob/pcon1pdf.men +%%DATADIR%%/frmenus/prob/pcon1ppf.men +%%DATADIR%%/frmenus/prob/pcon2cdf.men +%%DATADIR%%/frmenus/prob/pcon2pdf.men +%%DATADIR%%/frmenus/prob/pcon2ppf.men +%%DATADIR%%/frmenus/prob/pcoscdf.men +%%DATADIR%%/frmenus/prob/pcospdf.men +%%DATADIR%%/frmenus/prob/pcosppf.men +%%DATADIR%%/frmenus/prob/pdexcdf.men +%%DATADIR%%/frmenus/prob/pdexpdf.men +%%DATADIR%%/frmenus/prob/pdexppf.men +%%DATADIR%%/frmenus/prob/pdexsf.men +%%DATADIR%%/frmenus/prob/pdf.top +%%DATADIR%%/frmenus/prob/pdgacdf.men +%%DATADIR%%/frmenus/prob/pdgapdf.men +%%DATADIR%%/frmenus/prob/pdgappf.men +%%DATADIR%%/frmenus/prob/pdisccdf.top +%%DATADIR%%/frmenus/prob/pdiscdf.men +%%DATADIR%%/frmenus/prob/pdiscpdf.top +%%DATADIR%%/frmenus/prob/pdiscppf.top +%%DATADIR%%/frmenus/prob/pdispdf.men +%%DATADIR%%/frmenus/prob/pdisppf.men +%%DATADIR%%/frmenus/prob/pdiwcdf.men +%%DATADIR%%/frmenus/prob/pdiwpdf.men +%%DATADIR%%/frmenus/prob/pdiwppf.men +%%DATADIR%%/frmenus/prob/pdlgcdf.men +%%DATADIR%%/frmenus/prob/pdlgpdf.men +%%DATADIR%%/frmenus/prob/pdlgppf.men +%%DATADIR%%/frmenus/prob/pdnfcdf.men +%%DATADIR%%/frmenus/prob/pdnfpdf.men +%%DATADIR%%/frmenus/prob/pdnfppf.men +%%DATADIR%%/frmenus/prob/pdntcdf.men +%%DATADIR%%/frmenus/prob/pdntpdf.men +%%DATADIR%%/frmenus/prob/pdntppf.men +%%DATADIR%%/frmenus/prob/pdpucdf.men +%%DATADIR%%/frmenus/prob/pdpupdf.men +%%DATADIR%%/frmenus/prob/pdpuppf.men +%%DATADIR%%/frmenus/prob/pdwecdf.men +%%DATADIR%%/frmenus/prob/pdwepdf.men +%%DATADIR%%/frmenus/prob/pdweppf.men +%%DATADIR%%/frmenus/prob/percpoin.top +%%DATADIR%%/frmenus/prob/pev11cdf.men +%%DATADIR%%/frmenus/prob/pev11cha.men +%%DATADIR%%/frmenus/prob/pev11haz.men +%%DATADIR%%/frmenus/prob/pev11pdf.men +%%DATADIR%%/frmenus/prob/pev11ppf.men +%%DATADIR%%/frmenus/prob/pev12cdf.men +%%DATADIR%%/frmenus/prob/pev12cha.men +%%DATADIR%%/frmenus/prob/pev12haz.men +%%DATADIR%%/frmenus/prob/pev12pdf.men +%%DATADIR%%/frmenus/prob/pev12ppf.men +%%DATADIR%%/frmenus/prob/pev1cdf.men +%%DATADIR%%/frmenus/prob/pev1pdf.men +%%DATADIR%%/frmenus/prob/pev21cdf.men +%%DATADIR%%/frmenus/prob/pev21cha.men +%%DATADIR%%/frmenus/prob/pev21haz.men +%%DATADIR%%/frmenus/prob/pev21pdf.men +%%DATADIR%%/frmenus/prob/pev21ppf.men +%%DATADIR%%/frmenus/prob/pev22cdf.men +%%DATADIR%%/frmenus/prob/pev22cha.men +%%DATADIR%%/frmenus/prob/pev22haz.men +%%DATADIR%%/frmenus/prob/pev22pdf.men +%%DATADIR%%/frmenus/prob/pev22ppf.men +%%DATADIR%%/frmenus/prob/pev2cdf.men +%%DATADIR%%/frmenus/prob/pev2pdf.men +%%DATADIR%%/frmenus/prob/pewecdf.men +%%DATADIR%%/frmenus/prob/pewechaz.men +%%DATADIR%%/frmenus/prob/pewehaz.men +%%DATADIR%%/frmenus/prob/pewepdf.men +%%DATADIR%%/frmenus/prob/peweppf.men +%%DATADIR%%/frmenus/prob/pexcdf.men +%%DATADIR%%/frmenus/prob/pexchaz.men +%%DATADIR%%/frmenus/prob/pexhaz.men +%%DATADIR%%/frmenus/prob/pexhispd.men +%%DATADIR%%/frmenus/prob/pexpcdf.men +%%DATADIR%%/frmenus/prob/pexpchaz.men +%%DATADIR%%/frmenus/prob/pexpdf.men +%%DATADIR%%/frmenus/prob/pexphaz.men +%%DATADIR%%/frmenus/prob/pexppdf.men +%%DATADIR%%/frmenus/prob/pexppf.men +%%DATADIR%%/frmenus/prob/pexpppf.men +%%DATADIR%%/frmenus/prob/pexpsf.men +%%DATADIR%%/frmenus/prob/pfcacdf.men +%%DATADIR%%/frmenus/prob/pfcapdf.men +%%DATADIR%%/frmenus/prob/pfcappf.men +%%DATADIR%%/frmenus/prob/pfcdf.men +%%DATADIR%%/frmenus/prob/pflcdf.men +%%DATADIR%%/frmenus/prob/pflchaz.men +%%DATADIR%%/frmenus/prob/pflhaz.men +%%DATADIR%%/frmenus/prob/pflpdf.men +%%DATADIR%%/frmenus/prob/pflppf.men +%%DATADIR%%/frmenus/prob/pfnrcdf.men +%%DATADIR%%/frmenus/prob/pfnrpdf.men +%%DATADIR%%/frmenus/prob/pfnrppf.men +%%DATADIR%%/frmenus/prob/pfpdf.men +%%DATADIR%%/frmenus/prob/pfppf.men +%%DATADIR%%/frmenus/prob/pftcdf.men +%%DATADIR%%/frmenus/prob/pftpdf.men +%%DATADIR%%/frmenus/prob/pftppf.men +%%DATADIR%%/frmenus/prob/pgalcdf.men +%%DATADIR%%/frmenus/prob/pgalpdf.men +%%DATADIR%%/frmenus/prob/pgalppf.men +%%DATADIR%%/frmenus/prob/pgamcdf.men +%%DATADIR%%/frmenus/prob/pgamchaz.men +%%DATADIR%%/frmenus/prob/pgamhaz.men +%%DATADIR%%/frmenus/prob/pgampdf.men +%%DATADIR%%/frmenus/prob/pgamppf.men +%%DATADIR%%/frmenus/prob/pgeecdf.men +%%DATADIR%%/frmenus/prob/pgeechaz.men +%%DATADIR%%/frmenus/prob/pgeehaz.men +%%DATADIR%%/frmenus/prob/pgeepdf.men +%%DATADIR%%/frmenus/prob/pgeeppf.men +%%DATADIR%%/frmenus/prob/pgeo2cdf.men +%%DATADIR%%/frmenus/prob/pgeo2pdf.men +%%DATADIR%%/frmenus/prob/pgeo2ppf.men +%%DATADIR%%/frmenus/prob/pgeocdf.men +%%DATADIR%%/frmenus/prob/pgeopdf.men +%%DATADIR%%/frmenus/prob/pgeoppf.men +%%DATADIR%%/frmenus/prob/pgep2cdf.men +%%DATADIR%%/frmenus/prob/pgep2pdf.men +%%DATADIR%%/frmenus/prob/pgep2ppf.men +%%DATADIR%%/frmenus/prob/pgepcdf.men +%%DATADIR%%/frmenus/prob/pgepchaz.men +%%DATADIR%%/frmenus/prob/pgephaz.men +%%DATADIR%%/frmenus/prob/pgeppdf.men +%%DATADIR%%/frmenus/prob/pgepppf.men +%%DATADIR%%/frmenus/prob/pget1cdf.men +%%DATADIR%%/frmenus/prob/pget1pdf.men +%%DATADIR%%/frmenus/prob/pget1ppf.men +%%DATADIR%%/frmenus/prob/pget2cdf.men +%%DATADIR%%/frmenus/prob/pget2pdf.men +%%DATADIR%%/frmenus/prob/pget2ppf.men +%%DATADIR%%/frmenus/prob/pgev1cdf.men +%%DATADIR%%/frmenus/prob/pgev1pdf.men +%%DATADIR%%/frmenus/prob/pgev1ppf.men +%%DATADIR%%/frmenus/prob/pgev2cdf.men +%%DATADIR%%/frmenus/prob/pgev2pdf.men +%%DATADIR%%/frmenus/prob/pgev2ppf.men +%%DATADIR%%/frmenus/prob/pgevcdf.men +%%DATADIR%%/frmenus/prob/pgevpdf.men +%%DATADIR%%/frmenus/prob/pgevppf.men +%%DATADIR%%/frmenus/prob/pgexcdf.men +%%DATADIR%%/frmenus/prob/pgexpdf.men +%%DATADIR%%/frmenus/prob/pgexppf.men +%%DATADIR%%/frmenus/prob/pggdcdf.men +%%DATADIR%%/frmenus/prob/pggdchaz.men +%%DATADIR%%/frmenus/prob/pggdhaz.men +%%DATADIR%%/frmenus/prob/pggdpdf.men +%%DATADIR%%/frmenus/prob/pggdppf.men +%%DATADIR%%/frmenus/prob/pghcdf.men +%%DATADIR%%/frmenus/prob/pghflcdf.men +%%DATADIR%%/frmenus/prob/pghflpdf.men +%%DATADIR%%/frmenus/prob/pghflppf.men +%%DATADIR%%/frmenus/prob/pghpdf.men +%%DATADIR%%/frmenus/prob/pghppf.men +%%DATADIR%%/frmenus/prob/pgigcdf.men +%%DATADIR%%/frmenus/prob/pgigpdf.men +%%DATADIR%%/frmenus/prob/pgigppf.men +%%DATADIR%%/frmenus/prob/pgl2cdf.men +%%DATADIR%%/frmenus/prob/pgl2pdf.men +%%DATADIR%%/frmenus/prob/pgl2ppf.men +%%DATADIR%%/frmenus/prob/pgl3cdf.men +%%DATADIR%%/frmenus/prob/pgl3pdf.men +%%DATADIR%%/frmenus/prob/pgl3ppf.men +%%DATADIR%%/frmenus/prob/pgl4cdf.men +%%DATADIR%%/frmenus/prob/pgl4pdf.men +%%DATADIR%%/frmenus/prob/pgl4ppf.men +%%DATADIR%%/frmenus/prob/pgl5cdf.men +%%DATADIR%%/frmenus/prob/pgl5pdf.men +%%DATADIR%%/frmenus/prob/pgl5ppf.men +%%DATADIR%%/frmenus/prob/pgldcdf.men +%%DATADIR%%/frmenus/prob/pgldpdf.men +%%DATADIR%%/frmenus/prob/pgldppf.men +%%DATADIR%%/frmenus/prob/pglgcdf.men +%%DATADIR%%/frmenus/prob/pglgpdf.men +%%DATADIR%%/frmenus/prob/pglgppf.men +%%DATADIR%%/frmenus/prob/pglocdf.men +%%DATADIR%%/frmenus/prob/pglopdf.men +%%DATADIR%%/frmenus/prob/pgloppf.men +%%DATADIR%%/frmenus/prob/pglscdf.men +%%DATADIR%%/frmenus/prob/pglspdf.men +%%DATADIR%%/frmenus/prob/pglsppf.men +%%DATADIR%%/frmenus/prob/pgmccdf.men +%%DATADIR%%/frmenus/prob/pgmcpdf.men +%%DATADIR%%/frmenus/prob/pgmcppf.men +%%DATADIR%%/frmenus/prob/pgnbcdf.men +%%DATADIR%%/frmenus/prob/pgnbpdf.men +%%DATADIR%%/frmenus/prob/pgnbppf.men +%%DATADIR%%/frmenus/prob/pgomcdf.men +%%DATADIR%%/frmenus/prob/pgompdf.men +%%DATADIR%%/frmenus/prob/pgomppf.men +%%DATADIR%%/frmenus/prob/pgtlcdf.men +%%DATADIR%%/frmenus/prob/pgtlpdf.men +%%DATADIR%%/frmenus/prob/pgtlppf.men +%%DATADIR%%/frmenus/prob/pgtrcdf.men +%%DATADIR%%/frmenus/prob/pgtrpdf.men +%%DATADIR%%/frmenus/prob/pgtrppf.men +%%DATADIR%%/frmenus/prob/phercdf.men +%%DATADIR%%/frmenus/prob/pherpdf.men +%%DATADIR%%/frmenus/prob/pherppf.men +%%DATADIR%%/frmenus/prob/phfccdf.men +%%DATADIR%%/frmenus/prob/phfcpdf.men +%%DATADIR%%/frmenus/prob/phfcppf.men +%%DATADIR%%/frmenus/prob/phflcdf.men +%%DATADIR%%/frmenus/prob/phflpdf.men +%%DATADIR%%/frmenus/prob/phflppf.men +%%DATADIR%%/frmenus/prob/phfncdf.men +%%DATADIR%%/frmenus/prob/phfnce.men +%%DATADIR%%/frmenus/prob/phfnpdf.men +%%DATADIR%%/frmenus/prob/phfnppf.men +%%DATADIR%%/frmenus/prob/phsecdf.men +%%DATADIR%%/frmenus/prob/phsepdf.men +%%DATADIR%%/frmenus/prob/phseppf.men +%%DATADIR%%/frmenus/prob/phypcdf.men +%%DATADIR%%/frmenus/prob/phyppdf.men +%%DATADIR%%/frmenus/prob/phypppf.men +%%DATADIR%%/frmenus/prob/pibcdf.men +%%DATADIR%%/frmenus/prob/pibpdf.men +%%DATADIR%%/frmenus/prob/pibppf.men +%%DATADIR%%/frmenus/prob/pigacdf.men +%%DATADIR%%/frmenus/prob/pigachaz.men +%%DATADIR%%/frmenus/prob/pigahaz.men +%%DATADIR%%/frmenus/prob/pigapdf.men +%%DATADIR%%/frmenus/prob/pigappf.men +%%DATADIR%%/frmenus/prob/pigcdf.men +%%DATADIR%%/frmenus/prob/pigchaz.men +%%DATADIR%%/frmenus/prob/pighaz.men +%%DATADIR%%/frmenus/prob/pigpdf.men +%%DATADIR%%/frmenus/prob/pigppf.men +%%DATADIR%%/frmenus/prob/piwecdf.men +%%DATADIR%%/frmenus/prob/piwechaz.men +%%DATADIR%%/frmenus/prob/piwehaz.men +%%DATADIR%%/frmenus/prob/piwepdf.men +%%DATADIR%%/frmenus/prob/piweppf.men +%%DATADIR%%/frmenus/prob/pjsbcdf.men +%%DATADIR%%/frmenus/prob/pjsbpdf.men +%%DATADIR%%/frmenus/prob/pjsbppf.men +%%DATADIR%%/frmenus/prob/pjsucdf.men +%%DATADIR%%/frmenus/prob/pjsupdf.men +%%DATADIR%%/frmenus/prob/pjsuppf.men +%%DATADIR%%/frmenus/prob/pkapcdf.men +%%DATADIR%%/frmenus/prob/pkappdf.men +%%DATADIR%%/frmenus/prob/pkapppf.men +%%DATADIR%%/frmenus/prob/pkatcdf.men +%%DATADIR%%/frmenus/prob/pkatpdf.men +%%DATADIR%%/frmenus/prob/pkatppf.men +%%DATADIR%%/frmenus/prob/pkumcdf.men +%%DATADIR%%/frmenus/prob/pkumpdf.men +%%DATADIR%%/frmenus/prob/pkumppf.men +%%DATADIR%%/frmenus/prob/plamcdf.men +%%DATADIR%%/frmenus/prob/plampdf.men +%%DATADIR%%/frmenus/prob/plamppf.men +%%DATADIR%%/frmenus/prob/plamsf.men +%%DATADIR%%/frmenus/prob/plbecdf.men +%%DATADIR%%/frmenus/prob/plbepdf.men +%%DATADIR%%/frmenus/prob/plbeppf.men +%%DATADIR%%/frmenus/prob/plctcdf.men +%%DATADIR%%/frmenus/prob/plctpdf.men +%%DATADIR%%/frmenus/prob/plctppf.men +%%DATADIR%%/frmenus/prob/pldecdf.men +%%DATADIR%%/frmenus/prob/pldepdf.men +%%DATADIR%%/frmenus/prob/pldeppf.men +%%DATADIR%%/frmenus/prob/plexcdf.men +%%DATADIR%%/frmenus/prob/plexchaz.men +%%DATADIR%%/frmenus/prob/plexhaz.men +%%DATADIR%%/frmenus/prob/plexpdf.men +%%DATADIR%%/frmenus/prob/plexppf.men +%%DATADIR%%/frmenus/prob/plgacdf.men +%%DATADIR%%/frmenus/prob/plgapdf.men +%%DATADIR%%/frmenus/prob/plgappf.men +%%DATADIR%%/frmenus/prob/plgncdf.men +%%DATADIR%%/frmenus/prob/plgnchaz.men +%%DATADIR%%/frmenus/prob/plgnhaz.men +%%DATADIR%%/frmenus/prob/plgnpdf.men +%%DATADIR%%/frmenus/prob/plgnppf.men +%%DATADIR%%/frmenus/prob/pllgcdf.men +%%DATADIR%%/frmenus/prob/pllgpdf.men +%%DATADIR%%/frmenus/prob/pllgppf.men +%%DATADIR%%/frmenus/prob/plncdf.men +%%DATADIR%%/frmenus/prob/plnchaz.men +%%DATADIR%%/frmenus/prob/plnhaz.men +%%DATADIR%%/frmenus/prob/plnhispd.men +%%DATADIR%%/frmenus/prob/plnpdf.men +%%DATADIR%%/frmenus/prob/plnppf.men +%%DATADIR%%/frmenus/prob/plocscdf.top +%%DATADIR%%/frmenus/prob/plocspdf.top +%%DATADIR%%/frmenus/prob/plocsppf.top +%%DATADIR%%/frmenus/prob/plogcdf.men +%%DATADIR%%/frmenus/prob/plogpdf.men +%%DATADIR%%/frmenus/prob/plogppf.men +%%DATADIR%%/frmenus/prob/plogsf.men +%%DATADIR%%/frmenus/prob/ploscdf.men +%%DATADIR%%/frmenus/prob/plospdf.men +%%DATADIR%%/frmenus/prob/plosppf.men +%%DATADIR%%/frmenus/prob/plotcdf.top +%%DATADIR%%/frmenus/prob/plotchaz.top +%%DATADIR%%/frmenus/prob/plothaz.top +%%DATADIR%%/frmenus/prob/plotpdf.top +%%DATADIR%%/frmenus/prob/plotppf.top +%%DATADIR%%/frmenus/prob/plotsf.top +%%DATADIR%%/frmenus/prob/plpocdf.men +%%DATADIR%%/frmenus/prob/plpopdf.men +%%DATADIR%%/frmenus/prob/plpoppf.men +%%DATADIR%%/frmenus/prob/plsncdf.men +%%DATADIR%%/frmenus/prob/plsnpdf.men +%%DATADIR%%/frmenus/prob/plsnppf.men +%%DATADIR%%/frmenus/prob/plstcdf.men +%%DATADIR%%/frmenus/prob/plstpdf.men +%%DATADIR%%/frmenus/prob/plstppf.men +%%DATADIR%%/frmenus/prob/pmakacdf.men +%%DATADIR%%/frmenus/prob/pmakapdf.men +%%DATADIR%%/frmenus/prob/pmakappf.men +%%DATADIR%%/frmenus/prob/pmakbcdf.men +%%DATADIR%%/frmenus/prob/pmakbpdf.men +%%DATADIR%%/frmenus/prob/pmakbppf.men +%%DATADIR%%/frmenus/prob/pmakcdf.men +%%DATADIR%%/frmenus/prob/pmakpdf.men +%%DATADIR%%/frmenus/prob/pmakppf.men +%%DATADIR%%/frmenus/prob/pmatcdf.men +%%DATADIR%%/frmenus/prob/pmatpdf.men +%%DATADIR%%/frmenus/prob/pmatppf.men +%%DATADIR%%/frmenus/prob/pmaxcdf.men +%%DATADIR%%/frmenus/prob/pmaxpdf.men +%%DATADIR%%/frmenus/prob/pmaxppf.men +%%DATADIR%%/frmenus/prob/pmclcdf.men +%%DATADIR%%/frmenus/prob/pmclpdf.men +%%DATADIR%%/frmenus/prob/pmclppf.men +%%DATADIR%%/frmenus/prob/pmixcdf.top +%%DATADIR%%/frmenus/prob/pmixpdf.top +%%DATADIR%%/frmenus/prob/pmixppf.top +%%DATADIR%%/frmenus/prob/pmutcdf.men +%%DATADIR%%/frmenus/prob/pmutchaz.men +%%DATADIR%%/frmenus/prob/pmuthaz.men +%%DATADIR%%/frmenus/prob/pmutpdf.men +%%DATADIR%%/frmenus/prob/pmutppf.men +%%DATADIR%%/frmenus/prob/pnbcdf.men +%%DATADIR%%/frmenus/prob/pnbpdf.men +%%DATADIR%%/frmenus/prob/pnbppf.men +%%DATADIR%%/frmenus/prob/pncbcdf.men +%%DATADIR%%/frmenus/prob/pncbpdf.men +%%DATADIR%%/frmenus/prob/pncbppf.men +%%DATADIR%%/frmenus/prob/pncccdf.men +%%DATADIR%%/frmenus/prob/pnccpdf.men +%%DATADIR%%/frmenus/prob/pnccppf.men +%%DATADIR%%/frmenus/prob/pncfcdf.men +%%DATADIR%%/frmenus/prob/pncfpdf.men +%%DATADIR%%/frmenus/prob/pncfppf.men +%%DATADIR%%/frmenus/prob/pnctcdf.men +%%DATADIR%%/frmenus/prob/pnctpdf.men +%%DATADIR%%/frmenus/prob/pnctppf.men +%%DATADIR%%/frmenus/prob/pnorcdf.men +%%DATADIR%%/frmenus/prob/pnorchaz.men +%%DATADIR%%/frmenus/prob/pnorhaz.men +%%DATADIR%%/frmenus/prob/pnormcdf.men +%%DATADIR%%/frmenus/prob/pnormpdf.men +%%DATADIR%%/frmenus/prob/pnormppf.men +%%DATADIR%%/frmenus/prob/pnorpdf.men +%%DATADIR%%/frmenus/prob/pnorppf.men +%%DATADIR%%/frmenus/prob/pnorsf.men +%%DATADIR%%/frmenus/prob/pnrcdf.men +%%DATADIR%%/frmenus/prob/pnrchaz.men +%%DATADIR%%/frmenus/prob/pnrhaz.men +%%DATADIR%%/frmenus/prob/pnrhispd.men +%%DATADIR%%/frmenus/prob/pnrpdf.men +%%DATADIR%%/frmenus/prob/pnrppf.men +%%DATADIR%%/frmenus/prob/pogicdf.men +%%DATADIR%%/frmenus/prob/pogipdf.men +%%DATADIR%%/frmenus/prob/pogippf.men +%%DATADIR%%/frmenus/prob/poicdf.men +%%DATADIR%%/frmenus/prob/poidesc.top +%%DATADIR%%/frmenus/prob/poihispd.men +%%DATADIR%%/frmenus/prob/poipdf.men +%%DATADIR%%/frmenus/prob/poippcc.men +%%DATADIR%%/frmenus/prob/poippf.men +%%DATADIR%%/frmenus/prob/poissmle.men +%%DATADIR%%/frmenus/prob/powcdf.men +%%DATADIR%%/frmenus/prob/powhispd.men +%%DATADIR%%/frmenus/prob/powpdf.men +%%DATADIR%%/frmenus/prob/powppcc.men +%%DATADIR%%/frmenus/prob/powppccc.men +%%DATADIR%%/frmenus/prob/powppf.men +%%DATADIR%%/frmenus/prob/powprob.men +%%DATADIR%%/frmenus/prob/pp1shace.top +%%DATADIR%%/frmenus/prob/pp1shasc.top +%%DATADIR%%/frmenus/prob/pp1shask.top +%%DATADIR%%/frmenus/prob/pp1shasu.top +%%DATADIR%%/frmenus/prob/pp1shasy.top +%%DATADIR%%/frmenus/prob/pp1shaun.top +%%DATADIR%%/frmenus/prob/ppa2cdf.men +%%DATADIR%%/frmenus/prob/ppa2pdf.men +%%DATADIR%%/frmenus/prob/ppa2ppf.men +%%DATADIR%%/frmenus/prob/ppadece.men +%%DATADIR%%/frmenus/prob/ppalp.men +%%DATADIR%%/frmenus/prob/ppang.men +%%DATADIR%%/frmenus/prob/ppangce.men +%%DATADIR%%/frmenus/prob/ppapcdf.men +%%DATADIR%%/frmenus/prob/ppappdf.men +%%DATADIR%%/frmenus/prob/ppapppf.men +%%DATADIR%%/frmenus/prob/pparcdf.men +%%DATADIR%%/frmenus/prob/pparchaz.men +%%DATADIR%%/frmenus/prob/pparhaz.men +%%DATADIR%%/frmenus/prob/pparpdf.men +%%DATADIR%%/frmenus/prob/pparppf.men +%%DATADIR%%/frmenus/prob/ppars.men +%%DATADIR%%/frmenus/prob/pparsce.men +%%DATADIR%%/frmenus/prob/ppb10ce.men +%%DATADIR%%/frmenus/prob/ppb11ce.men +%%DATADIR%%/frmenus/prob/ppb12.men +%%DATADIR%%/frmenus/prob/ppb12ce.men +%%DATADIR%%/frmenus/prob/ppbbn.men +%%DATADIR%%/frmenus/prob/ppbet.men +%%DATADIR%%/frmenus/prob/ppbetce.men +%%DATADIR%%/frmenus/prob/ppbge.men +%%DATADIR%%/frmenus/prob/ppbin.men +%%DATADIR%%/frmenus/prob/ppbnb.men +%%DATADIR%%/frmenus/prob/ppbno.men +%%DATADIR%%/frmenus/prob/ppbnoce.men +%%DATADIR%%/frmenus/prob/ppbrace.men +%%DATADIR%%/frmenus/prob/ppbta.men +%%DATADIR%%/frmenus/prob/ppbu2ce.men +%%DATADIR%%/frmenus/prob/ppbu3.men +%%DATADIR%%/frmenus/prob/ppbu3ce.men +%%DATADIR%%/frmenus/prob/ppbu4.men +%%DATADIR%%/frmenus/prob/ppbu4ce.men +%%DATADIR%%/frmenus/prob/ppbu5.men +%%DATADIR%%/frmenus/prob/ppbu5ce.men +%%DATADIR%%/frmenus/prob/ppbu6.men +%%DATADIR%%/frmenus/prob/ppbu6ce.men +%%DATADIR%%/frmenus/prob/ppbu7ce.men +%%DATADIR%%/frmenus/prob/ppbu8ce.men +%%DATADIR%%/frmenus/prob/ppbu9.men +%%DATADIR%%/frmenus/prob/ppbu9ce.men +%%DATADIR%%/frmenus/prob/ppcau.men +%%DATADIR%%/frmenus/prob/ppcauce.men +%%DATADIR%%/frmenus/prob/ppcc.top +%%DATADIR%%/frmenus/prob/ppccaxis.men +%%DATADIR%%/frmenus/prob/ppccb12.men +%%DATADIR%%/frmenus/prob/ppccbet.men +%%DATADIR%%/frmenus/prob/ppccbno.men +%%DATADIR%%/frmenus/prob/ppccboot.top +%%DATADIR%%/frmenus/prob/ppccbu3.men +%%DATADIR%%/frmenus/prob/ppccbu5.men +%%DATADIR%%/frmenus/prob/ppccbu6.men +%%DATADIR%%/frmenus/prob/ppccbu9.men +%%DATADIR%%/frmenus/prob/ppccdpu.men +%%DATADIR%%/frmenus/prob/ppccewe.men +%%DATADIR%%/frmenus/prob/ppccf.men +%%DATADIR%%/frmenus/prob/ppccfca.men +%%DATADIR%%/frmenus/prob/ppccfnr.men +%%DATADIR%%/frmenus/prob/ppccgh.men +%%DATADIR%%/frmenus/prob/ppccgld.men +%%DATADIR%%/frmenus/prob/ppccgom.men +%%DATADIR%%/frmenus/prob/ppccgtl.men +%%DATADIR%%/frmenus/prob/ppccig.men +%%DATADIR%%/frmenus/prob/ppccjsb.men +%%DATADIR%%/frmenus/prob/ppccjsu.men +%%DATADIR%%/frmenus/prob/ppcckum.men +%%DATADIR%%/frmenus/prob/ppccopt.top +%%DATADIR%%/frmenus/prob/ppccperc.men +%%DATADIR%%/frmenus/prob/ppccpln.men +%%DATADIR%%/frmenus/prob/ppccplot.top +%%DATADIR%%/frmenus/prob/ppccrgt.men +%%DATADIR%%/frmenus/prob/ppccrig.men +%%DATADIR%%/frmenus/prob/ppcctnr.men +%%DATADIR%%/frmenus/prob/ppcctso.men +%%DATADIR%%/frmenus/prob/ppcctsp.men +%%DATADIR%%/frmenus/prob/ppcctss.men +%%DATADIR%%/frmenus/prob/ppchce.men +%%DATADIR%%/frmenus/prob/ppchsce.men +%%DATADIR%%/frmenus/prob/ppcon1.men +%%DATADIR%%/frmenus/prob/ppcon2.men +%%DATADIR%%/frmenus/prob/ppcos.men +%%DATADIR%%/frmenus/prob/ppcosce.men +%%DATADIR%%/frmenus/prob/ppdex.men +%%DATADIR%%/frmenus/prob/ppdexce.men +%%DATADIR%%/frmenus/prob/ppdfchis.top +%%DATADIR%%/frmenus/prob/ppdfdisc.top +%%DATADIR%%/frmenus/prob/ppdfexpo.top +%%DATADIR%%/frmenus/prob/ppdfmix.top +%%DATADIR%%/frmenus/prob/ppdfmske.top +%%DATADIR%%/frmenus/prob/ppdfncdi.top +%%DATADIR%%/frmenus/prob/ppdfnorm.top +%%DATADIR%%/frmenus/prob/ppdfpare.top +%%DATADIR%%/frmenus/prob/ppdfskew.top +%%DATADIR%%/frmenus/prob/ppdfsymm.top +%%DATADIR%%/frmenus/prob/ppdgace.men +%%DATADIR%%/frmenus/prob/ppdiw.men +%%DATADIR%%/frmenus/prob/ppdlg.men +%%DATADIR%%/frmenus/prob/ppdnf.men +%%DATADIR%%/frmenus/prob/ppdnfce.men +%%DATADIR%%/frmenus/prob/ppdnt.men +%%DATADIR%%/frmenus/prob/ppdntce.men +%%DATADIR%%/frmenus/prob/ppdpu.men +%%DATADIR%%/frmenus/prob/ppdpuce.men +%%DATADIR%%/frmenus/prob/ppdun.men +%%DATADIR%%/frmenus/prob/ppdwece.men +%%DATADIR%%/frmenus/prob/ppewe.men +%%DATADIR%%/frmenus/prob/ppewece.men +%%DATADIR%%/frmenus/prob/ppexcdf.men +%%DATADIR%%/frmenus/prob/ppexchaz.men +%%DATADIR%%/frmenus/prob/ppexhaz.men +%%DATADIR%%/frmenus/prob/ppexpdf.men +%%DATADIR%%/frmenus/prob/ppexppf.men +%%DATADIR%%/frmenus/prob/ppf.top +%%DATADIR%%/frmenus/prob/ppfca.men +%%DATADIR%%/frmenus/prob/ppfcace.men +%%DATADIR%%/frmenus/prob/ppfce.men +%%DATADIR%%/frmenus/prob/ppfnr.men +%%DATADIR%%/frmenus/prob/ppfnrce.men +%%DATADIR%%/frmenus/prob/ppfplots.top +%%DATADIR%%/frmenus/prob/ppftce.men +%%DATADIR%%/frmenus/prob/ppgal.men +%%DATADIR%%/frmenus/prob/ppgalce.men +%%DATADIR%%/frmenus/prob/ppgeoa.men +%%DATADIR%%/frmenus/prob/ppgeob.men +%%DATADIR%%/frmenus/prob/ppget1.men +%%DATADIR%%/frmenus/prob/ppget2.men +%%DATADIR%%/frmenus/prob/ppgex.men +%%DATADIR%%/frmenus/prob/ppgexce.men +%%DATADIR%%/frmenus/prob/ppggd.men +%%DATADIR%%/frmenus/prob/ppggdce.men +%%DATADIR%%/frmenus/prob/ppgh.men +%%DATADIR%%/frmenus/prob/ppghce.men +%%DATADIR%%/frmenus/prob/ppghflce.men +%%DATADIR%%/frmenus/prob/ppgig.men +%%DATADIR%%/frmenus/prob/ppgigce.men +%%DATADIR%%/frmenus/prob/ppgl2ce.men +%%DATADIR%%/frmenus/prob/ppgl3ce.men +%%DATADIR%%/frmenus/prob/ppgl4.men +%%DATADIR%%/frmenus/prob/ppgl4ce.men +%%DATADIR%%/frmenus/prob/ppgl5ce.men +%%DATADIR%%/frmenus/prob/ppgld.men +%%DATADIR%%/frmenus/prob/ppgldce.men +%%DATADIR%%/frmenus/prob/ppglg.men +%%DATADIR%%/frmenus/prob/ppgloce.men +%%DATADIR%%/frmenus/prob/ppgls.men +%%DATADIR%%/frmenus/prob/ppgmc.men +%%DATADIR%%/frmenus/prob/ppgmcce.men +%%DATADIR%%/frmenus/prob/ppgnb.men +%%DATADIR%%/frmenus/prob/ppgom.men +%%DATADIR%%/frmenus/prob/ppgomce.men +%%DATADIR%%/frmenus/prob/ppgtl.men +%%DATADIR%%/frmenus/prob/ppgtlce.men +%%DATADIR%%/frmenus/prob/ppgtr.men +%%DATADIR%%/frmenus/prob/ppgtrce.men +%%DATADIR%%/frmenus/prob/pphca.men +%%DATADIR%%/frmenus/prob/ppher.men +%%DATADIR%%/frmenus/prob/pphfc.men +%%DATADIR%%/frmenus/prob/pphfcce.men +%%DATADIR%%/frmenus/prob/pphfl.men +%%DATADIR%%/frmenus/prob/pphflce.men +%%DATADIR%%/frmenus/prob/pphfn.men +%%DATADIR%%/frmenus/prob/pphfnce.men +%%DATADIR%%/frmenus/prob/pphse.men +%%DATADIR%%/frmenus/prob/pphsece.men +%%DATADIR%%/frmenus/prob/pphyp.men +%%DATADIR%%/frmenus/prob/ppib.men +%%DATADIR%%/frmenus/prob/ppibce.men +%%DATADIR%%/frmenus/prob/ppig.men +%%DATADIR%%/frmenus/prob/ppigce.men +%%DATADIR%%/frmenus/prob/ppjsb.men +%%DATADIR%%/frmenus/prob/ppjsbce.men +%%DATADIR%%/frmenus/prob/ppjsu.men +%%DATADIR%%/frmenus/prob/ppjsuce.men +%%DATADIR%%/frmenus/prob/ppkap.men +%%DATADIR%%/frmenus/prob/ppkapce.men +%%DATADIR%%/frmenus/prob/ppkat.men +%%DATADIR%%/frmenus/prob/ppkum.men +%%DATADIR%%/frmenus/prob/ppkumce.men +%%DATADIR%%/frmenus/prob/pplamce.men +%%DATADIR%%/frmenus/prob/pplan.men +%%DATADIR%%/frmenus/prob/pplbe.men +%%DATADIR%%/frmenus/prob/pplbece.men +%%DATADIR%%/frmenus/prob/pplct.men +%%DATADIR%%/frmenus/prob/ppldece.men +%%DATADIR%%/frmenus/prob/pplexce.men +%%DATADIR%%/frmenus/prob/ppllgce.men +%%DATADIR%%/frmenus/prob/pplncdf.men +%%DATADIR%%/frmenus/prob/pplnchaz.men +%%DATADIR%%/frmenus/prob/pplnhaz.men +%%DATADIR%%/frmenus/prob/pplnpdf.men +%%DATADIR%%/frmenus/prob/pplnppf.men +%%DATADIR%%/frmenus/prob/pplocsca.top +%%DATADIR%%/frmenus/prob/pplocsce.top +%%DATADIR%%/frmenus/prob/pplog.men +%%DATADIR%%/frmenus/prob/pplogce.men +%%DATADIR%%/frmenus/prob/pplos.men +%%DATADIR%%/frmenus/prob/pplpo.men +%%DATADIR%%/frmenus/prob/pplsn.men +%%DATADIR%%/frmenus/prob/pplsnce.men +%%DATADIR%%/frmenus/prob/pplst.men +%%DATADIR%%/frmenus/prob/pplstce.men +%%DATADIR%%/frmenus/prob/ppmak.men +%%DATADIR%%/frmenus/prob/ppmaka.men +%%DATADIR%%/frmenus/prob/ppmakace.men +%%DATADIR%%/frmenus/prob/ppmakb.men +%%DATADIR%%/frmenus/prob/ppmakbce.men +%%DATADIR%%/frmenus/prob/ppmakce.men +%%DATADIR%%/frmenus/prob/ppmat.men +%%DATADIR%%/frmenus/prob/ppmax.men +%%DATADIR%%/frmenus/prob/ppmaxce.men +%%DATADIR%%/frmenus/prob/ppmclce.men +%%DATADIR%%/frmenus/prob/ppmutce.men +%%DATADIR%%/frmenus/prob/ppnb.men +%%DATADIR%%/frmenus/prob/ppncb.men +%%DATADIR%%/frmenus/prob/ppncbce.men +%%DATADIR%%/frmenus/prob/ppncc.men +%%DATADIR%%/frmenus/prob/ppnccce.men +%%DATADIR%%/frmenus/prob/ppncf.men +%%DATADIR%%/frmenus/prob/ppncfce.men +%%DATADIR%%/frmenus/prob/ppnct.men +%%DATADIR%%/frmenus/prob/ppnctce.men +%%DATADIR%%/frmenus/prob/ppnrcdf.men +%%DATADIR%%/frmenus/prob/ppnrchaz.men +%%DATADIR%%/frmenus/prob/ppnrhaz.men +%%DATADIR%%/frmenus/prob/ppnrpdf.men +%%DATADIR%%/frmenus/prob/ppnrppf.men +%%DATADIR%%/frmenus/prob/ppogice.men +%%DATADIR%%/frmenus/prob/ppoicdf.men +%%DATADIR%%/frmenus/prob/ppoipdf.men +%%DATADIR%%/frmenus/prob/ppoippf.men +%%DATADIR%%/frmenus/prob/ppowcdf.men +%%DATADIR%%/frmenus/prob/ppowpdf.men +%%DATADIR%%/frmenus/prob/ppowppf.men +%%DATADIR%%/frmenus/prob/pppa2.men +%%DATADIR%%/frmenus/prob/pppa2ce.men +%%DATADIR%%/frmenus/prob/pppap.men +%%DATADIR%%/frmenus/prob/pppar.men +%%DATADIR%%/frmenus/prob/ppparce.men +%%DATADIR%%/frmenus/prob/pppex.men +%%DATADIR%%/frmenus/prob/pppfchis.top +%%DATADIR%%/frmenus/prob/pppfdisc.top +%%DATADIR%%/frmenus/prob/pppfexpo.men +%%DATADIR%%/frmenus/prob/pppfexpo.top +%%DATADIR%%/frmenus/prob/pppfmix.top +%%DATADIR%%/frmenus/prob/pppfmske.top +%%DATADIR%%/frmenus/prob/pppfncdi.top +%%DATADIR%%/frmenus/prob/pppfnorm.top +%%DATADIR%%/frmenus/prob/pppfpare.top +%%DATADIR%%/frmenus/prob/pppfskew.top +%%DATADIR%%/frmenus/prob/pppfsymm.top +%%DATADIR%%/frmenus/prob/pppln.men +%%DATADIR%%/frmenus/prob/ppplnce.men +%%DATADIR%%/frmenus/prob/pppoi.men +%%DATADIR%%/frmenus/prob/pppowce.men +%%DATADIR%%/frmenus/prob/ppqbi.men +%%DATADIR%%/frmenus/prob/ppray.men +%%DATADIR%%/frmenus/prob/pprayce.men +%%DATADIR%%/frmenus/prob/pprecce.men +%%DATADIR%%/frmenus/prob/pprgt.men +%%DATADIR%%/frmenus/prob/pprgtce.men +%%DATADIR%%/frmenus/prob/pprig.men +%%DATADIR%%/frmenus/prob/pprigce.men +%%DATADIR%%/frmenus/prob/pprpoce.men +%%DATADIR%%/frmenus/prob/ppsdece.men +%%DATADIR%%/frmenus/prob/ppsem.men +%%DATADIR%%/frmenus/prob/ppsemce.men +%%DATADIR%%/frmenus/prob/ppsla.men +%%DATADIR%%/frmenus/prob/ppslace.men +%%DATADIR%%/frmenus/prob/ppsloce.men +%%DATADIR%%/frmenus/prob/ppsnce.men +%%DATADIR%%/frmenus/prob/ppst.men +%%DATADIR%%/frmenus/prob/ppstce.men +%%DATADIR%%/frmenus/prob/ppsubce.men +%%DATADIR%%/frmenus/prob/pptce.men +%%DATADIR%%/frmenus/prob/pptne.men +%%DATADIR%%/frmenus/prob/pptnece.men +%%DATADIR%%/frmenus/prob/pptnr.men +%%DATADIR%%/frmenus/prob/pptnrce.men +%%DATADIR%%/frmenus/prob/pptopce.men +%%DATADIR%%/frmenus/prob/pptra.men +%%DATADIR%%/frmenus/prob/pptrace.men +%%DATADIR%%/frmenus/prob/pptrice.men +%%DATADIR%%/frmenus/prob/pptso.men +%%DATADIR%%/frmenus/prob/pptsoce.men +%%DATADIR%%/frmenus/prob/pptsp.men +%%DATADIR%%/frmenus/prob/pptspce.men +%%DATADIR%%/frmenus/prob/pptss.men +%%DATADIR%%/frmenus/prob/pptssce.men +%%DATADIR%%/frmenus/prob/ppuni.men +%%DATADIR%%/frmenus/prob/ppunice.men +%%DATADIR%%/frmenus/prob/pputs.men +%%DATADIR%%/frmenus/prob/pputsce.men +%%DATADIR%%/frmenus/prob/ppvonce.men +%%DATADIR%%/frmenus/prob/ppwak.men +%%DATADIR%%/frmenus/prob/ppwakce.men +%%DATADIR%%/frmenus/prob/ppwar.men +%%DATADIR%%/frmenus/prob/ppwcace.men +%%DATADIR%%/frmenus/prob/ppyul.men +%%DATADIR%%/frmenus/prob/ppzet.men +%%DATADIR%%/frmenus/prob/ppzip.men +%%DATADIR%%/frmenus/prob/pqbicdf.men +%%DATADIR%%/frmenus/prob/pqbipdf.men +%%DATADIR%%/frmenus/prob/pqbippf.men +%%DATADIR%%/frmenus/prob/praycdf.men +%%DATADIR%%/frmenus/prob/praypdf.men +%%DATADIR%%/frmenus/prob/prayppf.men +%%DATADIR%%/frmenus/prob/preccdf.men +%%DATADIR%%/frmenus/prob/precpdf.men +%%DATADIR%%/frmenus/prob/precppf.men +%%DATADIR%%/frmenus/prob/prgtcdf.men +%%DATADIR%%/frmenus/prob/prgtpdf.men +%%DATADIR%%/frmenus/prob/prgtppf.men +%%DATADIR%%/frmenus/prob/prigcdf.men +%%DATADIR%%/frmenus/prob/prigchaz.men +%%DATADIR%%/frmenus/prob/prighaz.men +%%DATADIR%%/frmenus/prob/prigpdf.men +%%DATADIR%%/frmenus/prob/prigppf.men +%%DATADIR%%/frmenus/prob/prob.tar +%%DATADIR%%/frmenus/prob/prob.top +%%DATADIR%%/frmenus/prob/probpf.men +%%DATADIR%%/frmenus/prob/probplot.top +%%DATADIR%%/frmenus/prob/prpocdf.men +%%DATADIR%%/frmenus/prob/prpopdf.men +%%DATADIR%%/frmenus/prob/prpoppf.men +%%DATADIR%%/frmenus/prob/psdecdf.men +%%DATADIR%%/frmenus/prob/psdepdf.men +%%DATADIR%%/frmenus/prob/psdeppf.men +%%DATADIR%%/frmenus/prob/psemcdf.men +%%DATADIR%%/frmenus/prob/psempdf.men +%%DATADIR%%/frmenus/prob/psemppf.men +%%DATADIR%%/frmenus/prob/psh1acdf.top +%%DATADIR%%/frmenus/prob/psh1apdf.top +%%DATADIR%%/frmenus/prob/psh1appf.top +%%DATADIR%%/frmenus/prob/psh1bcdf.top +%%DATADIR%%/frmenus/prob/psh1bpdf.top +%%DATADIR%%/frmenus/prob/psh1bppf.top +%%DATADIR%%/frmenus/prob/psha1cdf.top +%%DATADIR%%/frmenus/prob/psha1pdf.top +%%DATADIR%%/frmenus/prob/psha1ppf.top +%%DATADIR%%/frmenus/prob/psha2cdf.top +%%DATADIR%%/frmenus/prob/psha2pdf.top +%%DATADIR%%/frmenus/prob/psha2ppf.top +%%DATADIR%%/frmenus/prob/psha3cdf.top +%%DATADIR%%/frmenus/prob/psha3pdf.top +%%DATADIR%%/frmenus/prob/psha3ppf.top +%%DATADIR%%/frmenus/prob/pslacdf.men +%%DATADIR%%/frmenus/prob/pslapdf.men +%%DATADIR%%/frmenus/prob/pslappf.men +%%DATADIR%%/frmenus/prob/pslocdf.men +%%DATADIR%%/frmenus/prob/pslopdf.men +%%DATADIR%%/frmenus/prob/psloppf.men +%%DATADIR%%/frmenus/prob/psncdf.men +%%DATADIR%%/frmenus/prob/psnpdf.men +%%DATADIR%%/frmenus/prob/psnppf.men +%%DATADIR%%/frmenus/prob/pstcdf.men +%%DATADIR%%/frmenus/prob/pstpdf.men +%%DATADIR%%/frmenus/prob/pstppf.men +%%DATADIR%%/frmenus/prob/psubcdf.men +%%DATADIR%%/frmenus/prob/psubpdf.men +%%DATADIR%%/frmenus/prob/psubppf.men +%%DATADIR%%/frmenus/prob/ptcdf.men +%%DATADIR%%/frmenus/prob/ptnecdf.men +%%DATADIR%%/frmenus/prob/ptnepdf.men +%%DATADIR%%/frmenus/prob/ptneppf.men +%%DATADIR%%/frmenus/prob/ptnrcdf.men +%%DATADIR%%/frmenus/prob/ptnrpdf.men +%%DATADIR%%/frmenus/prob/ptnrppf.men +%%DATADIR%%/frmenus/prob/ptopcdf.men +%%DATADIR%%/frmenus/prob/ptoppdf.men +%%DATADIR%%/frmenus/prob/ptopppf.men +%%DATADIR%%/frmenus/prob/ptpdf.men +%%DATADIR%%/frmenus/prob/ptppf.men +%%DATADIR%%/frmenus/prob/ptracdf.men +%%DATADIR%%/frmenus/prob/ptrapdf.men +%%DATADIR%%/frmenus/prob/ptrappf.men +%%DATADIR%%/frmenus/prob/ptricdf.men +%%DATADIR%%/frmenus/prob/ptripdf.men +%%DATADIR%%/frmenus/prob/ptrippf.men +%%DATADIR%%/frmenus/prob/ptsocdf.men +%%DATADIR%%/frmenus/prob/ptsopdf.men +%%DATADIR%%/frmenus/prob/ptsoppf.men +%%DATADIR%%/frmenus/prob/ptspcdf.men +%%DATADIR%%/frmenus/prob/ptsppdf.men +%%DATADIR%%/frmenus/prob/ptspppf.men +%%DATADIR%%/frmenus/prob/ptsscdf.men +%%DATADIR%%/frmenus/prob/ptsspdf.men +%%DATADIR%%/frmenus/prob/ptssppf.men +%%DATADIR%%/frmenus/prob/punicdf.men +%%DATADIR%%/frmenus/prob/punichaz.men +%%DATADIR%%/frmenus/prob/punihaz.men +%%DATADIR%%/frmenus/prob/punipdf.men +%%DATADIR%%/frmenus/prob/punippf.men +%%DATADIR%%/frmenus/prob/punisf.men +%%DATADIR%%/frmenus/prob/putscdf.men +%%DATADIR%%/frmenus/prob/putspdf.men +%%DATADIR%%/frmenus/prob/putsppf.men +%%DATADIR%%/frmenus/prob/pvoncdf.men +%%DATADIR%%/frmenus/prob/pvonpdf.men +%%DATADIR%%/frmenus/prob/pvonppf.men +%%DATADIR%%/frmenus/prob/pwakcdf.men +%%DATADIR%%/frmenus/prob/pwakpdf.men +%%DATADIR%%/frmenus/prob/pwakppf.men +%%DATADIR%%/frmenus/prob/pwalcdf.men +%%DATADIR%%/frmenus/prob/pwalchaz.men +%%DATADIR%%/frmenus/prob/pwalhaz.men +%%DATADIR%%/frmenus/prob/pwalpdf.men +%%DATADIR%%/frmenus/prob/pwalppf.men +%%DATADIR%%/frmenus/prob/pwarcdf.men +%%DATADIR%%/frmenus/prob/pwarpdf.men +%%DATADIR%%/frmenus/prob/pwarppf.men +%%DATADIR%%/frmenus/prob/pwcacdf.men +%%DATADIR%%/frmenus/prob/pwcapdf.men +%%DATADIR%%/frmenus/prob/pwcappf.men +%%DATADIR%%/frmenus/prob/pwei1cdf.men +%%DATADIR%%/frmenus/prob/pwei1cha.men +%%DATADIR%%/frmenus/prob/pwei1haz.men +%%DATADIR%%/frmenus/prob/pwei1pdf.men +%%DATADIR%%/frmenus/prob/pwei1ppf.men +%%DATADIR%%/frmenus/prob/pwei2cdf.men +%%DATADIR%%/frmenus/prob/pwei2cha.men +%%DATADIR%%/frmenus/prob/pwei2haz.men +%%DATADIR%%/frmenus/prob/pwei2pdf.men +%%DATADIR%%/frmenus/prob/pwei2ppf.men +%%DATADIR%%/frmenus/prob/pweicdf.men +%%DATADIR%%/frmenus/prob/pweipdf.men +%%DATADIR%%/frmenus/prob/pyulcdf.men +%%DATADIR%%/frmenus/prob/pyulpdf.men +%%DATADIR%%/frmenus/prob/pyulppf.men +%%DATADIR%%/frmenus/prob/pzetcdf.men +%%DATADIR%%/frmenus/prob/pzetpdf.men +%%DATADIR%%/frmenus/prob/pzetppf.men +%%DATADIR%%/frmenus/prob/pzipcdf.men +%%DATADIR%%/frmenus/prob/pzippdf.men +%%DATADIR%%/frmenus/prob/pzipppf.men +%%DATADIR%%/frmenus/prob/qbicdf.men +%%DATADIR%%/frmenus/prob/qbihispd.men +%%DATADIR%%/frmenus/prob/qbipdf.men +%%DATADIR%%/frmenus/prob/qbippf.men +%%DATADIR%%/frmenus/prob/qqplotma.men +%%DATADIR%%/frmenus/prob/randnumb.top +%%DATADIR%%/frmenus/prob/randwalk.top +%%DATADIR%%/frmenus/prob/ray2mle.men +%%DATADIR%%/frmenus/prob/raycdf.men +%%DATADIR%%/frmenus/prob/rayhispd.men +%%DATADIR%%/frmenus/prob/raymle.men +%%DATADIR%%/frmenus/prob/raypdf.men +%%DATADIR%%/frmenus/prob/rayppf.men +%%DATADIR%%/frmenus/prob/reccdf.men +%%DATADIR%%/frmenus/prob/rechispd.men +%%DATADIR%%/frmenus/prob/recpdf.men +%%DATADIR%%/frmenus/prob/recppcc.men +%%DATADIR%%/frmenus/prob/recppccc.men +%%DATADIR%%/frmenus/prob/recppf.men +%%DATADIR%%/frmenus/prob/recprob.men +%%DATADIR%%/frmenus/prob/rgtcdf.men +%%DATADIR%%/frmenus/prob/rgthispd.men +%%DATADIR%%/frmenus/prob/rgtpdf.men +%%DATADIR%%/frmenus/prob/rgtppf.men +%%DATADIR%%/frmenus/prob/rigcdf.men +%%DATADIR%%/frmenus/prob/rigchaz.men +%%DATADIR%%/frmenus/prob/rigdesc.top +%%DATADIR%%/frmenus/prob/righaz.men +%%DATADIR%%/frmenus/prob/righispd.men +%%DATADIR%%/frmenus/prob/rigpdf.men +%%DATADIR%%/frmenus/prob/rigppf.men +%%DATADIR%%/frmenus/prob/rpocdf.men +%%DATADIR%%/frmenus/prob/rpohispd.men +%%DATADIR%%/frmenus/prob/rpopdf.men +%%DATADIR%%/frmenus/prob/rpoppcc.men +%%DATADIR%%/frmenus/prob/rpoppccc.men +%%DATADIR%%/frmenus/prob/rpoppf.men +%%DATADIR%%/frmenus/prob/rpoprob.men +%%DATADIR%%/frmenus/prob/s1acppcc.top +%%DATADIR%%/frmenus/prob/s1acprob.top +%%DATADIR%%/frmenus/prob/s1appccb.men +%%DATADIR%%/frmenus/prob/s1appccb.top +%%DATADIR%%/frmenus/prob/s1bcppcc.top +%%DATADIR%%/frmenus/prob/s1bcprob.top +%%DATADIR%%/frmenus/prob/s1bppccb.top +%%DATADIR%%/frmenus/prob/s1ppccbo.top +%%DATADIR%%/frmenus/prob/sdecdf.men +%%DATADIR%%/frmenus/prob/sdehispd.men +%%DATADIR%%/frmenus/prob/sdepdf.men +%%DATADIR%%/frmenus/prob/sdeppcc.men +%%DATADIR%%/frmenus/prob/sdeppccc.men +%%DATADIR%%/frmenus/prob/sdeppf.men +%%DATADIR%%/frmenus/prob/sdeprob.men +%%DATADIR%%/frmenus/prob/semcdf.men +%%DATADIR%%/frmenus/prob/semdesc.top +%%DATADIR%%/frmenus/prob/semhispd.men +%%DATADIR%%/frmenus/prob/sempdf.men +%%DATADIR%%/frmenus/prob/semppf.men +%%DATADIR%%/frmenus/prob/setgene.men +%%DATADIR%%/frmenus/prob/setseed.men +%%DATADIR%%/frmenus/prob/sh1ahisp.top +%%DATADIR%%/frmenus/prob/sh1appcc.top +%%DATADIR%%/frmenus/prob/sh1aprob.top +%%DATADIR%%/frmenus/prob/sh1bhisp.top +%%DATADIR%%/frmenus/prob/sh1bppcc.top +%%DATADIR%%/frmenus/prob/sh1bprob.top +%%DATADIR%%/frmenus/prob/sh1cppcc.top +%%DATADIR%%/frmenus/prob/sh1cprob.top +%%DATADIR%%/frmenus/prob/sh2cppcc.top +%%DATADIR%%/frmenus/prob/sh2cprob.top +%%DATADIR%%/frmenus/prob/sh3cprob.top +%%DATADIR%%/frmenus/prob/sha1acdf.top +%%DATADIR%%/frmenus/prob/sha1apdf.top +%%DATADIR%%/frmenus/prob/sha1appf.top +%%DATADIR%%/frmenus/prob/sha1aran.top +%%DATADIR%%/frmenus/prob/sha1bcdf.top +%%DATADIR%%/frmenus/prob/sha1bpdf.top +%%DATADIR%%/frmenus/prob/sha1bppf.top +%%DATADIR%%/frmenus/prob/sha1bran.top +%%DATADIR%%/frmenus/prob/sha1hisp.top +%%DATADIR%%/frmenus/prob/sha1ppcc.top +%%DATADIR%%/frmenus/prob/sha1prob.top +%%DATADIR%%/frmenus/prob/sha2hisp.top +%%DATADIR%%/frmenus/prob/sha2ppcc.top +%%DATADIR%%/frmenus/prob/sha2prob.top +%%DATADIR%%/frmenus/prob/sha3hisp.top +%%DATADIR%%/frmenus/prob/sha3prob.top +%%DATADIR%%/frmenus/prob/shap1aad.top +%%DATADIR%%/frmenus/prob/shap1aks.top +%%DATADIR%%/frmenus/prob/shap1bad.top +%%DATADIR%%/frmenus/prob/shap1bks.top +%%DATADIR%%/frmenus/prob/shap1cdf.top +%%DATADIR%%/frmenus/prob/shap1ks.top +%%DATADIR%%/frmenus/prob/shap1mle.top +%%DATADIR%%/frmenus/prob/shap1pdf.top +%%DATADIR%%/frmenus/prob/shap1ppf.top +%%DATADIR%%/frmenus/prob/shap1ran.top +%%DATADIR%%/frmenus/prob/shap2ad.top +%%DATADIR%%/frmenus/prob/shap2cdf.top +%%DATADIR%%/frmenus/prob/shap2ks.top +%%DATADIR%%/frmenus/prob/shap2mle.top +%%DATADIR%%/frmenus/prob/shap2pdf.top +%%DATADIR%%/frmenus/prob/shap2ppf.top +%%DATADIR%%/frmenus/prob/shap2ran.top +%%DATADIR%%/frmenus/prob/shap3ad.top +%%DATADIR%%/frmenus/prob/shap3cdf.top +%%DATADIR%%/frmenus/prob/shap3ks.top +%%DATADIR%%/frmenus/prob/shap3pdf.top +%%DATADIR%%/frmenus/prob/shap3ppf.top +%%DATADIR%%/frmenus/prob/shap3ran.top +%%DATADIR%%/frmenus/prob/skewcdf.top +%%DATADIR%%/frmenus/prob/skewdesc.top +%%DATADIR%%/frmenus/prob/skewhisp.top +%%DATADIR%%/frmenus/prob/skewpdf.top +%%DATADIR%%/frmenus/prob/skewppf.top +%%DATADIR%%/frmenus/prob/slacdf.men +%%DATADIR%%/frmenus/prob/slahispd.men +%%DATADIR%%/frmenus/prob/slapdf.men +%%DATADIR%%/frmenus/prob/slappf.men +%%DATADIR%%/frmenus/prob/slocdf.men +%%DATADIR%%/frmenus/prob/slohispd.men +%%DATADIR%%/frmenus/prob/slopdf.men +%%DATADIR%%/frmenus/prob/sloppcc.men +%%DATADIR%%/frmenus/prob/sloppccc.men +%%DATADIR%%/frmenus/prob/sloppf.men +%%DATADIR%%/frmenus/prob/sloprob.men +%%DATADIR%%/frmenus/prob/sncdf.men +%%DATADIR%%/frmenus/prob/snhispd.men +%%DATADIR%%/frmenus/prob/snpdf.men +%%DATADIR%%/frmenus/prob/snppcc.men +%%DATADIR%%/frmenus/prob/snppccc.men +%%DATADIR%%/frmenus/prob/snppf.men +%%DATADIR%%/frmenus/prob/snprob.men +%%DATADIR%%/frmenus/prob/specfit.top +%%DATADIR%%/frmenus/prob/statproc.top +%%DATADIR%%/frmenus/prob/stcdf.men +%%DATADIR%%/frmenus/prob/sthispd.men +%%DATADIR%%/frmenus/prob/stocproc.top +%%DATADIR%%/frmenus/prob/stpdf.men +%%DATADIR%%/frmenus/prob/stppf.men +%%DATADIR%%/frmenus/prob/subcdf.men +%%DATADIR%%/frmenus/prob/subhispd.men +%%DATADIR%%/frmenus/prob/subpdf.men +%%DATADIR%%/frmenus/prob/subppcc.men +%%DATADIR%%/frmenus/prob/subppccc.men +%%DATADIR%%/frmenus/prob/subppf.men +%%DATADIR%%/frmenus/prob/subprob.men +%%DATADIR%%/frmenus/prob/symmcdf.top +%%DATADIR%%/frmenus/prob/symmdesc.top +%%DATADIR%%/frmenus/prob/symmhisp.top +%%DATADIR%%/frmenus/prob/symmpdf.top +%%DATADIR%%/frmenus/prob/symmppf.top +%%DATADIR%%/frmenus/prob/tcdf.men +%%DATADIR%%/frmenus/prob/tdesc.top +%%DATADIR%%/frmenus/prob/thispd.men +%%DATADIR%%/frmenus/prob/tnecdf.men +%%DATADIR%%/frmenus/prob/tnehispd.men +%%DATADIR%%/frmenus/prob/tnepdf.men +%%DATADIR%%/frmenus/prob/tneppf.men +%%DATADIR%%/frmenus/prob/tnrcdf.men +%%DATADIR%%/frmenus/prob/tnrhispd.men +%%DATADIR%%/frmenus/prob/tnrpdf.men +%%DATADIR%%/frmenus/prob/tnrppf.men +%%DATADIR%%/frmenus/prob/topcdf.men +%%DATADIR%%/frmenus/prob/tophispd.men +%%DATADIR%%/frmenus/prob/topmle.men +%%DATADIR%%/frmenus/prob/toppdf.men +%%DATADIR%%/frmenus/prob/topppcc.men +%%DATADIR%%/frmenus/prob/topppccc.men +%%DATADIR%%/frmenus/prob/topppf.men +%%DATADIR%%/frmenus/prob/topprob.men +%%DATADIR%%/frmenus/prob/tpdf.men +%%DATADIR%%/frmenus/prob/tppcc.men +%%DATADIR%%/frmenus/prob/tppccc.men +%%DATADIR%%/frmenus/prob/tppf.men +%%DATADIR%%/frmenus/prob/tprob.men +%%DATADIR%%/frmenus/prob/tracdf.men +%%DATADIR%%/frmenus/prob/trahispd.men +%%DATADIR%%/frmenus/prob/trapdf.men +%%DATADIR%%/frmenus/prob/trappf.men +%%DATADIR%%/frmenus/prob/tricdf.men +%%DATADIR%%/frmenus/prob/tridesc.top +%%DATADIR%%/frmenus/prob/trihispd.men +%%DATADIR%%/frmenus/prob/tripdf.men +%%DATADIR%%/frmenus/prob/trippcc.men +%%DATADIR%%/frmenus/prob/trippccc.men +%%DATADIR%%/frmenus/prob/trippf.men +%%DATADIR%%/frmenus/prob/triprob.men +%%DATADIR%%/frmenus/prob/tsocdf.men +%%DATADIR%%/frmenus/prob/tsohispd.men +%%DATADIR%%/frmenus/prob/tsopdf.men +%%DATADIR%%/frmenus/prob/tsoppf.men +%%DATADIR%%/frmenus/prob/tspcdf.men +%%DATADIR%%/frmenus/prob/tsphispd.men +%%DATADIR%%/frmenus/prob/tspmle.men +%%DATADIR%%/frmenus/prob/tsppdf.men +%%DATADIR%%/frmenus/prob/tspppf.men +%%DATADIR%%/frmenus/prob/tsscdf.men +%%DATADIR%%/frmenus/prob/tsshispd.men +%%DATADIR%%/frmenus/prob/tsspdf.men +%%DATADIR%%/frmenus/prob/tssppf.men +%%DATADIR%%/frmenus/prob/tukcdf.men +%%DATADIR%%/frmenus/prob/tukdesc.top +%%DATADIR%%/frmenus/prob/tukhispd.men +%%DATADIR%%/frmenus/prob/tukpdf.men +%%DATADIR%%/frmenus/prob/tukppf.men +%%DATADIR%%/frmenus/prob/unicdf.men +%%DATADIR%%/frmenus/prob/unichaz.men +%%DATADIR%%/frmenus/prob/unidesc.top +%%DATADIR%%/frmenus/prob/unihaz.men +%%DATADIR%%/frmenus/prob/unihispd.men +%%DATADIR%%/frmenus/prob/unimle.men +%%DATADIR%%/frmenus/prob/unipdf.men +%%DATADIR%%/frmenus/prob/unippf.men +%%DATADIR%%/frmenus/prob/utscdf.men +%%DATADIR%%/frmenus/prob/utshispd.men +%%DATADIR%%/frmenus/prob/utspdf.men +%%DATADIR%%/frmenus/prob/utsppf.men +%%DATADIR%%/frmenus/prob/viewprob.top +%%DATADIR%%/frmenus/prob/voncdf.men +%%DATADIR%%/frmenus/prob/vonhispd.men +%%DATADIR%%/frmenus/prob/vonpdf.men +%%DATADIR%%/frmenus/prob/vonppcc.men +%%DATADIR%%/frmenus/prob/vonppccc.men +%%DATADIR%%/frmenus/prob/vonppf.men +%%DATADIR%%/frmenus/prob/vonprob.men +%%DATADIR%%/frmenus/prob/wakcdf.men +%%DATADIR%%/frmenus/prob/wakhispd.men +%%DATADIR%%/frmenus/prob/wakpdf.men +%%DATADIR%%/frmenus/prob/wakppf.men +%%DATADIR%%/frmenus/prob/walcdf.men +%%DATADIR%%/frmenus/prob/walchaz.men +%%DATADIR%%/frmenus/prob/waldesc.top +%%DATADIR%%/frmenus/prob/walhaz.men +%%DATADIR%%/frmenus/prob/walhispd.men +%%DATADIR%%/frmenus/prob/walpdf.men +%%DATADIR%%/frmenus/prob/walppf.men +%%DATADIR%%/frmenus/prob/warcdf.men +%%DATADIR%%/frmenus/prob/warhispd.men +%%DATADIR%%/frmenus/prob/warpdf.men +%%DATADIR%%/frmenus/prob/warppf.men +%%DATADIR%%/frmenus/prob/wcacdf.men +%%DATADIR%%/frmenus/prob/wcahispd.men +%%DATADIR%%/frmenus/prob/wcapdf.men +%%DATADIR%%/frmenus/prob/wcappcc.men +%%DATADIR%%/frmenus/prob/wcappccc.men +%%DATADIR%%/frmenus/prob/wcappf.men +%%DATADIR%%/frmenus/prob/wcaprob.men +%%DATADIR%%/frmenus/prob/wei1cdf.men +%%DATADIR%%/frmenus/prob/wei1chaz.men +%%DATADIR%%/frmenus/prob/wei1desc.top +%%DATADIR%%/frmenus/prob/wei1haz.men +%%DATADIR%%/frmenus/prob/wei1hisp.men +%%DATADIR%%/frmenus/prob/wei1pdf.men +%%DATADIR%%/frmenus/prob/wei1ppf.men +%%DATADIR%%/frmenus/prob/wei2cdf.men +%%DATADIR%%/frmenus/prob/wei2chaz.men +%%DATADIR%%/frmenus/prob/wei2desc.top +%%DATADIR%%/frmenus/prob/wei2haz.men +%%DATADIR%%/frmenus/prob/wei2hisp.men +%%DATADIR%%/frmenus/prob/wei2pdf.men +%%DATADIR%%/frmenus/prob/wei2ppf.men +%%DATADIR%%/frmenus/prob/yulcdf.men +%%DATADIR%%/frmenus/prob/yulhispd.men +%%DATADIR%%/frmenus/prob/yulpdf.men +%%DATADIR%%/frmenus/prob/yulppcc.men +%%DATADIR%%/frmenus/prob/yulppf.men +%%DATADIR%%/frmenus/prob/zetcdf.men +%%DATADIR%%/frmenus/prob/zethispd.men +%%DATADIR%%/frmenus/prob/zetpdf.men +%%DATADIR%%/frmenus/prob/zetppcc.men +%%DATADIR%%/frmenus/prob/zetppf.men +%%DATADIR%%/frmenus/prob/zipcdf.men +%%DATADIR%%/frmenus/prob/ziphispd.men +%%DATADIR%%/frmenus/prob/zippdf.men +%%DATADIR%%/frmenus/prob/zipppcc.men +%%DATADIR%%/frmenus/prob/zipppf.men +%%DATADIR%%/frmenus/qual/1988winn.top +%%DATADIR%%/frmenus/qual/1989winn.top +%%DATADIR%%/frmenus/qual/1990winn.top +%%DATADIR%%/frmenus/qual/1991winn.top +%%DATADIR%%/frmenus/qual/1992winn.top +%%DATADIR%%/frmenus/qual/1993winn.top +%%DATADIR%%/frmenus/qual/7oldrefe.top +%%DATADIR%%/frmenus/qual/7oldtool.top +%%DATADIR%%/frmenus/qual/accept.top +%%DATADIR%%/frmenus/qual/accrejss.men +%%DATADIR%%/frmenus/qual/amescont.top +%%DATADIR%%/frmenus/qual/aoqds.men +%%DATADIR%%/frmenus/qual/aoqss.men +%%DATADIR%%/frmenus/qual/applinfo.top +%%DATADIR%%/frmenus/qual/arlchart.top +%%DATADIR%%/frmenus/qual/asnds.men +%%DATADIR%%/frmenus/qual/asnsl.men +%%DATADIR%%/frmenus/qual/atids.men +%%DATADIR%%/frmenus/qual/atiss.men +%%DATADIR%%/frmenus/qual/attnscon.top +%%DATADIR%%/frmenus/qual/attuccon.top +%%DATADIR%%/frmenus/qual/awarcri1.top +%%DATADIR%%/frmenus/qual/awarcri2.top +%%DATADIR%%/frmenus/qual/awarcri3.top +%%DATADIR%%/frmenus/qual/awarcri4.top +%%DATADIR%%/frmenus/qual/awarcri5.top +%%DATADIR%%/frmenus/qual/awarcri6.top +%%DATADIR%%/frmenus/qual/awarcri7.top +%%DATADIR%%/frmenus/qual/awarcrit.top +%%DATADIR%%/frmenus/qual/baldrefe.top +%%DATADIR%%/frmenus/qual/baldrige.top +%%DATADIR%%/frmenus/qual/cadicont.top +%%DATADIR%%/frmenus/qual/carl.men +%%DATADIR%%/frmenus/qual/cc.men +%%DATADIR%%/frmenus/qual/ccont.men +%%DATADIR%%/frmenus/qual/checksh.top +%%DATADIR%%/frmenus/qual/cnpk.men +%%DATADIR%%/frmenus/qual/coc.men +%%DATADIR%%/frmenus/qual/cochdisc.top +%%DATADIR%%/frmenus/qual/cochrefe.top +%%DATADIR%%/frmenus/qual/contchar.men +%%DATADIR%%/frmenus/qual/contchar.top +%%DATADIR%%/frmenus/qual/cp.men +%%DATADIR%%/frmenus/qual/cpk.men +%%DATADIR%%/frmenus/qual/cpk.top +%%DATADIR%%/frmenus/qual/cpkplot.top +%%DATADIR%%/frmenus/qual/cpkrefer.top +%%DATADIR%%/frmenus/qual/cpkstat.top +%%DATADIR%%/frmenus/qual/cpm.men +%%DATADIR%%/frmenus/qual/cusum.men +%%DATADIR%%/frmenus/qual/cusumarl.men +%%DATADIR%%/frmenus/qual/datasets.top +%%DATADIR%%/frmenus/qual/deming14.top +%%DATADIR%%/frmenus/qual/discacce.top +%%DATADIR%%/frmenus/qual/disccoun.top +%%DATADIR%%/frmenus/qual/disccumu.top +%%DATADIR%%/frmenus/qual/discewma.top +%%DATADIR%%/frmenus/qual/discmove.top +%%DATADIR%%/frmenus/qual/discmult.top +%%DATADIR%%/frmenus/qual/discussi.top +%%DATADIR%%/frmenus/qual/discxbar.top +%%DATADIR%%/frmenus/qual/eastcont.top +%%DATADIR%%/frmenus/qual/ewma.top +%%DATADIR%%/frmenus/qual/ewmacont.men +%%DATADIR%%/frmenus/qual/exp_loss.men +%%DATADIR%%/frmenus/qual/fedxcont.top +%%DATADIR%%/frmenus/qual/globcont.top +%%DATADIR%%/frmenus/qual/grancont.top +%%DATADIR%%/frmenus/qual/hotecon2.men +%%DATADIR%%/frmenus/qual/hotecon3.men +%%DATADIR%%/frmenus/qual/hotecon4.men +%%DATADIR%%/frmenus/qual/hotecont.men +%%DATADIR%%/frmenus/qual/ibmconta.top +%%DATADIR%%/frmenus/qual/ishikawa.men.not_working +%%DATADIR%%/frmenus/qual/ishikawa.top +%%DATADIR%%/frmenus/qual/marlcont.top +%%DATADIR%%/frmenus/qual/millcont.top +%%DATADIR%%/frmenus/qual/motocont.top +%%DATADIR%%/frmenus/qual/movrcont.men +%%DATADIR%%/frmenus/qual/movscont.men +%%DATADIR%%/frmenus/qual/movxcont.men +%%DATADIR%%/frmenus/qual/mpc.top +%%DATADIR%%/frmenus/qual/npcont.men +%%DATADIR%%/frmenus/qual/occhart.top +%%DATADIR%%/frmenus/qual/occsp1.men +%%DATADIR%%/frmenus/qual/ocds.men +%%DATADIR%%/frmenus/qual/ocsl.men +%%DATADIR%%/frmenus/qual/ocssa.men +%%DATADIR%%/frmenus/qual/ocssb.men +%%DATADIR%%/frmenus/qual/parl.men +%%DATADIR%%/frmenus/qual/pcont.men +%%DATADIR%%/frmenus/qual/percdefe.men +%%DATADIR%%/frmenus/qual/planss.men +%%DATADIR%%/frmenus/qual/poc.men +%%DATADIR%%/frmenus/qual/prevwinn.top +%%DATADIR%%/frmenus/qual/princont.men +%%DATADIR%%/frmenus/qual/qual.top +%%DATADIR%%/frmenus/qual/qualdisc.top +%%DATADIR%%/frmenus/qual/qualfram.top +%%DATADIR%%/frmenus/qual/rangcont.men +%%DATADIR%%/frmenus/qual/referenc.top +%%DATADIR%%/frmenus/qual/ritzcont.top +%%DATADIR%%/frmenus/qual/sdcont.men +%%DATADIR%%/frmenus/qual/solecont.top +%%DATADIR%%/frmenus/qual/spcdiscu.top +%%DATADIR%%/frmenus/qual/tagplot.men +%%DATADIR%%/frmenus/qual/tagrefer.top +%%DATADIR%%/frmenus/qual/tagstat.men +%%DATADIR%%/frmenus/qual/taguchi.top +%%DATADIR%%/frmenus/qual/ticontac.top +%%DATADIR%%/frmenus/qual/ucont.men +%%DATADIR%%/frmenus/qual/wallcont.top +%%DATADIR%%/frmenus/qual/westcont.top +%%DATADIR%%/frmenus/qual/xbararl.men +%%DATADIR%%/frmenus/qual/xbarcont.men +%%DATADIR%%/frmenus/qual/xbaroc.men +%%DATADIR%%/frmenus/qual/xerocont.top +%%DATADIR%%/frmenus/qual/zytecont.top +%%DATADIR%%/frmenus/refman/command.men +%%DATADIR%%/frmenus/refman/refman.top +%%DATADIR%%/frmenus/reli/4plot.men +%%DATADIR%%/frmenus/reli/acelassu.top +%%DATADIR%%/frmenus/reli/acelerat.top +%%DATADIR%%/frmenus/reli/acelexpm.top +%%DATADIR%%/frmenus/reli/acelexpo.top +%%DATADIR%%/frmenus/reli/acellgnm.top +%%DATADIR%%/frmenus/reli/acellogn.top +%%DATADIR%%/frmenus/reli/acelnota.top +%%DATADIR%%/frmenus/reli/acelrela.top +%%DATADIR%%/frmenus/reli/acelweib.top +%%DATADIR%%/frmenus/reli/acelweim.top +%%DATADIR%%/frmenus/reli/adev11.men +%%DATADIR%%/frmenus/reli/adev12.men +%%DATADIR%%/frmenus/reli/adexp.men +%%DATADIR%%/frmenus/reli/adgamma.men +%%DATADIR%%/frmenus/reli/adgep.men +%%DATADIR%%/frmenus/reli/adlogn.men +%%DATADIR%%/frmenus/reli/adnorm.men +%%DATADIR%%/frmenus/reli/adweib.men +%%DATADIR%%/frmenus/reli/andedarl.top +%%DATADIR%%/frmenus/reli/arrenh.top +%%DATADIR%%/frmenus/reli/arrplot.men +%%DATADIR%%/frmenus/reli/bestfitd.top +%%DATADIR%%/frmenus/reli/bootev11.men +%%DATADIR%%/frmenus/reli/bootev12.men +%%DATADIR%%/frmenus/reli/bootev21.men +%%DATADIR%%/frmenus/reli/bootev22.men +%%DATADIR%%/frmenus/reli/bootexp.men +%%DATADIR%%/frmenus/reli/bootfl.men +%%DATADIR%%/frmenus/reli/bootgam.men +%%DATADIR%%/frmenus/reli/bootgee.men +%%DATADIR%%/frmenus/reli/bootgep.men +%%DATADIR%%/frmenus/reli/bootgep2.men +%%DATADIR%%/frmenus/reli/bootgev.men +%%DATADIR%%/frmenus/reli/bootgev1.men +%%DATADIR%%/frmenus/reli/bootgev2.men +%%DATADIR%%/frmenus/reli/bootiga.men +%%DATADIR%%/frmenus/reli/bootiwe.men +%%DATADIR%%/frmenus/reli/bootlga.men +%%DATADIR%%/frmenus/reli/bootlgn.men +%%DATADIR%%/frmenus/reli/bootnor.men +%%DATADIR%%/frmenus/reli/bootpex.men +%%DATADIR%%/frmenus/reli/bootwal.men +%%DATADIR%%/frmenus/reli/bootwei1.men +%%DATADIR%%/frmenus/reli/bootwei2.men +%%DATADIR%%/frmenus/reli/censor.top +%%DATADIR%%/frmenus/reli/chsnor.men +%%DATADIR%%/frmenus/reli/cme.men +%%DATADIR%%/frmenus/reli/comp2exp.men +%%DATADIR%%/frmenus/reli/compute.top +%%DATADIR%%/frmenus/reli/cummean.men +%%DATADIR%%/frmenus/reli/cumrplot.men +%%DATADIR%%/frmenus/reli/cumuhaza.men +%%DATADIR%%/frmenus/reli/datasets.top +%%DATADIR%%/frmenus/reli/dehaan.men +%%DATADIR%%/frmenus/reli/discacel.top +%%DATADIR%%/frmenus/reli/discexpl.top +%%DATADIR%%/frmenus/reli/discgrow.top +%%DATADIR%%/frmenus/reli/dischpp.top +%%DATADIR%%/frmenus/reli/discks.top +%%DATADIR%%/frmenus/reli/discmle.top +%%DATADIR%%/frmenus/reli/discnonr.top +%%DATADIR%%/frmenus/reli/discpara.top +%%DATADIR%%/frmenus/reli/discppbo.top +%%DATADIR%%/frmenus/reli/discppcc.top +%%DATADIR%%/frmenus/reli/discreda.top +%%DATADIR%%/frmenus/reli/discrene.top +%%DATADIR%%/frmenus/reli/discrepa.top +%%DATADIR%%/frmenus/reli/discrepl.top +%%DATADIR%%/frmenus/reli/discrn.top +%%DATADIR%%/frmenus/reli/discseri.top +%%DATADIR%%/frmenus/reli/discsyst.top +%%DATADIR%%/frmenus/reli/disctren.top +%%DATADIR%%/frmenus/reli/distmode.top +%%DATADIR%%/frmenus/reli/edanpdis.top +%%DATADIR%%/frmenus/reli/edapardi.top +%%DATADIR%%/frmenus/reli/efitdisc.top +%%DATADIR%%/frmenus/reli/eppnpdis.top +%%DATADIR%%/frmenus/reli/epppardi.top +%%DATADIR%%/frmenus/reli/estbfdf.top +%%DATADIR%%/frmenus/reli/estbfdpa.top +%%DATADIR%%/frmenus/reli/estdadef.top +%%DATADIR%%/frmenus/reli/estdanp.top +%%DATADIR%%/frmenus/reli/estdapar.top +%%DATADIR%%/frmenus/reli/estdesal.top +%%DATADIR%%/frmenus/reli/estemcdf.top +%%DATADIR%%/frmenus/reli/estemchf.top +%%DATADIR%%/frmenus/reli/estemdv.top +%%DATADIR%%/frmenus/reli/estemhf.top +%%DATADIR%%/frmenus/reli/estemmrl.top +%%DATADIR%%/frmenus/reli/estempdf.top +%%DATADIR%%/frmenus/reli/estemppf.top +%%DATADIR%%/frmenus/reli/estemrf.top +%%DATADIR%%/frmenus/reli/estimate.top +%%DATADIR%%/frmenus/reli/estmeali.top +%%DATADIR%%/frmenus/reli/estmlske.top +%%DATADIR%%/frmenus/reli/estmlsym.top +%%DATADIR%%/frmenus/reli/estperpo.top +%%DATADIR%%/frmenus/reli/estppdef.top +%%DATADIR%%/frmenus/reli/estppnp.top +%%DATADIR%%/frmenus/reli/estpppar.top +%%DATADIR%%/frmenus/reli/esttaipr.top +%%DATADIR%%/frmenus/reli/esttldef.top +%%DATADIR%%/frmenus/reli/esttlnp.top +%%DATADIR%%/frmenus/reli/esttlpar.top +%%DATADIR%%/frmenus/reli/esttolli.top +%%DATADIR%%/frmenus/reli/esttpdef.top +%%DATADIR%%/frmenus/reli/esttpnp.top +%%DATADIR%%/frmenus/reli/esttppar.top +%%DATADIR%%/frmenus/reli/etlnpdis.top +%%DATADIR%%/frmenus/reli/etlpardi.top +%%DATADIR%%/frmenus/reli/etpnpdis.top +%%DATADIR%%/frmenus/reli/etppardi.top +%%DATADIR%%/frmenus/reli/evandeda.top +%%DATADIR%%/frmenus/reli/evbfd.top +%%DATADIR%%/frmenus/reli/evdesc.top +%%DATADIR%%/frmenus/reli/evdisc.top +%%DATADIR%%/frmenus/reli/evhistpd.top +%%DATADIR%%/frmenus/reli/evks.top +%%DATADIR%%/frmenus/reli/evmle.top +%%DATADIR%%/frmenus/reli/evppccbo.top +%%DATADIR%%/frmenus/reli/evppccpl.top +%%DATADIR%%/frmenus/reli/evprpl.top +%%DATADIR%%/frmenus/reli/evrefere.top +%%DATADIR%%/frmenus/reli/evsimula.top +%%DATADIR%%/frmenus/reli/expecdf.men +%%DATADIR%%/frmenus/reli/explawls.men +%%DATADIR%%/frmenus/reli/explawml.men +%%DATADIR%%/frmenus/reli/expo2ml.men +%%DATADIR%%/frmenus/reli/expo2mlc.men +%%DATADIR%%/frmenus/reli/expo2pp.men +%%DATADIR%%/frmenus/reli/expo2ppc.men +%%DATADIR%%/frmenus/reli/expomle.men +%%DATADIR%%/frmenus/reli/expomle1.men +%%DATADIR%%/frmenus/reli/expomle2.men +%%DATADIR%%/frmenus/reli/expomle4.men +%%DATADIR%%/frmenus/reli/expomode.top +%%DATADIR%%/frmenus/reli/extremev.top +%%DATADIR%%/frmenus/reli/eyring.top +%%DATADIR%%/frmenus/reli/fit_disc.top +%%DATADIR%%/frmenus/reli/fullspec.men +%%DATADIR%%/frmenus/reli/gammle.men +%%DATADIR%%/frmenus/reli/gammmode.top +%%DATADIR%%/frmenus/reli/goodad.top +%%DATADIR%%/frmenus/reli/goodchsq.top +%%DATADIR%%/frmenus/reli/goodfitg.top +%%DATADIR%%/frmenus/reli/goodfitq.top +%%DATADIR%%/frmenus/reli/goodfopt.top +%%DATADIR%%/frmenus/reli/goodks.top +%%DATADIR%%/frmenus/reli/goodppcc.top +%%DATADIR%%/frmenus/reli/growth.top +%%DATADIR%%/frmenus/reli/gumbmle.men +%%DATADIR%%/frmenus/reli/handbook.top +%%DATADIR%%/frmenus/reli/hazard.men +%%DATADIR%%/frmenus/reli/histpdfp.top +%%DATADIR%%/frmenus/reli/idbfdist.top +%%DATADIR%%/frmenus/reli/idbfdske.top +%%DATADIR%%/frmenus/reli/idbfdsym.top +%%DATADIR%%/frmenus/reli/igmle.men +%%DATADIR%%/frmenus/reli/intaplot.men +%%DATADIR%%/frmenus/reli/intarr.men +%%DATADIR%%/frmenus/reli/ksalp.men +%%DATADIR%%/frmenus/reli/ksev11.men +%%DATADIR%%/frmenus/reli/ksev12.men +%%DATADIR%%/frmenus/reli/ksev21.men +%%DATADIR%%/frmenus/reli/ksev22.men +%%DATADIR%%/frmenus/reli/ksewe.men +%%DATADIR%%/frmenus/reli/ksexp.men +%%DATADIR%%/frmenus/reli/ksfl.men +%%DATADIR%%/frmenus/reli/ksgam.men +%%DATADIR%%/frmenus/reli/ksgee.men +%%DATADIR%%/frmenus/reli/ksgep.men +%%DATADIR%%/frmenus/reli/ksgep2.men +%%DATADIR%%/frmenus/reli/ksgev.men +%%DATADIR%%/frmenus/reli/ksgev1.men +%%DATADIR%%/frmenus/reli/ksgev2.men +%%DATADIR%%/frmenus/reli/ksig.men +%%DATADIR%%/frmenus/reli/ksiga.men +%%DATADIR%%/frmenus/reli/ksiwe.men +%%DATADIR%%/frmenus/reli/kslga.men +%%DATADIR%%/frmenus/reli/kslgn.men +%%DATADIR%%/frmenus/reli/ksnor.men +%%DATADIR%%/frmenus/reli/kspex.men +%%DATADIR%%/frmenus/reli/kspln.men +%%DATADIR%%/frmenus/reli/kspnr.men +%%DATADIR%%/frmenus/reli/ksrig.men +%%DATADIR%%/frmenus/reli/ksscale.men +%%DATADIR%%/frmenus/reli/kswal.men +%%DATADIR%%/frmenus/reli/kswei1.men +%%DATADIR%%/frmenus/reli/kswei2.men +%%DATADIR%%/frmenus/reli/lgnecdf.men +%%DATADIR%%/frmenus/reli/lgnmle.men +%%DATADIR%%/frmenus/reli/lognmode.top +%%DATADIR%%/frmenus/reli/lsqexpo.men +%%DATADIR%%/frmenus/reli/lsqfl.men +%%DATADIR%%/frmenus/reli/lsqfrec.men +%%DATADIR%%/frmenus/reli/lsqgamm.men +%%DATADIR%%/frmenus/reli/lsqgpar.men +%%DATADIR%%/frmenus/reli/lsqgumb.men +%%DATADIR%%/frmenus/reli/lsqig.men +%%DATADIR%%/frmenus/reli/lsqiga.men +%%DATADIR%%/frmenus/reli/lsqlga.men +%%DATADIR%%/frmenus/reli/lsqlgn.men +%%DATADIR%%/frmenus/reli/lsqnor.men +%%DATADIR%%/frmenus/reli/lsqrig.men +%%DATADIR%%/frmenus/reli/lsqweib.men +%%DATADIR%%/frmenus/reli/meanldef.top +%%DATADIR%%/frmenus/reli/meanlpar.top +%%DATADIR%%/frmenus/reli/mle.top +%%DATADIR%%/frmenus/reli/mleboot.top +%%DATADIR%%/frmenus/reli/mleev11.men +%%DATADIR%%/frmenus/reli/mleev12.men +%%DATADIR%%/frmenus/reli/mleev22.men +%%DATADIR%%/frmenus/reli/mleexp.men +%%DATADIR%%/frmenus/reli/mlefl.men +%%DATADIR%%/frmenus/reli/mlegam.men +%%DATADIR%%/frmenus/reli/mlegee.men +%%DATADIR%%/frmenus/reli/mlegep.men +%%DATADIR%%/frmenus/reli/mleig.men +%%DATADIR%%/frmenus/reli/mleiwe.men +%%DATADIR%%/frmenus/reli/mlelgn.men +%%DATADIR%%/frmenus/reli/mlenor.men +%%DATADIR%%/frmenus/reli/mleperc.men +%%DATADIR%%/frmenus/reli/mlewei1.men +%%DATADIR%%/frmenus/reli/mlewei2.men +%%DATADIR%%/frmenus/reli/mrfplot.men +%%DATADIR%%/frmenus/reli/nonparam.top +%%DATADIR%%/frmenus/reli/nonrenew.top +%%DATADIR%%/frmenus/reli/nonrep.top +%%DATADIR%%/frmenus/reli/normmle.men +%%DATADIR%%/frmenus/reli/normprpl.men +%%DATADIR%%/frmenus/reli/numbperc.men +%%DATADIR%%/frmenus/reli/pexpafr.men +%%DATADIR%%/frmenus/reli/plgnafr.men +%%DATADIR%%/frmenus/reli/plot.top +%%DATADIR%%/frmenus/reli/plotafr.top +%%DATADIR%%/frmenus/reli/plotcdf.top +%%DATADIR%%/frmenus/reli/plotchaz.top +%%DATADIR%%/frmenus/reli/plothaz.top +%%DATADIR%%/frmenus/reli/plotpdf.top +%%DATADIR%%/frmenus/reli/plotppf.top +%%DATADIR%%/frmenus/reli/poismode.top +%%DATADIR%%/frmenus/reli/potdisc.top +%%DATADIR%%/frmenus/reli/potplot.men +%%DATADIR%%/frmenus/reli/powerest.dp +%%DATADIR%%/frmenus/reli/powerest.men +%%DATADIR%%/frmenus/reli/powersim.men +%%DATADIR%%/frmenus/reli/powlawls.men +%%DATADIR%%/frmenus/reli/powlawm2.men +%%DATADIR%%/frmenus/reli/ppalp.men +%%DATADIR%%/frmenus/reli/ppalpce.men +%%DATADIR%%/frmenus/reli/ppbwe.men +%%DATADIR%%/frmenus/reli/ppbwece.men +%%DATADIR%%/frmenus/reli/ppcc2sha.top +%%DATADIR%%/frmenus/reli/ppccadva.top +%%DATADIR%%/frmenus/reli/ppccalp.men +%%DATADIR%%/frmenus/reli/ppccalpc.men +%%DATADIR%%/frmenus/reli/ppccboot.top +%%DATADIR%%/frmenus/reli/ppccdisa.top +%%DATADIR%%/frmenus/reli/ppcce21c.men +%%DATADIR%%/frmenus/reli/ppcce22c.men +%%DATADIR%%/frmenus/reli/ppccev21.men +%%DATADIR%%/frmenus/reli/ppccev22.men +%%DATADIR%%/frmenus/reli/ppccewe.men +%%DATADIR%%/frmenus/reli/ppccewec.men +%%DATADIR%%/frmenus/reli/ppccfl.men +%%DATADIR%%/frmenus/reli/ppccflce.men +%%DATADIR%%/frmenus/reli/ppccfrec.men +%%DATADIR%%/frmenus/reli/ppccgam.men +%%DATADIR%%/frmenus/reli/ppccgamc.men +%%DATADIR%%/frmenus/reli/ppccgamm.men +%%DATADIR%%/frmenus/reli/ppccge1c.men +%%DATADIR%%/frmenus/reli/ppccge2c.men +%%DATADIR%%/frmenus/reli/ppccgee.men +%%DATADIR%%/frmenus/reli/ppccgeec.men +%%DATADIR%%/frmenus/reli/ppccgep.men +%%DATADIR%%/frmenus/reli/ppccgep2.men +%%DATADIR%%/frmenus/reli/ppccgepc.men +%%DATADIR%%/frmenus/reli/ppccgev.men +%%DATADIR%%/frmenus/reli/ppccgev1.men +%%DATADIR%%/frmenus/reli/ppccgev2.men +%%DATADIR%%/frmenus/reli/ppccgpar.men +%%DATADIR%%/frmenus/reli/ppccig.men +%%DATADIR%%/frmenus/reli/ppcciga.men +%%DATADIR%%/frmenus/reli/ppccigac.men +%%DATADIR%%/frmenus/reli/ppccigce.men +%%DATADIR%%/frmenus/reli/ppcciwe.men +%%DATADIR%%/frmenus/reli/ppcciwec.men +%%DATADIR%%/frmenus/reli/ppcclga.men +%%DATADIR%%/frmenus/reli/ppcclgac.men +%%DATADIR%%/frmenus/reli/ppcclgn.men +%%DATADIR%%/frmenus/reli/ppcclgnc.men +%%DATADIR%%/frmenus/reli/ppcclgnr.men +%%DATADIR%%/frmenus/reli/ppcclnrc.men +%%DATADIR%%/frmenus/reli/ppccopti.top +%%DATADIR%%/frmenus/reli/ppccperc.men +%%DATADIR%%/frmenus/reli/ppccpex.men +%%DATADIR%%/frmenus/reli/ppccpexc.men +%%DATADIR%%/frmenus/reli/ppccpln.men +%%DATADIR%%/frmenus/reli/ppccplnc.men +%%DATADIR%%/frmenus/reli/ppccplot.top +%%DATADIR%%/frmenus/reli/ppccpnr.men +%%DATADIR%%/frmenus/reli/ppccpnrc.men +%%DATADIR%%/frmenus/reli/ppccrig.men +%%DATADIR%%/frmenus/reli/ppccrigc.men +%%DATADIR%%/frmenus/reli/ppccw1rc.men +%%DATADIR%%/frmenus/reli/ppccwal.men +%%DATADIR%%/frmenus/reli/ppccwalc.men +%%DATADIR%%/frmenus/reli/ppccwe1c.men +%%DATADIR%%/frmenus/reli/ppccwe1r.men +%%DATADIR%%/frmenus/reli/ppccwe2c.men +%%DATADIR%%/frmenus/reli/ppccwei1.men +%%DATADIR%%/frmenus/reli/ppccwei2.men +%%DATADIR%%/frmenus/reli/ppccweib.men +%%DATADIR%%/frmenus/reli/ppcgep2c.men +%%DATADIR%%/frmenus/reli/ppev11.men +%%DATADIR%%/frmenus/reli/ppev11ce.men +%%DATADIR%%/frmenus/reli/ppev12.men +%%DATADIR%%/frmenus/reli/ppev12ce.men +%%DATADIR%%/frmenus/reli/ppev21.men +%%DATADIR%%/frmenus/reli/ppev21ce.men +%%DATADIR%%/frmenus/reli/ppev22.men +%%DATADIR%%/frmenus/reli/ppev22ce.men +%%DATADIR%%/frmenus/reli/ppewe.men +%%DATADIR%%/frmenus/reli/ppewece.men +%%DATADIR%%/frmenus/reli/ppexp.men +%%DATADIR%%/frmenus/reli/ppexpce.men +%%DATADIR%%/frmenus/reli/ppfl.men +%%DATADIR%%/frmenus/reli/ppflce.men +%%DATADIR%%/frmenus/reli/ppgam.men +%%DATADIR%%/frmenus/reli/ppgamce.men +%%DATADIR%%/frmenus/reli/ppgee.men +%%DATADIR%%/frmenus/reli/ppgeece.men +%%DATADIR%%/frmenus/reli/ppgep.men +%%DATADIR%%/frmenus/reli/ppgep2ce.men +%%DATADIR%%/frmenus/reli/ppgepce.men +%%DATADIR%%/frmenus/reli/ppgev.men +%%DATADIR%%/frmenus/reli/ppgev1.men +%%DATADIR%%/frmenus/reli/ppgev1ce.men +%%DATADIR%%/frmenus/reli/ppgev2.men +%%DATADIR%%/frmenus/reli/ppgev2ce.men +%%DATADIR%%/frmenus/reli/ppgevce.men +%%DATADIR%%/frmenus/reli/ppig.men +%%DATADIR%%/frmenus/reli/ppiga.men +%%DATADIR%%/frmenus/reli/ppigace.men +%%DATADIR%%/frmenus/reli/ppigce.men +%%DATADIR%%/frmenus/reli/ppiwe.men +%%DATADIR%%/frmenus/reli/ppiwece.men +%%DATADIR%%/frmenus/reli/pplga.men +%%DATADIR%%/frmenus/reli/pplgace.men +%%DATADIR%%/frmenus/reli/pplgn.men +%%DATADIR%%/frmenus/reli/pplgnce.men +%%DATADIR%%/frmenus/reli/ppnor.men +%%DATADIR%%/frmenus/reli/ppnorce.men +%%DATADIR%%/frmenus/reli/pppex.men +%%DATADIR%%/frmenus/reli/pppexce.men +%%DATADIR%%/frmenus/reli/pppln.men +%%DATADIR%%/frmenus/reli/ppplnce.men +%%DATADIR%%/frmenus/reli/pppnr.men +%%DATADIR%%/frmenus/reli/pppnrce.men +%%DATADIR%%/frmenus/reli/pprig.men +%%DATADIR%%/frmenus/reli/pprigce.men +%%DATADIR%%/frmenus/reli/ppwal.men +%%DATADIR%%/frmenus/reli/ppwalce.men +%%DATADIR%%/frmenus/reli/ppwei1.men +%%DATADIR%%/frmenus/reli/ppwei1ce.men +%%DATADIR%%/frmenus/reli/ppwei2.men +%%DATADIR%%/frmenus/reli/ppwei2ce.men +%%DATADIR%%/frmenus/reli/probexpo.men +%%DATADIR%%/frmenus/reli/probgumb.men +%%DATADIR%%/frmenus/reli/probnorm.men +%%DATADIR%%/frmenus/reli/pwei1afr.men +%%DATADIR%%/frmenus/reli/pwei2afr.men +%%DATADIR%%/frmenus/reli/ref.top +%%DATADIR%%/frmenus/reli/regrmode.top +%%DATADIR%%/frmenus/reli/regrover.top +%%DATADIR%%/frmenus/reli/reli.top +%%DATADIR%%/frmenus/reli/reliabil.top +%%DATADIR%%/frmenus/reli/reliassu.top +%%DATADIR%%/frmenus/reli/relicfit.top +%%DATADIR%%/frmenus/reli/relichs.top +%%DATADIR%%/frmenus/reli/relidata.top +%%DATADIR%%/frmenus/reli/relidesc.top +%%DATADIR%%/frmenus/reli/relidisc.top +%%DATADIR%%/frmenus/reli/reliks.top +%%DATADIR%%/frmenus/reli/relipp.top +%%DATADIR%%/frmenus/reli/relippce.top +%%DATADIR%%/frmenus/reli/relippgr.top +%%DATADIR%%/frmenus/reli/reliprpl.top +%%DATADIR%%/frmenus/reli/reliquan.top +%%DATADIR%%/frmenus/reli/relirand.top +%%DATADIR%%/frmenus/reli/relirefe.top +%%DATADIR%%/frmenus/reli/relisimu.top +%%DATADIR%%/frmenus/reli/relitopi.top +%%DATADIR%%/frmenus/reli/relitre2.men +%%DATADIR%%/frmenus/reli/relitren.men +%%DATADIR%%/frmenus/reli/renewal.top +%%DATADIR%%/frmenus/reli/repair.top +%%DATADIR%%/frmenus/reli/repaplot.men +%%DATADIR%%/frmenus/reli/replppcc.top +%%DATADIR%%/frmenus/reli/rfitdisc.top +%%DATADIR%%/frmenus/reli/runseq.men +%%DATADIR%%/frmenus/reli/simulati.men +%%DATADIR%%/frmenus/reli/supbfdf.top +%%DATADIR%%/frmenus/reli/system.top +%%DATADIR%%/frmenus/reli/test.top +%%DATADIR%%/frmenus/reli/weibmle.men +%%DATADIR%%/frmenus/reli/weibmlec.men +%%DATADIR%%/frmenus/reli/weibmode.top +%%DATADIR%%/frmenus/reli/xx.top +%%DATADIR%%/frmenus/roadmap/BOXSHOES.DP +%%DATADIR%%/frmenus/roadmap/BOXSPRIN.DP +%%DATADIR%%/frmenus/roadmap/DRAFT69.BAT +%%DATADIR%%/frmenus/roadmap/DRAFT69.DP +%%DATADIR%%/frmenus/roadmap/FULLER2.DP +%%DATADIR%%/frmenus/roadmap/LEW.DP +%%DATADIR%%/frmenus/roadmap/MAVRO.DP +%%DATADIR%%/frmenus/roadmap/PONTIUS.DP +%%DATADIR%%/frmenus/roadmap/UGIANSKY.DP +%%DATADIR%%/frmenus/roadmap/bestfunc.top +%%DATADIR%%/frmenus/roadmap/bestsett.top +%%DATADIR%%/frmenus/roadmap/control.top +%%DATADIR%%/frmenus/roadmap/distmod.top +%%DATADIR%%/frmenus/roadmap/homogene.top +%%DATADIR%%/frmenus/roadmap/impfact.top +%%DATADIR%%/frmenus/roadmap/interlab.top +%%DATADIR%%/frmenus/roadmap/multifac.top +%%DATADIR%%/frmenus/roadmap/multivar.top +%%DATADIR%%/frmenus/roadmap/percenti.top +%%DATADIR%%/frmenus/roadmap/rankfact.top +%%DATADIR%%/frmenus/roadmap/ranklist.top +%%DATADIR%%/frmenus/roadmap/roadmap.roo +%%DATADIR%%/frmenus/roadmap/roadmap.top +%%DATADIR%%/frmenus/roadmap/sigmod.top +%%DATADIR%%/frmenus/roadmap/signal.top +%%DATADIR%%/frmenus/roadmap/typval.top +%%DATADIR%%/frmenus/roadmap/uncertai.top +%%DATADIR%%/frmenus/scre/browser.men +%%DATADIR%%/frmenus/scre/browser.top +%%DATADIR%%/frmenus/scre/chanscbc.top +%%DATADIR%%/frmenus/scre/dppath.men +%%DATADIR%%/frmenus/scre/hbpath.men +%%DATADIR%%/frmenus/scre/manual.top +%%DATADIR%%/frmenus/scre/scre.top +%%DATADIR%%/frmenus/stat/1flotest.men +%%DATADIR%%/frmenus/stat/1fvatest.men +%%DATADIR%%/frmenus/stat/1res1fac.top +%%DATADIR%%/frmenus/stat/1res2fac.top +%%DATADIR%%/frmenus/stat/2resp.top +%%DATADIR%%/frmenus/stat/4plot.men +%%DATADIR%%/frmenus/stat/6plot.men +%%DATADIR%%/frmenus/stat/abasis.men +%%DATADIR%%/frmenus/stat/allasdpl.men +%%DATADIR%%/frmenus/stat/allavapl.men +%%DATADIR%%/frmenus/stat/andedaks.men +%%DATADIR%%/frmenus/stat/andedark.men +%%DATADIR%%/frmenus/stat/andedarl.men +%%DATADIR%%/frmenus/stat/andrdark.men +%%DATADIR%%/frmenus/stat/anova.men +%%DATADIR%%/frmenus/stat/anovag.men +%%DATADIR%%/frmenus/stat/autocopl.men +%%DATADIR%%/frmenus/stat/bartlett.men +%%DATADIR%%/frmenus/stat/bbasis.men +%%DATADIR%%/frmenus/stat/biweconf.men +%%DATADIR%%/frmenus/stat/blockplo.men +%%DATADIR%%/frmenus/stat/boxplot.men +%%DATADIR%%/frmenus/stat/boxplot1.men +%%DATADIR%%/frmenus/stat/capabili.men +%%DATADIR%%/frmenus/stat/chisq2s.men +%%DATADIR%%/frmenus/stat/chisqind.men +%%DATADIR%%/frmenus/stat/chisqtst.men +%%DATADIR%%/frmenus/stat/compdeap.men +%%DATADIR%%/frmenus/stat/compdepp.men +%%DATADIR%%/frmenus/stat/conlimme.men +%%DATADIR%%/frmenus/stat/conlimpr.men +%%DATADIR%%/frmenus/stat/croslodi.men +%%DATADIR%%/frmenus/stat/crosplco.men +%%DATADIR%%/frmenus/stat/crospllo.men +%%DATADIR%%/frmenus/stat/crosplms.men +%%DATADIR%%/frmenus/stat/crosplot.men +%%DATADIR%%/frmenus/stat/crosplpe.men +%%DATADIR%%/frmenus/stat/crosplqc.men +%%DATADIR%%/frmenus/stat/crosplsc.men +%%DATADIR%%/frmenus/stat/crosqudi.men +%%DATADIR%%/frmenus/stat/crosscdi.men +%%DATADIR%%/frmenus/stat/crosstab.men +%%DATADIR%%/frmenus/stat/cumsumra.men +%%DATADIR%%/frmenus/stat/dexphd.men +%%DATADIR%%/frmenus/stat/diffconf.men +%%DATADIR%%/frmenus/stat/diffprop.men +%%DATADIR%%/frmenus/stat/discussi.top +%%DATADIR%%/frmenus/stat/discussi.top.old +%%DATADIR%%/frmenus/stat/dixon.men +%%DATADIR%%/frmenus/stat/durbin.men +%%DATADIR%%/frmenus/stat/esd.men +%%DATADIR%%/frmenus/stat/freqbloc.men +%%DATADIR%%/frmenus/stat/frequenc.men +%%DATADIR%%/frmenus/stat/friedman.men +%%DATADIR%%/frmenus/stat/ftestloc.men +%%DATADIR%%/frmenus/stat/grubb.men +%%DATADIR%%/frmenus/stat/handbook.top +%%DATADIR%%/frmenus/stat/histogra.men +%%DATADIR%%/frmenus/stat/klotz.men +%%DATADIR%%/frmenus/stat/kruskal.men +%%DATADIR%%/frmenus/stat/ks2s.men +%%DATADIR%%/frmenus/stat/lag.men +%%DATADIR%%/frmenus/stat/lagplot.men +%%DATADIR%%/frmenus/stat/levene.men +%%DATADIR%%/frmenus/stat/ljung.men +%%DATADIR%%/frmenus/stat/ljungbox.men +%%DATADIR%%/frmenus/stat/mannwhit.men +%%DATADIR%%/frmenus/stat/meanplot.men +%%DATADIR%%/frmenus/stat/meansdcl.men +%%DATADIR%%/frmenus/stat/mediconf.men +%%DATADIR%%/frmenus/stat/medpol.men +%%DATADIR%%/frmenus/stat/medpolg.men +%%DATADIR%%/frmenus/stat/mulfbund.men +%%DATADIR%%/frmenus/stat/multfact.top +%%DATADIR%%/frmenus/stat/normtole.men +%%DATADIR%%/frmenus/stat/other.top +%%DATADIR%%/frmenus/stat/periodog.men +%%DATADIR%%/frmenus/stat/quade.men +%%DATADIR%%/frmenus/stat/qualcont.top +%%DATADIR%%/frmenus/stat/reli.top +%%DATADIR%%/frmenus/stat/replplot.men +%%DATADIR%%/frmenus/stat/runs.men +%%DATADIR%%/frmenus/stat/scatplot.men +%%DATADIR%%/frmenus/stat/scatplot.men.bck +%%DATADIR%%/frmenus/stat/sdplot.men +%%DATADIR%%/frmenus/stat/signtest.men +%%DATADIR%%/frmenus/stat/spectrum.men +%%DATADIR%%/frmenus/stat/specvari.men +%%DATADIR%%/frmenus/stat/squarank.men +%%DATADIR%%/frmenus/stat/stat.top +%%DATADIR%%/frmenus/stat/statcalc.top +%%DATADIR%%/frmenus/stat/statlodi.men +%%DATADIR%%/frmenus/stat/statplco.men +%%DATADIR%%/frmenus/stat/statpllo.men +%%DATADIR%%/frmenus/stat/statplms.men +%%DATADIR%%/frmenus/stat/statplot.men +%%DATADIR%%/frmenus/stat/statplot.men.bck +%%DATADIR%%/frmenus/stat/statplpe.men +%%DATADIR%%/frmenus/stat/statplqc.men +%%DATADIR%%/frmenus/stat/statplsc.men +%%DATADIR%%/frmenus/stat/statqudi.men +%%DATADIR%%/frmenus/stat/statscdi.men +%%DATADIR%%/frmenus/stat/summstat.men +%%DATADIR%%/frmenus/stat/tabulate.men +%%DATADIR%%/frmenus/stat/test.top +%%DATADIR%%/frmenus/stat/tietjen.men +%%DATADIR%%/frmenus/stat/trimconf.men +%%DATADIR%%/frmenus/stat/ttest.men +%%DATADIR%%/frmenus/stat/univaria.top +%%DATADIR%%/frmenus/stat/unlocoli.men +%%DATADIR%%/frmenus/stat/unloplot.men +%%DATADIR%%/frmenus/stat/unlotest.men +%%DATADIR%%/frmenus/stat/unvaplot.men +%%DATADIR%%/frmenus/stat/unvatest.men +%%DATADIR%%/frmenus/stat/vertplot.men +%%DATADIR%%/frmenus/stat/weibmle.men +%%DATADIR%%/frmenus/stat/whatisst.top +%%DATADIR%%/frmenus/stat/whichsta.top +%%DATADIR%%/frmenus/stat/wilcoxon.men +%%DATADIR%%/frmenus/stat/wilkshap.men +%%DATADIR%%/frmenus/stat/yates.men +%%DATADIR%%/frmenus/stat/youdplot.men +%%DATADIR%%/frmenus/tim2/argaspec.men +%%DATADIR%%/frmenus/tim2/assumpti.top +%%DATADIR%%/frmenus/tim2/bytechni.top +%%DATADIR%%/frmenus/tim2/cohespec.men +%%DATADIR%%/frmenus/tim2/cospectr.men +%%DATADIR%%/frmenus/tim2/croscopl.men +%%DATADIR%%/frmenus/tim2/croscpma.men +%%DATADIR%%/frmenus/tim2/croslagp.men +%%DATADIR%%/frmenus/tim2/crosspec.men +%%DATADIR%%/frmenus/tim2/discussi.top +%%DATADIR%%/frmenus/tim2/dualplot.men +%%DATADIR%%/frmenus/tim2/freqdisc.top +%%DATADIR%%/frmenus/tim2/freqdoma.top +%%DATADIR%%/frmenus/tim2/freqstch.top +%%DATADIR%%/frmenus/tim2/gainspec.men +%%DATADIR%%/frmenus/tim2/phasspec.men +%%DATADIR%%/frmenus/tim2/quadspec.men +%%DATADIR%%/frmenus/tim2/scatplot.men +%%DATADIR%%/frmenus/tim2/testassu.top +%%DATADIR%%/frmenus/tim2/teststat.top +%%DATADIR%%/frmenus/tim2/teststdi.top +%%DATADIR%%/frmenus/tim2/testwhit.top +%%DATADIR%%/frmenus/tim2/testwhite.top +%%DATADIR%%/frmenus/tim2/testwndi.top +%%DATADIR%%/frmenus/tim2/tim2anal.top +%%DATADIR%%/frmenus/tim2/timecros.top +%%DATADIR%%/frmenus/tim2/timedisc.top +%%DATADIR%%/frmenus/tim2/timedoma.top +%%DATADIR%%/frmenus/tim2/timedomd.top +%%DATADIR%%/frmenus/tim2/timestch.top +%%DATADIR%%/frmenus/tim2/viewdata.top +%%DATADIR%%/frmenus/time/DDSFAQS.TEX +%%DATADIR%%/frmenus/time/DDSHABER.DP +%%DATADIR%%/frmenus/time/DDSLEW.DP +%%DATADIR%%/frmenus/time/DDSLUTH.DP +%%DATADIR%%/frmenus/time/DDSSIN.DP +%%DATADIR%%/frmenus/time/DDSSUNS2.DP +%%DATADIR%%/frmenus/time/FFT1.DP +%%DATADIR%%/frmenus/time/FFT2.DP +%%DATADIR%%/frmenus/time/FLICKER.DP +%%DATADIR%%/frmenus/time/LEW.DP +%%DATADIR%%/frmenus/time/MAVRO.DP +%%DATADIR%%/frmenus/time/RANDWALK.DP +%%DATADIR%%/frmenus/time/SMOOTH.DP +%%DATADIR%%/frmenus/time/SOULEN.DP +%%DATADIR%%/frmenus/time/allasdpl.men +%%DATADIR%%/frmenus/time/allavapl.men +%%DATADIR%%/frmenus/time/approach.top +%%DATADIR%%/frmenus/time/ar1fit.men +%%DATADIR%%/frmenus/time/ar2fit.men +%%DATADIR%%/frmenus/time/arma.top +%%DATADIR%%/frmenus/time/armadisc.top +%%DATADIR%%/frmenus/time/assumpti.top +%%DATADIR%%/frmenus/time/autoanal.top +%%DATADIR%%/frmenus/time/autocopl.men +%%DATADIR%%/frmenus/time/autocpma.men +%%DATADIR%%/frmenus/time/autocpre.men +%%DATADIR%%/frmenus/time/bjfit.men +%%DATADIR%%/frmenus/time/bjfore.men +%%DATADIR%%/frmenus/time/bjforepl.men +%%DATADIR%%/frmenus/time/bjpar.men +%%DATADIR%%/frmenus/time/bjsdpred.men +%%DATADIR%%/frmenus/time/boxjdisc.top +%%DATADIR%%/frmenus/time/boxjenki.top +%%DATADIR%%/frmenus/time/bytechni.top +%%DATADIR%%/frmenus/time/compdeap.men +%%DATADIR%%/frmenus/time/compdepp.men +%%DATADIR%%/frmenus/time/data1var.top +%%DATADIR%%/frmenus/time/dds.men +%%DATADIR%%/frmenus/time/dds.top +%%DATADIR%%/frmenus/time/dds1.top +%%DATADIR%%/frmenus/time/dds10.top +%%DATADIR%%/frmenus/time/dds11.top +%%DATADIR%%/frmenus/time/dds12.top +%%DATADIR%%/frmenus/time/dds13.top +%%DATADIR%%/frmenus/time/dds14.top +%%DATADIR%%/frmenus/time/dds15.top +%%DATADIR%%/frmenus/time/dds16.top +%%DATADIR%%/frmenus/time/dds17.top +%%DATADIR%%/frmenus/time/dds18.top +%%DATADIR%%/frmenus/time/dds19.top +%%DATADIR%%/frmenus/time/dds2.top +%%DATADIR%%/frmenus/time/dds20.top +%%DATADIR%%/frmenus/time/dds21.top +%%DATADIR%%/frmenus/time/dds22.top +%%DATADIR%%/frmenus/time/dds23.top +%%DATADIR%%/frmenus/time/dds24.top +%%DATADIR%%/frmenus/time/dds25.top +%%DATADIR%%/frmenus/time/dds26.top +%%DATADIR%%/frmenus/time/dds27.top +%%DATADIR%%/frmenus/time/dds28.top +%%DATADIR%%/frmenus/time/dds3.top +%%DATADIR%%/frmenus/time/dds4.top +%%DATADIR%%/frmenus/time/dds5.top +%%DATADIR%%/frmenus/time/dds6.top +%%DATADIR%%/frmenus/time/dds7.top +%%DATADIR%%/frmenus/time/dds8.top +%%DATADIR%%/frmenus/time/dds9.top +%%DATADIR%%/frmenus/time/ddsdisc.top +%%DATADIR%%/frmenus/time/ddsexam.top +%%DATADIR%%/frmenus/time/ddsfaqs.top +%%DATADIR%%/frmenus/time/ddsplots.men +%%DATADIR%%/frmenus/time/differ.men +%%DATADIR%%/frmenus/time/discussi.top +%%DATADIR%%/frmenus/time/exposmoo.men +%%DATADIR%%/frmenus/time/fitsins0.men +%%DATADIR%%/frmenus/time/fitsins1.men +%%DATADIR%%/frmenus/time/fitsins2.men +%%DATADIR%%/frmenus/time/frdofidi.top +%%DATADIR%%/frmenus/time/frdomodi.top +%%DATADIR%%/frmenus/time/frdosmdi.top +%%DATADIR%%/frmenus/time/freqdisc.top +%%DATADIR%%/frmenus/time/freqdoma.top +%%DATADIR%%/frmenus/time/freqfilt.top +%%DATADIR%%/frmenus/time/freqmode.top +%%DATADIR%%/frmenus/time/freqsmoo.top +%%DATADIR%%/frmenus/time/freqstch.top +%%DATADIR%%/frmenus/time/fsmodisc.top +%%DATADIR%%/frmenus/time/handbook.top +%%DATADIR%%/frmenus/time/identbj.top +%%DATADIR%%/frmenus/time/lagplot.men +%%DATADIR%%/frmenus/time/lagvar.men +%%DATADIR%%/frmenus/time/linearfi.men +%%DATADIR%%/frmenus/time/lowess.men +%%DATADIR%%/frmenus/time/meanplot.men +%%DATADIR%%/frmenus/time/partaucp.men +%%DATADIR%%/frmenus/time/periodog.men +%%DATADIR%%/frmenus/time/quadfit.men +%%DATADIR%%/frmenus/time/referenc.top +%%DATADIR%%/frmenus/time/regress.top +%%DATADIR%%/frmenus/time/sdplot.men +%%DATADIR%%/frmenus/time/seasaddi.top +%%DATADIR%%/frmenus/time/seasadj.men +%%DATADIR%%/frmenus/time/seasadju.top +%%DATADIR%%/frmenus/time/seasboxp.men +%%DATADIR%%/frmenus/time/seasdiff.men +%%DATADIR%%/frmenus/time/seasinde.men +%%DATADIR%%/frmenus/time/seasloes.men +%%DATADIR%%/frmenus/time/seasmean.men +%%DATADIR%%/frmenus/time/seassubs.men +%%DATADIR%%/frmenus/time/smoodisc.top +%%DATADIR%%/frmenus/time/smooexam.top +%%DATADIR%%/frmenus/time/smoofilt.top +%%DATADIR%%/frmenus/time/spectrum.men +%%DATADIR%%/frmenus/time/stattech.top +%%DATADIR%%/frmenus/time/testassu.top +%%DATADIR%%/frmenus/time/teststat.top +%%DATADIR%%/frmenus/time/teststdi.top +%%DATADIR%%/frmenus/time/testwhit.top +%%DATADIR%%/frmenus/time/testwhite.top +%%DATADIR%%/frmenus/time/testwndi.top +%%DATADIR%%/frmenus/time/tidosmdi.top +%%DATADIR%%/frmenus/time/tidosmdo.top +%%DATADIR%%/frmenus/time/tidosmva.top +%%DATADIR%%/frmenus/time/timeanal.top +%%DATADIR%%/frmenus/time/timeaute.top +%%DATADIR%%/frmenus/time/timedisc.top +%%DATADIR%%/frmenus/time/timedoma.top +%%DATADIR%%/frmenus/time/timedomd.top +%%DATADIR%%/frmenus/time/timeexam.top +%%DATADIR%%/frmenus/time/timefilt.top +%%DATADIR%%/frmenus/time/timesmoo.top +%%DATADIR%%/frmenus/time/timestch.top +%%DATADIR%%/frmenus/time/trenaddi.top +%%DATADIR%%/frmenus/time/trenadju.top +%%DATADIR%%/frmenus/time/tsmodisc.top +%%DATADIR%%/frmenus/time/typquest.top +%%DATADIR%%/frmenus/time/validbj.top +%%DATADIR%%/frmenus/time/viewdata.top +%%DATADIR%%/frmenus/top.top +%%DATADIR%%/frmenus/unce/assumpti.top +%%DATADIR%%/frmenus/unce/compinfo.top +%%DATADIR%%/frmenus/unce/discussi.top +%%DATADIR%%/frmenus/unce/engiinfo.top +%%DATADIR%%/frmenus/unce/faqs.top +%%DATADIR%%/frmenus/unce/formspec.top +%%DATADIR%%/frmenus/unce/importan.top +%%DATADIR%%/frmenus/unce/methdisc.top +%%DATADIR%%/frmenus/unce/properro.men +%%DATADIR%%/frmenus/unce/referenc.top +%%DATADIR%%/frmenus/unce/statinfo.men +%%DATADIR%%/frmenus/unce/statinfo.top +%%DATADIR%%/frmenus/unce/unceanal.top +%%DATADIR%%/frmenus/univ/1facano4.men +%%DATADIR%%/frmenus/univ/1flotest.men +%%DATADIR%%/frmenus/univ/1fvatest.men +%%DATADIR%%/frmenus/univ/4plot.men +%%DATADIR%%/frmenus/univ/4plot.men.bck +%%DATADIR%%/frmenus/univ/6plot.men +%%DATADIR%%/frmenus/univ/allasdpl.men +%%DATADIR%%/frmenus/univ/allavapl.men +%%DATADIR%%/frmenus/univ/anova4.men +%%DATADIR%%/frmenus/univ/assumpti.top +%%DATADIR%%/frmenus/univ/autocopl.men +%%DATADIR%%/frmenus/univ/barttes4.men +%%DATADIR%%/frmenus/univ/bihist2.men +%%DATADIR%%/frmenus/univ/blockplo.men +%%DATADIR%%/frmenus/univ/bootmdpl.men +%%DATADIR%%/frmenus/univ/bootmepl.men +%%DATADIR%%/frmenus/univ/bootmmpl.men +%%DATADIR%%/frmenus/univ/bootmrpl.men +%%DATADIR%%/frmenus/univ/bootrapl.men +%%DATADIR%%/frmenus/univ/bootrspl.men +%%DATADIR%%/frmenus/univ/bootrvpl.men +%%DATADIR%%/frmenus/univ/bootsdpl.men +%%DATADIR%%/frmenus/univ/boxplot.men +%%DATADIR%%/frmenus/univ/boxplot1.men +%%DATADIR%%/frmenus/univ/boxplot2.men +%%DATADIR%%/frmenus/univ/boxplot4.men +%%DATADIR%%/frmenus/univ/chisgfch.men +%%DATADIR%%/frmenus/univ/chisgfdi.men +%%DATADIR%%/frmenus/univ/chisgfex.men +%%DATADIR%%/frmenus/univ/chisgfmi.men +%%DATADIR%%/frmenus/univ/chisgfmx.men +%%DATADIR%%/frmenus/univ/chisgfnc.men +%%DATADIR%%/frmenus/univ/chisgfno.men +%%DATADIR%%/frmenus/univ/chisgfpa.men +%%DATADIR%%/frmenus/univ/chisgfsk.men +%%DATADIR%%/frmenus/univ/chisgfsy.men +%%DATADIR%%/frmenus/univ/chisq.top +%%DATADIR%%/frmenus/univ/compdeap.men +%%DATADIR%%/frmenus/univ/compdepp.men +%%DATADIR%%/frmenus/univ/conlimme.men +%%DATADIR%%/frmenus/univ/coreques.top +%%DATADIR%%/frmenus/univ/creaxseq.men +%%DATADIR%%/frmenus/univ/discinfl.top +%%DATADIR%%/frmenus/univ/discussi.top +%%DATADIR%%/frmenus/univ/distesti.top +%%DATADIR%%/frmenus/univ/distribu.top +%%DATADIR%%/frmenus/univ/disttest.top +%%DATADIR%%/frmenus/univ/ftest2.men +%%DATADIR%%/frmenus/univ/histogra.men +%%DATADIR%%/frmenus/univ/inflcurv.top +%%DATADIR%%/frmenus/univ/inflloca.men +%%DATADIR%%/frmenus/univ/inflmisc.men +%%DATADIR%%/frmenus/univ/inflperc.men +%%DATADIR%%/frmenus/univ/inflqc.men +%%DATADIR%%/frmenus/univ/inflscal.men +%%DATADIR%%/frmenus/univ/jackmdpl.men +%%DATADIR%%/frmenus/univ/jackmepl.men +%%DATADIR%%/frmenus/univ/jackmmpl.men +%%DATADIR%%/frmenus/univ/jackmrpl.men +%%DATADIR%%/frmenus/univ/jackrapl.men +%%DATADIR%%/frmenus/univ/jackrspl.men +%%DATADIR%%/frmenus/univ/jackrvpl.men +%%DATADIR%%/frmenus/univ/jacksdpl.men +%%DATADIR%%/frmenus/univ/ks.top +%%DATADIR%%/frmenus/univ/ksgfch.men +%%DATADIR%%/frmenus/univ/ksgfex.men +%%DATADIR%%/frmenus/univ/ksgfmi.men +%%DATADIR%%/frmenus/univ/ksgfmx.men +%%DATADIR%%/frmenus/univ/ksgfnc.men +%%DATADIR%%/frmenus/univ/ksgfno.men +%%DATADIR%%/frmenus/univ/ksgfpa.men +%%DATADIR%%/frmenus/univ/ksgfsk.men +%%DATADIR%%/frmenus/univ/ksgfsy.men +%%DATADIR%%/frmenus/univ/lag.men +%%DATADIR%%/frmenus/univ/lagplot.men +%%DATADIR%%/frmenus/univ/locaboot.top +%%DATADIR%%/frmenus/univ/locacoli.men +%%DATADIR%%/frmenus/univ/locaesti.men +%%DATADIR%%/frmenus/univ/locaesti.top +%%DATADIR%%/frmenus/univ/locaplot.men +%%DATADIR%%/frmenus/univ/locarobu.top +%%DATADIR%%/frmenus/univ/locatest.men +%%DATADIR%%/frmenus/univ/locatest.top +%%DATADIR%%/frmenus/univ/location.top +%%DATADIR%%/frmenus/univ/locest.men +%%DATADIR%%/frmenus/univ/mean.men +%%DATADIR%%/frmenus/univ/meancl.men +%%DATADIR%%/frmenus/univ/meanplo2.men +%%DATADIR%%/frmenus/univ/meanplo4.men +%%DATADIR%%/frmenus/univ/mediplo2.men +%%DATADIR%%/frmenus/univ/mediplo4.men +%%DATADIR%%/frmenus/univ/midmplo2.men +%%DATADIR%%/frmenus/univ/midmplo4.men +%%DATADIR%%/frmenus/univ/midrplo2.men +%%DATADIR%%/frmenus/univ/midrplo4.men +%%DATADIR%%/frmenus/univ/normprp2.men +%%DATADIR%%/frmenus/univ/normprp4.men +%%DATADIR%%/frmenus/univ/normprpl.men +%%DATADIR%%/frmenus/univ/pdfhissy.men +%%DATADIR%%/frmenus/univ/performa.top +%%DATADIR%%/frmenus/univ/periodog.men +%%DATADIR%%/frmenus/univ/ppccpl2p.men +%%DATADIR%%/frmenus/univ/ppccpldi.men +%%DATADIR%%/frmenus/univ/ppccplot.top +%%DATADIR%%/frmenus/univ/ppccpls2.men +%%DATADIR%%/frmenus/univ/ppccplsk.men +%%DATADIR%%/frmenus/univ/ppccplsy.men +%%DATADIR%%/frmenus/univ/probplch.men +%%DATADIR%%/frmenus/univ/probpldi.men +%%DATADIR%%/frmenus/univ/probplex.men +%%DATADIR%%/frmenus/univ/probplmi.men +%%DATADIR%%/frmenus/univ/probplnc.men +%%DATADIR%%/frmenus/univ/probplno.men +%%DATADIR%%/frmenus/univ/probplot.top +%%DATADIR%%/frmenus/univ/probplpa.men +%%DATADIR%%/frmenus/univ/probplsk.men +%%DATADIR%%/frmenus/univ/probplsy.men +%%DATADIR%%/frmenus/univ/qqplot2.men +%%DATADIR%%/frmenus/univ/qqplot4.men +%%DATADIR%%/frmenus/univ/rangplo2.men +%%DATADIR%%/frmenus/univ/rangplo4.men +%%DATADIR%%/frmenus/univ/referenc.top +%%DATADIR%%/frmenus/univ/relscl.men +%%DATADIR%%/frmenus/univ/relsplo4.men +%%DATADIR%%/frmenus/univ/relvaria.top +%%DATADIR%%/frmenus/univ/relvboot.top +%%DATADIR%%/frmenus/univ/relvcoli.men +%%DATADIR%%/frmenus/univ/relvdisc.top +%%DATADIR%%/frmenus/univ/relvesti.men +%%DATADIR%%/frmenus/univ/relvesti.top +%%DATADIR%%/frmenus/univ/relvtest.men +%%DATADIR%%/frmenus/univ/relvtest.top +%%DATADIR%%/frmenus/univ/runseqpl.men +%%DATADIR%%/frmenus/univ/scatplot.men +%%DATADIR%%/frmenus/univ/sd.men +%%DATADIR%%/frmenus/univ/sdplot2.men +%%DATADIR%%/frmenus/univ/sdplot4.men +%%DATADIR%%/frmenus/univ/specvari.men +%%DATADIR%%/frmenus/univ/statplot.men +%%DATADIR%%/frmenus/univ/stattech.top +%%DATADIR%%/frmenus/univ/summstat.men +%%DATADIR%%/frmenus/univ/testassu.top +%%DATADIR%%/frmenus/univ/testfidi.top +%%DATADIR%%/frmenus/univ/testfilo.top +%%DATADIR%%/frmenus/univ/testfiva.top +%%DATADIR%%/frmenus/univ/testrand.top +%%DATADIR%%/frmenus/univ/ttest2.men +%%DATADIR%%/frmenus/univ/univanal.top +%%DATADIR%%/frmenus/univ/variatio.top +%%DATADIR%%/frmenus/univ/variboot.top +%%DATADIR%%/frmenus/univ/varicoli.men +%%DATADIR%%/frmenus/univ/varidisc.top +%%DATADIR%%/frmenus/univ/variesti.men +%%DATADIR%%/frmenus/univ/variesti.top +%%DATADIR%%/frmenus/univ/variplot.men +%%DATADIR%%/frmenus/univ/varitest.men +%%DATADIR%%/frmenus/univ/varitest.top +%%DATADIR%%/frmenus/univ/vertplo2.men +%%DATADIR%%/frmenus/univ/vertplo4.men +%%DATADIR%%/frmenus/univ/viewdata.top +%%DATADIR%%/frmenus/univ/workexam.top +%%DATADIR%%/frmenus/woch/amplif.men +%%DATADIR%%/frmenus/woch/and.men +%%DATADIR%%/frmenus/woch/arc.men +%%DATADIR%%/frmenus/woch/arrow.men +%%DATADIR%%/frmenus/woch/attrtext.men +%%DATADIR%%/frmenus/woch/box.men +%%DATADIR%%/frmenus/woch/capacito.men +%%DATADIR%%/frmenus/woch/circle.men +%%DATADIR%%/frmenus/woch/cube.men +%%DATADIR%%/frmenus/woch/diamond.men +%%DATADIR%%/frmenus/woch/disc.top +%%DATADIR%%/frmenus/woch/drawdata.men +%%DATADIR%%/frmenus/woch/drawelec.top +%%DATADIR%%/frmenus/woch/drawgeom.top +%%DATADIR%%/frmenus/woch/ellipse.men +%%DATADIR%%/frmenus/woch/ground.men +%%DATADIR%%/frmenus/woch/inductor.men +%%DATADIR%%/frmenus/woch/lattice.men +%%DATADIR%%/frmenus/woch/movedata.men +%%DATADIR%%/frmenus/woch/nor.men +%%DATADIR%%/frmenus/woch/or.men +%%DATADIR%%/frmenus/woch/oval.men +%%DATADIR%%/frmenus/woch/point.men +%%DATADIR%%/frmenus/woch/polygon.men +%%DATADIR%%/frmenus/woch/pyramid.men +%%DATADIR%%/frmenus/woch/resistor.men +%%DATADIR%%/frmenus/woch/semicirc.men +%%DATADIR%%/frmenus/woch/triangle.men +%%DATADIR%%/frmenus/woch/vwritext.men +%%DATADIR%%/frmenus/woch/woch.top +%%DATADIR%%/frmenus/woch/workexam.top +%%DATADIR%%/frmenus/woch/writtext.men +%%DATADIR%%/frscript/tclIndex +%%DATADIR%%/frscript/top.top +%%DATADIR%%/frscript/xdataplot.wish +%%DATADIR%%/frscript/xdpConfig +%%DATADIR%%/frscript/xdpConfig.in +%%DATADIR%%/frscript/xdpDP.tcl +%%DATADIR%%/frscript/xdpData.tcl +%%DATADIR%%/frscript/xdpForm.tcl +%%DATADIR%%/frscript/xdpGraph.tcl +%%DATADIR%%/frscript/xdpGrset.tcl +%%DATADIR%%/frscript/xdpIcon.gif +%%DATADIR%%/frscript/xdpIcon.xbm +%%DATADIR%%/frscript/xdpPage.tcl +%%DATADIR%%/frscript/xdpPull.tcl +%%DATADIR%%/frscript/xdpTop.tcl +%%DATADIR%%/frscript/xdpfont +%%DATADIR%%/help/INDEX.DAT +%%DATADIR%%/help/INDEX2.DAT +%%DATADIR%%/help/colors +%%DATADIR%%/help/commands +%%DATADIR%%/help/dataplot.css +%%DATADIR%%/help/dataplot_snapshot.pdf +%%DATADIR%%/help/datasets +%%DATADIR%%/help/defaults +%%DATADIR%%/help/designs +%%DATADIR%%/help/dirichlet_pdf +%%DATADIR%%/help/distribu +%%DATADIR%%/help/dp_question_mark_examples.txt +%%DATADIR%%/help/dpdicf.tex +%%DATADIR%%/help/dpdirf.tex +%%DATADIR%%/help/dphe1f.tex +%%DATADIR%%/help/dphe2f.tex +%%DATADIR%%/help/dphe3f.tex +%%DATADIR%%/help/dphe4f.tex +%%DATADIR%%/help/dphe5f.tex +%%DATADIR%%/help/dphe6f.tex +%%DATADIR%%/help/dphe7f.tex +%%DATADIR%%/help/faqs +%%DATADIR%%/help/footernull.htm +%%DATADIR%%/help/function +%%DATADIR%%/help/greeksym +%%DATADIR%%/help/handbk.tex +%%DATADIR%%/help/headernull.htm +%%DATADIR%%/help/inline +%%DATADIR%%/help/jjfq +%%DATADIR%%/help/latexfooter.tex +%%DATADIR%%/help/latexheader.tex +%%DATADIR%%/help/lines +%%DATADIR%%/help/macros +%%DATADIR%%/help/mathsymb +%%DATADIR%%/help/miscsymb +%%DATADIR%%/help/probe +%%DATADIR%%/help/programs +%%DATADIR%%/help/refman.tex +%%DATADIR%%/help/reldef.tex +%%DATADIR%%/help/reliability.tex +%%DATADIR%%/help/sed_footer.htm +%%DATADIR%%/help/sed_header.htm +%%DATADIR%%/help/sedfooter.htm +%%DATADIR%%/help/sedheader.htm +%%DATADIR%%/help/subcomma +%%DATADIR%%/help/syntax +%%DATADIR%%/macros/2COLUMN.DP +%%DATADIR%%/macros/3DPLOT.DP +%%DATADIR%%/macros/ANOVA.DP +%%DATADIR%%/macros/ANOVASUB.DP +%%DATADIR%%/macros/AOQSS.DP +%%DATADIR%%/macros/ARL_C.DP +%%DATADIR%%/macros/ARL_P.DP +%%DATADIR%%/macros/ARL_XBAR.DP +%%DATADIR%%/macros/ATISS.DP +%%DATADIR%%/macros/BARTCOVA.DP +%%DATADIR%%/macros/BARTLETT.DP +%%DATADIR%%/macros/CALENDAR.DP +%%DATADIR%%/macros/CANNONIC.DP +%%DATADIR%%/macros/CASCADEP.DP +%%DATADIR%%/macros/CHECKCLASSIC2LEVEL.DP +%%DATADIR%%/macros/CHECKCLASSICAL2LEVEL.DP +%%DATADIR%%/macros/CHECKCORNERS.DP +%%DATADIR%%/macros/CHECKKYX.DP +%%DATADIR%%/macros/CHECKSYS.DP +%%DATADIR%%/macros/COMP2EXP.DP +%%DATADIR%%/macros/CONF.DP +%%DATADIR%%/macros/CONFLIMD.DP +%%DATADIR%%/macros/CONFLIMI.DP +%%DATADIR%%/macros/CONFLIMM.DP +%%DATADIR%%/macros/CONFLIMS.DP +%%DATADIR%%/macros/CONFOUND.DP +%%DATADIR%%/macros/CONNDOTS.DP +%%DATADIR%%/macros/CONVERT_TO_CLASSICAL_UNITS.DP +%%DATADIR%%/macros/CORE.DP +%%DATADIR%%/macros/CPUTIME.DP +%%DATADIR%%/macros/DARKBLUE.DP +%%DATADIR%%/macros/DEX10STEPANALYSIS_SCOTT_8_16.DP +%%DATADIR%%/macros/DEX9PLOT.DP +%%DATADIR%%/macros/DEXBOXCO.DP +%%DATADIR%%/macros/DEXCASE.DP +%%DATADIR%%/macros/DEXCLAS1.DP +%%DATADIR%%/macros/DEXCLASS2002.DP +%%DATADIR%%/macros/DEXCLASS2007.DP +%%DATADIR%%/macros/DEXCOMB.DP +%%DATADIR%%/macros/DEXCONT2.DP +%%DATADIR%%/macros/DEXCONTQ.DP +%%DATADIR%%/macros/DEXCUBE.DP +%%DATADIR%%/macros/DEXFACT2.DP +%%DATADIR%%/macros/DEXFACT3.DP +%%DATADIR%%/macros/DEXKN.DP +%%DATADIR%%/macros/DEXPARET.DP +%%DATADIR%%/macros/DEXPLOT.DP +%%DATADIR%%/macros/DEXPLOT1.DP +%%DATADIR%%/macros/DEXPLOTHISTORY.DP +%%DATADIR%%/macros/DEXPLOTINTERROGATE.DP +%%DATADIR%%/macros/DEXPLOTSUB.DP +%%DATADIR%%/macros/DEXSCAT1.DP +%%DATADIR%%/macros/DEXSCAT2.DP +%%DATADIR%%/macros/DEXSQUAR.DP +%%DATADIR%%/macros/DEXSSCOR.DP +%%DATADIR%%/macros/DEXSTAT1.DP +%%DATADIR%%/macros/DEXSTAT2.DP +%%DATADIR%%/macros/DEXSTAT3.DP +%%DATADIR%%/macros/DEXSTAT4.DP +%%DATADIR%%/macros/DEXYP64.DP +%%DATADIR%%/macros/DIGIT.DP +%%DATADIR%%/macros/E691BPH1.DP +%%DATADIR%%/macros/E691BPH2.DP +%%DATADIR%%/macros/E691BPK1.DP +%%DATADIR%%/macros/E691BPK2.DP +%%DATADIR%%/macros/E691DOH1.DP +%%DATADIR%%/macros/E691DOH2.DP +%%DATADIR%%/macros/E691DOK1.DP +%%DATADIR%%/macros/E691DOK2.DP +%%DATADIR%%/macros/E691PLO1.DP +%%DATADIR%%/macros/E691PLO2.DP +%%DATADIR%%/macros/E691PLO3.DP +%%DATADIR%%/macros/E691PLO4.DP +%%DATADIR%%/macros/E691PLO5.DP +%%DATADIR%%/macros/E691PLO6.DP +%%DATADIR%%/macros/E691PLO7.DP +%%DATADIR%%/macros/FISHCLAS.DP +%%DATADIR%%/macros/FISHDISC.DP +%%DATADIR%%/macros/FTESTLOC.DP +%%DATADIR%%/macros/GRUBB.DP +%%DATADIR%%/macros/HOTELL.DP +%%DATADIR%%/macros/HOTELL2.DP +%%DATADIR%%/macros/IDA.DP +%%DATADIR%%/macros/IDA2.DP +%%DATADIR%%/macros/IDA3.DP +%%DATADIR%%/macros/INDEX.DAT +%%DATADIR%%/macros/INDEX2.DAT +%%DATADIR%%/macros/INTCHAR.DP +%%DATADIR%%/macros/INVMAT.DP +%%DATADIR%%/macros/ISHIKAW2.DP +%%DATADIR%%/macros/ISHIKAWA.DP +%%DATADIR%%/macros/KW.DP +%%DATADIR%%/macros/LEVENE.DP +%%DATADIR%%/macros/LOGO.DP +%%DATADIR%%/macros/LOGO2.DP +%%DATADIR%%/macros/LOGO3.DP +%%DATADIR%%/macros/LOGO3B.DP +%%DATADIR%%/macros/LOGO4.DP +%%DATADIR%%/macros/MARK.DP +%%DATADIR%%/macros/MARK2.DP +%%DATADIR%%/macros/MARK3.DP +%%DATADIR%%/macros/MARK4.DP +%%DATADIR%%/macros/MARK5.DP +%%DATADIR%%/macros/MDPLOT.DP +%%DATADIR%%/macros/MPC262A.DP +%%DATADIR%%/macros/MPC262AA.DP +%%DATADIR%%/macros/MPC262B.DP +%%DATADIR%%/macros/MPC262BB.DP +%%DATADIR%%/macros/MPC262C.DP +%%DATADIR%%/macros/MPC262D.DP +%%DATADIR%%/macros/MPC262DD.DP +%%DATADIR%%/macros/MPC264C.DP +%%DATADIR%%/macros/MPC264D.DP +%%DATADIR%%/macros/MPC266A.DP +%%DATADIR%%/macros/MPC266B.DP +%%DATADIR%%/macros/MPC266C.DP +%%DATADIR%%/macros/MPC266D.DP +%%DATADIR%%/macros/MPC266E.DP +%%DATADIR%%/macros/MPC266F.DP +%%DATADIR%%/macros/MPC266H.DP +%%DATADIR%%/macros/MPC266I.DP +%%DATADIR%%/macros/MPC266J.DP +%%DATADIR%%/macros/MPC266K.DP +%%DATADIR%%/macros/MPC266L.DP +%%DATADIR%%/macros/MPC266M.DP +%%DATADIR%%/macros/MULTTEXT.DP +%%DATADIR%%/macros/NORMHIST.DP +%%DATADIR%%/macros/OC_C.DP +%%DATADIR%%/macros/OC_P.DP +%%DATADIR%%/macros/OC_SSA.DP +%%DATADIR%%/macros/OC_SSB.DP +%%DATADIR%%/macros/OC_XBAR.DP +%%DATADIR%%/macros/PAIRCOMP.DP +%%DATADIR%%/macros/PARETO.DP +%%DATADIR%%/macros/PIECHART.DP +%%DATADIR%%/macros/PLOT1VAR.DP +%%DATADIR%%/macros/PLOT2VAR.DP +%%DATADIR%%/macros/PLOTFUNC.DP +%%DATADIR%%/macros/PLOTSIN.DP +%%DATADIR%%/macros/PLOTTEXT.DP +%%DATADIR%%/macros/POWEREST.DP +%%DATADIR%%/macros/RANDSAMP.DP +%%DATADIR%%/macros/REVERT_TO_ORIGINAL_UNITS.DP +%%DATADIR%%/macros/RIGHTMARGINFACTORSANDLEVELS.DP +%%DATADIR%%/macros/SDPRED.DP +%%DATADIR%%/macros/SHADEBOX.DP +%%DATADIR%%/macros/SIMPMETH.DP +%%DATADIR%%/macros/SORT.DP +%%DATADIR%%/macros/SUBPLOT.DP +%%DATADIR%%/macros/SUBPLOTR.DP +%%DATADIR%%/macros/SUM.DP +%%DATADIR%%/macros/TESTORTH.DP +%%DATADIR%%/macros/TTEST.DP +%%DATADIR%%/macros/WORDCHAH.DP +%%DATADIR%%/macros/WORDCHAV.DP +%%DATADIR%%/macros/WORDPLOT.DP +%%DATADIR%%/macros/YATESGEN.DP +%%DATADIR%%/macros/ZIPMACR.BAT +%%DATADIR%%/macros/macros.txt +%%DATADIR%%/menu/dpm10f.tex +%%DATADIR%%/menu/dpm11f.tex +%%DATADIR%%/menu/dpm12f.tex +%%DATADIR%%/menu/dpm13f.tex +%%DATADIR%%/menu/dpm14f.tex +%%DATADIR%%/menu/dpm15f.tex +%%DATADIR%%/menu/dpm16f.tex +%%DATADIR%%/menu/dpme1f.tex +%%DATADIR%%/menu/dpme2f.tex +%%DATADIR%%/menu/dpme3f.tex +%%DATADIR%%/menu/dpme4f.tex +%%DATADIR%%/menu/dpme5f.tex +%%DATADIR%%/menu/dpme6f.tex +%%DATADIR%%/menu/dpme7f.tex +%%DATADIR%%/menu/dpme8f.tex +%%DATADIR%%/menu/dpme9f.tex +%%DATADIR%%/minitest.dp +%%DATADIR%%/programs/2TO30M21.DP +%%DATADIR%%/programs/2TO7M4.DP +%%DATADIR%%/programs/3D.DP +%%DATADIR%%/programs/3D0.DP +%%DATADIR%%/programs/3D2.DP +%%DATADIR%%/programs/3DNOPLOT.DP +%%DATADIR%%/programs/4PLOT.DP +%%DATADIR%%/programs/ABER19.DP +%%DATADIR%%/programs/ANOVAALL.DP +%%DATADIR%%/programs/ANSCOMB2.DP +%%DATADIR%%/programs/ANSCOMBE.DP +%%DATADIR%%/programs/ASQCSAL.DP +%%DATADIR%%/programs/AUTOEXEC.DP +%%DATADIR%%/programs/B.DP +%%DATADIR%%/programs/BALLSTIC.DP +%%DATADIR%%/programs/BARPLOMM.DP +%%DATADIR%%/programs/BARPLOT6.DP +%%DATADIR%%/programs/BATTADD2.DP +%%DATADIR%%/programs/BATTADD3.DP +%%DATADIR%%/programs/BAYEUNIV.DP +%%DATADIR%%/programs/BCLINEPL.DP +%%DATADIR%%/programs/BEAM.DP +%%DATADIR%%/programs/BENNETT.DP +%%DATADIR%%/programs/BENNETT1.DP +%%DATADIR%%/programs/BENNETT3.DP +%%DATADIR%%/programs/BENNETT6.DP +%%DATADIR%%/programs/BENNETT7.DP +%%DATADIR%%/programs/BENNETT8.DP +%%DATADIR%%/programs/BENNETT9.DP +%%DATADIR%%/programs/BERGER1.DP +%%DATADIR%%/programs/BIHIST.DP +%%DATADIR%%/programs/BIPLOT.DP +%%DATADIR%%/programs/BIQUAD.DP +%%DATADIR%%/programs/BLACKBOD.DP +%%DATADIR%%/programs/BLOCPLOT.DP +%%DATADIR%%/programs/BOETTIN1.DP +%%DATADIR%%/programs/BOETTING.DP +%%DATADIR%%/programs/BOOTBER2.DP +%%DATADIR%%/programs/BOOTBERG.DP +%%DATADIR%%/programs/BOOTHCOX.DP +%%DATADIR%%/programs/BOOTLEW.DP +%%DATADIR%%/programs/BOOTMARS.DP +%%DATADIR%%/programs/BOOTSIMI.DP +%%DATADIR%%/programs/BOXAUTO.DP +%%DATADIR%%/programs/BOXAUTO2.DP +%%DATADIR%%/programs/BOXAUTO3.DP +%%DATADIR%%/programs/BOXBIKE2.DP +%%DATADIR%%/programs/BOXCAKE.DP +%%DATADIR%%/programs/BOXCAKE2.DP +%%DATADIR%%/programs/BOXCAKE3.DP +%%DATADIR%%/programs/BOXCAKE4.DP +%%DATADIR%%/programs/BOXCHEM.DP +%%DATADIR%%/programs/BOXCLEAN.DP +%%DATADIR%%/programs/BOXDR175.DP +%%DATADIR%%/programs/BOXFILT.DP +%%DATADIR%%/programs/BOXPENIC.DP +%%DATADIR%%/programs/BOXPLOT.DP +%%DATADIR%%/programs/BOXPLOT2.DP +%%DATADIR%%/programs/BOXREAC2.DP +%%DATADIR%%/programs/BOXREAC3.DP +%%DATADIR%%/programs/BOXREACT.DP +%%DATADIR%%/programs/BOXSHOE2.DP +%%DATADIR%%/programs/BOXSHOE3.DP +%%DATADIR%%/programs/BOXSHOES.DP +%%DATADIR%%/programs/BOXSPRIN.DP +%%DATADIR%%/programs/BOXYIEL2.DP +%%DATADIR%%/programs/BOXYIEL3.DP +%%DATADIR%%/programs/BOXYIEL9.DP +%%DATADIR%%/programs/BOXYIELD.DP +%%DATADIR%%/programs/BUG.DP +%%DATADIR%%/programs/C.DP +%%DATADIR%%/programs/CANNCORR.DP +%%DATADIR%%/programs/CC.DP +%%DATADIR%%/programs/CCC.DP +%%DATADIR%%/programs/CHARMAP.DP +%%DATADIR%%/programs/CHEMMIX.DP +%%DATADIR%%/programs/CHWIRUT1.DP +%%DATADIR%%/programs/CIRCLE.DP +%%DATADIR%%/programs/CIRCUIT.DP +%%DATADIR%%/programs/CLARK2.DP +%%DATADIR%%/programs/CLARK3.DP +%%DATADIR%%/programs/CLARK4.DP +%%DATADIR%%/programs/COLORMAP.DP +%%DATADIR%%/programs/CONFIG.DP +%%DATADIR%%/programs/CONTOUR.DP +%%DATADIR%%/programs/CPKPLOT.DP +%%DATADIR%%/programs/CROARKIN.DP +%%DATADIR%%/programs/DAT2PLOT.DP +%%DATADIR%%/programs/DATAPLOT.DP +%%DATADIR%%/programs/DDS.DP +%%DATADIR%%/programs/DDS2SUB.DP +%%DATADIR%%/programs/DERIVPLO.DP +%%DATADIR%%/programs/DEXCONTP.DP +%%DATADIR%%/programs/DEXCUB70.DP +%%DATADIR%%/programs/DEXINTMP.DP +%%DATADIR%%/programs/DEXMEANP.DP +%%DATADIR%%/programs/DEXOPT.DP +%%DATADIR%%/programs/DEXREG.DP +%%DATADIR%%/programs/DEXSCREE.DP +%%DATADIR%%/programs/DEXSIM.DP +%%DATADIR%%/programs/DEXSURF.DP +%%DATADIR%%/programs/DEXTITCU.DP +%%DATADIR%%/programs/DIOPHANT.DP +%%DATADIR%%/programs/DPTEST.DP +%%DATADIR%%/programs/DRAPS518.DP +%%DATADIR%%/programs/DRAPS521.DP +%%DATADIR%%/programs/DUEUER.DP +%%DATADIR%%/programs/EBERHARD.DP +%%DATADIR%%/programs/EDA1.DP +%%DATADIR%%/programs/EFRON1.DP +%%DATADIR%%/programs/ELECT92.DP +%%DATADIR%%/programs/ELECT92B.DP +%%DATADIR%%/programs/ELECT92C.DP +%%DATADIR%%/programs/ELKINS12.DP +%%DATADIR%%/programs/ERRBARPL.DP +%%DATADIR%%/programs/FFT1.DP +%%DATADIR%%/programs/FFT2.DP +%%DATADIR%%/programs/FFT3.DP +%%DATADIR%%/programs/FFTPLOT.DP +%%DATADIR%%/programs/FILTER.DP +%%DATADIR%%/programs/FISH2DIS.DP +%%DATADIR%%/programs/FISHIRIS.DP +%%DATADIR%%/programs/FISHIRIS.DP.WORK +%%DATADIR%%/programs/FONG5.DP +%%DATADIR%%/programs/FULLER2.DP +%%DATADIR%%/programs/FULLODR1.DP +%%DATADIR%%/programs/FULLODR2.DP +%%DATADIR%%/programs/FUNNEL.DP +%%DATADIR%%/programs/FUNNEL11.DP +%%DATADIR%%/programs/FUNNEL2.DP +%%DATADIR%%/programs/FUNNEL3.DP +%%DATADIR%%/programs/GANOVA3.DP +%%DATADIR%%/programs/GEAR.DP +%%DATADIR%%/programs/GOLD.DP +%%DATADIR%%/programs/GOLD2.DP +%%DATADIR%%/programs/HABER1.DP +%%DATADIR%%/programs/HAMAKER.DP +%%DATADIR%%/programs/HARE.DP +%%DATADIR%%/programs/HARE2.DP +%%DATADIR%%/programs/HARE3.DP +%%DATADIR%%/programs/HICHO.DP +%%DATADIR%%/programs/HICHOSUB.DP +%%DATADIR%%/programs/HIST.DP +%%DATADIR%%/programs/HIST2.DP +%%DATADIR%%/programs/HORLICK1.DP +%%DATADIR%%/programs/HORLICK4.DP +%%DATADIR%%/programs/HOSPITAL.DP +%%DATADIR%%/programs/HOTBAR.DP +%%DATADIR%%/programs/HOTBAR0.DP +%%DATADIR%%/programs/HOTELL2.DP +%%DATADIR%%/programs/HUMPHRE5.DP +%%DATADIR%%/programs/INDEX.DAT +%%DATADIR%%/programs/INDEX2.DAT +%%DATADIR%%/programs/IRLS.DP +%%DATADIR%%/programs/ITRIJOBS.DP +%%DATADIR%%/programs/JONES.DP +%%DATADIR%%/programs/KRASNY1.DP +%%DATADIR%%/programs/KRASNY2.DP +%%DATADIR%%/programs/LABELXX.DP +%%DATADIR%%/programs/LABELYX.DP +%%DATADIR%%/programs/LAD.DP +%%DATADIR%%/programs/LAGERGRE.DP +%%DATADIR%%/programs/LAGPLOT.DP +%%DATADIR%%/programs/LASHMORE.DP +%%DATADIR%%/programs/LECHBUG.DP +%%DATADIR%%/programs/LEIGH.DP +%%DATADIR%%/programs/LEIGH2.DP +%%DATADIR%%/programs/LEIGH2SU.DP +%%DATADIR%%/programs/LEIGH3.DP +%%DATADIR%%/programs/LEIGH3SU.DP +%%DATADIR%%/programs/LEVENSO3.DP +%%DATADIR%%/programs/LEW11.DP +%%DATADIR%%/programs/LI.DP +%%DATADIR%%/programs/LINREG.DP +%%DATADIR%%/programs/LINUT2.DP +%%DATADIR%%/programs/LINUT3.DP +%%DATADIR%%/programs/LINUT4.DP +%%DATADIR%%/programs/LINUT5.DP +%%DATADIR%%/programs/LIREACT.DP +%%DATADIR%%/programs/LIREACT2.DP +%%DATADIR%%/programs/LIREACT3.DP +%%DATADIR%%/programs/LIREACT4.DP +%%DATADIR%%/programs/LISSAJOU.DP +%%DATADIR%%/programs/LISTENB2.DP +%%DATADIR%%/programs/LIU.DP +%%DATADIR%%/programs/LP.DP +%%DATADIR%%/programs/MANDEL1.DP +%%DATADIR%%/programs/MANDEL2.DP +%%DATADIR%%/programs/MANDEL3.DP +%%DATADIR%%/programs/MANSFIELD.DP +%%DATADIR%%/programs/MATHOPER.DP +%%DATADIR%%/programs/MATTING2.DP +%%DATADIR%%/programs/MATTING3.DP +%%DATADIR%%/programs/MATTINGL.DP +%%DATADIR%%/programs/MAXITEST.DP +%%DATADIR%%/programs/MEANPLOT.DP +%%DATADIR%%/programs/MINITEST.DP +%%DATADIR%%/programs/MORALE5A.DP +%%DATADIR%%/programs/MORALE5B.DP +%%DATADIR%%/programs/MORALES.DP +%%DATADIR%%/programs/MORALES5.DP +%%DATADIR%%/programs/MORTGAG2.DP +%%DATADIR%%/programs/MORTGAGE.DP +%%DATADIR%%/programs/MPC262A.DP +%%DATADIR%%/programs/MPC262AA.DP +%%DATADIR%%/programs/MPC262B.DP +%%DATADIR%%/programs/MPC262BB.DP +%%DATADIR%%/programs/MPC262C.DP +%%DATADIR%%/programs/MPC262D.DP +%%DATADIR%%/programs/MPC262DD.DP +%%DATADIR%%/programs/MPC264C.DP +%%DATADIR%%/programs/MPC264D.DP +%%DATADIR%%/programs/MULTITRA.DP +%%DATADIR%%/programs/MULTPLOT.DP +%%DATADIR%%/programs/NAKATAN1.DP +%%DATADIR%%/programs/NAKATAN3.DP +%%DATADIR%%/programs/NAKATANI.DP +%%DATADIR%%/programs/NEGIZ4.DP +%%DATADIR%%/programs/NORMDENS.DP +%%DATADIR%%/programs/NORRIS.DP +%%DATADIR%%/programs/NORRIS2.DP +%%DATADIR%%/programs/NORRIS5.DP +%%DATADIR%%/programs/NORRIS6.DP +%%DATADIR%%/programs/OAKLEY.DP +%%DATADIR%%/programs/OIL.DP +%%DATADIR%%/programs/OLYMPICS.DP +%%DATADIR%%/programs/OPTMODEL.DP +%%DATADIR%%/programs/PALLETT.DP +%%DATADIR%%/programs/PARCOORD.DP +%%DATADIR%%/programs/PB12LIN.DP +%%DATADIR%%/programs/PB12LIN2.DP +%%DATADIR%%/programs/PCC.DP +%%DATADIR%%/programs/PDFPLOT.DP +%%DATADIR%%/programs/PERIODI2.DP +%%DATADIR%%/programs/PERIODIC.DP +%%DATADIR%%/programs/PHD.DP +%%DATADIR%%/programs/PLANETS.DP +%%DATADIR%%/programs/PLOT25.DP +%%DATADIR%%/programs/PLOT25C.DP +%%DATADIR%%/programs/PLOTALL.DP +%%DATADIR%%/programs/PLOTCOL1.DP +%%DATADIR%%/programs/PLOTCOL2.DP +%%DATADIR%%/programs/PLOTCOLO.DP +%%DATADIR%%/programs/PLOTMAT.DP +%%DATADIR%%/programs/PLOTROOT.DP +%%DATADIR%%/programs/PLOTTEXT.DP +%%DATADIR%%/programs/PNCC.DP +%%DATADIR%%/programs/POLYROO1.DP +%%DATADIR%%/programs/POLYROO2.DP +%%DATADIR%%/programs/PONTIUS.DP +%%DATADIR%%/programs/PPCCPLOT.DP +%%DATADIR%%/programs/PREDPLOT.DP +%%DATADIR%%/programs/PROFPLOT.DP +%%DATADIR%%/programs/PSFONTS.DP +%%DATADIR%%/programs/PUNCH.DP +%%DATADIR%%/programs/PUNCH2.DP +%%DATADIR%%/programs/QCC.DP +%%DATADIR%%/programs/QUANPLOT.DP +%%DATADIR%%/programs/QUINLAN.DP +%%DATADIR%%/programs/QUINLAN2.DP +%%DATADIR%%/programs/RAIN.DP +%%DATADIR%%/programs/REFPLOT.DP +%%DATADIR%%/programs/RENNEX.DP +%%DATADIR%%/programs/RENNEX2.DP +%%DATADIR%%/programs/RENNEX5.DP +%%DATADIR%%/programs/RENNEX6.DP +%%DATADIR%%/programs/RENNEX7.DP +%%DATADIR%%/programs/RESPLOT.DP +%%DATADIR%%/programs/RFSPREAD.DP +%%DATADIR%%/programs/RIDGE.DP +%%DATADIR%%/programs/RIDGE.DP.OLD +%%DATADIR%%/programs/ROOTPLOT.DP +%%DATADIR%%/programs/ROSSIT16.DP +%%DATADIR%%/programs/ROSSITER.DP +%%DATADIR%%/programs/SCHAUER2.DP +%%DATADIR%%/programs/SCHAUER3.DP +%%DATADIR%%/programs/SCHAUER4.DP +%%DATADIR%%/programs/SCHILLER.DP +%%DATADIR%%/programs/SDPLOT.DP +%%DATADIR%%/programs/SEMATECH.DP +%%DATADIR%%/programs/SETCOLOR.DP +%%DATADIR%%/programs/SHADEBOX.DP +%%DATADIR%%/programs/SHEESLE2.DP +%%DATADIR%%/programs/SIGN.DP +%%DATADIR%%/programs/SIMON.DP +%%DATADIR%%/programs/SIMON2.DP +%%DATADIR%%/programs/SIMON3.DP +%%DATADIR%%/programs/SIMPLEX.DP +%%DATADIR%%/programs/SIMPLEX1.DP +%%DATADIR%%/programs/SIMPLEX2.DP +%%DATADIR%%/programs/SIMPLEX3.DP +%%DATADIR%%/programs/SIMPLEXD.DP +%%DATADIR%%/programs/SIMPLEXR.DP +%%DATADIR%%/programs/SLPLOT.DP +%%DATADIR%%/programs/SPECPLOT.DP +%%DATADIR%%/programs/SPIKEPLO.DP +%%DATADIR%%/programs/SPIRAL.DP +%%DATADIR%%/programs/SPRINGS.DP +%%DATADIR%%/programs/STARPLOT.DP +%%DATADIR%%/programs/STATGRAP.DP +%%DATADIR%%/programs/STENBAK2.DP +%%DATADIR%%/programs/STENBAKK.DP +%%DATADIR%%/programs/T2CC.DP +%%DATADIR%%/programs/TAGTRACE.DP +%%DATADIR%%/programs/TEST.DP +%%DATADIR%%/programs/TEST3.DP +%%DATADIR%%/programs/TEST6.DP +%%DATADIR%%/programs/TEST7.DP +%%DATADIR%%/programs/TEST8.DP +%%DATADIR%%/programs/TESTBIHI.DP +%%DATADIR%%/programs/TESTBLOC.DP +%%DATADIR%%/programs/TESTCME.DP +%%DATADIR%%/programs/TESTCME2.DP +%%DATADIR%%/programs/TESTCOL2.DP +%%DATADIR%%/programs/TESTCOLO.DP +%%DATADIR%%/programs/TESTCON1.DP +%%DATADIR%%/programs/TESTCONT.DP +%%DATADIR%%/programs/TESTDDS.DP +%%DATADIR%%/programs/TESTDDS1.DP +%%DATADIR%%/programs/TESTDDS2.DP +%%DATADIR%%/programs/TESTDDS3.DP +%%DATADIR%%/programs/TESTDDS4.DP +%%DATADIR%%/programs/TESTF.DP +%%DATADIR%%/programs/TESTF2.DP +%%DATADIR%%/programs/TESTFIT.DP +%%DATADIR%%/programs/TESTHELP.DP +%%DATADIR%%/programs/TESTHOTB.DP +%%DATADIR%%/programs/TESTPPCC.DP +%%DATADIR%%/programs/TESTWEIB.DP +%%DATADIR%%/programs/TESTWRIT.DP +%%DATADIR%%/programs/TEXASMAP.DP +%%DATADIR%%/programs/THURBER.DP +%%DATADIR%%/programs/TIETJEN.DP +%%DATADIR%%/programs/TRIG.DP +%%DATADIR%%/programs/TUMOR.DP +%%DATADIR%%/programs/UCC.DP +%%DATADIR%%/programs/UGIANSKY.DP +%%DATADIR%%/programs/VANGEL31.DP +%%DATADIR%%/programs/VANGEL32.DP +%%DATADIR%%/programs/VANGEL33.DP +%%DATADIR%%/programs/VANGEL34.DP +%%DATADIR%%/programs/WAMPLER1.DP +%%DATADIR%%/programs/WEIBPLOT.DP +%%DATADIR%%/programs/WEIBSIM.DP +%%DATADIR%%/programs/WEIGHTS.DP +%%DATADIR%%/programs/WILCOXRS.DP +%%DATADIR%%/programs/WILCOXSR.DP +%%DATADIR%%/programs/WILLIAMS.DP +%%DATADIR%%/programs/WOMELDOR.DP +%%DATADIR%%/programs/WRIGHT11.DP +%%DATADIR%%/programs/WRIGHT6.DP +%%DATADIR%%/programs/WRIGLEGE.DP +%%DATADIR%%/programs/WRIGLEVE.DP +%%DATADIR%%/programs/WRIGMARG.DP +%%DATADIR%%/programs/WRIGOPTI.DP +%%DATADIR%%/programs/WRIGPLCN.DP +%%DATADIR%%/programs/XBARCHAR.DP +%%DATADIR%%/programs/YOUDPLOT.DP +%%DATADIR%%/programs/ZETAGREE.DP +%%DATADIR%%/programs/dppl1f.dat +%%DATADIR%%/programs/dppl2f.dat +%%DATADIR%%/programs/fishold.dp +%%DATADIR%%/programs/fishold2.dp +%%DATADIR%%/programs/programs.txt +%%DATADIR%%/scripts/mean.py +%%DATADIR%%/text/2KINDEX.TXT +%%DATADIR%%/text/2TO3.TXT +%%DATADIR%%/text/AREACOD2.TXT +%%DATADIR%%/text/AREACODE.TXT +%%DATADIR%%/text/AREAS.TXT +%%DATADIR%%/text/ASCII.TXT +%%DATADIR%%/text/ATOMS.TXT +%%DATADIR%%/text/BALDAPPL.TXT +%%DATADIR%%/text/BALDCRIT.TXT +%%DATADIR%%/text/BALDFRAM.TXT +%%DATADIR%%/text/BALDREFE.TXT +%%DATADIR%%/text/BALDRIGE.TXT +%%DATADIR%%/text/BARKEREX.TXT +%%DATADIR%%/text/BINTAILP.TXT +%%DATADIR%%/text/BOXCOX.TXT +%%DATADIR%%/text/BOXEXAMP.TXT +%%DATADIR%%/text/BOXHHEX.TXT +%%DATADIR%%/text/BOXINDEX.TXT +%%DATADIR%%/text/CALENDAR.TXT +%%DATADIR%%/text/COMMINDE.TXT +%%DATADIR%%/text/CONSTANT.TXT +%%DATADIR%%/text/CONVFACT.TXT +%%DATADIR%%/text/CORRECTI.TXT +%%DATADIR%%/text/DATAPLOT.TXT +%%DATADIR%%/text/DEFAULTS.TXT +%%DATADIR%%/text/DELTEXT.BAT +%%DATADIR%%/text/DEMING14.TXT +%%DATADIR%%/text/DEMING7.TXT +%%DATADIR%%/text/DEX5.TXT +%%DATADIR%%/text/DEX7.TXT +%%DATADIR%%/text/DEXCONT.TXT +%%DATADIR%%/text/DEXCONT2.TXT +%%DATADIR%%/text/DEXEXAMP.TXT +%%DATADIR%%/text/DEXNIST.TXT +%%DATADIR%%/text/DEXPLAN.TXT +%%DATADIR%%/text/DEXPLANS.TXT +%%DATADIR%%/text/DEXRES4.TXT +%%DATADIR%%/text/DEXSTAT2.TXT +%%DATADIR%%/text/DEXSUMS2.TXT +%%DATADIR%%/text/DEXSUMSH.TXT +%%DATADIR%%/text/DPEX1F.TXT +%%DATADIR%%/text/DPGUI.TXT +%%DATADIR%%/text/DPMAIF.TXT +%%DATADIR%%/text/DPSNAPSH.TXT +%%DATADIR%%/text/DPSW.TXT +%%DATADIR%%/text/DPWORKSH.TXT +%%DATADIR%%/text/FEDPAY88.TXT +%%DATADIR%%/text/HOT.TXT +%%DATADIR%%/text/INDEX.DAT +%%DATADIR%%/text/INDEX2.DAT +%%DATADIR%%/text/ISHIKAW4.TXT +%%DATADIR%%/text/JAPAN3.TXT +%%DATADIR%%/text/JAPAN6.TXT +%%DATADIR%%/text/JAPANU.TXT +%%DATADIR%%/text/JAPANW.TXT +%%DATADIR%%/text/JOBS.TXT +%%DATADIR%%/text/KACKER.TXT +%%DATADIR%%/text/LATITUDE.TXT +%%DATADIR%%/text/MORTGAGE.TXT +%%DATADIR%%/text/NEWTOOLS.TXT +%%DATADIR%%/text/NORPPCC.TXT +%%DATADIR%%/text/NORPPCCS.TXT +%%DATADIR%%/text/OLDTOOLS.TXT +%%DATADIR%%/text/PDF.TXT +%%DATADIR%%/text/PERIM.TXT +%%DATADIR%%/text/PERIODIC.TXT +%%DATADIR%%/text/POSTCODE.TXT +%%DATADIR%%/text/POSTRATE.TXT +%%DATADIR%%/text/PPF.TXT +%%DATADIR%%/text/PRINCIPL.TXT +%%DATADIR%%/text/PROPERR.TXT +%%DATADIR%%/text/QUAL7OLD.TXT +%%DATADIR%%/text/QUALCOST.TXT +%%DATADIR%%/text/QUALTAG.TXT +%%DATADIR%%/text/QUICKREF.TXT +%%DATADIR%%/text/REFERENC.TXT +%%DATADIR%%/text/REFFIT.TXT +%%DATADIR%%/text/SNOWY.TXT +%%DATADIR%%/text/SPECTRUM.TXT +%%DATADIR%%/text/TAGINDEX.TXT +%%DATADIR%%/text/TAGREF.TXT +%%DATADIR%%/text/TAX1979.TXT +%%DATADIR%%/text/TAX1987.TXT +%%DATADIR%%/text/TIMEMANA.TXT +%%DATADIR%%/text/VOLUMES.TXT +%%DATADIR%%/text/WINDCHIL.TXT +%%DATADIR%%/text/WORKSTAT.TXT +%%DATADIR%%/text/ZIPTEXT.BAT -- cgit From 1269ee67792fa83073011e43adaaf35c3c553159 Mon Sep 17 00:00:00 2001 From: pfg Date: Tue, 6 Aug 2019 16:16:50 +0000 Subject: math/superlu_mt: update URLs. Make fetchable again. Cleanup distfiles while here. Approved by: thierry (mentor) --- math/superlu_mt/Makefile | 9 ++++----- math/superlu_mt/distinfo | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile index 20a4e577f628..8e554208bfbd 100644 --- a/math/superlu_mt/Makefile +++ b/math/superlu_mt/Makefile @@ -1,14 +1,13 @@ -# Created by: Pedro Giffuni +# Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= superlu_mt PORTVERSION= 3.1.20160319 PORTREVISION= 6 CATEGORIES= math -MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ - http://crd.lbl.gov/~xiaoye/:doc +MASTER_SITES= https://portal.nersc.gov/project/sparse/superlu/ \ + https://portal.nersc.gov/project/sparse/xiaoye-web/:doc DISTNAME= ${PORTNAME}_3.1 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} simax97.ps.gz:doc DIST_SUBDIR= superlu2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -18,7 +17,6 @@ COMMENT= Routines for performing multithreaded sparse factorization LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/License.txt -BROKEN= unfetchable BROKEN_aarch64= fails to build: undefined reference to sbrk BROKEN_powerpc64= fails to build: pstest runs away and consumes all memory BROKEN_sparc64= fails to link @@ -26,6 +24,7 @@ BROKEN_sparc64= fails to link USES= fortran gmake OPTIONS_DEFINE= DOCS +DOCS_DISTFILES= simax97.ps.gz:doc .include diff --git a/math/superlu_mt/distinfo b/math/superlu_mt/distinfo index 20e005bf9129..83cc852397da 100644 --- a/math/superlu_mt/distinfo +++ b/math/superlu_mt/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1494706587 -SHA256 (superlu2/superlu_mt_3.1.tar.gz) = 407b544b9a92b2ed536b1e713e80f986824cf3016657a4bfc2f3e7d2a76ecab6 -SIZE (superlu2/superlu_mt_3.1.tar.gz) = 1824440 +TIMESTAMP = 1565022927 SHA256 (superlu2/simax97.ps.gz) = 8f8ae10e28dfdeda2fed58b0bcec1bf96f10fa7b1d055aff160d77d7aeb8a983 SIZE (superlu2/simax97.ps.gz) = 158724 -- cgit From d001d29960e1fa6c14575d8945f6bd0fdc6aa6b8 Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 6 Aug 2019 17:05:30 +0000 Subject: Make fetchable again Submitted by: Daniel Roethlisberger --- security/fiked/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/security/fiked/Makefile b/security/fiked/Makefile index cdfcf41ca7cd..1ae7a7e3c0fe 100644 --- a/security/fiked/Makefile +++ b/security/fiked/Makefile @@ -5,7 +5,7 @@ PORTNAME= fiked PORTVERSION= 0.0.5 PORTREVISION= 7 CATEGORIES= security -MASTER_SITES= http://mirror.roe.ch/dist/fiked/ +MASTER_SITES= https://mirror.roe.ch/rel/fiked/ MAINTAINER= ports@FreeBSD.org COMMENT= Fake IKE PSK+XAUTH daemon based on VPNC @@ -13,8 +13,6 @@ COMMENT= Fake IKE PSK+XAUTH daemon based on VPNC LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= unfetchable - LIB_DEPENDS= libgcrypt.so:security/libgcrypt USES= gmake tar:bzip2 -- cgit From 1d4d0e4f7073d83fc8ab5eb105568ced4adf8c4c Mon Sep 17 00:00:00 2001 From: jgh Date: Tue, 6 Aug 2019 17:25:33 +0000 Subject: - set deprecation - set expiration to 2019-10-05 PR: 239661 Submitted by: w.schwarzenfeld@utanet.at (based on) --- x11-wm/fvwm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile index 3914ddd8fb65..cac495ae3dbd 100644 --- a/x11-wm/fvwm/Makefile +++ b/x11-wm/fvwm/Makefile @@ -12,6 +12,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Fvwm window manager BROKEN= unfetchable +DEPRECATED= unsupported upstream +EXPIRATION_DATE= 2019-10-05 CONFLICTS= fvwm-2.* -- cgit From 21c91a798d2f6b8023498e90e5583253dbc08d99 Mon Sep 17 00:00:00 2001 From: fernape Date: Tue, 6 Aug 2019 17:36:36 +0000 Subject: math/cvc4: simplify post-patch * Bump PORTREVISION * Unbreak lang/maude and lang/solidity (broken in r508058 and r508059) Reported by: jbeich@ Reviewed by: jbeich@ Differential Revision: https://reviews.freebsd.org/D21170 --- lang/maude/Makefile | 2 -- lang/solidity/Makefile | 2 -- math/cvc4/Makefile | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lang/maude/Makefile b/lang/maude/Makefile index b7c0ffa1ed1a..0bc46c0eeb0b 100644 --- a/lang/maude/Makefile +++ b/lang/maude/Makefile @@ -13,8 +13,6 @@ COMMENT= High-performance reflective language LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= 'cvc4_public.h' file not found - BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libbdd.so:science/buddy \ libtecla.so:devel/libtecla \ diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index 229fa2ba0e47..030024c61751 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -13,8 +13,6 @@ COMMENT= Solidity Contract-Oriented Programming Language LICENSE= GPLv3 -BROKEN= 'cvc4_public.h' file not found - BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile index e1c263b32b44..016f9e925fc6 100644 --- a/math/cvc4/Makefile +++ b/math/cvc4/Makefile @@ -2,6 +2,7 @@ PORTNAME= cvc4 DISTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= math java MASTER_SITES+= http://www.antlr3.org/download/:antlr3 DISTFILES+= antlr-3.4-complete.jar:antlr3 @@ -87,9 +88,8 @@ post-extract: @${CHMOD} +x ${WRKDIR}/antlr3 post-patch: - @${REINPLACE_CMD} -e "s|sed -i 's|sed -i.bak 's|g" \ + @${REINPLACE_CMD} -e "s|sed -i 's|sed -i '' 's|g" \ ${WRKSRC}/src/fix-install-headers.sh - @${FIND} ${WRKSRC} -name '*.bak' -delete # make a relative symlink instead of absolute to build dir post-install-JAVA-on: -- cgit From c3fb4cc72ab7f068a6374b476f87a9909519765e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:41:59 +0000 Subject: Add py-xmldiff 2.3 xmldiff is a library and a command-line utility for making diffs out of XML. This may seem like something that doesn't need a dedicated utility, but change detection in hierarchical data is very different from change detection in flat data. XML type formats are also not only used for computer readable0 data, it is also often used as a format for hierarchical data that can be rendered into human readable formats. A traditional diff on such a format would tell you line by line the differences, but this would not be be readable by a human. xmldiff provides tools to make human readable diffs in those situations. WWW: https://github.com/Shoobx/xmldiff --- textproc/Makefile | 1 + textproc/py-xmldiff/Makefile | 24 ++++++++++++++++++++++++ textproc/py-xmldiff/distinfo | 3 +++ textproc/py-xmldiff/pkg-descr | 10 ++++++++++ 4 files changed, 38 insertions(+) create mode 100644 textproc/py-xmldiff/Makefile create mode 100644 textproc/py-xmldiff/distinfo create mode 100644 textproc/py-xmldiff/pkg-descr diff --git a/textproc/Makefile b/textproc/Makefile index baee34480616..260e865df6a9 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1420,6 +1420,7 @@ SUBDIR += py-xlwriter SUBDIR += py-xlwt SUBDIR += py-xml-default-dict + SUBDIR += py-xmldiff SUBDIR += py-yapf SUBDIR += py-zope.app.i18n SUBDIR += py-zope.app.locales diff --git a/textproc/py-xmldiff/Makefile b/textproc/py-xmldiff/Makefile new file mode 100644 index 000000000000..0ef115849dc2 --- /dev/null +++ b/textproc/py-xmldiff/Makefile @@ -0,0 +1,24 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= xmldiff +PORTVERSION= 2.3 +CATEGORIES= textproc python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Creates diffs of XML files + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.1.0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/textproc/py-xmldiff/distinfo b/textproc/py-xmldiff/distinfo new file mode 100644 index 000000000000..2f990e47492e --- /dev/null +++ b/textproc/py-xmldiff/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565108366 +SHA256 (xmldiff-2.3.tar.gz) = 2727f62ab590c1fc834e86033988a76a86a67f5a78196584049b7a722bd94466 +SIZE (xmldiff-2.3.tar.gz) = 95947 diff --git a/textproc/py-xmldiff/pkg-descr b/textproc/py-xmldiff/pkg-descr new file mode 100644 index 000000000000..7569feed5497 --- /dev/null +++ b/textproc/py-xmldiff/pkg-descr @@ -0,0 +1,10 @@ +xmldiff is a library and a command-line utility for making diffs out of XML. +This may seem like something that doesn't need a dedicated utility, but change +detection in hierarchical data is very different from change detection in flat +data. XML type formats are also not only used for computer readable0 data, it is +also often used as a format for hierarchical data that can be rendered into +human readable formats. A traditional diff on such a format would tell you line +by line the differences, but this would not be be readable by a human. xmldiff +provides tools to make human readable diffs in those situations. + +WWW: https://github.com/Shoobx/xmldiff -- cgit From b1c2ab92fb506b039eab00d8db961224f1b4a458 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:04 +0000 Subject: Update to 1.10.2 Changes: https://github.com/DNS-OARC/dnscap/releases --- dns/dnscap/Makefile | 2 +- dns/dnscap/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dns/dnscap/Makefile b/dns/dnscap/Makefile index 91d1183112d7..5aaf94b9f37c 100644 --- a/dns/dnscap/Makefile +++ b/dns/dnscap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dnscap -PORTVERSION= 1.10.1 +PORTVERSION= 1.10.2 MASTER_SITES= https://www.dns-oarc.net/files/dnscap/ PORTEPOCH= 1 CATEGORIES= dns diff --git a/dns/dnscap/distinfo b/dns/dnscap/distinfo index f08cc7864464..db7c0ec1c755 100644 --- a/dns/dnscap/distinfo +++ b/dns/dnscap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562689550 -SHA256 (dnscap-1.10.1.tar.gz) = f919e6a8494e35b4a3428999fe4665ecb35c2ae1452d0c35da823f608c77a84f -SIZE (dnscap-1.10.1.tar.gz) = 655853 +TIMESTAMP = 1565108368 +SHA256 (dnscap-1.10.2.tar.gz) = fabeb5e037b80f572808e10aafcbf12190e0e62a89c2695d0cc52bd7de30c28b +SIZE (dnscap-1.10.2.tar.gz) = 655932 -- cgit From 9dc77576b381d1f6c91e9502dac656d414b547f8 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:09 +0000 Subject: Update to 5.0.13 Changes: https://github.com/tinymce/tinymce/blob/master/modules/tinymce/changelog.txt --- www/tinymce/Makefile | 2 +- www/tinymce/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile index f1c063bbefba..e880a3fe0801 100644 --- a/www/tinymce/Makefile +++ b/www/tinymce/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tinymce -PORTVERSION= 5.0.12 +PORTVERSION= 5.0.13 CATEGORIES= www MASTER_SITES= http://download.tiny.cloud/tinymce/community/ \ LOCAL/sunpoet diff --git a/www/tinymce/distinfo b/www/tinymce/distinfo index dceb2f36306f..5be1aa4cb465 100644 --- a/www/tinymce/distinfo +++ b/www/tinymce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563640689 -SHA256 (tinymce_5.0.12.zip) = 522e6daa3448e3ec7bbb4ca81183ebf188ef930f291b4795ffbd10cdf32ca5f6 -SIZE (tinymce_5.0.12.zip) = 635278 +TIMESTAMP = 1565108370 +SHA256 (tinymce_5.0.13.zip) = 7ac333ac97d05b0ba510554b912c8bfce58641797e829588317e6de426787af4 +SIZE (tinymce_5.0.13.zip) = 649425 -- cgit From 277c7577535129d8e425f70e75839c7c04657186 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:15 +0000 Subject: Update to 0.2.2 Changes: https://metacpan.org/changes/distribution/Types-Core https://metacpan.org/source/LAWALSH/Types-Core-0.2.2/lib/Types/Core.pm --- devel/p5-Types-Core/Makefile | 2 +- devel/p5-Types-Core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/p5-Types-Core/Makefile b/devel/p5-Types-Core/Makefile index 12a37226d771..d9e8cfe39a0d 100644 --- a/devel/p5-Types-Core/Makefile +++ b/devel/p5-Types-Core/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Types-Core -PORTVERSION= 0.2.1 +PORTVERSION= 0.2.2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:LAWALSH diff --git a/devel/p5-Types-Core/distinfo b/devel/p5-Types-Core/distinfo index 919966e3e3f1..b7010b57eec6 100644 --- a/devel/p5-Types-Core/distinfo +++ b/devel/p5-Types-Core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565012808 -SHA256 (Types-Core-0.2.1.tar.gz) = af4132dc25f39af01a6f7bf81782f68346f10dd1965f882492e3712481e8b844 -SIZE (Types-Core-0.2.1.tar.gz) = 18405 +TIMESTAMP = 1565108372 +SHA256 (Types-Core-0.2.2.tar.gz) = 12ad27e68d3089d3bf50d17cb050302fb725b64ff7ab6431240252760b56888b +SIZE (Types-Core-0.2.2.tar.gz) = 18681 -- cgit From 2bafe890598cfd26f0fc47aba35033f95e0aeacc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:20 +0000 Subject: Update to 4.32.3 Changes: https://github.com/HypothesisWorks/hypothesis/blob/master/hypothesis-python/docs/changes.rst --- devel/py-hypothesis/Makefile | 2 +- devel/py-hypothesis/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile index 9f4bbf52d803..ed6b53a099df 100644 --- a/devel/py-hypothesis/Makefile +++ b/devel/py-hypothesis/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hypothesis -PORTVERSION= 4.32.2 +PORTVERSION= 4.32.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-hypothesis/distinfo b/devel/py-hypothesis/distinfo index c3bec6f0e102..c65cab1aeec4 100644 --- a/devel/py-hypothesis/distinfo +++ b/devel/py-hypothesis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564757533 -SHA256 (hypothesis-4.32.2.tar.gz) = 2bc111859ad0456cc585aeb417dc012165c2e37e03e4b10aba73ec0c9b6330e4 -SIZE (hypothesis-4.32.2.tar.gz) = 201699 +TIMESTAMP = 1565108374 +SHA256 (hypothesis-4.32.3.tar.gz) = c6d4ba47bc97e4651fccd692d6cecca9c1ad673f114107e4d37419d5fc172ee2 +SIZE (hypothesis-4.32.3.tar.gz) = 201345 -- cgit From 4dd3a2db03aac9a238f7e197358eabdef90e1163 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:25 +0000 Subject: Update to 1.37.0 Changes: https://docs.openstack.org/oslo.cache/latest/user/history.html --- devel/py-oslo.cache/Makefile | 2 +- devel/py-oslo.cache/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-oslo.cache/Makefile b/devel/py-oslo.cache/Makefile index 44ef32f475a3..c9c6fd4021cd 100644 --- a/devel/py-oslo.cache/Makefile +++ b/devel/py-oslo.cache/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oslo.cache -PORTVERSION= 1.36.0 +PORTVERSION= 1.37.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.cache/distinfo b/devel/py-oslo.cache/distinfo index ef4edaafdf67..11ad783e3e20 100644 --- a/devel/py-oslo.cache/distinfo +++ b/devel/py-oslo.cache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561147699 -SHA256 (oslo.cache-1.36.0.tar.gz) = a1b91ca7eef8d5c15b48c9f7aabe01b6bfa96b971eb9ddb7c2fd4f79f713b259 -SIZE (oslo.cache-1.36.0.tar.gz) = 54680 +TIMESTAMP = 1565108376 +SHA256 (oslo.cache-1.37.0.tar.gz) = da0f787bb47f71c3a0b1e7141b30498590da0aa8e72e205e79ac74581954af9a +SIZE (oslo.cache-1.37.0.tar.gz) = 54565 -- cgit From 95d51814c574c2fceddafbe205b42d05fa85f7bf Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:31 +0000 Subject: Update to 3.38.1 Changes: https://docs.openstack.org/oslo.middleware/latest/user/history.html --- devel/py-oslo.middleware/Makefile | 2 +- devel/py-oslo.middleware/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-oslo.middleware/Makefile b/devel/py-oslo.middleware/Makefile index 7962ad561f7b..4fa44add9eeb 100644 --- a/devel/py-oslo.middleware/Makefile +++ b/devel/py-oslo.middleware/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oslo.middleware -PORTVERSION= 3.38.0 +PORTVERSION= 3.38.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.middleware/distinfo b/devel/py-oslo.middleware/distinfo index d739a9e33761..0e5251726c7c 100644 --- a/devel/py-oslo.middleware/distinfo +++ b/devel/py-oslo.middleware/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556375511 -SHA256 (oslo.middleware-3.38.0.tar.gz) = 73d6e5ac96b1c41b3db1168323b83aeff0f995b0fcc72561b98c45aacd76b5d3 -SIZE (oslo.middleware-3.38.0.tar.gz) = 56886 +TIMESTAMP = 1565108378 +SHA256 (oslo.middleware-3.38.1.tar.gz) = fc7970509e8b4ac847f3c0c5ec9bb331b7e8a664bacef9eb26676636f39e8a81 +SIZE (oslo.middleware-3.38.1.tar.gz) = 56359 -- cgit From 35aa16f2b05f58add3aaf73b71bfb0ba15ca1d73 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:36 +0000 Subject: Update to 1.3.1 Changes: https://github.com/planetlabs/planet-client-python/releases --- www/py-planet/Makefile | 2 +- www/py-planet/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile index fd839a0bcbe8..1677b150ade1 100644 --- a/www/py-planet/Makefile +++ b/www/py-planet/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= planet -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-planet/distinfo b/www/py-planet/distinfo index b009e205a9e3..ef92cd926e7b 100644 --- a/www/py-planet/distinfo +++ b/www/py-planet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563640755 -SHA256 (planet-1.3.0.tar.gz) = 5833113de70e6e77b51058c3faa1d5a705bbeaa72848609a9e5199035e239b06 -SIZE (planet-1.3.0.tar.gz) = 37560 +TIMESTAMP = 1565108380 +SHA256 (planet-1.3.1.tar.gz) = b3efbbdb63f0602cd3769e6c268cd3db0a917fd7f3973cd520b28ff99f23d5a0 +SIZE (planet-1.3.1.tar.gz) = 37690 -- cgit From 36222f46032ee82b8762d804bdc9f3b3bd73467f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:41 +0000 Subject: Update to 2.11.326 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index e93ad61c3902..34c54444fd16 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.325 +DISTVERSION= 2.11.326 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 920c3b05e28e..774a77ee3541 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564837238 -SHA256 (rubygem/aws-sdk-2.11.325.gem) = 7d5abb7e5d8122d12e1c63a28505afa5feb79cad2002ca4dd672ea8dab70dee8 -SIZE (rubygem/aws-sdk-2.11.325.gem) = 4608 +TIMESTAMP = 1565108382 +SHA256 (rubygem/aws-sdk-2.11.326.gem) = 6dc5edff191fc2ca5aba422513688c6d8c52bb4317ef3a2d4950a37c83a0a146 +SIZE (rubygem/aws-sdk-2.11.326.gem) = 4608 -- cgit From d3f1278e1acd61f1bfad215f97e58a3ddef0fc09 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:46 +0000 Subject: Update to 2.11.326 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 8ef545c49aee..dede773eca3c 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.325 +DISTVERSION= 2.11.326 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 9545eb181c4c..d49168f87645 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564837241 -SHA256 (rubygem/aws-sdk-core-2.11.325.gem) = c8dbca28db332c3df143746b5883741d9c2e7d6bc5639ca2fd1a6b8e47f264aa -SIZE (rubygem/aws-sdk-core-2.11.325.gem) = 1629184 +TIMESTAMP = 1565108384 +SHA256 (rubygem/aws-sdk-core-2.11.326.gem) = 522ae5d7b5663a59d0923b3ec92473f7f23f6107bc4b65d6a4bc11256ef98bd3 +SIZE (rubygem/aws-sdk-core-2.11.326.gem) = 1631232 -- cgit From 0f8fd5ba234fe7b7d98a4fe884c2208c880ff769 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:52 +0000 Subject: Update to 2.11.326 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 97a8105e1ee2..6f04f1d9f8a0 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.325 +DISTVERSION= 2.11.326 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 2199d1d05668..59f95b6df02a 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564837243 -SHA256 (rubygem/aws-sdk-resources-2.11.325.gem) = 25d3228afc9c80c9299b1acb7cee387c1eaaf5bf33541d22d1a7f8a66d05875a -SIZE (rubygem/aws-sdk-resources-2.11.325.gem) = 48640 +TIMESTAMP = 1565108386 +SHA256 (rubygem/aws-sdk-resources-2.11.326.gem) = 4da005b6c0a963b6b6f244e4a52adbee7725cb648f86777b5f9aa1dd4d669a38 +SIZE (rubygem/aws-sdk-resources-2.11.326.gem) = 48640 -- cgit From fe6b37844c81604883725b6c01526bff5d719ea0 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:42:57 +0000 Subject: Update to 0.9.0 Changes: https://github.com/googleapis/google-auth-library-ruby/blob/master/CHANGELOG.md --- security/rubygem-googleauth/Makefile | 2 +- security/rubygem-googleauth/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/rubygem-googleauth/Makefile b/security/rubygem-googleauth/Makefile index 409c37635819..58fdf257e7d7 100644 --- a/security/rubygem-googleauth/Makefile +++ b/security/rubygem-googleauth/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= googleauth -PORTVERSION= 0.8.1 +PORTVERSION= 0.9.0 CATEGORIES= security rubygems MASTER_SITES= RG diff --git a/security/rubygem-googleauth/distinfo b/security/rubygem-googleauth/distinfo index b0498e9a5230..2cdde84a3578 100644 --- a/security/rubygem-googleauth/distinfo +++ b/security/rubygem-googleauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553765425 -SHA256 (rubygem/googleauth-0.8.1.gem) = 5f527d4eb2284279be5b2d605e0eef19d0a7187d2b489f6ce0c6f011d637195f -SIZE (rubygem/googleauth-0.8.1.gem) = 47104 +TIMESTAMP = 1565108388 +SHA256 (rubygem/googleauth-0.9.0.gem) = 0e2faad0fc1b0cfe3a55e606fd0567ea7d7ba61d6f317e097ea498d33280b7d3 +SIZE (rubygem/googleauth-0.9.0.gem) = 49664 -- cgit From 35d12381870d4f1a05efa026a3f3cbc8f1d2f102 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:43:02 +0000 Subject: Update to 0.132 Changes: https://metacpan.org/changes/distribution/Astro-SpaceTrack --- astro/p5-Astro-SpaceTrack/Makefile | 2 +- astro/p5-Astro-SpaceTrack/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile index a5840e1f519b..7915f74c569d 100644 --- a/astro/p5-Astro-SpaceTrack/Makefile +++ b/astro/p5-Astro-SpaceTrack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Astro-SpaceTrack -PORTVERSION= 0.131 +PORTVERSION= 0.132 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/astro/p5-Astro-SpaceTrack/distinfo b/astro/p5-Astro-SpaceTrack/distinfo index 08301806e2ce..e8ad84724e74 100644 --- a/astro/p5-Astro-SpaceTrack/distinfo +++ b/astro/p5-Astro-SpaceTrack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563736994 -SHA256 (Astro-SpaceTrack-0.131.tar.gz) = 84b8291515c6185d895e8513dece7fb045b74bccd4b151abed678cac585f9298 -SIZE (Astro-SpaceTrack-0.131.tar.gz) = 184936 +TIMESTAMP = 1565108390 +SHA256 (Astro-SpaceTrack-0.132.tar.gz) = 4fcad86e29bbba69bd0821a8329613931a90d65fe3c25eae55ec83bf4aa462c1 +SIZE (Astro-SpaceTrack-0.132.tar.gz) = 184872 -- cgit From 24119b4258dcd55730e75a7a79c17ea28696cbda Mon Sep 17 00:00:00 2001 From: sunpoet Date: Tue, 6 Aug 2019 17:43:07 +0000 Subject: Update MASTER_SITES and unbreak this port PR: 239663 (based on) Reported by: Walter Schwarzenfeld --- security/distcache/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/distcache/Makefile b/security/distcache/Makefile index b520abbe2b45..6913bb7d2966 100644 --- a/security/distcache/Makefile +++ b/security/distcache/Makefile @@ -4,8 +4,7 @@ PORTNAME= distcache DISTVERSION= 1.5.1 CATEGORIES= security www -MASTER_SITES= SF/${PORTNAME}/2.%20${PORTNAME}-stable/${PORTVERSION} \ - http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/ +MASTER_SITES= SF/distcache/1.%20distcache-devel/1.5.1 MAINTAINER= ports@FreeBSD.org COMMENT= Distributed OpenSSL session caching tools @@ -13,8 +12,6 @@ COMMENT= Distributed OpenSSL session caching tools LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= unfetchable - USES= libtool ssl tar:bzip2 USE_RC_SUBR= dc_server USE_LDCONFIG= yes -- cgit From 9aef22c4afb264a272755114a4c2f582f6208da4 Mon Sep 17 00:00:00 2001 From: fernape Date: Tue, 6 Aug 2019 17:53:16 +0000 Subject: math/emc2: pet portlint * Move out of order variable * Remake patches --- math/emc2/Makefile | 4 ++-- math/emc2/files/patch-Makefile | 4 ++-- math/emc2/files/patch-f3d__u_hp700__prettydate.c | 8 ++++---- math/emc2/files/patch-f3d__u_hp700__prettytime.c | 8 ++++---- math/emc2/files/patch-libI77__fio.h | 4 ++-- math/emc2/files/patch-libI77__lread.c | 10 +++++----- math/emc2/files/patch-libemc2_1.c | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/math/emc2/Makefile b/math/emc2/Makefile index 8e6b4606c831..6dac0e70630c 100644 --- a/math/emc2/Makefile +++ b/math/emc2/Makefile @@ -17,11 +17,11 @@ LICENSE_NAME= INRIA license, perhaps specific to emc2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LICENSE_PERMS= auto-accept no-dist-sell no-pkg-sell -RESTRICTED= No resale, contact author for commercial usage - USES= gmake USE_XORG= x11 xau xcb xdmcp + ALL_TARGET= ${PORTNAME} +RESTRICTED= No resale, contact author for commercial usage .if defined(LANG) && ${LANG:Mfr*} != "" CFLAGS+= -DFRENCH diff --git a/math/emc2/files/patch-Makefile b/math/emc2/files/patch-Makefile index 2dd8634f9b0b..344fe959b418 100644 --- a/math/emc2/files/patch-Makefile +++ b/math/emc2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Feb 10 09:17:51 2003 -+++ Makefile Tue Dec 16 23:22:42 2003 +--- Makefile.orig 2003-02-10 08:17:51 UTC ++++ Makefile @@ -8,9 +8,9 @@ # for IBM RS6000 #CC=xlc diff --git a/math/emc2/files/patch-f3d__u_hp700__prettydate.c b/math/emc2/files/patch-f3d__u_hp700__prettydate.c index 1cc91f968391..1e8ceb1ea4f7 100644 --- a/math/emc2/files/patch-f3d__u_hp700__prettydate.c +++ b/math/emc2/files/patch-f3d__u_hp700__prettydate.c @@ -1,6 +1,6 @@ ---- ./f3d/u_hp700/prettydate.c.orig 2010-08-31 08:51:18.000000000 -0400 -+++ ./f3d/u_hp700/prettydate.c 2010-08-31 08:52:44.000000000 -0400 -@@ -6,7 +6,7 @@ +--- f3d/u_hp700/prettydate.c.orig 1999-11-09 14:58:17 UTC ++++ f3d/u_hp700/prettydate.c +@@ -6,7 +6,7 @@ char *date; { time_t timevar; struct tm *pttm; @@ -9,7 +9,7 @@ timevar=time(&timevar); pttm = localtime(&timevar); -@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@ char *date; sprintf(buffer,"%02d%02d%02d",pttm->tm_year % 100, pttm->tm_mon+1, pttm->tm_mday); diff --git a/math/emc2/files/patch-f3d__u_hp700__prettytime.c b/math/emc2/files/patch-f3d__u_hp700__prettytime.c index 863755e7427d..ce5e229beab0 100644 --- a/math/emc2/files/patch-f3d__u_hp700__prettytime.c +++ b/math/emc2/files/patch-f3d__u_hp700__prettytime.c @@ -1,6 +1,6 @@ ---- ./f3d/u_hp700/prettytime.c.orig 2010-08-31 08:51:31.000000000 -0400 -+++ ./f3d/u_hp700/prettytime.c 2010-08-31 08:52:32.000000000 -0400 -@@ -6,7 +6,7 @@ +--- f3d/u_hp700/prettytime.c.orig 1999-11-09 14:58:18 UTC ++++ f3d/u_hp700/prettytime.c +@@ -6,7 +6,7 @@ char *timeret; { time_t timevar; struct tm *pttm; @@ -9,7 +9,7 @@ timevar=time(&timevar); pttm = localtime(&timevar); -@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@ char *timeret; sprintf(buffer,"%02d%02d%02d000000",pttm->tm_hour, pttm->tm_min, pttm->tm_sec); diff --git a/math/emc2/files/patch-libI77__fio.h b/math/emc2/files/patch-libI77__fio.h index 1ebd63157a40..83cd08d3a14a 100644 --- a/math/emc2/files/patch-libI77__fio.h +++ b/math/emc2/files/patch-libI77__fio.h @@ -1,5 +1,5 @@ ---- libI77/fio.h.orig Tue Nov 9 15:58:43 1999 -+++ libI77/fio.h Tue Dec 16 23:53:43 2003 +--- libI77/fio.h.orig 1999-11-09 14:58:43 UTC ++++ libI77/fio.h @@ -17,6 +17,12 @@ #endif #endif diff --git a/math/emc2/files/patch-libI77__lread.c b/math/emc2/files/patch-libI77__lread.c index c948e6142608..4590305bed6a 100644 --- a/math/emc2/files/patch-libI77__lread.c +++ b/math/emc2/files/patch-libI77__lread.c @@ -1,6 +1,6 @@ ---- ./libI77/lread.c.orig 2010-08-31 08:39:32.000000000 -0400 -+++ ./libI77/lread.c 2010-08-31 08:40:19.000000000 -0400 -@@ -369,7 +369,7 @@ +--- libI77/lread.c.orig 1999-11-09 14:58:44 UTC ++++ libI77/lread.c +@@ -369,7 +369,7 @@ l_CHAR(Void) *p++ = ch; f__lcount = 10*f__lcount + ch - '0'; if (++i == size) { @@ -9,7 +9,7 @@ (unsigned int)(size += BUFSIZE)); p = f__lchar + i; } -@@ -401,7 +401,7 @@ +@@ -401,7 +401,7 @@ l_CHAR(Void) noquote: *p++ = ch; if (++i == size) { @@ -18,7 +18,7 @@ (unsigned int)(size += BUFSIZE)); p = f__lchar + i; } -@@ -414,7 +414,7 @@ +@@ -414,7 +414,7 @@ l_CHAR(Void) if(i==size) { newone: diff --git a/math/emc2/files/patch-libemc2_1.c b/math/emc2/files/patch-libemc2_1.c index eca9f96691b8..6b7ce92b7986 100644 --- a/math/emc2/files/patch-libemc2_1.c +++ b/math/emc2/files/patch-libemc2_1.c @@ -1,6 +1,6 @@ ---- ./libemc2_1.c.orig 2010-08-31 08:37:40.000000000 -0400 -+++ ./libemc2_1.c 2010-08-31 08:38:38.000000000 -0400 -@@ -1517,7 +1517,7 @@ +--- libemc2_1.c.orig 1999-11-09 14:58:23 UTC ++++ libemc2_1.c +@@ -1517,7 +1517,7 @@ R*/ i__1[2] = 7, a__1[2] = "' retry"; s_cat(ch__1, a__1, i__1, &c__3, 99L); scrtch_(ch__1, ii + 19); -- cgit From 017c829626e94b448e0bfdc0c79cba6a500192c1 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Tue, 6 Aug 2019 19:48:39 +0000 Subject: graphics/dilay: fix build with GCC-based architectures GCC needs -Wno-narrowing: src/isosurface-extraction/grid.cpp:309:53: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] While here also add USES=gl. PR: 239312 Approved by: yuri (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D21143 --- graphics/dilay/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/dilay/Makefile b/graphics/dilay/Makefile index db8b23a3397d..45ebc55af971 100644 --- a/graphics/dilay/Makefile +++ b/graphics/dilay/Makefile @@ -14,13 +14,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm -USES= compiler:c++14-lang gmake qmake qt:5 +USES= compiler:c++14-lang gl gmake qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= abau USE_CXXSTD= c++14 USE_GL= gl USE_QT= core gui opengl widgets xml buildtools_build +CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +CXXFLAGS_gcc= -Wno-narrowing MAKE_JOBS_UNSAFE= yes # Workaround for: https://github.com/abau/dilay/issues/19 parallel build fails (still a problem despite having been closed) PLIST_FILES= bin/dilay \ -- cgit From d2e2279197bc56507149c53fbd127123008a0372 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Tue, 6 Aug 2019 20:35:37 +0000 Subject: sysutils/mtm: Fix a typo in COMMENT Reported by: kai --- sysutils/mtm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/mtm/Makefile b/sysutils/mtm/Makefile index c52f0bfe51f7..61870d07d7b1 100644 --- a/sysutils/mtm/Makefile +++ b/sysutils/mtm/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 1.0.1 CATEGORIES= sysutils MAINTAINER= 0mp@FreeBSD.org -COMMENT= Terminal multiplexer focued on simplicity, compatibility and stability +COMMENT= Terminal multiplexer focused on simplicity, compatibility and stability LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/README.rst -- cgit From 86b947ddacf09b489a9b723c94cbf32d3e9c68ea Mon Sep 17 00:00:00 2001 From: demon Date: Tue, 6 Aug 2019 20:42:07 +0000 Subject: Update to version 2.0.4. --- net/haproxy/Makefile | 3 +-- net/haproxy/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index e8641dc0b0bf..5f849e22138c 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 2.0.3 -PORTREVISION= 1 +DISTVERSION= 2.0.4 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/2.0/src/ diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index 9e776bd3c30c..5f10fb31d832 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563893819 -SHA256 (haproxy-2.0.3.tar.gz) = aac1ff3e5079997985b6560f46bf265447d0cd841f11c4d77f15942c9fe4b770 -SIZE (haproxy-2.0.3.tar.gz) = 2534678 +TIMESTAMP = 1565124008 +SHA256 (haproxy-2.0.4.tar.gz) = e2680696032c8b957cd26fd948fff239d2cfc17b00964e6d2dc5adf8155fcef1 +SIZE (haproxy-2.0.4.tar.gz) = 2538442 -- cgit From fba73ec90fd48e558957859886e0e8bae9c6bc3c Mon Sep 17 00:00:00 2001 From: ultima Date: Tue, 6 Aug 2019 21:54:29 +0000 Subject: Updated to v164 Changes: Added Icelake client model numbers --- sysutils/mcelog/Makefile | 2 +- sysutils/mcelog/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/mcelog/Makefile b/sysutils/mcelog/Makefile index ca342d265333..6cc0c92ff99f 100644 --- a/sysutils/mcelog/Makefile +++ b/sysutils/mcelog/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mcelog -PORTVERSION= 162 +PORTVERSION= 164 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/mcelog/distinfo b/sysutils/mcelog/distinfo index 2c067124d1f9..82a988663bef 100644 --- a/sysutils/mcelog/distinfo +++ b/sysutils/mcelog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550099603 -SHA256 (andikleen-mcelog-v162_GH0.tar.gz) = 875e98572e86240ea319ab1f69ee6d744eb8b73ac5d700e474f6410d0f52d3fc -SIZE (andikleen-mcelog-v162_GH0.tar.gz) = 308347 +TIMESTAMP = 1565128189 +SHA256 (andikleen-mcelog-v164_GH0.tar.gz) = cef63be2e77394b847a0fe046db87cdbb40df5f94a868694f01f9680148818a6 +SIZE (andikleen-mcelog-v164_GH0.tar.gz) = 308393 -- cgit From daa7a7415953865b7a67d704499464a6efb2b182 Mon Sep 17 00:00:00 2001 From: zeising Date: Tue, 6 Aug 2019 22:14:41 +0000 Subject: graphics/drm-devel-kmod: Update snapshot Update graphics/drm-devel-kmod to the latest snapshot. Fixes a panic on ppc64 POWER9. FreeBSD Graphics issue: #161 https://github.com/FreeBSDDesktop/kms-drm/issues/161 MFH: 2019Q3 --- graphics/drm-devel-kmod/Makefile | 5 ++--- graphics/drm-devel-kmod/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile index cd5825688699..3c08bd0a3b43 100644 --- a/graphics/drm-devel-kmod/Makefile +++ b/graphics/drm-devel-kmod/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= drm-devel-kmod -PORTVERSION= 5.0.g20190722 -PORTREVISION= 1 +PORTVERSION= 5.0.g20190806 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -29,7 +28,7 @@ USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= 938547c +GH_TAGNAME= 1d1a81b .include diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo index 4618f2450f5b..ef42f0d2cae4 100644 --- a/graphics/drm-devel-kmod/distinfo +++ b/graphics/drm-devel-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563813834 -SHA256 (FreeBSDDesktop-kms-drm-5.0.g20190722-938547c_GH0.tar.gz) = 6a92c766dd87632d6a3ad30fb26f309a18478e673310f0fb04e798ccc74ff3b6 -SIZE (FreeBSDDesktop-kms-drm-5.0.g20190722-938547c_GH0.tar.gz) = 14631376 +TIMESTAMP = 1565128771 +SHA256 (FreeBSDDesktop-kms-drm-5.0.g20190806-1d1a81b_GH0.tar.gz) = cb299c99ada40d338659f2932e32e0d75e7b7947b0a19837f66af7e323f8ef83 +SIZE (FreeBSDDesktop-kms-drm-5.0.g20190806-1d1a81b_GH0.tar.gz) = 14631085 -- cgit From 2413073f36d74d20124d9871976ec2d07f9c6c79 Mon Sep 17 00:00:00 2001 From: zeising Date: Tue, 6 Aug 2019 22:15:37 +0000 Subject: graphics/drm-current-kmod: Update snapshot Update graphics/drm-current-kmod to the latest snapshot. Fixes a panic on ppc64 POWER9. FreeBSD Graphics issue: #161 https://github.com/FreeBSDDesktop/kms-drm/issues/161 MFH: 2019Q3 (implict, drm-drivers blanket) --- graphics/drm-current-kmod/Makefile | 5 ++--- graphics/drm-current-kmod/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile index 8dbb675e7074..b558b248d8b7 100644 --- a/graphics/drm-current-kmod/Makefile +++ b/graphics/drm-current-kmod/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= drm-current-kmod -PORTVERSION= 4.16.g20190722 -PORTREVISION= 1 +PORTVERSION= 4.16.g20190806 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -29,7 +28,7 @@ USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= 9dc2a2b +GH_TAGNAME= 2ada4e8 .include diff --git a/graphics/drm-current-kmod/distinfo b/graphics/drm-current-kmod/distinfo index 5911cf6313e4..b5555747df31 100644 --- a/graphics/drm-current-kmod/distinfo +++ b/graphics/drm-current-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563814268 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190722-9dc2a2b_GH0.tar.gz) = bee86f3c1d505bf52359025782898e8802f3fb75927ed1a018bee00ec8269565 -SIZE (FreeBSDDesktop-kms-drm-4.16.g20190722-9dc2a2b_GH0.tar.gz) = 13089177 +TIMESTAMP = 1565128858 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190806-2ada4e8_GH0.tar.gz) = da338eb2feb113a7579a7c14eaabf0a45ad0aebafc8ca3851a48fbe4094c1b7a +SIZE (FreeBSDDesktop-kms-drm-4.16.g20190806-2ada4e8_GH0.tar.gz) = 13088709 -- cgit From 7dfcab4d096aa187aa3e1124838b93a2a143ff00 Mon Sep 17 00:00:00 2001 From: jgh Date: Tue, 6 Aug 2019 22:33:35 +0000 Subject: - update to 5.57 - remove unnecessary patches (worked with upstream to bring in) - shift to uses for gnome - add libdepends on libpng16.so:graphics/png --- x11/xlockmore/Makefile | 20 ++++++-------------- x11/xlockmore/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 2fb7544ec54a..c259ec82f4ee 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -2,27 +2,27 @@ # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.55 -PORTREVISION= 1 +PORTVERSION= 5.57 CATEGORIES?= x11 MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Like XLock session locker/screen saver, but just more LICENSE= BSD2CLAUSE -USES= tar:xz +USES= tar:xz gnome + GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ --without-dtsaver --without-rplay --without-nas \ --without-gtk --without-esound --disable-setuid -USE_GNOME= # USE_XORG= x11 xaw ice sm xpm xext xinerama -LIB_DEPENDS+= libfreetype.so:print/freetype2 +LIB_DEPENDS+= libfreetype.so:print/freetype2 \ + libpng16.so:graphics/png OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \ @@ -162,13 +162,5 @@ pre-extract: post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in - @${REINPLACE_CMD} -e 's|$$(SOUNDPATH)|$$(DESTDIR)$$(SOUNDPATH)|g' ${WRKSRC}/modes/Makefile.in - @${REINPLACE_CMD} -e '/$$(ETCDIR)play.sh/ s|$$(INSTALL_PROGRAM)|$$(INSTALL_PROGRAM:N-s)|' ${WRKSRC}/modes/Makefile.in -.if exists(/usr/bin/fortune) - @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in -.endif - -post-configure: - @${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile .include diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 8b96d0305557..8e88d0bc15e4 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531500962 -SHA256 (xlockmore-5.55.tar.xz) = d4f1fa5b19efc20262d77207636aa54fc66ba40aa867119f03a15981b3396ef8 -SIZE (xlockmore-5.55.tar.xz) = 1650116 +TIMESTAMP = 1565032489 +SHA256 (xlockmore-5.57.tar.xz) = f9acf99befd798ac93909b2d7d6578a256d2dac283ddc562acc9b6ef10cc28a3 +SIZE (xlockmore-5.57.tar.xz) = 1835880 -- cgit From a676ab5a6449bd6fb6d1ee216913568a4b0201a4 Mon Sep 17 00:00:00 2001 From: jgh Date: Tue, 6 Aug 2019 22:45:08 +0000 Subject: - remove unnecessary usage of MASTER_SITES --- sysutils/screenfetch/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 6d803aa452a4..9b0f6330d53f 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -5,9 +5,8 @@ PORTNAME= screenFetch PORTVERSION= 3.8.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= LOCAL/jgh/sysutils/${PORTNAME:tl}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Bash Screenshot Information Tool LICENSE= GPLv3+ -- cgit From 761606292f81873c36f5cac3b5a35bb2a347bbe7 Mon Sep 17 00:00:00 2001 From: jgh Date: Wed, 7 Aug 2019 01:16:30 +0000 Subject: - update to 20190725 - shift to gmake for build - pet portlint Release 20190725: ================= - autoconf scripts update - added build description for cmake - added build dependency calculation - added support for PAGER environment variable - make now stores object files in build directory - removed some dead code - changed default log level to status - reworked/simplified logging code > Description of fields to fill in above: 76 columns --| > PR: If and which Problem Report is related. > Submitted by: If someone else sent in the change. > Reported by: If someone else reported the issue. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization (each collaborator). > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. M xjobs/Makefile M xjobs/distinfo --- sysutils/xjobs/Makefile | 9 +++++---- sysutils/xjobs/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sysutils/xjobs/Makefile b/sysutils/xjobs/Makefile index 047326e7577d..65fab792ac5a 100644 --- a/sysutils/xjobs/Makefile +++ b/sysutils/xjobs/Makefile @@ -2,20 +2,21 @@ # $FreeBSD$ PORTNAME= xjobs -PORTVERSION= 20170829 +PORTVERSION= 20190725 CATEGORIES= sysutils MASTER_SITES= http://www.maier-komor.de/xjobs/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Utility reads job descriptions line by line and executes in parallel LICENSE= GPLv2 +USES= tar:tgz gmake + GNU_CONFIGURE= yes PLIST_FILES= bin/xjobs man/man1/xjobs.1.gz -USES= tar:tgz -PORTDOCS= ChangeLog README +PORTDOCS= ChangeLog README.md OPTIONS_DEFINE= DOCS diff --git a/sysutils/xjobs/distinfo b/sysutils/xjobs/distinfo index 094f4e097218..4ca0c3f75b65 100644 --- a/sysutils/xjobs/distinfo +++ b/sysutils/xjobs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532707374 -SHA256 (xjobs-20170829.tgz) = ebbd0b7fa90451773732680e6d0afe426c75150ad5ec7bce77537d109afcc6da -SIZE (xjobs-20170829.tgz) = 109732 +TIMESTAMP = 1565133472 +SHA256 (xjobs-20190725.tgz) = 1583e9fe6d93493f6d8d6f1652413c3a4694630112d0294f0d49d629afa9fa78 +SIZE (xjobs-20190725.tgz) = 113216 -- cgit From 3da1016cb5291dc638c7c58a7730915558edbdf9 Mon Sep 17 00:00:00 2001 From: jgh Date: Wed, 7 Aug 2019 01:30:59 +0000 Subject: - pet portlint a bit > Description of fields to fill in above: 76 columns --| > PR: If and which Problem Report is related. > Submitted by: If someone else sent in the change. > Reported by: If someone else reported the issue. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization (each collaborator). > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. M fluxbox/Makefile --- x11-wm/fluxbox/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index e7fa78c2b8ee..5f56bd08beb7 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Small and fast window manager based on BlackBox LICENSE= MIT @@ -20,8 +20,9 @@ LIB_DEPENDS= libfribidi.so:converters/fribidi \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USE_XORG= x11 xext xorgproto xft xpm xrandr USES= gmake pkgconfig + +USE_XORG= x11 xext xorgproto xft xpm xrandr GNU_CONFIGURE= yes PORTDATA= * -- cgit From d73f54c9b9b2b09fd4dc339c65e6a4e63f978b6d Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 7 Aug 2019 01:35:26 +0000 Subject: New port: x11-toolkits/redkite: GUI toolkit --- x11-toolkits/Makefile | 1 + x11-toolkits/redkite/Makefile | 24 ++++++++++++++++++++++++ x11-toolkits/redkite/distinfo | 3 +++ x11-toolkits/redkite/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ x11-toolkits/redkite/pkg-descr | 4 ++++ x11-toolkits/redkite/pkg-plist | 23 +++++++++++++++++++++++ 6 files changed, 75 insertions(+) create mode 100644 x11-toolkits/redkite/Makefile create mode 100644 x11-toolkits/redkite/distinfo create mode 100644 x11-toolkits/redkite/files/patch-CMakeLists.txt create mode 100644 x11-toolkits/redkite/pkg-descr create mode 100644 x11-toolkits/redkite/pkg-plist diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 9e166729fd1f..c2ebb0c7f2c7 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -224,6 +224,7 @@ SUBDIR += qtermwidget SUBDIR += qwt5-qt5 SUBDIR += qwt6 + SUBDIR += redkite SUBDIR += rep-gtk2 SUBDIR += rubygem-gdk3 SUBDIR += rubygem-gtk2 diff --git a/x11-toolkits/redkite/Makefile b/x11-toolkits/redkite/Makefile new file mode 100644 index 000000000000..279f1630b2fb --- /dev/null +++ b/x11-toolkits/redkite/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= redkite +DISTVERSIONPREFIX= v +DISTVERSION= v0.6-4 +DISTVERSIONSUFFIX= -gad49c91 +CATEGORIES= x11-toolkits + +MAINTAINER= yuri@FreeBSD.org +COMMENT= GUI toolkit + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cmake compiler:c++14-lang gnome localbase:ldflags +USE_GITHUB= yes +GH_ACCOUNT= quamplex +USE_GNOME= cairo +USE_LDCONFIG= yes + +CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib +CMAKE_OFF= ENABLE_EXAMPLES + +.include diff --git a/x11-toolkits/redkite/distinfo b/x11-toolkits/redkite/distinfo new file mode 100644 index 000000000000..8c041d39338e --- /dev/null +++ b/x11-toolkits/redkite/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565141035 +SHA256 (quamplex-redkite-vv0.6-4-gad49c91_GH0.tar.gz) = eedc7a3bd25038b835e4220c2dae325aefd9ad6bb028d3416d9d5bc717ddfaa2 +SIZE (quamplex-redkite-vv0.6-4-gad49c91_GH0.tar.gz) = 122164 diff --git a/x11-toolkits/redkite/files/patch-CMakeLists.txt b/x11-toolkits/redkite/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5e725baec9f6 --- /dev/null +++ b/x11-toolkits/redkite/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2019-08-06 19:58:51 UTC ++++ CMakeLists.txt +@@ -10,6 +10,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES Darwin) + message(FATAL_ERROR "Redkite not implemented yet for Mac OS X") + elseif (CMAKE_SYSTEM_NAME MATCHES Linux) + message(STATUS " Build Redkite for GNU/Linux") ++elseif (CMAKE_SYSTEM_NAME MATCHES "^(FreeBSD|DragonFly)$") ++ message(STATUS " Build Redkite for FreeBSD") + else() + message(FATAL_ERROR "Redkite not implemented yet for ${CMAKE_SYSTEM_NAME}") + endif() +@@ -174,7 +176,7 @@ else() # defualt GNU/Linux + include_directories(${RK_INCLUDE_PATH}/impl/platforms/xwin) + endif() + +-add_library(redkite STATIC ++add_library(redkite SHARED + ${RK_HEADERS} + ${RK_HEADERS_IMPL} + ${RK_HEADERS_PLATFORM} diff --git a/x11-toolkits/redkite/pkg-descr b/x11-toolkits/redkite/pkg-descr new file mode 100644 index 000000000000..08125c592290 --- /dev/null +++ b/x11-toolkits/redkite/pkg-descr @@ -0,0 +1,4 @@ +Redkite is a small free software and cross-platform GUI toolkit. It is inspired +from other well known GUI toolkits. + +WWW: https://github.com/iurienistor/redkite diff --git a/x11-toolkits/redkite/pkg-plist b/x11-toolkits/redkite/pkg-plist new file mode 100644 index 000000000000..1ef534236468 --- /dev/null +++ b/x11-toolkits/redkite/pkg-plist @@ -0,0 +1,23 @@ +bin/rkpng2c +include/redkite/Rk.h +include/redkite/RkCanvas.h +include/redkite/RkColor.h +include/redkite/RkEvent.h +include/redkite/RkEventQueue.h +include/redkite/RkFont.h +include/redkite/RkImage.h +include/redkite/RkLabel.h +include/redkite/RkLineEdit.h +include/redkite/RkLog.h +include/redkite/RkMain.h +include/redkite/RkPainter.h +include/redkite/RkPen.h +include/redkite/RkPlatform.h +include/redkite/RkPoint.h +include/redkite/RkProgressBar.h +include/redkite/RkRealPoint.h +include/redkite/RkRect.h +include/redkite/RkSize.h +include/redkite/RkTimer.h +include/redkite/RkWidget.h +lib/libredkite.so -- cgit From f59b2d1c12651b99d70dd96deff1d5725e84e6c0 Mon Sep 17 00:00:00 2001 From: meta Date: Wed, 7 Aug 2019 05:02:38 +0000 Subject: New port: audio/mkcue: generates CUE sheets from a CD TOC (Table Of Contents) PR: 239406 Submitted by: tobias.rehbein@web.de --- audio/Makefile | 1 + audio/mkcue/Makefile | 25 +++++++++++++++++++++++++ audio/mkcue/distinfo | 3 +++ audio/mkcue/pkg-descr | 6 ++++++ 4 files changed, 35 insertions(+) create mode 100644 audio/mkcue/Makefile create mode 100644 audio/mkcue/distinfo create mode 100644 audio/mkcue/pkg-descr diff --git a/audio/Makefile b/audio/Makefile index 9d5b2f17e77b..1b9abdba0274 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -509,6 +509,7 @@ SUBDIR += mixmos SUBDIR += mixxx SUBDIR += mixxx21 + SUBDIR += mkcue SUBDIR += mma SUBDIR += moc SUBDIR += modplugplay diff --git a/audio/mkcue/Makefile b/audio/mkcue/Makefile new file mode 100644 index 000000000000..074031eb32f6 --- /dev/null +++ b/audio/mkcue/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= mkcue +PORTVERSION= 1 +CATEGORIES= audio +MASTER_SITES= DEBIAN +DISTNAME= ${PORTNAME}_${PORTVERSION}.orig + +MAINTAINER= tobias.rehbein@web.de +COMMENT= Generates CUE sheets from a CD TOC (Table Of Contents) + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig +MAKEFILE= GNUmakefile +GNU_CONFIGURE= yes + +PLIST_FILES= bin/mkcue + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/mkcue ${STAGEDIR}${PREFIX}/bin + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkcue + +.include diff --git a/audio/mkcue/distinfo b/audio/mkcue/distinfo new file mode 100644 index 000000000000..df4e95ce49b0 --- /dev/null +++ b/audio/mkcue/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1560369510 +SHA256 (mkcue_1.orig.tar.gz) = 2aaf57da4d0f2e24329d5e952e90ec182d4aa82e4b2e025283e42370f9494867 +SIZE (mkcue_1.orig.tar.gz) = 80650 diff --git a/audio/mkcue/pkg-descr b/audio/mkcue/pkg-descr new file mode 100644 index 000000000000..756533325427 --- /dev/null +++ b/audio/mkcue/pkg-descr @@ -0,0 +1,6 @@ +mkcue generates CUE sheets from a CD TOC (Table Of Contents). + +It is a perfect companion for abcde to generate backups of your audio CDs using +the FLAC codec and the single track option. + +WWW: https://packages.debian.org/sid/mkcue -- cgit From 3b100d679d9fbaec992c55910bb162cbaa232b0c Mon Sep 17 00:00:00 2001 From: jkim Date: Wed, 7 Aug 2019 05:13:43 +0000 Subject: Update MASTER_SITES and unbreak. --- net-mgmt/p0f2/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-mgmt/p0f2/Makefile b/net-mgmt/p0f2/Makefile index 35c015e40529..7f318637c525 100644 --- a/net-mgmt/p0f2/Makefile +++ b/net-mgmt/p0f2/Makefile @@ -4,15 +4,12 @@ PORTNAME= p0f2 PORTVERSION= 2.0.8 PORTREVISION= 1 CATEGORIES= net-mgmt security -MASTER_SITES= http://lcamtuf.coredump.cx/p0f/ \ - http://farrokhi.net/distfiles/ +MASTER_SITES= http://lcamtuf.coredump.cx/p0f3/releases/old/2.x/ DISTNAME= p0f-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Passive OS fingerprinting tool -BROKEN= unfetchable - CONFLICTS= p0f-3.* USES= gmake tar:tgz -- cgit From 283e46ea13d1de9ffa87f9a6f1354986ee61823a Mon Sep 17 00:00:00 2001 From: kai Date: Wed, 7 Aug 2019 05:53:55 +0000 Subject: astro/xtide: Fix missing distfile and unbreak * Make the tarball for the harmonics file fetchable again as it has been updated to a newer version a while ago. * Also update the WWW field to spare users from redirects while I'm here. PR: 239666 Submitted by: Walter Schwarzenfeld (based on) MFH: 2019Q3 --- astro/xtide/Makefile | 6 ++---- astro/xtide/distinfo | 6 +++--- astro/xtide/pkg-descr | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index 8b85c9626025..33be33fc6dca 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -3,7 +3,7 @@ PORTNAME= xtide PORTVERSION= 2.15.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro geography MASTER_SITES= https://flaterco.com/files/xtide/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -18,8 +18,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -BROKEN= unfetchable - USES= compiler:c++0x gmake libtool localbase tar:bzip2 USE_LDCONFIG= yes @@ -43,7 +41,7 @@ X11_DESKTOP_ENTRIES= "XTide" "" "xtide" "xtide" "" "" DISTNAME_TCD= libtcd-2.2.7-r2 WRKSRC_TCD= ${WRKDIR}/${DISTNAME_TCD:C/-r[0-9]+//} -DISTNAME_HARM= harmonics-dwf-20151227-free +DISTNAME_HARM= harmonics-dwf-20190620-free WRKSRC_HARM= ${WRKDIR}/${DISTNAME_HARM:C/-free//} DISTNAME_WVS= wvs diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo index 0a1863e03cbf..ddbcc49e8cd0 100644 --- a/astro/xtide/distinfo +++ b/astro/xtide/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1551830866 +TIMESTAMP = 1565079145 SHA256 (xtide-2.15.2.tar.bz2) = c81c2e8fd1b655b6e798332097056654f2e9e97fb88052c1a5582ba13fa46931 SIZE (xtide-2.15.2.tar.bz2) = 727048 SHA256 (libtcd-2.2.7-r2.tar.bz2) = aff1f218b84106c572d094912cd11c828e1ea212db5661cdcc0e2e6253020a94 SIZE (libtcd-2.2.7-r2.tar.bz2) = 308959 -SHA256 (harmonics-dwf-20151227-free.tar.bz2) = b382acfd94cefd6f6434ff3efdbecfd929abe3639e345979da7826a37ed5a7ac -SIZE (harmonics-dwf-20151227-free.tar.bz2) = 499871 +SHA256 (harmonics-dwf-20190620-free.tar.bz2) = 879546f30761c129610f2bcca50fa1f38c043f67721eefa51cf8c5a1e949f616 +SIZE (harmonics-dwf-20190620-free.tar.bz2) = 676075 SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75 SIZE (wvs.tar.bz2) = 37461520 diff --git a/astro/xtide/pkg-descr b/astro/xtide/pkg-descr index 3f706f738b95..042199b00536 100644 --- a/astro/xtide/pkg-descr +++ b/astro/xtide/pkg-descr @@ -2,4 +2,4 @@ The xtide program predicts and displays tides. It is capable of producing output in a variety of dynamic and static formats, and has extensions for X, plain ASCII, and HTML. -WWW: http://www.flaterco.com/xtide/ +WWW: https://flaterco.com/xtide/ -- cgit From 8416add4224d6cb3f8c1e6913bb6d11e5bffdff9 Mon Sep 17 00:00:00 2001 From: joneum Date: Wed, 7 Aug 2019 07:16:48 +0000 Subject: Update to 6.4.36 Sponsored by: Netzkommune GmbH --- www/groupoffice/Makefile | 2 +- www/groupoffice/distinfo | 6 +-- www/groupoffice/pkg-plist | 107 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 107 insertions(+), 8 deletions(-) diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile index f1fcbe6972d9..3246697d6eb6 100644 --- a/www/groupoffice/Makefile +++ b/www/groupoffice/Makefile @@ -3,7 +3,7 @@ PORTNAME= groupoffice DISTVERSIONPREFIX= com- -DISTVERSION= 6.4.25 +DISTVERSION= 6.4.36 CATEGORIES= www MASTER_SITES= SF/group-office/${DISTVERSION:R} DISTNAME= ${PORTNAME}-${DISTVERSION}-php-71 diff --git a/www/groupoffice/distinfo b/www/groupoffice/distinfo index 3c67a6388d25..4c33fadfb7ee 100644 --- a/www/groupoffice/distinfo +++ b/www/groupoffice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562085149 -SHA256 (groupoffice-6.4.25-php-71.tar.gz) = fe2b4f489c747bd8da25cc13250705a9a7faafce6c74de87ed3c021dbffe3cbf -SIZE (groupoffice-6.4.25-php-71.tar.gz) = 47149949 +TIMESTAMP = 1565158485 +SHA256 (groupoffice-6.4.36-php-71.tar.gz) = 15f48791a69c4c87409269d71971783610b2f8b9dd7a464ecb92d187ce0e2f8b +SIZE (groupoffice-6.4.36-php-71.tar.gz) = 47288704 diff --git a/www/groupoffice/pkg-plist b/www/groupoffice/pkg-plist index 50209e3bcc24..55323b3a4212 100644 --- a/www/groupoffice/pkg-plist +++ b/www/groupoffice/pkg-plist @@ -365,6 +365,8 @@ %%WWWDIR%%/go/core/language/de.php %%WWWDIR%%/go/core/language/el.php %%WWWDIR%%/go/core/language/en.php +%%WWWDIR%%/go/core/language/en_au.php +%%WWWDIR%%/go/core/language/en_uk.php %%WWWDIR%%/go/core/language/es.php %%WWWDIR%%/go/core/language/et.php %%WWWDIR%%/go/core/language/fi.php @@ -600,6 +602,7 @@ %%WWWDIR%%/go/core/views/extjs3/search/Panel.js %%WWWDIR%%/go/core/views/extjs3/search/SearchCombo.js %%WWWDIR%%/go/core/views/extjs3/search/SearchEmailCombo.js +%%WWWDIR%%/go/core/views/extjs3/search/SearchField.js %%WWWDIR%%/go/core/views/extjs3/smtp/AccountCombo.js %%WWWDIR%%/go/core/views/extjs3/smtp/AccountDialog.js %%WWWDIR%%/go/core/views/extjs3/smtp/GridPanel.js @@ -656,12 +659,15 @@ %%WWWDIR%%/go/modules/business/.git/logs/refs/remotes/origin/6.4.x %%WWWDIR%%/go/modules/business/.git/logs/refs/remotes/origin/HEAD %%WWWDIR%%/go/modules/business/.git/logs/refs/remotes/origin/master +%%WWWDIR%%/go/modules/business/.git/objects/01/7cf0e0b8bf700bc3320b1735fdb5db1d10f56b %%WWWDIR%%/go/modules/business/.git/objects/01/88c1370f1aaaeb0512835ba443c1692f18e3ab %%WWWDIR%%/go/modules/business/.git/objects/02/8976593a8dc3d374accf1c276d46b5c0be2d87 %%WWWDIR%%/go/modules/business/.git/objects/04/40146c92f3d3dd71ce5fe664a5b23006d77006 %%WWWDIR%%/go/modules/business/.git/objects/07/8580b88e6cc78eb0cf818b72c8e58f5e9c5420 %%WWWDIR%%/go/modules/business/.git/objects/09/38082171ec07b1392f26bd357767437dd575da +%%WWWDIR%%/go/modules/business/.git/objects/0b/baf2ae96932341b580b2919aef68560956e8e8 %%WWWDIR%%/go/modules/business/.git/objects/0d/6b78b2fcc7b1bedfc68039483836b1ba8e9325 +%%WWWDIR%%/go/modules/business/.git/objects/0d/c8e4a035d91ede98fa7002809d91efbeb0cb78 %%WWWDIR%%/go/modules/business/.git/objects/0e/dabdf8b2e7554bb2c45be43ade0ef44d9712a5 %%WWWDIR%%/go/modules/business/.git/objects/0f/0166d5a41d408b252098bb22d15abab081b1ab %%WWWDIR%%/go/modules/business/.git/objects/0f/74293747384ce63dcd6c3a7a0389ab51c83210 @@ -676,40 +682,55 @@ %%WWWDIR%%/go/modules/business/.git/objects/18/81b5dba07347944b0088411717713cfee2fdd0 %%WWWDIR%%/go/modules/business/.git/objects/19/0e3ea112a052332a2738463cf20f4e0c70a9f4 %%WWWDIR%%/go/modules/business/.git/objects/1a/a690d775e8a53ce8dce165ba44bcd5a1679f33 +%%WWWDIR%%/go/modules/business/.git/objects/1a/f781bb8adb506192a31d4fd40cd735d989f6c4 %%WWWDIR%%/go/modules/business/.git/objects/1b/900e3c24fb51a609b26e8d63ca9c0edf54840a %%WWWDIR%%/go/modules/business/.git/objects/1b/934b8de6dd4a758a0da9295f879d3914db645c %%WWWDIR%%/go/modules/business/.git/objects/1e/5704b3ec872811b74ddcd28124d84382777bf0 %%WWWDIR%%/go/modules/business/.git/objects/1e/d2b4ed92a57f6eae672e4cf8b78f92e03d1ecc %%WWWDIR%%/go/modules/business/.git/objects/1f/c684f5955655d5a44ea98d2fa6d180fc6cda94 %%WWWDIR%%/go/modules/business/.git/objects/20/f3ffddb269d6b07bada55167a7ec536fbedc9c +%%WWWDIR%%/go/modules/business/.git/objects/29/25aaf72858ba739b7c28549eb787ba8e0c2d59 %%WWWDIR%%/go/modules/business/.git/objects/2b/540a97480cca228b7cb21e67210f4e858be377 +%%WWWDIR%%/go/modules/business/.git/objects/2b/af9470d0ab0f8a20427dd0b3d1d0ae98cc1220 %%WWWDIR%%/go/modules/business/.git/objects/2c/95947f2260985ab1efc529ee4ccce1527cf95d %%WWWDIR%%/go/modules/business/.git/objects/2c/ccf39e792d11550dc3066753a0bab4127a657f %%WWWDIR%%/go/modules/business/.git/objects/30/12779ff0975c7ae800d88b890102b5963049fa +%%WWWDIR%%/go/modules/business/.git/objects/30/6e0e48c59e5dadb9bf4b606f7426008a83a123 %%WWWDIR%%/go/modules/business/.git/objects/31/fae7678908933d461860a7b90a2046a3ad588e %%WWWDIR%%/go/modules/business/.git/objects/33/74b451aefd4476a3ff22c99aefac6f19928994 %%WWWDIR%%/go/modules/business/.git/objects/34/048b0c50a1c2c2ec0928883a7836af208f25c0 +%%WWWDIR%%/go/modules/business/.git/objects/34/8362af88f1ba9df47f59f59e72960849166deb %%WWWDIR%%/go/modules/business/.git/objects/35/d2af60cc3d3b91661596ce89fd5b2bf68bbc23 +%%WWWDIR%%/go/modules/business/.git/objects/36/1962f711e30e9328877b83124879aa61251618 %%WWWDIR%%/go/modules/business/.git/objects/36/323907587d71c54fe5dcd89c91dbff7abb6bd4 %%WWWDIR%%/go/modules/business/.git/objects/37/2c4d06663e8100bfc2cc3715449109c1e347ae %%WWWDIR%%/go/modules/business/.git/objects/3c/c41d85bfd66a1dc00982e9dd3004e1ecc2b063 %%WWWDIR%%/go/modules/business/.git/objects/3e/1d7b956fd9bd785d2c686afbdf2aa34df4a0a9 +%%WWWDIR%%/go/modules/business/.git/objects/3e/4ce7248c830e76864052bb37e4e5e42bdd09cb +%%WWWDIR%%/go/modules/business/.git/objects/41/43bc79a1fe45ffed6fdbb851a636c237d68ed5 %%WWWDIR%%/go/modules/business/.git/objects/41/86c8a28d75f6c9d8ff75f0fa3d78a158d1b46e %%WWWDIR%%/go/modules/business/.git/objects/42/3aacfb6e85b53afe8992f42e1864c88b480f49 +%%WWWDIR%%/go/modules/business/.git/objects/45/fcba9aabc03362ecd3a50a6da37ee330e39b5b %%WWWDIR%%/go/modules/business/.git/objects/4b/600db58c9842ce72075f81695056e807aaff04 +%%WWWDIR%%/go/modules/business/.git/objects/4f/e16b0b615e825513b0002e2934fd04ed840b6b %%WWWDIR%%/go/modules/business/.git/objects/52/40196e3a09f675b74449e9af2f5206014a33d6 %%WWWDIR%%/go/modules/business/.git/objects/54/901ff85b88c4cfa3087e29c30bcc12b395bb29 %%WWWDIR%%/go/modules/business/.git/objects/55/bf7abb9942ec75047217240ca2d5a509f11ddf %%WWWDIR%%/go/modules/business/.git/objects/55/d4f1647ccbcc531fbf1441094d5bf2a3e13a8f +%%WWWDIR%%/go/modules/business/.git/objects/55/f302906d21d08784ce8413fc1b25b07e95ec60 %%WWWDIR%%/go/modules/business/.git/objects/56/82f9c1188a9033580c1c07a77100e62c4aa379 %%WWWDIR%%/go/modules/business/.git/objects/57/abe917dd86222e7d2c14eea0cb7f5e2f480746 %%WWWDIR%%/go/modules/business/.git/objects/59/00ae987cf0504753ef60cda5e28298f03a8368 +%%WWWDIR%%/go/modules/business/.git/objects/59/e71ee228d70331aff51900f8c32d62beba450d %%WWWDIR%%/go/modules/business/.git/objects/5a/ccab32038aa2c651f8f20830b0750a3c3f409f %%WWWDIR%%/go/modules/business/.git/objects/5a/dceb1c1ba579df4215a10e60f6d3439ea399c1 +%%WWWDIR%%/go/modules/business/.git/objects/5a/e4190d6099963f508551bfdee0ec97353e3788 +%%WWWDIR%%/go/modules/business/.git/objects/5c/4c291daa8fbdf47163e80b3b5f040da4b1bfa7 %%WWWDIR%%/go/modules/business/.git/objects/5c/7d17902f61c358ff3631c0d1761ee82efe9967 %%WWWDIR%%/go/modules/business/.git/objects/5e/4e8769d8be007cf938cf74a92cf34a4dae3349 %%WWWDIR%%/go/modules/business/.git/objects/60/479fae2fcef92b3fc32be4249bedf1db018b82 %%WWWDIR%%/go/modules/business/.git/objects/60/eb612b88e0ea43b8a96b0ce5674a49069624a9 +%%WWWDIR%%/go/modules/business/.git/objects/62/456bb499e4f9cb8e81a44945ebfaf985b14a79 %%WWWDIR%%/go/modules/business/.git/objects/65/d546ff5237ec82f6a184292c9cb7caa4ee77d2 %%WWWDIR%%/go/modules/business/.git/objects/66/4000ec6256c1f2da292d99351571938f9ce018 %%WWWDIR%%/go/modules/business/.git/objects/6a/1773a59125a58bb77810aac5bfb652839c857d @@ -722,6 +743,7 @@ %%WWWDIR%%/go/modules/business/.git/objects/70/0ccead915881d908a451109d366ba4d368cca2 %%WWWDIR%%/go/modules/business/.git/objects/70/6923cd4493862b1ef6a8e997f0d8f6b0219293 %%WWWDIR%%/go/modules/business/.git/objects/70/d9cf98a648fe00384f8475ff6361ee30401288 +%%WWWDIR%%/go/modules/business/.git/objects/71/b6f4122b6eb63b006eca499e4ee1a5295dfa0d %%WWWDIR%%/go/modules/business/.git/objects/73/cae9dabf9832d2cfb3506d97e9f1f5041fde60 %%WWWDIR%%/go/modules/business/.git/objects/74/12252e641a7eb4b11076f320971a76e8943bcd %%WWWDIR%%/go/modules/business/.git/objects/75/ac80c3e54ffa8771490fe8a764991278eaf73f @@ -730,9 +752,11 @@ %%WWWDIR%%/go/modules/business/.git/objects/7c/232814fb3ea7b1059db95f3354b8992a0f214c %%WWWDIR%%/go/modules/business/.git/objects/7d/d425d01fdfa574b905c40cb329f68867fc77e4 %%WWWDIR%%/go/modules/business/.git/objects/81/3e13e662674675b1c080e6ee292498ee1c805f +%%WWWDIR%%/go/modules/business/.git/objects/82/c8a01e4048b535f1dc7e2b962e7fbf28f13cf6 %%WWWDIR%%/go/modules/business/.git/objects/84/62265aad60831658af9e40cd56b117eae076d6 %%WWWDIR%%/go/modules/business/.git/objects/88/e65cb999c64ffa17a72331857b78c5ab427c04 %%WWWDIR%%/go/modules/business/.git/objects/89/0f4bcb1c205b59515dc5401093b66e19f46ea2 +%%WWWDIR%%/go/modules/business/.git/objects/8a/f03334ebd951f9aafd272edfd3e2756b61cb9f %%WWWDIR%%/go/modules/business/.git/objects/8b/e76e3c9663fa918b882dc080a679ffa0e47f96 %%WWWDIR%%/go/modules/business/.git/objects/8c/a82a21140c0e1e70b4e5a75b14ff5e3f9060d3 %%WWWDIR%%/go/modules/business/.git/objects/8e/32a34b3b020be18e280b4b7585f35fe155d8f6 @@ -742,6 +766,7 @@ %%WWWDIR%%/go/modules/business/.git/objects/91/91e40f7f2c989a899f22bd1cef2e272db9ce41 %%WWWDIR%%/go/modules/business/.git/objects/93/e3c9cadd116f3193eef8bad50954ea89e60f0c %%WWWDIR%%/go/modules/business/.git/objects/94/249d6e1d073ff4f7637ec9689ec72a9ce6a6b1 +%%WWWDIR%%/go/modules/business/.git/objects/94/708626c6e26ed6189256854a441999abad09b7 %%WWWDIR%%/go/modules/business/.git/objects/97/1e473c6ee4c32aae05aeeccb9937536fd23dce %%WWWDIR%%/go/modules/business/.git/objects/97/7102e554fa4021263646cec6d569c6b84d17f5 %%WWWDIR%%/go/modules/business/.git/objects/98/56bf74aedda25cf3c890cf59c669f16fdb15d3 @@ -754,7 +779,9 @@ %%WWWDIR%%/go/modules/business/.git/objects/a1/b313225f9b692e8cccd3a3102f01a3d1d97be1 %%WWWDIR%%/go/modules/business/.git/objects/a2/f829d01ca8d25f23eaed0cce94a1d5c2f4ee51 %%WWWDIR%%/go/modules/business/.git/objects/a3/a49bec1a07f2c9d05f0e99ef3d50708530ae5f +%%WWWDIR%%/go/modules/business/.git/objects/a5/9d561657a69e185ef0edee54df5469500f8a49 %%WWWDIR%%/go/modules/business/.git/objects/a5/bc181ce5dbcbc976e9fe884e0ffad618a3e622 +%%WWWDIR%%/go/modules/business/.git/objects/a6/c38d8ac977592bece86bb61ed252688da1a193 %%WWWDIR%%/go/modules/business/.git/objects/a8/de2fb9633f9fbd2980ac5ba3d0bb470fe39951 %%WWWDIR%%/go/modules/business/.git/objects/a9/9348fb5337fec192884cbc346f27430010c0ae %%WWWDIR%%/go/modules/business/.git/objects/a9/bec4781e3d5d9d07fc0da317d734afc76dce94 @@ -768,11 +795,17 @@ %%WWWDIR%%/go/modules/business/.git/objects/ae/0111bebcb8b8582224b8bf57ab93b4923409d4 %%WWWDIR%%/go/modules/business/.git/objects/ae/63cee5174aa0f237b8bf6d44fdfcfe5d6c0448 %%WWWDIR%%/go/modules/business/.git/objects/af/0b26dd0a73f9d2bc5c7c65d37dc4a90bcc8e39 +%%WWWDIR%%/go/modules/business/.git/objects/b5/185c5e000bd0b7930744c4802480859d7a6f4a %%WWWDIR%%/go/modules/business/.git/objects/b6/474acaf60c771531ccd471a377cc7020fce4ab %%WWWDIR%%/go/modules/business/.git/objects/b6/63192d774eff915831cf3fa05d1d2f11d7ad2a +%%WWWDIR%%/go/modules/business/.git/objects/b6/cd96b537832bd399ee365c4322f9ac1a8e6553 +%%WWWDIR%%/go/modules/business/.git/objects/b9/3c07d54a25859e7d958b0685fa689388fa8a36 +%%WWWDIR%%/go/modules/business/.git/objects/b9/ba060f38154073832ac2c9978a02600555431d %%WWWDIR%%/go/modules/business/.git/objects/ba/835bfbda72b154605aac17458304ba08f9df21 %%WWWDIR%%/go/modules/business/.git/objects/bc/845dd5c4661faeb7d701ca9906eb8aca114c70 %%WWWDIR%%/go/modules/business/.git/objects/bd/656344d9c8bf8e006d3e15e79d19c35cef6a1d +%%WWWDIR%%/go/modules/business/.git/objects/be/9b5363750cff312b207df27ad1b1228cad5e15 +%%WWWDIR%%/go/modules/business/.git/objects/be/f108b8829b0d1825dd0c1e1f763aa78b0b395f %%WWWDIR%%/go/modules/business/.git/objects/c3/c99750ca28f7abe5661e7f2bbc5e5820e2494c %%WWWDIR%%/go/modules/business/.git/objects/c3/f65ea83b4df4c34e54a98f514983ba15163b49 %%WWWDIR%%/go/modules/business/.git/objects/c4/1e1d259b68932d3e68a06d65722050e84a5093 @@ -786,15 +819,19 @@ %%WWWDIR%%/go/modules/business/.git/objects/cf/ae59d8ab1e53de878ca83fa494818bde132141 %%WWWDIR%%/go/modules/business/.git/objects/d2/388a8ee5221dcbe815852f396ff6661523ebd8 %%WWWDIR%%/go/modules/business/.git/objects/d3/d03a4930f2599bd2ed439426421d70c3a4c140 +%%WWWDIR%%/go/modules/business/.git/objects/d4/3464f22b24c979aab027dd1ea0032806c4b8d2 +%%WWWDIR%%/go/modules/business/.git/objects/d4/64bc9f9f47eb6a4f52631849276b1d7e3f0412 %%WWWDIR%%/go/modules/business/.git/objects/d4/bb2ced5bb00dc57cd618824e8fb682fa2ebf89 %%WWWDIR%%/go/modules/business/.git/objects/d5/32abae2c0698e388b2ee10ad115176c1dd74a8 %%WWWDIR%%/go/modules/business/.git/objects/d5/39f42de26b8997a727d9be6eed14d6a1986d42 +%%WWWDIR%%/go/modules/business/.git/objects/d8/fbcd41736fb8f1870a4176777fe0d58526840a %%WWWDIR%%/go/modules/business/.git/objects/da/f3d8787605a13b5b9a659baba996aeae8e97fd %%WWWDIR%%/go/modules/business/.git/objects/dc/8ae31e5583607e7277715d3dd308bf11c891e9 %%WWWDIR%%/go/modules/business/.git/objects/dd/abe0ed39e77b289531fd9c9828cbfa1497d5f7 %%WWWDIR%%/go/modules/business/.git/objects/de/4d80342b4d48353995d4dc7e2624bdcd93b1b1 %%WWWDIR%%/go/modules/business/.git/objects/e0/8649d4eb193c36dd55e87e9c72cba83e40bd75 %%WWWDIR%%/go/modules/business/.git/objects/e1/c45027847f084fa9673758586a75bf832e8710 +%%WWWDIR%%/go/modules/business/.git/objects/e2/43d96f34460d8e695e2189d0770902af2a799b %%WWWDIR%%/go/modules/business/.git/objects/e6/67219de1b36d13c38c863d6e88386bf6513565 %%WWWDIR%%/go/modules/business/.git/objects/e7/a24958a414cf0a82b9208f21a4a62349f6e775 %%WWWDIR%%/go/modules/business/.git/objects/e8/2006858f98f9625bdad22bea186f79dfda8b6f @@ -811,9 +848,13 @@ %%WWWDIR%%/go/modules/business/.git/objects/f2/8b33611d7e549b4c372fe585b6014105b6ff11 %%WWWDIR%%/go/modules/business/.git/objects/f3/0c6cbbf2cdd60bec0342419a90b1bb48a56995 %%WWWDIR%%/go/modules/business/.git/objects/f3/99b148f7727b4f94a6fcfdbd05278dadbb8d7f +%%WWWDIR%%/go/modules/business/.git/objects/f6/9dcae21acd800e73d0f00de4eceb25a58645d9 %%WWWDIR%%/go/modules/business/.git/objects/f6/c40ff0a4e183f50eaa0a872823b87a71cf34a8 %%WWWDIR%%/go/modules/business/.git/objects/f8/675d7cd425bc178464b5ceb20034ddc6dbc50a +%%WWWDIR%%/go/modules/business/.git/objects/f9/1714b80ddaddd810689e9f3c084b6650467cf4 +%%WWWDIR%%/go/modules/business/.git/objects/fc/10819e1ce42a0d0bfae65014b59aba9b0a6363 %%WWWDIR%%/go/modules/business/.git/objects/fc/72caf801384b55878bdbf17348b270f00e91c6 +%%WWWDIR%%/go/modules/business/.git/objects/fc/812bbcf31c882c9be3735e913c774c8fea3e9a %%WWWDIR%%/go/modules/business/.git/objects/fd/849ed3c4b5750813c2c4432d14f2889006d01a %%WWWDIR%%/go/modules/business/.git/objects/fe/c6b38e0fc704180b8c2634255ac76aff462904 %%WWWDIR%%/go/modules/business/.git/objects/ff/ad73e02727fb5dac91f0d62a9df94bbb0801d4 @@ -837,6 +878,7 @@ %%WWWDIR%%/go/modules/business/newsletters/install/uninstall.sql %%WWWDIR%%/go/modules/business/newsletters/install/updates.php %%WWWDIR%%/go/modules/business/newsletters/language/en.php +%%WWWDIR%%/go/modules/business/newsletters/language/it.php %%WWWDIR%%/go/modules/business/newsletters/language/nl.php %%WWWDIR%%/go/modules/business/newsletters/model/AddressList.php %%WWWDIR%%/go/modules/business/newsletters/model/AddressListEntity.php @@ -894,6 +936,7 @@ %%WWWDIR%%/go/modules/community/addressbook/install/uninstall.sql %%WWWDIR%%/go/modules/community/addressbook/install/updates.php %%WWWDIR%%/go/modules/community/addressbook/language/en.php +%%WWWDIR%%/go/modules/community/addressbook/language/it.php %%WWWDIR%%/go/modules/community/addressbook/language/nl.php %%WWWDIR%%/go/modules/community/addressbook/model/Address.php %%WWWDIR%%/go/modules/community/addressbook/model/AddressBook.php @@ -965,6 +1008,7 @@ %%WWWDIR%%/go/modules/community/bookmarks/install/uninstall.sql %%WWWDIR%%/go/modules/community/bookmarks/install/updates.php %%WWWDIR%%/go/modules/community/bookmarks/language/en.php +%%WWWDIR%%/go/modules/community/bookmarks/language/it.php %%WWWDIR%%/go/modules/community/bookmarks/language/nl.php %%WWWDIR%%/go/modules/community/bookmarks/model/Bookmark.php %%WWWDIR%%/go/modules/community/bookmarks/model/Category.php @@ -1079,6 +1123,7 @@ %%WWWDIR%%/go/modules/community/ldapauthenticator/language/fr.php %%WWWDIR%%/go/modules/community/ldapauthenticator/language/hu.php %%WWWDIR%%/go/modules/community/ldapauthenticator/language/id.php +%%WWWDIR%%/go/modules/community/ldapauthenticator/language/it.php %%WWWDIR%%/go/modules/community/ldapauthenticator/language/pt_br.php %%WWWDIR%%/go/modules/community/ldapauthenticator/model/Authenticator.php %%WWWDIR%%/go/modules/community/ldapauthenticator/model/Domain.php @@ -1208,6 +1253,8 @@ %%WWWDIR%%/go/modules/community/test/model/AHasOne.php %%WWWDIR%%/go/modules/community/test/model/B.php %%WWWDIR%%/go/modules/community/test/model/C.php +%%WWWDIR%%/go/modules/core/customfields/language/cs.php +%%WWWDIR%%/go/modules/core/groups/language/cs.php %%WWWDIR%%/go/vendor/jupload/readme.md %%WWWDIR%%/go/vendor/jupload/wjhk.jupload.jar %%WWWDIR%%/go/vendor/odtphp/library/Segment.php @@ -1276,10 +1323,13 @@ %%WWWDIR%%/licensechecks/groupoffice-pro.php %%WWWDIR%%/modules/addressbook/AddressbookModule.php %%WWWDIR%%/modules/addressbook/install/updates.php +%%WWWDIR%%/modules/addressbook/language/cs.php +%%WWWDIR%%/modules/addressbook/views/Extjs3/ContactDetail.js %%WWWDIR%%/modules/assistant/AssistantModule.php %%WWWDIR%%/modules/assistant/assistant.js %%WWWDIR%%/modules/assistant/filehandler/Assistant.php %%WWWDIR%%/modules/assistant/install/instal.sql +%%WWWDIR%%/modules/assistant/language/cs.php %%WWWDIR%%/modules/assistant/language/de.php %%WWWDIR%%/modules/assistant/language/en.php %%WWWDIR%%/modules/assistant/language/fr.php @@ -1569,6 +1619,7 @@ %%WWWDIR%%/modules/bookmarks/icons/viewmag.png %%WWWDIR%%/modules/bookmarks/icons/wizard.png %%WWWDIR%%/modules/bookmarks/install/updates.php +%%WWWDIR%%/modules/bookmarks/language/cs.php %%WWWDIR%%/modules/caldav/CaldavModule.php %%WWWDIR%%/modules/caldav/CalendarsBackend.php %%WWWDIR%%/modules/caldav/calendar.php @@ -1762,6 +1813,7 @@ %%WWWDIR%%/modules/chat/xmpp-prebind-php/lib/XmppPrebind.php %%WWWDIR%%/modules/comments/CommentsModule.php %%WWWDIR%%/modules/comments/install/updates.php +%%WWWDIR%%/modules/comments/language/cs.php %%WWWDIR%%/modules/cron/CronModule.php %%WWWDIR%%/modules/cron/controller/CronGroupController.php %%WWWDIR%%/modules/cron/controller/CronUserController.php @@ -2230,7 +2282,6 @@ %%WWWDIR%%/modules/exactonline/views/Extjs3/Projects2Overrides.js %%WWWDIR%%/modules/exactonline/views/Extjs3/SettingsPanel.js %%WWWDIR%%/modules/favorites/FavoritesModule.php -%%WWWDIR%%/modules/favorites/controller/AddressbookFavoritesController.php %%WWWDIR%%/modules/favorites/controller/CalendarFavoritesController.php %%WWWDIR%%/modules/favorites/controller/FavoritesController.php %%WWWDIR%%/modules/favorites/controller/TasklistFavoritesController.php @@ -2629,7 +2680,6 @@ %%WWWDIR%%/modules/log/export/CurrentGrid.php %%WWWDIR%%/modules/log/language/bg.php %%WWWDIR%%/modules/log/language/bn_bd.php -%%WWWDIR%%/modules/log/language/cs.php %%WWWDIR%%/modules/log/language/de.php %%WWWDIR%%/modules/log/language/en.php %%WWWDIR%%/modules/log/language/fr.php @@ -2803,6 +2853,7 @@ %%WWWDIR%%/modules/phpbb3/controller/BridgeController.php %%WWWDIR%%/modules/phpbb3/install/noautoinstall %%WWWDIR%%/modules/phpbb3/language/bn_bd.php +%%WWWDIR%%/modules/phpbb3/language/cs.php %%WWWDIR%%/modules/phpbb3/language/en.php %%WWWDIR%%/modules/phpbb3/language/fr.php %%WWWDIR%%/modules/phpbb3/language/hu.php @@ -3080,6 +3131,7 @@ %%WWWDIR%%/modules/reminders/language/hr.php %%WWWDIR%%/modules/reminders/language/hu.php %%WWWDIR%%/modules/reminders/language/id.php +%%WWWDIR%%/modules/reminders/language/it.php %%WWWDIR%%/modules/reminders/language/nb.php %%WWWDIR%%/modules/reminders/language/nl.php %%WWWDIR%%/modules/reminders/language/pt_br.php @@ -3119,6 +3171,7 @@ %%WWWDIR%%/modules/savemailas/themes/Default/style.css %%WWWDIR%%/modules/scanbox/ScanboxModule.php %%WWWDIR%%/modules/scanbox/controller/ScanboxController.php +%%WWWDIR%%/modules/scanbox/language/cs.php %%WWWDIR%%/modules/scanbox/language/de.php %%WWWDIR%%/modules/scanbox/language/en.php %%WWWDIR%%/modules/scanbox/language/es.php @@ -3453,9 +3506,7 @@ %%WWWDIR%%/modules/summary/themes/Default/style.css %%WWWDIR%%/modules/sync/Settings.js %%WWWDIR%%/modules/sync/SyncModule.php -%%WWWDIR%%/modules/sync/controller/UserAddressbookController.php %%WWWDIR%%/modules/sync/controller/UserCalendarController.php -%%WWWDIR%%/modules/sync/controller/UserNoteCategoryController.php %%WWWDIR%%/modules/sync/controller/UserTasklistController.php %%WWWDIR%%/modules/sync/install/install.sql %%WWWDIR%%/modules/sync/install/uninstall.sql @@ -6767,6 +6818,54 @@ %%WWWDIR%%/views/Extjs3/javascript/ext-all-debug.js %%WWWDIR%%/views/Extjs3/javascript/ext-all.d.ts %%WWWDIR%%/views/Extjs3/javascript/ext-base-debug.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-af.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-am.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-bg.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ca.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-cs.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-da.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-de.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-el_GR.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-en.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-en_GB.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-es.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-et.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-fa.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-fi.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-fr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-fr_CA.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-gr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-he.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-hr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-hu.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-id.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-it.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ja.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ko.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-lt.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-lv.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-mk.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-nl.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-no_NB.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-no_NN.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-pl.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-pt.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-pt_BR.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-pt_PT.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ro.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ru.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-sk.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-sl.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-sr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-sr_RS.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-sv_SE.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-th-utf8.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-th.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-tr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-ukr.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-vn.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-zh_CN.js +%%WWWDIR%%/views/Extjs3/javascript/ext-locale/ext-lang-zh_TW.js %%WWWDIR%%/views/Extjs3/javascript/form/ColorField.js %%WWWDIR%%/views/Extjs3/javascript/form/Combo.js %%WWWDIR%%/views/Extjs3/javascript/form/ComboBoxMulti.js -- cgit From 5d6f5a2e7d813c9a0a399386b019342338d3b053 Mon Sep 17 00:00:00 2001 From: madpilot Date: Wed, 7 Aug 2019 07:18:19 +0000 Subject: - Update greybird theme to 3.22.10 - Use option targets - Remove unneeded comment - Update WWW - Take maintainership under xfce --- x11-themes/greybird-theme/Makefile | 18 ++++++------------ x11-themes/greybird-theme/distinfo | 6 +++--- x11-themes/greybird-theme/pkg-descr | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/x11-themes/greybird-theme/Makefile b/x11-themes/greybird-theme/Makefile index da3210d6f6ea..1de28493ed00 100644 --- a/x11-themes/greybird-theme/Makefile +++ b/x11-themes/greybird-theme/Makefile @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= greybird -PORTVERSION= 3.22.9 +PORTVERSION= 3.22.10 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= x11-themes xfce PKGNAMESUFFIX= -theme -MAINTAINER= ports@FreeBSD.org +MAINTAINER= xfce@FreeBSD.org COMMENT= Gtk and xfwm4 themes for the Xfce Desktop LICENSE= GPLv2 CC-BY-SA-3.0 @@ -24,14 +23,13 @@ GH_PROJECT= Greybird USE_GITHUB= yes NO_BUILD= yes -OPTIONS_DEFINE= NOTIFYD +OPTIONS_DEFINE= NOTIFYD OPTIONS_DEFAULT= NOTIFYD -NOTIFYD_DESC= Install xfce4-notifyd theme +OPTIONS_SUB= yes -.include +NOTIFYD_DESC= Install xfce4-notifyd theme post-patch: -# Remove .orig file @${RM} ${WRKSRC}/gtk-?.0/*.orig do-install: @@ -41,13 +39,9 @@ do-install: ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/share/themes/Greybird .endfor -.if ${PORT_OPTIONS:MNOTIFYD} +do-install-NOTIFYD-on: @cd ${WRKSRC} && \ ${COPYTREE_SHARE} xfce-notify-4.0/ \ ${STAGEDIR}${PREFIX}/share/themes/Greybird -PLIST_SUB+= NOTIFYD="" -.else -PLIST_SUB+= NOTIFYD="@comment " -.endif .include diff --git a/x11-themes/greybird-theme/distinfo b/x11-themes/greybird-theme/distinfo index a7441a5fa53c..b3e4e6009352 100644 --- a/x11-themes/greybird-theme/distinfo +++ b/x11-themes/greybird-theme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544963821 -SHA256 (shimmerproject-Greybird-v3.22.9_GH0.tar.gz) = 1385136e53eea173e66ee7e7738ec3bbe446a1af8ee5c54b90b3bd61c5d22de1 -SIZE (shimmerproject-Greybird-v3.22.9_GH0.tar.gz) = 211750 +TIMESTAMP = 1565129212 +SHA256 (shimmerproject-Greybird-v3.22.10_GH0.tar.gz) = 9fafeb2e6e7ed2eb6b4937b730940796960c40834a549a84121f14dfc9f5551c +SIZE (shimmerproject-Greybird-v3.22.10_GH0.tar.gz) = 212225 diff --git a/x11-themes/greybird-theme/pkg-descr b/x11-themes/greybird-theme/pkg-descr index 5a4ad3b9ee71..f0db22940e6c 100644 --- a/x11-themes/greybird-theme/pkg-descr +++ b/x11-themes/greybird-theme/pkg-descr @@ -3,4 +3,4 @@ Greybird is complete desktop theme for the Xfce Desktop. It includes: - Xfwm4 theme - xfce4-notifyd theme -WWW: http://shimmerproject.org/projects/greybird/ +WWW: https://github.com/shimmerproject/Greybird -- cgit From 2df45a0589c6768edc9416adf938a5fa4b9f965f Mon Sep 17 00:00:00 2001 From: joneum Date: Wed, 7 Aug 2019 07:37:56 +0000 Subject: Update to 1.341 Sponsored by: Netzkommune GmbH --- www/p5-Reddit-Client/Makefile | 2 +- www/p5-Reddit-Client/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/p5-Reddit-Client/Makefile b/www/p5-Reddit-Client/Makefile index a39031d08ac6..fa2ab6ca30a9 100644 --- a/www/p5-Reddit-Client/Makefile +++ b/www/p5-Reddit-Client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Reddit-Client -PORTVERSION= 1.32 +PORTVERSION= 1.341 PORTEPOCH= 4 CATEGORIES= www perl5 MASTER_SITES= CPAN diff --git a/www/p5-Reddit-Client/distinfo b/www/p5-Reddit-Client/distinfo index 781509a281e4..926e3fab90e0 100644 --- a/www/p5-Reddit-Client/distinfo +++ b/www/p5-Reddit-Client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560270292 -SHA256 (Reddit-Client-1.32.tar.gz) = 7f37fc4a280d7f779c40ec6036fe3665246e042748d271a3e663efc493fd0f4a -SIZE (Reddit-Client-1.32.tar.gz) = 36241 +TIMESTAMP = 1565162382 +SHA256 (Reddit-Client-1.341.tar.gz) = 0efe14f7e4db32fff4f6a629c51533d2ce389d296515bb87c54a4d0fb228ea47 +SIZE (Reddit-Client-1.341.tar.gz) = 36388 -- cgit From e6d1de2b2d3f54add97d3911b3e880f69d926efe Mon Sep 17 00:00:00 2001 From: tobik Date: Wed, 7 Aug 2019 08:33:24 +0000 Subject: devel/ccls: Pet portclippy --- devel/ccls/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/ccls/Makefile b/devel/ccls/Makefile index 2fae6faa997e..08d934d7b61f 100644 --- a/devel/ccls/Makefile +++ b/devel/ccls/Makefile @@ -27,13 +27,13 @@ CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" CXXFLAGS+= -DNDEBUG PLIST_FILES= bin/ccls +PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_DISTFILES= MaskRay-ccls.wiki-20190226.tar.gz:docs DOCS_MASTER_SITES= LOCAL/tobik:docs \ https://pkg.tobik.me/distfiles/:docs -PORTDOCS= * +DOCS_DISTFILES= MaskRay-ccls.wiki-20190226.tar.gz:docs post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -- cgit From 1ac01c8fcde89f3f0b269479ab0a0871cd5e17ec Mon Sep 17 00:00:00 2001 From: linimon Date: Wed, 7 Aug 2019 08:40:45 +0000 Subject: Refactor out the constant string '80' to ease future maintenance. --- devel/include-what-you-use/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index 170fc0f50324..3cd23e0f0a99 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -12,8 +12,9 @@ COMMENT= Tool for use with clang to analyze #includes in C and C++ source files LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BUILD_DEPENDS= clang80:devel/llvm80 -RUN_DEPENDS= clang80:devel/llvm80 +LLVM_VER= 80 +BUILD_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} +RUN_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} USES= cmake compiler:c++11-lang ncurses python:run shebangfix USE_GITHUB= yes @@ -23,7 +24,7 @@ SHEBANG_FILES= fix_includes.py \ GH_TAGNAME= clang_8.0 -CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm80/lib/cmake/llvm \ - -DClang_DIR=${LOCALBASE}/llvm80/lib/cmake/clang +CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm \ + -DClang_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang .include -- cgit From 958bdcd2b94195b300d56af76818ed3f900b8173 Mon Sep 17 00:00:00 2001 From: tobik Date: Wed, 7 Aug 2019 08:47:31 +0000 Subject: devel/ccls: Update to latest commit This should make it work with devel/llvm90. PR: 239682 --- devel/ccls/Makefile | 6 ++---- devel/ccls/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/devel/ccls/Makefile b/devel/ccls/Makefile index 08d934d7b61f..d8a635d2431b 100644 --- a/devel/ccls/Makefile +++ b/devel/ccls/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ccls -DISTVERSION= 0.20190314 -PORTREVISION= 1 +DISTVERSION= 0.20190731 CATEGORIES= devel MASTER_SITES= LOCAL/tobik @@ -19,8 +18,7 @@ LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} USES= cmake compiler:c++17-lang localbase USE_GITHUB= yes GH_ACCOUNT= MaskRay -# Commit matching 0.20190314 -#GH_TAGNAME= 1976fec59559b7d2a88b5dcd7631e089eaa194fc +GH_TAGNAME= 8b0332173f51389d3ab914313b874cea04f4ead4 CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \ -DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm" diff --git a/devel/ccls/distinfo b/devel/ccls/distinfo index ad2686c26742..06a7e60b3e7d 100644 --- a/devel/ccls/distinfo +++ b/devel/ccls/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1554059611 +TIMESTAMP = 1565166319 SHA256 (MaskRay-ccls.wiki-20190226.tar.gz) = 29f9c5d75e7134d21b77987d4b30baeb9b84a6b70bde53add119be00875c31dd SIZE (MaskRay-ccls.wiki-20190226.tar.gz) = 29128 -SHA256 (MaskRay-ccls-0.20190314_GH0.tar.gz) = aaefa603a76325bb94e5222d144e19c432771346990c8b84165832bf37d15bb3 -SIZE (MaskRay-ccls-0.20190314_GH0.tar.gz) = 158665 +SHA256 (MaskRay-ccls-0.20190731-8b0332173f51389d3ab914313b874cea04f4ead4_GH0.tar.gz) = 9cf356b612ce5abcb3e2885cf0e8febf8a74de1c50044fd3b58b267d2f7b2429 +SIZE (MaskRay-ccls-0.20190731-8b0332173f51389d3ab914313b874cea04f4ead4_GH0.tar.gz) = 159995 -- cgit From e980781eb2e5ade4efc0be452bd6250e750999dc Mon Sep 17 00:00:00 2001 From: linimon Date: Wed, 7 Aug 2019 08:57:27 +0000 Subject: Refactor out the constant string '80' to ease future maintenance. --- devel/creduce/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile index 2329f5005975..8cca218be899 100644 --- a/devel/creduce/Makefile +++ b/devel/creduce/Makefile @@ -8,8 +8,9 @@ MASTER_SITES= http://embed.cs.utah.edu/creduce/ MAINTAINER= swills@FreeBSD.org COMMENT= Produces small test cases -BUILD_DEPENDS= llvm-config80:devel/llvm80 -RUN_DEPENDS= llvm-config80:devel/llvm80 \ +LLVM_VER= 80 +BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} \ topformflat:devel/delta \ astyle:devel/astyle \ p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \ @@ -22,10 +23,10 @@ RUN_DEPENDS= llvm-config80:devel/llvm80 \ BROKEN_powerpc64= fails to configure: cannot compile and link test program with selected LLVM GNU_CONFIGURE= yes -CONFIGURE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config80 \ - CC=${LOCALBASE}/bin/clang80 \ - CXX=${LOCALBASE}/bin/clang++80 \ - CPP=${LOCALBASE}/bin/clang-cpp80 +CONFIGURE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \ + CC=${LOCALBASE}/bin/clang${LLVM_VER} \ + CXX=${LOCALBASE}/bin/clang++${LLVM_VER} \ + CPP=${LOCALBASE}/bin/clang-cpp${LLVM_VER} USES= autoreconf gmake libtool perl5 -- cgit From 1a83a01cf3a8e234375bd7b03f6bb0ab93e10fe4 Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 7 Aug 2019 09:01:58 +0000 Subject: textproc/castxml: drop LLVM_40 option after r505416 Reported by: tobik --- textproc/castxml/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile index 261f99e02a08..d03f816b80b7 100644 --- a/textproc/castxml/Makefile +++ b/textproc/castxml/Makefile @@ -29,7 +29,7 @@ OPTIONS_SUB= yes LLVM_DESC= LLVM Version OPTIONS_SINGLE= LLVM -OPTIONS_SINGLE_LLVM= LLVM_DEVEL LLVM_80 LLVM_70 LLVM_60 LLVM_40 +OPTIONS_SINGLE_LLVM= LLVM_DEVEL LLVM_80 LLVM_70 LLVM_60 LLVM_DEVEL_DESC= llvm-devel LLVM_DEVEL_VARS= LLVM_VERSION=-devel @@ -43,9 +43,6 @@ LLVM_70_VARS= LLVM_VERSION=70 LLVM_60_DESC= LLVM 6 LLVM_60_VARS= LLVM_VERSION=60 -LLVM_40_DESC= LLVM 4 -LLVM_40_VARS= LLVM_VERSION=40 - DOCS_CMAKE_BOOL= SPHINX_MAN DOCS_CMAKE_ON= -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx -- cgit From cb709217ed6da1de5e56148a572b31fb0df024ff Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Wed, 7 Aug 2019 09:02:28 +0000 Subject: - Switch to options helpers - Update WWW Approved by: portmgr blanket --- www/coppermine/Makefile | 11 +++-------- www/coppermine/pkg-descr | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile index 9685867e0fbe..4ae6546c1cad 100644 --- a/www/coppermine/Makefile +++ b/www/coppermine/Makefile @@ -15,7 +15,8 @@ USES= php OPTIONS_DEFINE= DOCS IMAGEMAGICK IMAGEMAGICK_DESC= Use ImageMagick instead of PHP GD extension -IMAGEMAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick6 +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMAGEMAGICK_USE_OFF= PHP=gd USE_PHP= ctype hash json mysqli pcre xml @@ -27,13 +28,7 @@ NO_BUILD= yes NO_ARCH= yes PORTDOCS= CHANGELOG.txt LICENSE.txt README.txt -SUB_FILES+= pkg-message - -.include - -.if empty(PORT_OPTIONS:MIMAGEMAGICK) -USE_PHP+= gd -.endif +SUB_FILES= pkg-message pre-everything:: @${ECHO_MSG} "" diff --git a/www/coppermine/pkg-descr b/www/coppermine/pkg-descr index 57052a9fd512..e3a1e85361f4 100644 --- a/www/coppermine/pkg-descr +++ b/www/coppermine/pkg-descr @@ -13,4 +13,4 @@ uses PHP, a MySQL database and the GD library (version 1.x or 2.x) or ImageMagick to make the thumbnails. An install script makes the installation fast and simple. -WWW: http://coppermine-gallery.net/ +WWW: https://coppermine-gallery.net/ -- cgit From c9c0302661abaeb452cb6a47735be8cde225a16f Mon Sep 17 00:00:00 2001 From: gahr Date: Wed, 7 Aug 2019 09:08:07 +0000 Subject: devel/fossil: check for the JSON1 extension when using sqlite3 from ports PR: 239668 Reported by: software@bertram-scharpf.de --- devel/fossil/files/patch-auto.def | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 devel/fossil/files/patch-auto.def diff --git a/devel/fossil/files/patch-auto.def b/devel/fossil/files/patch-auto.def new file mode 100644 index 000000000000..ad5fc7abce0c --- /dev/null +++ b/devel/fossil/files/patch-auto.def @@ -0,0 +1,18 @@ +--- auto.def.orig 2019-07-13 13:05:19 UTC ++++ auto.def +@@ -149,6 +149,15 @@ if {![opt-bool internal-sqlite]} { + } + + find_internal_sqlite ++ ++ if {![cc-check-progs sqlite3]} { ++ user-error "system sqlite3 command not found" ++ } ++ msg-checking "Checking for JSON1 support in system sqlite3..." ++ if {[catch {exec [get-define SQLITE3] << {select json(true);}} res] || $res != 1} { ++ user-error "system sqlite3 does not have the JSON1 extension" ++ } ++ msg-result "yes" + } + + proc is_mingw {} { -- cgit From 1e7699af2deb8e982008007d909597d694ba7693 Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 7 Aug 2019 09:10:57 +0000 Subject: textproc/castxml: add LLVM_90 option after r508190 --- textproc/castxml/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile index d03f816b80b7..a8f12ed81c5c 100644 --- a/textproc/castxml/Makefile +++ b/textproc/castxml/Makefile @@ -29,11 +29,14 @@ OPTIONS_SUB= yes LLVM_DESC= LLVM Version OPTIONS_SINGLE= LLVM -OPTIONS_SINGLE_LLVM= LLVM_DEVEL LLVM_80 LLVM_70 LLVM_60 +OPTIONS_SINGLE_LLVM= LLVM_DEVEL LLVM_90 LLVM_80 LLVM_70 LLVM_60 LLVM_DEVEL_DESC= llvm-devel LLVM_DEVEL_VARS= LLVM_VERSION=-devel +LLVM_90_DESC= LLVM 9 +LLVM_90_VARS= LLVM_VERSION=90 + LLVM_80_DESC= LLVM 8 LLVM_80_VARS= LLVM_VERSION=80 -- cgit From a280dba2eafcb71be63c66a356583707f4fed7b8 Mon Sep 17 00:00:00 2001 From: linimon Date: Wed, 7 Aug 2019 09:42:22 +0000 Subject: Fix build on GCC-based architectures by adding c++11-lang to USES: /usr/local/lib/libgraphite2.so.3: undefined reference to `__cxa_throw_bad_array_new_length@CXXABI_1.3.8' Approved by: portmgr (tier-2 blanket) --- net-p2p/mldonkey/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index d1d7d5804f99..2832644f41cb 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/Copying.txt CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* -USES= gmake iconv pkgconfig tar:bzip2 +USES= compiler:c++11-lang gmake iconv pkgconfig tar:bzip2 USE_OCAML= yes USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes -- cgit From 24a647098ebdb4af8a035d6439d04388ed357a73 Mon Sep 17 00:00:00 2001 From: bofh Date: Wed, 7 Aug 2019 09:58:15 +0000 Subject: emulators/qemu-devel: Update version 3.1.0=>4.0.0 - USES=gl is not always needed [1] PR: 238364 [1] Submitted by: pizzamig [1] Reported by: bz --- emulators/qemu-devel/Makefile | 27 +++++-------- emulators/qemu-devel/distinfo | 6 +-- emulators/qemu-devel/files/patch-Makefile | 12 +++--- emulators/qemu-devel/files/patch-configure | 46 +++++++++++++++------- .../patch-disas_libvixl_vixl_a64_disasm-a64.cc | 4 +- emulators/qemu-devel/files/patch-include_net_net.h | 4 +- .../qemu-devel/files/patch-include_qemu_atomic.h | 10 ++--- emulators/qemu-devel/files/patch-net_tap-bsd.c | 4 +- emulators/qemu-devel/files/patch-qemu-doc.texi | 13 +++++- emulators/qemu-devel/pkg-plist | 18 ++++++--- 10 files changed, 85 insertions(+), 59 deletions(-) diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 301256eb6c28..b4ffaf8a4b99 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTVERSION= 4.0.0 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ PKGNAMESUFFIX= -devel @@ -22,7 +21,7 @@ LIB_DEPENDS= libnettle.so:security/nettle \ libepoxy.so:graphics/libepoxy \ libpcre2-8.so:devel/pcre2 -USES= cpe gmake gnome pkgconfig bison perl5 python:2.7,build tar:xz +USES= bison cpe gmake gnome iconv:wchar_t perl5 pkgconfig python:build tar:xz USE_GNOME= cairo glib20 libxml2 USE_PERL5= build USE_XORG= pixman @@ -51,12 +50,12 @@ STATIC_LINK_DESC= Statically link the executables VDE_DESC= vde dependency (for vde networking) OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE OPTIONS_SUB= yes -X11_USE= SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2 +X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl X11_CONFIGURE_ENABLE= sdl GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext -GTK3_USES= gettext +GTK3_USES= gettext gl GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls @@ -69,6 +68,7 @@ PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --disable-curl OPENGL_USE= GL=gl +OPENGL_USES= gl OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir @@ -84,11 +84,12 @@ STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static NCURSES_USES= ncurses:base SAMBA_USES= samba:run # smbd SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd -DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html +DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \ + sphinx-build:textproc/py-sphinx DOCS_USES= makeinfo DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 -PORTDOCS= docs qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ +PORTDOCS= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ qemu-qmp-ref.html qemu-qmp-ref.txt WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation @@ -99,6 +100,7 @@ CONFIGURE_ARGS= --localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \ --disable-linux-user --disable-linux-aio --disable-xen \ --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" +INSTALLS_ICONS= yes .include @@ -130,21 +132,10 @@ post-patch: @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure - @${REINPLACE_CMD} -E \ - -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ - ${WRKSRC}/qemu-doc.texi - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} -E \ - -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ - ${WRKSRC}/scripts/texi2pod.pl post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index 14681107c2ac..6ad6264b1d46 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551235571 -SHA256 (qemu/3.1.0/qemu-3.1.0.tar.xz) = 6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc -SIZE (qemu/3.1.0/qemu-3.1.0.tar.xz) = 36070104 +TIMESTAMP = 1556455551 +SHA256 (qemu/4.0.0/qemu-4.0.0.tar.xz) = 13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469 +SIZE (qemu/4.0.0/qemu-4.0.0.tar.xz) = 55628624 diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile index 84fa77d3f2ac..095b684f8e80 100644 --- a/emulators/qemu-devel/files/patch-Makefile +++ b/emulators/qemu-devel/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2018-12-11 17:44:34 UTC +--- Makefile.orig 2019-04-23 18:14:45 UTC +++ Makefile -@@ -353,9 +353,14 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -311,9 +311,14 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS @@ -15,10 +15,10 @@ DOCS+=docs/qemu-block-drivers.7 DOCS+=docs/qemu-cpu-models.7 ifdef CONFIG_VIRTFS -@@ -823,11 +828,13 @@ BLOBS= - endif +@@ -742,11 +747,13 @@ install-sphinxdocs: sphinxdocs + $(call install-manual,interop) - install-doc: $(DOCS) + install-doc: $(DOCS) install-sphinxdocs +ifndef NOPORTDOCS $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" @@ -29,7 +29,7 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -842,8 +849,10 @@ ifneq ($(TOOLS),) +@@ -764,8 +771,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP endif ifneq (,$(findstring qemu-ga,$(TOOLS))) $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure index ea30d217e7b2..c41037e2774c 100644 --- a/emulators/qemu-devel/files/patch-configure +++ b/emulators/qemu-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2018-12-11 17:44:34 UTC +--- configure.orig 2019-04-23 18:14:45 UTC +++ configure -@@ -393,7 +393,7 @@ DSOSUF=".so" +@@ -396,7 +396,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" @@ -9,7 +9,7 @@ datadir="\${prefix}/share" firmwarepath="\${prefix}/share/qemu-firmware" qemu_docdir="\${prefix}/share/doc/qemu" -@@ -469,6 +469,9 @@ numa="" +@@ -476,6 +476,9 @@ numa="" tcmalloc="no" jemalloc="no" replication="yes" @@ -19,7 +19,7 @@ vxhs="" bochs="yes" cloop="yes" -@@ -1097,6 +1100,10 @@ for opt do +@@ -1118,6 +1121,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; @@ -29,8 +29,8 @@ + ;; --disable-slirp) slirp="no" ;; - --disable-vde) vde="no" -@@ -2860,6 +2867,14 @@ if ! check_include "ifaddrs.h" ; then + --enable-slirp=system) slirp="system" +@@ -2972,6 +2979,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## @@ -45,19 +45,37 @@ # VTE probe if test "$vte" != "no"; then -@@ -4466,11 +4481,6 @@ fi +@@ -3629,7 +3644,7 @@ for i in $glib_modules; do + glib_libs=$($pkg_config --libs $i) + QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" + LIBS="$glib_libs $LIBS" +- libs_qga="$glib_libs $libs_qga" ++ libs_qga="$glib_libs -lintl $libs_qga" + else + error_exit "glib-$glib_req_ver $i is required to compile QEMU" + fi +@@ -4723,11 +4738,6 @@ has_sphinx_build() { if test "$docs" != "no" ; then - if has makeinfo && has pod2man; then + if has makeinfo && has pod2man && has_sphinx_build; then docs=yes - else - if test "$docs" = "yes" ; then -- feature_not_found "docs" "Install texinfo and Perl/perl-podlators" +- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx" - fi - docs=no fi fi -@@ -4984,7 +4994,51 @@ if test "$debug_stack_usage" = "yes"; then +@@ -4861,7 +4871,7 @@ fi + + # check for libusb + if test "$libusb" != "no" ; then +- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then ++ if $pkg_config libusb-1.0; then + libusb="yes" + libusb_cflags=$($pkg_config --cflags libusb-1.0) + libusb_libs=$($pkg_config --libs libusb-1.0) +@@ -5251,7 +5261,51 @@ if test "$debug_stack_usage" = "yes"; then fi fi @@ -109,7 +127,7 @@ ########################################## # check if we have open_by_handle_at -@@ -6005,6 +6059,7 @@ echo "Audio drivers $audio_drv_list" +@@ -6332,6 +6386,7 @@ echo "Audio drivers $audio_drv_list" echo "Block whitelist (rw) $block_drv_rw_whitelist" echo "Block whitelist (ro) $block_drv_ro_whitelist" echo "VirtFS support $virtfs" @@ -117,7 +135,7 @@ echo "Multipath support $mpath" echo "VNC support $vnc" if test "$vnc" = "yes" ; then -@@ -6240,6 +6295,15 @@ fi +@@ -6565,6 +6620,15 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi @@ -130,10 +148,10 @@ + echo "CONFIG_BPF=y" >> $config_host_mak + fi +fi - if test "$slirp" = "yes" ; then + if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6470,6 +6534,9 @@ fi +@@ -6812,6 +6876,9 @@ fi # if this macro is set. if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak diff --git a/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc index 4e88b6b4a362..546595845c62 100644 --- a/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc +++ b/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc @@ -1,6 +1,6 @@ ---- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2016-04-14 20:19:53 UTC +--- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2019-04-23 18:14:45 UTC +++ disas/libvixl/vixl/a64/disasm-a64.cc -@@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffse +@@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffsetToOutput(cons if (offset < 0) { abs_offset = -abs_offset; } diff --git a/emulators/qemu-devel/files/patch-include_net_net.h b/emulators/qemu-devel/files/patch-include_net_net.h index 95d3b5e33654..92d57989a03f 100644 --- a/emulators/qemu-devel/files/patch-include_net_net.h +++ b/emulators/qemu-devel/files/patch-include_net_net.h @@ -1,6 +1,6 @@ ---- include/net/net.h.orig 2015-11-03 20:01:34 UTC +--- include/net/net.h.orig 2019-04-23 18:14:46 UTC +++ include/net/net.h -@@ -202,8 +202,8 @@ void qmp_netdev_add(QDict *qdict, QObjec +@@ -209,8 +209,8 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error int net_hub_id_for_client(NetClientState *nc, int *id); NetClientState *net_hub_port_find(int hub_id); diff --git a/emulators/qemu-devel/files/patch-include_qemu_atomic.h b/emulators/qemu-devel/files/patch-include_qemu_atomic.h index c1f3819a413a..623073e0b29a 100644 --- a/emulators/qemu-devel/files/patch-include_qemu_atomic.h +++ b/emulators/qemu-devel/files/patch-include_qemu_atomic.h @@ -1,6 +1,6 @@ ---- include/qemu/atomic.h.orig 2017-04-20 14:57:00 UTC +--- include/qemu/atomic.h.orig 2019-04-23 18:14:46 UTC +++ include/qemu/atomic.h -@@ -182,10 +182,12 @@ +@@ -201,10 +201,12 @@ /* Provide shorter names for GCC atomic builtins, return old value */ #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) @@ -13,7 +13,7 @@ #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) -@@ -199,10 +201,12 @@ +@@ -218,10 +220,12 @@ /* And even shorter names that return void. */ #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) #define atomic_dec(ptr) ((void) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST)) @@ -26,7 +26,7 @@ #define atomic_xor(ptr, n) ((void) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST)) #else /* __ATOMIC_RELAXED */ -@@ -370,10 +374,12 @@ +@@ -389,10 +393,12 @@ #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) @@ -39,7 +39,7 @@ #define atomic_xor_fetch(ptr, n) __sync_xor_and_fetch(ptr, n) #define atomic_cmpxchg(ptr, old, new) __sync_val_compare_and_swap(ptr, old, new) -@@ -382,10 +388,12 @@ +@@ -401,10 +407,12 @@ /* And even shorter names that return void. */ #define atomic_inc(ptr) ((void) __sync_fetch_and_add(ptr, 1)) #define atomic_dec(ptr) ((void) __sync_fetch_and_add(ptr, -1)) diff --git a/emulators/qemu-devel/files/patch-net_tap-bsd.c b/emulators/qemu-devel/files/patch-net_tap-bsd.c index 8e027eda9e61..6d94c1bde1ca 100644 --- a/emulators/qemu-devel/files/patch-net_tap-bsd.c +++ b/emulators/qemu-devel/files/patch-net_tap-bsd.c @@ -1,6 +1,6 @@ ---- net/tap-bsd.c.orig 2015-11-03 20:01:34 UTC +--- net/tap-bsd.c.orig 2019-04-23 18:14:46 UTC +++ net/tap-bsd.c -@@ -29,6 +29,7 @@ +@@ -31,6 +31,7 @@ #if defined(__NetBSD__) || defined(__FreeBSD__) #include diff --git a/emulators/qemu-devel/files/patch-qemu-doc.texi b/emulators/qemu-devel/files/patch-qemu-doc.texi index 4bcda8581c01..aa79d423f792 100644 --- a/emulators/qemu-devel/files/patch-qemu-doc.texi +++ b/emulators/qemu-devel/files/patch-qemu-doc.texi @@ -1,6 +1,15 @@ ---- qemu-doc.texi.orig 2015-11-03 20:01:35 UTC +--- qemu-doc.texi.orig 2019-04-23 18:14:46 UTC +++ qemu-doc.texi -@@ -355,7 +355,8 @@ Send Ctrl-a +@@ -200,7 +200,7 @@ VGA BIOS. + QEMU uses YM3812 emulation by Tatsuyuki Satoh. + + QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/}) +-by Tibor "TS" Schütz. ++by Tibor "TS" Schuetz. + + Note that, by default, GUS shares IRQ(7) with parallel ports and so + QEMU must be told to not have parallel ports to have working GUS. +@@ -560,7 +560,8 @@ Send the escape character to the frontend @c man begin SEEALSO The HTML documentation of QEMU for more precise information and Linux diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist index 98a08f1c0710..bf144fa1a856 100644 --- a/emulators/qemu-devel/pkg-plist +++ b/emulators/qemu-devel/pkg-plist @@ -1,3 +1,4 @@ +bin/elf2dmp bin/qemu-edid bin/qemu-ga bin/qemu-i386 @@ -96,12 +97,9 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/petalogix-s3adsp1800.dtb %%DATADIR%%/bamboo.dtb %%DATADIR%%/kvmvapic.bin -%%DATADIR%%/qemu-icon.bmp -%%DATADIR%%/qemu_logo_no_text.svg %%DATADIR%%/u-boot.e500 %%DATADIR%%/keymaps/ar %%DATADIR%%/keymaps/bepo -%%DATADIR%%/keymaps/common %%DATADIR%%/keymaps/cz %%DATADIR%%/keymaps/da %%DATADIR%%/keymaps/de @@ -124,9 +122,7 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/keymaps/lt %%DATADIR%%/keymaps/lv %%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/modifiers %%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/nl-be %%DATADIR%%/keymaps/no %%DATADIR%%/keymaps/pl %%DATADIR%%/keymaps/pt @@ -136,8 +132,20 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/keymaps/sv %%DATADIR%%/keymaps/th %%DATADIR%%/keymaps/tr +%%DATADIR%%/pvh.bin %%DATADIR%%/vgabios-bochs-display.bin %%DATADIR%%/vgabios-ramfb.bin +share/icons/hicolor/128x128/apps/qemu.png +share/icons/hicolor/16x16/apps/qemu.png +share/icons/hicolor/24x24/apps/qemu.png +share/icons/hicolor/256x256/apps/qemu.png +share/icons/hicolor/32x32/apps/qemu.bmp +share/icons/hicolor/32x32/apps/qemu.png +share/icons/hicolor/48x48/apps/qemu.png +share/icons/hicolor/512x512/apps/qemu.png +share/icons/hicolor/64x64/apps/qemu.png +share/icons/hicolor/scalable/apps/qemu.svg +share/applications/qemu.desktop %%GTK3%%share/locale/bg/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/de_DE/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo -- cgit From ea1de97602896f357e117700d633c9c416935b5f Mon Sep 17 00:00:00 2001 From: tobik Date: Wed, 7 Aug 2019 10:37:10 +0000 Subject: Mk/Uses/cargo.mk: cargo-crates to flag unknown git hosts To avoid some head scratching print a warning instead of being silent when encountering unhandled git hosts. --- Mk/Scripts/cargo-crates.awk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Mk/Scripts/cargo-crates.awk b/Mk/Scripts/cargo-crates.awk index 8bba428196b4..a15bc4bcf080 100644 --- a/Mk/Scripts/cargo-crates.awk +++ b/Mk/Scripts/cargo-crates.awk @@ -72,7 +72,9 @@ function split_url(s) { tag = url["fragment"] } + added = 0 if (url["host"] == "github.com") { + added = 1 gh_tuple[gh_tuple_len++] = sprintf(\ "%s:%s:%s:%s", account, project, tag, package_name) } else { @@ -88,9 +90,14 @@ function split_url(s) { gl_tuple[gl_tuple_len++] = sprintf(\ "%s:%s:%s:%s:%s", site, account, project, tag, package_name) } + added = 1 break } } + + if (!added) { + printf "Warning: Ignoring git source on line %d: %s\n", NR, $3 > "/dev/stderr" + } } function print_array(start, arr, arrlen) { -- cgit From 2503f60e9807fae7fd77f2977a41b84959ecc70a Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 7 Aug 2019 11:29:55 +0000 Subject: multimedia/vapoursynth: update to R47.1 Changes: https://github.com/vapoursynth/vapoursynth/compare/R46...R47.1 Changes: http://www.vapoursynth.com/2019/08/r47-fixing-small-issues/ Reported by: GitHub (watch releases) --- multimedia/vapoursynth/Makefile | 3 +-- multimedia/vapoursynth/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index a4b571d201c4..3caaaee3c312 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vapoursynth -PORTVERSION= R46 -PORTREVISION= 2 +PORTVERSION= R47.1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/vapoursynth/distinfo b/multimedia/vapoursynth/distinfo index 15ae908eebb9..a7430ce410f4 100644 --- a/multimedia/vapoursynth/distinfo +++ b/multimedia/vapoursynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561668733 -SHA256 (vapoursynth-vapoursynth-R46_GH0.tar.gz) = e0b6e538cc54a021935e89a88c5fdae23c018873413501785c80b343c455fe7f -SIZE (vapoursynth-vapoursynth-R46_GH0.tar.gz) = 598758 +TIMESTAMP = 1565119677 +SHA256 (vapoursynth-vapoursynth-R47.1_GH0.tar.gz) = 095509b088ed1c3ba452ee0fed4a5f134719ac817ffc594f79557f499ad9fa6b +SIZE (vapoursynth-vapoursynth-R47.1_GH0.tar.gz) = 585656 -- cgit From e6cf5ef3ca4727fe34d651699ca0deab1fb9addd Mon Sep 17 00:00:00 2001 From: bofh Date: Wed, 7 Aug 2019 12:02:12 +0000 Subject: net/netselect: Update version 0.3=>0.4 - Take MAINTAINERSHIP --- net/netselect/Makefile | 16 +++++++++------- net/netselect/distinfo | 5 +++-- net/netselect/files/patch-netselect.c | 32 +++++++++++++++----------------- net/netselect/pkg-plist | 1 + 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/net/netselect/Makefile b/net/netselect/Makefile index b7d4d33297fd..b4d3db865f5e 100644 --- a/net/netselect/Makefile +++ b/net/netselect/Makefile @@ -2,22 +2,23 @@ # $FreeBSD$ PORTNAME= netselect -PORTVERSION= 0.3 +PORTVERSION= 0.4 +DISTVERSIONPREFIX=${PORTNAME}- CATEGORIES= net -MASTER_SITES= http://apenwarr.ca/netselect/ \ - GENTOO -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Ultrafast implementation of ping LICENSE= BSD3CLAUSE +USES= gmake +USE_GITHUB= yes + +GH_ACCOUNT= apenwarr + OPTIONS_DEFINE= SUID DOCS OPTIONS_SUB= yes SUID_DESC= Install with the setuid bit to allow use by non-root users -EXTRACT_AFTER_ARGS=netselect/netselect.c netselect/README - -WRKSRC= ${WRKDIR}/${PORTNAME} do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c @@ -25,6 +26,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net/netselect/distinfo b/net/netselect/distinfo index bd7b0b933aff..b283625f173a 100644 --- a/net/netselect/distinfo +++ b/net/netselect/distinfo @@ -1,2 +1,3 @@ -SHA256 (netselect-0.3.tar.gz) = fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 -SIZE (netselect-0.3.tar.gz) = 22047 +TIMESTAMP = 1565127643 +SHA256 (apenwarr-netselect-netselect-0.4_GH0.tar.gz) = ae343991c94b1fdeb5e7896bb11d357c1dd9297f5d842c507953f57935e15e19 +SIZE (apenwarr-netselect-netselect-0.4_GH0.tar.gz) = 22095 diff --git a/net/netselect/files/patch-netselect.c b/net/netselect/files/patch-netselect.c index 6717a97234aa..413ba24de07e 100644 --- a/net/netselect/files/patch-netselect.c +++ b/net/netselect/files/patch-netselect.c @@ -1,6 +1,6 @@ ---- netselect.c 2001-08-29 05:18:57.000000000 -0400 -+++ netselect.c 2015-03-09 02:31:02.000000000 -0400 -@@ -39,14 +39,13 @@ +--- netselect.c.orig 2010-10-26 23:08:55 UTC ++++ netselect.c +@@ -39,15 +39,14 @@ * hey, great! Let me know. -- apenwarr */ @@ -17,20 +17,21 @@ +#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__OpenBSD__) +#include -+#endif -+#include #endif ++#include ++#endif #include -@@ -152,6 +151,7 @@ + #include +@@ -167,6 +166,7 @@ int main(int argc, char **argv) extern int optind; int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100; - int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1; + int ch, seq, ttl, max_ttl = 30, num_score = 1; + int on = 1; + int use_icmp = 0; + unsigned int min_tries = 10; struct timeval now; - struct timezone tz; - OPacket outpacket; /* last output (udp) packet */ -@@ -234,7 +234,12 @@ +@@ -280,7 +280,12 @@ int main(int argc, char **argv) if (verbose >= 1) fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n", num_score, numhosts, numhosts==1 ? "" : "es"); @@ -44,7 +45,7 @@ /* keep going until most of the hosts have been finished */ must_continue = numhosts; while (must_continue && must_continue >= numhosts/2) -@@ -712,7 +717,7 @@ +@@ -774,7 +779,7 @@ static void send_probe(int seq, int ttl, OPacket *op, ip->ip_off = 0; ip->ip_hl = sizeof(*ip) >> 2; ip->ip_p = IPPROTO_UDP; @@ -53,18 +54,15 @@ ip->ip_ttl = ttl; ip->ip_v = IPVERSION; ip->ip_id = htons(ident + seq); -@@ -771,12 +776,8 @@ - int cc = 0; +@@ -905,11 +910,7 @@ static HostData *wait_for_reply(HostData *hosts, int n time_t msec_used; HostData *host; -- + -#if !defined(__GLIBC__) - int fromlen = sizeof(from); -#else /* __GLIBC__ */ -- size_t fromlen = sizeof(from); + socklen_t fromlen = sizeof(from); -#endif /* __GLIBC__ */ -+ -+ socklen_t fromlen = sizeof(from); FD_ZERO(&fds); FD_SET(sock, &fds); diff --git a/net/netselect/pkg-plist b/net/netselect/pkg-plist index 7a520d7b93c1..a9fafde7ce2e 100644 --- a/net/netselect/pkg-plist +++ b/net/netselect/pkg-plist @@ -1,3 +1,4 @@ %%SUID%%@(root,wheel,4110) bin/netselect %%NO_SUID%%@(root,wheel,100) bin/netselect %%PORTDOCS%%%%DOCSDIR%%/README +man/man1/netselect.1.gz -- cgit From 9504f7acc196189c4290916a73cf87e16f3f8340 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Wed, 7 Aug 2019 12:19:11 +0000 Subject: devel/shell-toolbox: Update to 20190528 Changelog: https://github.com/kusalananda/shell-toolbox/releases/tag/20190528 --- devel/shell-toolbox/Makefile | 2 +- devel/shell-toolbox/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/shell-toolbox/Makefile b/devel/shell-toolbox/Makefile index 69ff5b9a3a55..431b10f51d7c 100644 --- a/devel/shell-toolbox/Makefile +++ b/devel/shell-toolbox/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= shell-toolbox -DISTVERSION= 20180719 +DISTVERSION= 20190528 CATEGORIES= devel MAINTAINER= 0mp@FreeBSD.org diff --git a/devel/shell-toolbox/distinfo b/devel/shell-toolbox/distinfo index 397227bc97af..387a87000730 100644 --- a/devel/shell-toolbox/distinfo +++ b/devel/shell-toolbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534322930 -SHA256 (kusalananda-shell-toolbox-20180719_GH0.tar.gz) = 0d0206a4eb84579434d20c22e36b6e2dc24a65e9432a0aa83ccde76440ab8f70 -SIZE (kusalananda-shell-toolbox-20180719_GH0.tar.gz) = 75390 +TIMESTAMP = 1565171398 +SHA256 (kusalananda-shell-toolbox-20190528_GH0.tar.gz) = 427d92a016e41f6eb12be1382fbd9f6439bb4805145490992479fbd0ce9f7904 +SIZE (kusalananda-shell-toolbox-20190528_GH0.tar.gz) = 90944 -- cgit From 440c104d6280c194521bc512604216b27fff0a30 Mon Sep 17 00:00:00 2001 From: ericbsd Date: Wed, 7 Aug 2019 12:48:57 +0000 Subject: New ports x11/slick-greeter 1.2.7 A slick-looking LightDM greeter --- x11/slick-greeter/Makefile | 33 ++++++ x11/slick-greeter/distinfo | 3 + x11/slick-greeter/pkg-descr | 3 + x11/slick-greeter/pkg-plist | 244 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+) create mode 100644 x11/slick-greeter/Makefile create mode 100644 x11/slick-greeter/distinfo create mode 100644 x11/slick-greeter/pkg-descr create mode 100644 x11/slick-greeter/pkg-plist diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile new file mode 100644 index 000000000000..45f0b5b0ef0a --- /dev/null +++ b/x11/slick-greeter/Makefile @@ -0,0 +1,33 @@ +# Created by: Eric Turgeon +# $FreeBSD$ + +PORTNAME= slick-greeter +PORTVERSION= 1.2.7 +CATEGORIES= x11 + +MAINTAINER= ericbsd@FreeBSD.org +COMMENT= A slick-looking LightDM greeter + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= liblightdm-gobject-1.so:x11/lightdm \ + libcanberra-gtk3.so:audio/libcanberra-gtk3 +BUILD_DEPENDS= valac:lang/vala + +USES= autoreconf gettext gmake gnome localbase pkgconfig +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool + +USE_XORG= x11 + +USE_GITHUB= yes +GH_ACCOUNT= linuxmint + +GNU_CONFIGURE= yes +INSTALLS_ICONS= yes + +GLIB_SCHEMAS= x.dm.slick-greeter.gschema.xml + +OPTIONS_DEFINE= DOCS + +.include diff --git a/x11/slick-greeter/distinfo b/x11/slick-greeter/distinfo new file mode 100644 index 000000000000..db8c289359a9 --- /dev/null +++ b/x11/slick-greeter/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565124298 +SHA256 (linuxmint-slick-greeter-1.2.7_GH0.tar.gz) = cf01d8cf859a5a5a81e211d157b25e6190892159b85c4781b13bec872b0534ea +SIZE (linuxmint-slick-greeter-1.2.7_GH0.tar.gz) = 249151 diff --git a/x11/slick-greeter/pkg-descr b/x11/slick-greeter/pkg-descr new file mode 100644 index 000000000000..286fb07b0639 --- /dev/null +++ b/x11/slick-greeter/pkg-descr @@ -0,0 +1,3 @@ +A slick-looking LightDM greeter. + +WWW: https://github.com/linuxmint/slick-greeter diff --git a/x11/slick-greeter/pkg-plist b/x11/slick-greeter/pkg-plist new file mode 100644 index 000000000000..cecb0ce0313e --- /dev/null +++ b/x11/slick-greeter/pkg-plist @@ -0,0 +1,244 @@ +/usr/bin/slick-greeter-check-hidpi +/usr/bin/slick-greeter-set-keyboard-layout +man/man1/slick-greeter-check-hidpi.1.gz +man/man1/slick-greeter-set-keyboard-layout.1.gz +man/man8/slick-greeter.8.gz +sbin/slick-greeter +share/locale/af/LC_MESSAGES/slick-greeter.mo +share/locale/am/LC_MESSAGES/slick-greeter.mo +share/locale/an/LC_MESSAGES/slick-greeter.mo +share/locale/ar/LC_MESSAGES/slick-greeter.mo +share/locale/ast/LC_MESSAGES/slick-greeter.mo +share/locale/az/LC_MESSAGES/slick-greeter.mo +share/locale/be/LC_MESSAGES/slick-greeter.mo +share/locale/bem/LC_MESSAGES/slick-greeter.mo +share/locale/bg/LC_MESSAGES/slick-greeter.mo +share/locale/bn/LC_MESSAGES/slick-greeter.mo +share/locale/bo/LC_MESSAGES/slick-greeter.mo +share/locale/br/LC_MESSAGES/slick-greeter.mo +share/locale/bs/LC_MESSAGES/slick-greeter.mo +share/locale/ca/LC_MESSAGES/slick-greeter.mo +share/locale/ca@valencia/LC_MESSAGES/slick-greeter.mo +share/locale/ce/LC_MESSAGES/slick-greeter.mo +share/locale/ckb/LC_MESSAGES/slick-greeter.mo +share/locale/crh/LC_MESSAGES/slick-greeter.mo +share/locale/cs/LC_MESSAGES/slick-greeter.mo +share/locale/cv/LC_MESSAGES/slick-greeter.mo +share/locale/cy/LC_MESSAGES/slick-greeter.mo +share/locale/da/LC_MESSAGES/slick-greeter.mo +share/locale/de/LC_MESSAGES/slick-greeter.mo +share/locale/el/LC_MESSAGES/slick-greeter.mo +share/locale/en_AU/LC_MESSAGES/slick-greeter.mo +share/locale/en_CA/LC_MESSAGES/slick-greeter.mo +share/locale/en_GB/LC_MESSAGES/slick-greeter.mo +share/locale/eo/LC_MESSAGES/slick-greeter.mo +share/locale/es/LC_MESSAGES/slick-greeter.mo +share/locale/et/LC_MESSAGES/slick-greeter.mo +share/locale/eu/LC_MESSAGES/slick-greeter.mo +share/locale/fa/LC_MESSAGES/slick-greeter.mo +share/locale/fi/LC_MESSAGES/slick-greeter.mo +share/locale/fil/LC_MESSAGES/slick-greeter.mo +share/locale/fo/LC_MESSAGES/slick-greeter.mo +share/locale/fr/LC_MESSAGES/slick-greeter.mo +share/locale/fr_CA/LC_MESSAGES/slick-greeter.mo +share/locale/frp/LC_MESSAGES/slick-greeter.mo +share/locale/fy/LC_MESSAGES/slick-greeter.mo +share/locale/ga/LC_MESSAGES/slick-greeter.mo +share/locale/gd/LC_MESSAGES/slick-greeter.mo +share/locale/gl/LC_MESSAGES/slick-greeter.mo +share/locale/gu/LC_MESSAGES/slick-greeter.mo +share/locale/he/LC_MESSAGES/slick-greeter.mo +share/locale/hi/LC_MESSAGES/slick-greeter.mo +share/locale/hr/LC_MESSAGES/slick-greeter.mo +share/locale/ht/LC_MESSAGES/slick-greeter.mo +share/locale/hu/LC_MESSAGES/slick-greeter.mo +share/locale/hy/LC_MESSAGES/slick-greeter.mo +share/locale/ia/LC_MESSAGES/slick-greeter.mo +share/locale/id/LC_MESSAGES/slick-greeter.mo +share/locale/ie/LC_MESSAGES/slick-greeter.mo +share/locale/is/LC_MESSAGES/slick-greeter.mo +share/locale/it/LC_MESSAGES/slick-greeter.mo +share/locale/ja/LC_MESSAGES/slick-greeter.mo +share/locale/ka/LC_MESSAGES/slick-greeter.mo +share/locale/kab/LC_MESSAGES/slick-greeter.mo +share/locale/kk/LC_MESSAGES/slick-greeter.mo +share/locale/kl/LC_MESSAGES/slick-greeter.mo +share/locale/km/LC_MESSAGES/slick-greeter.mo +share/locale/kn/LC_MESSAGES/slick-greeter.mo +share/locale/ko/LC_MESSAGES/slick-greeter.mo +share/locale/ku/LC_MESSAGES/slick-greeter.mo +share/locale/kw/LC_MESSAGES/slick-greeter.mo +share/locale/ky/LC_MESSAGES/slick-greeter.mo +share/locale/la/LC_MESSAGES/slick-greeter.mo +share/locale/lb/LC_MESSAGES/slick-greeter.mo +share/locale/lo/LC_MESSAGES/slick-greeter.mo +share/locale/lt/LC_MESSAGES/slick-greeter.mo +share/locale/lv/LC_MESSAGES/slick-greeter.mo +share/locale/mg/LC_MESSAGES/slick-greeter.mo +share/locale/mhr/LC_MESSAGES/slick-greeter.mo +share/locale/mi/LC_MESSAGES/slick-greeter.mo +share/locale/ml/LC_MESSAGES/slick-greeter.mo +share/locale/mr/LC_MESSAGES/slick-greeter.mo +share/locale/ms/LC_MESSAGES/slick-greeter.mo +share/locale/my/LC_MESSAGES/slick-greeter.mo +share/locale/nap/LC_MESSAGES/slick-greeter.mo +share/locale/nb/LC_MESSAGES/slick-greeter.mo +share/locale/ne/LC_MESSAGES/slick-greeter.mo +share/locale/nl/LC_MESSAGES/slick-greeter.mo +share/locale/nn/LC_MESSAGES/slick-greeter.mo +share/locale/oc/LC_MESSAGES/slick-greeter.mo +share/locale/os/LC_MESSAGES/slick-greeter.mo +share/locale/pa/LC_MESSAGES/slick-greeter.mo +share/locale/pl/LC_MESSAGES/slick-greeter.mo +share/locale/ps/LC_MESSAGES/slick-greeter.mo +share/locale/pt/LC_MESSAGES/slick-greeter.mo +share/locale/pt_BR/LC_MESSAGES/slick-greeter.mo +share/locale/ro/LC_MESSAGES/slick-greeter.mo +share/locale/ru/LC_MESSAGES/slick-greeter.mo +share/locale/sa/LC_MESSAGES/slick-greeter.mo +share/locale/sc/LC_MESSAGES/slick-greeter.mo +share/locale/sd/LC_MESSAGES/slick-greeter.mo +share/locale/se/LC_MESSAGES/slick-greeter.mo +share/locale/shn/LC_MESSAGES/slick-greeter.mo +share/locale/si/LC_MESSAGES/slick-greeter.mo +share/locale/sk/LC_MESSAGES/slick-greeter.mo +share/locale/sl/LC_MESSAGES/slick-greeter.mo +share/locale/sq/LC_MESSAGES/slick-greeter.mo +share/locale/sr/LC_MESSAGES/slick-greeter.mo +share/locale/sr@latin/LC_MESSAGES/slick-greeter.mo +share/locale/sv/LC_MESSAGES/slick-greeter.mo +share/locale/sw/LC_MESSAGES/slick-greeter.mo +share/locale/szl/LC_MESSAGES/slick-greeter.mo +share/locale/ta/LC_MESSAGES/slick-greeter.mo +share/locale/te/LC_MESSAGES/slick-greeter.mo +share/locale/tg/LC_MESSAGES/slick-greeter.mo +share/locale/th/LC_MESSAGES/slick-greeter.mo +share/locale/ti/LC_MESSAGES/slick-greeter.mo +share/locale/tr/LC_MESSAGES/slick-greeter.mo +share/locale/ug/LC_MESSAGES/slick-greeter.mo +share/locale/uk/LC_MESSAGES/slick-greeter.mo +share/locale/ur/LC_MESSAGES/slick-greeter.mo +share/locale/uz/LC_MESSAGES/slick-greeter.mo +share/locale/vec/LC_MESSAGES/slick-greeter.mo +share/locale/vi/LC_MESSAGES/slick-greeter.mo +share/locale/wae/LC_MESSAGES/slick-greeter.mo +share/locale/zh_CN/LC_MESSAGES/slick-greeter.mo +share/locale/zh_HK/LC_MESSAGES/slick-greeter.mo +share/locale/zh_TW/LC_MESSAGES/slick-greeter.mo +%%DATADIR%%/a11y.svg +%%DATADIR%%/active.png +%%DATADIR%%/arrow_left.png +%%DATADIR%%/arrow_right.png +%%DATADIR%%/battery.svg +%%DATADIR%%/battery_10.svg +%%DATADIR%%/battery_25.svg +%%DATADIR%%/battery_50.svg +%%DATADIR%%/dialog_close.png +%%DATADIR%%/dialog_close_highlight.png +%%DATADIR%%/dialog_close_press.png +%%DATADIR%%/hibernate.png +%%DATADIR%%/hibernate_highlight.png +%%DATADIR%%/keyboard.svg +%%DATADIR%%/message.png +%%DATADIR%%/remote_login_help.png +%%DATADIR%%/restart.png +%%DATADIR%%/restart_highlight.png +%%DATADIR%%/shadow.png +%%DATADIR%%/shutdown.png +%%DATADIR%%/shutdown.svg +%%DATADIR%%/shutdown_highlight.png +%%DATADIR%%/suspend.png +%%DATADIR%%/suspend_highlight.png +%%DATADIR%%/switcher_corner.png +%%DATADIR%%/switcher_left.png +%%DATADIR%%/switcher_top.png +share/xgreeters/slick-greeter.desktop +/usr/%%DATADIR%%/badges/IceWM-Experimental.png +/usr/%%DATADIR%%/badges/IceWM-Lite.png +/usr/%%DATADIR%%/badges/IceWM.png +/usr/%%DATADIR%%/badges/LXDE.png +/usr/%%DATADIR%%/badges/Lubuntu-Netbook.png +/usr/%%DATADIR%%/badges/Lubuntu.png +/usr/%%DATADIR%%/badges/QLubuntu.png +/usr/%%DATADIR%%/badges/XBMC.png +/usr/%%DATADIR%%/badges/aewm++.png +/usr/%%DATADIR%%/badges/afterstep.png +/usr/%%DATADIR%%/badges/amiwm.png +/usr/%%DATADIR%%/badges/awesome.svg +/usr/%%DATADIR%%/badges/blackbox.png +/usr/%%DATADIR%%/badges/budgie-desktop.svg +/usr/%%DATADIR%%/badges/cairo-dock-fallback.png +/usr/%%DATADIR%%/badges/cairo-dock-unity.png +/usr/%%DATADIR%%/badges/cairo-dock.png +/usr/%%DATADIR%%/badges/cde.svg +/usr/%%DATADIR%%/badges/chromium.svg +/usr/%%DATADIR%%/badges/cinnamon.svg +/usr/%%DATADIR%%/badges/cinnamon2d.svg +/usr/%%DATADIR%%/badges/deepin.png +/usr/%%DATADIR%%/badges/dwm.svg +/usr/%%DATADIR%%/badges/ede.png +/usr/%%DATADIR%%/badges/enlightenment.svg +/usr/%%DATADIR%%/badges/etoile.svg +/usr/%%DATADIR%%/badges/evilwm.png +/usr/%%DATADIR%%/badges/fluxbox.svg +/usr/%%DATADIR%%/badges/fvwm-crystal.png +/usr/%%DATADIR%%/badges/fvwm.png +/usr/%%DATADIR%%/badges/fvwm1.png +/usr/%%DATADIR%%/badges/gnome-bluetile.svg +/usr/%%DATADIR%%/badges/gnome-classic.svg +/usr/%%DATADIR%%/badges/gnome-flashback-compiz.svg +/usr/%%DATADIR%%/badges/gnome-flashback-metacity.svg +/usr/%%DATADIR%%/badges/gnome-shell.svg +/usr/%%DATADIR%%/badges/gnome-wayland.svg +/usr/%%DATADIR%%/badges/gnome-xmonad.png +/usr/%%DATADIR%%/badges/gnome-xorg.svg +/usr/%%DATADIR%%/badges/gnome.svg +/usr/%%DATADIR%%/badges/gnustep.png +/usr/%%DATADIR%%/badges/herbstluftwm.png +/usr/%%DATADIR%%/badges/i3-with-shmlog.png +/usr/%%DATADIR%%/badges/i3.png +/usr/%%DATADIR%%/badges/icewm-session.png +/usr/%%DATADIR%%/badges/kde-plasma.png +/usr/%%DATADIR%%/badges/kde.png +/usr/%%DATADIR%%/badges/larswm.png +/usr/%%DATADIR%%/badges/lubuntu-nexus7.png +/usr/%%DATADIR%%/badges/lxgames.png +/usr/%%DATADIR%%/badges/matchbox.png +/usr/%%DATADIR%%/badges/mate-old.png +/usr/%%DATADIR%%/badges/mate.svg +/usr/%%DATADIR%%/badges/mythbuntu.png +/usr/%%DATADIR%%/badges/openbox-gnome.png +/usr/%%DATADIR%%/badges/openbox-kde.png +/usr/%%DATADIR%%/badges/openbox.png +/usr/%%DATADIR%%/badges/openbsd-cwm.png +/usr/%%DATADIR%%/badges/pantheon.png +/usr/%%DATADIR%%/badges/pekwm.png +/usr/%%DATADIR%%/badges/plasma.png +/usr/%%DATADIR%%/badges/ratpoison.png +/usr/%%DATADIR%%/badges/razor.png +/usr/%%DATADIR%%/badges/recovery_console.png +/usr/%%DATADIR%%/badges/sawfish.png +/usr/%%DATADIR%%/badges/steamos.svg +/usr/%%DATADIR%%/badges/stumpwm.png +/usr/%%DATADIR%%/badges/subtle.png +/usr/%%DATADIR%%/badges/sugar-session-0.84.png +/usr/%%DATADIR%%/badges/sugar-session-0.86.png +/usr/%%DATADIR%%/badges/sugar-session-0.88.png +/usr/%%DATADIR%%/badges/sugar-session-0.90.png +/usr/%%DATADIR%%/badges/sugar-session-0.96.png +/usr/%%DATADIR%%/badges/sugar-session-0.98.png +/usr/%%DATADIR%%/badges/trinity.png +/usr/%%DATADIR%%/badges/twm.png +/usr/%%DATADIR%%/badges/ubuntu-xorg.svg +/usr/%%DATADIR%%/badges/ubuntu.svg +/usr/%%DATADIR%%/badges/ubuntustudio.svg +/usr/%%DATADIR%%/badges/unknown.png +/usr/%%DATADIR%%/badges/usr.png +/usr/%%DATADIR%%/badges/wmaker-common.png +/usr/%%DATADIR%%/badges/wmii.png +/usr/%%DATADIR%%/badges/xfce.svg +/usr/%%DATADIR%%/badges/xmonad.png +/usr/%%DATADIR%%/badges/xterm.png +/usr/%%DATADIR%%/badges/xubuntu.svg +@dir /usr/%%DATADIR%%/badges +@dir /usr/%%DATADIR%% -- cgit From b00d932b6abbdd132426e5049e5060aece8b7ebd Mon Sep 17 00:00:00 2001 From: gahr Date: Wed, 7 Aug 2019 13:05:22 +0000 Subject: devel/fossil: adopt sqlite3 config tests from upstream See discussion here: https://fossil-scm.org/forum/forumpost/68b692badf --- devel/fossil/files/patch-auto.def | 18 ---- devel/fossil/files/patch-sqlite-config-test | 154 ++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 18 deletions(-) delete mode 100644 devel/fossil/files/patch-auto.def create mode 100644 devel/fossil/files/patch-sqlite-config-test diff --git a/devel/fossil/files/patch-auto.def b/devel/fossil/files/patch-auto.def deleted file mode 100644 index ad5fc7abce0c..000000000000 --- a/devel/fossil/files/patch-auto.def +++ /dev/null @@ -1,18 +0,0 @@ ---- auto.def.orig 2019-07-13 13:05:19 UTC -+++ auto.def -@@ -149,6 +149,15 @@ if {![opt-bool internal-sqlite]} { - } - - find_internal_sqlite -+ -+ if {![cc-check-progs sqlite3]} { -+ user-error "system sqlite3 command not found" -+ } -+ msg-checking "Checking for JSON1 support in system sqlite3..." -+ if {[catch {exec [get-define SQLITE3] << {select json(true);}} res] || $res != 1} { -+ user-error "system sqlite3 does not have the JSON1 extension" -+ } -+ msg-result "yes" - } - - proc is_mingw {} { diff --git a/devel/fossil/files/patch-sqlite-config-test b/devel/fossil/files/patch-sqlite-config-test new file mode 100644 index 000000000000..43576db3a297 --- /dev/null +++ b/devel/fossil/files/patch-sqlite-config-test @@ -0,0 +1,154 @@ +Index: auto.def +================================================================== +--- auto.def ++++ auto.def +@@ -116,11 +116,11 @@ + } + return $found + } + + if {![opt-bool internal-sqlite]} { +- proc find_internal_sqlite {} { ++ proc find_system_sqlite {} { + + # On some systems (slackware), libsqlite3 requires -ldl to link. So + # search for the system SQLite once with -ldl, and once without. If + # the library can only be found with $extralibs set to -ldl, then + # the code below will append -ldl to LIBS. +@@ -131,14 +131,10 @@ + # if sqlite3_stmt_isexplain can be found as well. If we can find open() but + # not stmt_isexplain(), then the system SQLite is too old to link against + # fossil. + # + if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} { +- if {![check-function-in-lib sqlite3_stmt_isexplain sqlite3 $extralibs]} { +- user-error "system sqlite3 too old (require >= 3.28.0)" +- } +- + # Success. Update symbols and return. + # + define USE_SYSTEM_SQLITE 1 + define-append LIBS -lsqlite3 + define-append LIBS $extralibs +@@ -146,11 +142,44 @@ + } + } + user-error "system sqlite3 not found" + } + +- find_internal_sqlite ++ find_system_sqlite ++ ++ proc test_system_sqlite {} { ++ # Check compatibility of the system SQLite library by running the sqlcompttest.c ++ # program in the source tree ++ # ++ set cmdline {} ++ lappend cmdline {*}[get-define CCACHE] ++ lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] ++ lappend cmdline $::autosetup(dir)/../src/sqlcompattest.c -o conftest__ ++ lappend cmdline {*}[get-define LDFLAGS] ++ lappend cmdline {*}[get-define LIBS] ++ set ok 1 ++ set err [catch {exec-with-stderr {*}$cmdline} result errinfo] ++ if {$err} { ++ configlog "Failed: [join $cmdline]" ++ if {[string length $result]>0} {configlog $result} ++ configlog "============" ++ set ok 0 ++ } elseif {$::autosetup(debug)} { ++ configlog "Compiled OK: [join $cmdline]" ++ configlog "============" ++ } ++ if {!$ok} { ++ user-error "unable to compile SQLite compatibility test program" ++ } ++ set err [catch {exec-with-stderr ./conftest__} result errinfo] ++ if {$err} { ++ user-error $result ++ } ++ file delete ./conftest__ ++ } ++ test_system_sqlite ++ + } + + proc is_mingw {} { + return [string match *mingw* [get-define host]] + } + +ADDED src/sqlcompattest.c +Index: src/sqlcompattest.c +================================================================== +--- src/sqlcompattest.c ++++ src/sqlcompattest.c +@@ -0,0 +1,69 @@ ++/* ++** Copyright (c) 2019 D. Richard Hipp ++** ++** This program is free software; you can redistribute it and/or ++** modify it under the terms of the Simplified BSD License (also ++** known as the "2-Clause License" or "FreeBSD License".) ++** ++** This program is distributed in the hope that it will be useful, ++** but without any warranty; without even the implied warranty of ++** merchantability or fitness for a particular purpose. ++** ++** Author contact information: ++** drh@hwaci.com ++** http://www.hwaci.com/drh/ ++** ++******************************************************************************* ++** ++** This file is NOT part of the Fossil executable ++** ++** This file contains a test program used by ../configure with the ++** the --disable-internal-sqlite option to determine whether or ++** not the system SQLite library is sufficient to support Fossil. ++** ++** It is preferred to statically link Fossil with the sqlite3.c source ++** file that is part of the source tree and not use any SQLite shared ++** library that is included with the system. But some packagers do not ++** like to do this. Hence, we provide the option to link Fossil against ++** the system SQLite shared library. But Fossil is very particular about ++** the version and build options for SQLite. Unless a recent version of ++** SQLite is available, and unless that SQLite is built using some ++** non-default features, the system library won't meet the needs of ++** Fossil. This program attempts to determine if the system library ++** SQLite is sufficient for Fossil. ++** ++** Compile this program, linking it against the system SQLite library, ++** and run it. If it returns with a zero exit code, then all is well. ++** But if it returns a non-zero exit code, then the system SQLite library ++** lacks some capability that Fossil uses. A message on stdout describes ++** the missing feature. ++*/ ++#include "sqlite3.h" ++#include ++ ++int main(int argc, char **argv){ ++ int i; ++ static const char *zRequiredOpts[] = { ++ "ENABLE_FTS4", /* Required for repository search */ ++ "ENABLE_JSON1", /* Required for the check-in locking protocol */ ++ "ENABLE_DBSTAT_VTAB", /* Required by /repo-tabsize page */ ++ }; ++ ++ /* Check minimum SQLite version number */ ++ if( sqlite3_libversion_number()<3028000 ){ ++ printf("found SQLite version %s but need 3.28.0 or later\n", ++ sqlite3_libversion()); ++ return 1; ++ } ++ ++ for(i=0; i Date: Wed, 7 Aug 2019 16:06:31 +0000 Subject: Update netbeans to 11.1. Full Changelog: http://netbeans.apache.org/download/nb111/index.html --- java/netbeans/Makefile | 7 +++-- java/netbeans/distinfo | 6 ++--- java/netbeans/pkg-plist | 69 ++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 66 insertions(+), 16 deletions(-) diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile index c51565a7675f..e95d9625c7b6 100644 --- a/java/netbeans/Makefile +++ b/java/netbeans/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= netbeans -DISTVERSION= 11.0 +DISTVERSION= 11.1 CATEGORIES= java devel -MASTER_SITES= APACHE/incubator/netbeans/incubating-netbeans/incubating-${PORTVERSION}/ -#MASTER_SITES= https://dist.apache.org/repos/dist/dev/incubator/netbeans/incubating-netbeans/incubating-${DISTVERSION}/ -DISTNAME= incubating-netbeans-${DISTVERSION}-bin +MASTER_SITES= APACHE/netbeans/netbeans/${PORTVERSION}/ +DISTNAME= netbeans-${DISTVERSION}-bin MAINTAINER= kwm@FreeBSD.org COMMENT= Modular, standards-based integrated development environment diff --git a/java/netbeans/distinfo b/java/netbeans/distinfo index 5e7a565cfdab..9581176e9f54 100644 --- a/java/netbeans/distinfo +++ b/java/netbeans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554468897 -SHA256 (incubating-netbeans-11.0-bin.zip) = d0a9c8bfe8f22e5a4504573ab57a09580be6eda24268330c6aa8ff67ecd7b0fe -SIZE (incubating-netbeans-11.0-bin.zip) = 318063051 +TIMESTAMP = 1564945554 +SHA256 (netbeans-11.1-bin.zip) = c21d31bafdb1b01688300891de27db9bb9df55fa568875603255107d96483c17 +SIZE (netbeans-11.1-bin.zip) = 334785395 diff --git a/java/netbeans/pkg-plist b/java/netbeans/pkg-plist index 54ac7ffbeda1..022b67b8d8ec 100644 --- a/java/netbeans/pkg-plist +++ b/java/netbeans/pkg-plist @@ -1,7 +1,6 @@ @(,,0555) bin/%%DATADIR%% %%DATADIR%%/CREDITS.html %%DATADIR%%/DEPENDENCIES -%%DATADIR%%/DISCLAIMER %%DATADIR%%/LICENSE %%DATADIR%%/NOTICE %%DATADIR%%/README.html @@ -84,10 +83,16 @@ %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-resources.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-specs-support.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee7-api.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee8-api.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-jellytools-enterprise.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-jsp-lexer.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-maven-j2ee.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-maven-jaxws.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-payara-common.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-payara-eecommon.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-payara-jakartaee.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-payara-micro.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-payara-tooling.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-performance-javaee.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-performance-scripting.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-performance-web.xml @@ -162,10 +167,13 @@ %%DATADIR%%/enterprise/modules/ext/commons-fileupload-1.3.jar %%DATADIR%%/enterprise/modules/ext/el-impl.jar %%DATADIR%%/enterprise/modules/ext/glassfish-jspparser-4.0.jar +%%DATADIR%%/enterprise/modules/ext/javaee-api-5.jar %%DATADIR%%/enterprise/modules/ext/javaee-api-6.0.jar %%DATADIR%%/enterprise/modules/ext/javaee-api-7.0.jar +%%DATADIR%%/enterprise/modules/ext/javaee-api-8.0.jar %%DATADIR%%/enterprise/modules/ext/javaee-web-api-6.0.jar %%DATADIR%%/enterprise/modules/ext/javaee-web-api-7.0.jar +%%DATADIR%%/enterprise/modules/ext/javaee-web-api-8.0.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/javax.annotation.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/jaxb-api-osgi.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/webservices-api-osgi.jar @@ -274,10 +282,16 @@ %%DATADIR%%/enterprise/modules/org-netbeans-modules-javaee-resources.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-javaee-specs-support.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-javaee7-api.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-javaee8-api.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-jellytools-enterprise.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-jsp-lexer.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-maven-j2ee.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-maven-jaxws.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-payara-common.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-payara-eecommon.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-payara-jakartaee.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-payara-micro.jar +%%DATADIR%%/enterprise/modules/org-netbeans-modules-payara-tooling.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-performance-javaee.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-performance-scripting.jar %%DATADIR%%/enterprise/modules/org-netbeans-modules-performance-web.jar @@ -373,10 +387,16 @@ %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-javaee-resources.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-javaee-specs-support.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-javaee7-api.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-javaee8-api.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-jellytools-enterprise.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-jsp-lexer.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-maven-j2ee.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-maven-jaxws.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-payara-common.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-payara-eecommon.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-payara-jakartaee.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-payara-micro.xml +%%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-payara-tooling.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-performance-javaee.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-performance-scripting.xml %%DATADIR%%/enterprise/update_tracking/org-netbeans-modules-performance-web.xml @@ -463,6 +483,8 @@ %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-glassfish-common.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-glassfish-javaee.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-glassfish-tooling.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-gradle-htmlui.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-gradle-javaee.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-gradle-kit.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-groovy-and-gradle-kit.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-groovy-antproject.xml @@ -526,6 +548,7 @@ %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javaee-injection.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javaee-project.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javaee7-api.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javaee8-api.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javafx2-editor.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javafx2-kit.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javafx2-platform.xml @@ -551,6 +574,7 @@ %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javascript2-requirejs.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javascript2-sdoc.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-javawebstart.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-kotlin-editor.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-languages-apacheconf.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-languages-ini.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-maven-checkstyle.xml @@ -564,7 +588,12 @@ %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-maven-repository.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-maven.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-nashorn-execution.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-openjfx-samples.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-options-java.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-payara-common.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-payara-jakartaee.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-payara-micro.xml +%%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-payara-tooling.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-performance-ergonomics.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-php-apigen.xml %%DATADIR%%/ergonomics/config/Modules/org-netbeans-modules-php-atoum.xml @@ -725,7 +754,9 @@ %%DATADIR%%/extide/update_tracking/org-netbeans-modules-options-java.xml %%DATADIR%%/groovy/.lastModified %%DATADIR%%/groovy/VERSION.txt +%%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-htmlui.xml %%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-java.xml +%%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-javaee.xml %%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-kit.xml %%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-persistence.xml %%DATADIR%%/groovy/config/Modules/org-netbeans-modules-gradle-spring.xml @@ -754,7 +785,9 @@ %%DATADIR%%/groovy/modules/gradle/org.jacoco.core.jar %%DATADIR%%/groovy/modules/gradle/slf4j-api.jar %%DATADIR%%/groovy/modules/gradle/slf4j-jdk14.jar +%%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-htmlui.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-java.jar +%%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-javaee.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-kit.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-persistence.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-gradle-spring.jar @@ -770,7 +803,9 @@ %%DATADIR%%/groovy/modules/org-netbeans-modules-groovy-support.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-libs-groovy.jar %%DATADIR%%/groovy/modules/org-netbeans-modules-maven-groovy.jar +%%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-htmlui.xml %%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-java.xml +%%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-javaee.xml %%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-kit.xml %%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-persistence.xml %%DATADIR%%/groovy/update_tracking/org-netbeans-modules-gradle-spring.xml @@ -993,6 +1028,7 @@ %%DATADIR%%/ide/config/Modules/com-googlecode-javaewah-JavaEWAH.xml %%DATADIR%%/ide/config/Modules/com-jcraft-jsch.xml %%DATADIR%%/ide/config/Modules/com-jcraft-jzlib.xml +%%DATADIR%%/ide/config/Modules/libs-c-kohlschutter-junixsocket.xml %%DATADIR%%/ide/config/Modules/org-apache-commons-codec.xml %%DATADIR%%/ide/config/Modules/org-apache-commons-httpclient.xml %%DATADIR%%/ide/config/Modules/org-apache-commons-io.xml @@ -1272,7 +1308,7 @@ %%DATADIR%%/ide/modules/ext/derbysampledb.zip %%DATADIR%%/ide/modules/ext/freemarker-2.3.19.jar %%DATADIR%%/ide/modules/ext/generated-wsdl-xsd-2004.08.24.jar -%%DATADIR%%/ide/modules/ext/graal-sdk-1.0.0-rc12.jar +%%DATADIR%%/ide/modules/ext/graal-sdk-19.0.0.jar %%DATADIR%%/ide/modules/ext/html5-parser.jar %%DATADIR%%/ide/modules/ext/icu4j-4_4_2.jar %%DATADIR%%/ide/modules/ext/ini4j-0.5.1.jar @@ -1284,7 +1320,6 @@ %%DATADIR%%/ide/modules/ext/jaxb/jaxb-xjc-2.2.5-2.jar %%DATADIR%%/ide/modules/ext/jaxb/jaxb1-impl-2.2.5-2.jar %%DATADIR%%/ide/modules/ext/jcodings-1.0.18.jar -%%DATADIR%%/ide/modules/ext/jcodings-1.0.41.jar %%DATADIR%%/ide/modules/ext/jing.jar %%DATADIR%%/ide/modules/ext/joni-2.1.11.jar %%DATADIR%%/ide/modules/ext/jsch-agentproxy-core.jar @@ -1292,14 +1327,17 @@ %%DATADIR%%/ide/modules/ext/jsch-agentproxy-sshagent.jar %%DATADIR%%/ide/modules/ext/jsch-agentproxy-usocket-jna.jar %%DATADIR%%/ide/modules/ext/json-simple-1.1.1.jar +%%DATADIR%%/ide/modules/ext/junixsocket-common-2.2.0.jar +%%DATADIR%%/ide/modules/ext/junixsocket-core-2.2.0.jar +%%DATADIR%%/ide/modules/ext/junixsocket-native-common-2.2.0.jar %%DATADIR%%/ide/modules/ext/jvyamlb-0.2.6.jar %%DATADIR%%/ide/modules/ext/libpam4j-1.1.jar %%DATADIR%%/ide/modules/ext/log4j-1.2.15.jar %%DATADIR%%/ide/modules/ext/lucene-core-3.5.0.jar %%DATADIR%%/ide/modules/ext/org-netbeans-tax.jar -%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j-0.4.1.jar -%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j.generator-0.4.1.jar -%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j.jsonrpc-0.4.1.jar +%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j-0.7.0.jar +%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j.generator-0.7.0.jar +%%DATADIR%%/ide/modules/ext/org.eclipse.lsp4j.jsonrpc-0.7.0.jar %%DATADIR%%/ide/modules/ext/org.eclipse.tm4e.core_0.2.0.201809031154.jar %%DATADIR%%/ide/modules/ext/org.eclipse.xtend.lib-2.14.0.jar %%DATADIR%%/ide/modules/ext/org.eclipse.xtend.lib.macro-2.14.0.jar @@ -1320,6 +1358,7 @@ %%DATADIR%%/ide/modules/ext/xerces-2.8.0.jar %%DATADIR%%/ide/modules/lib/extbrowser.dll %%DATADIR%%/ide/modules/lib/extbrowser64.dll +%%DATADIR%%/ide/modules/libs-c-kohlschutter-junixsocket.jar %%DATADIR%%/ide/modules/org-apache-commons-codec.jar %%DATADIR%%/ide/modules/org-apache-commons-httpclient.jar %%DATADIR%%/ide/modules/org-apache-commons-io.jar @@ -1577,6 +1616,7 @@ %%DATADIR%%/ide/update_tracking/com-googlecode-javaewah-JavaEWAH.xml %%DATADIR%%/ide/update_tracking/com-jcraft-jsch.xml %%DATADIR%%/ide/update_tracking/com-jcraft-jzlib.xml +%%DATADIR%%/ide/update_tracking/libs-c-kohlschutter-junixsocket.xml %%DATADIR%%/ide/update_tracking/org-apache-commons-codec.xml %%DATADIR%%/ide/update_tracking/org-apache-commons-httpclient.xml %%DATADIR%%/ide/update_tracking/org-apache-commons-io.xml @@ -1946,6 +1986,8 @@ %%DATADIR%%/java/config/Modules/org-netbeans-modules-junit-ant.xml %%DATADIR%%/java/config/Modules/org-netbeans-modules-junit-ui.xml %%DATADIR%%/java/config/Modules/org-netbeans-modules-junit.xml +%%DATADIR%%/java/config/Modules/org-netbeans-modules-kotlin-editor.xml +%%DATADIR%%/java/config/Modules/org-netbeans-modules-libs-corba-omgapi.xml %%DATADIR%%/java/config/Modules/org-netbeans-modules-maven-checkstyle.xml %%DATADIR%%/java/config/Modules/org-netbeans-modules-maven-coverage.xml %%DATADIR%%/java/config/Modules/org-netbeans-modules-maven-embedder.xml @@ -2082,6 +2124,7 @@ %%DATADIR%%/java/modules/ext/AbsoluteLayout.jar %%DATADIR%%/java/modules/ext/byte-buddy-1.7.9.jar %%DATADIR%%/java/modules/ext/cglib-2.2.jar +%%DATADIR%%/java/modules/ext/corba/omgapi/glassfish-corba-omgapi.jar %%DATADIR%%/java/modules/ext/docs %%DATADIR%%/java/modules/ext/eclipselink/javax.persistence-2.1.0.jar %%DATADIR%%/java/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar @@ -2271,6 +2314,8 @@ %%DATADIR%%/java/modules/org-netbeans-modules-junit-ant.jar %%DATADIR%%/java/modules/org-netbeans-modules-junit-ui.jar %%DATADIR%%/java/modules/org-netbeans-modules-junit.jar +%%DATADIR%%/java/modules/org-netbeans-modules-kotlin-editor.jar +%%DATADIR%%/java/modules/org-netbeans-modules-libs-corba-omgapi.jar %%DATADIR%%/java/modules/org-netbeans-modules-maven-checkstyle.jar %%DATADIR%%/java/modules/org-netbeans-modules-maven-coverage.jar %%DATADIR%%/java/modules/org-netbeans-modules-maven-embedder.jar @@ -2424,6 +2469,8 @@ %%DATADIR%%/java/update_tracking/org-netbeans-modules-junit-ant.xml %%DATADIR%%/java/update_tracking/org-netbeans-modules-junit-ui.xml %%DATADIR%%/java/update_tracking/org-netbeans-modules-junit.xml +%%DATADIR%%/java/update_tracking/org-netbeans-modules-kotlin-editor.xml +%%DATADIR%%/java/update_tracking/org-netbeans-modules-libs-corba-omgapi.xml %%DATADIR%%/java/update_tracking/org-netbeans-modules-maven-checkstyle.xml %%DATADIR%%/java/update_tracking/org-netbeans-modules-maven-coverage.xml %%DATADIR%%/java/update_tracking/org-netbeans-modules-maven-embedder.xml @@ -2474,18 +2521,21 @@ %%DATADIR%%/javafx/config/Modules/org-netbeans-modules-javafx2-project.xml %%DATADIR%%/javafx/config/Modules/org-netbeans-modules-javafx2-samples.xml %%DATADIR%%/javafx/config/Modules/org-netbeans-modules-javafx2-scenebuilder.xml +%%DATADIR%%/javafx/config/Modules/org-netbeans-modules-openjfx-samples.xml %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-editor.jar %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-kit.jar %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-platform.jar %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-project.jar %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-samples.jar %%DATADIR%%/javafx/modules/org-netbeans-modules-javafx2-scenebuilder.jar +%%DATADIR%%/javafx/modules/org-netbeans-modules-openjfx-samples.jar %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-editor.xml %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-kit.xml %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-platform.xml %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-project.xml %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-samples.xml %%DATADIR%%/javafx/update_tracking/org-netbeans-modules-javafx2-scenebuilder.xml +%%DATADIR%%/javafx/update_tracking/org-netbeans-modules-openjfx-samples.xml %%DATADIR%%/licenses/ANTLR-2 %%DATADIR%%/licenses/Apache-1.1 %%DATADIR%%/licenses/Apache-2.0 @@ -3294,10 +3344,11 @@ %%DATADIR%%/webcommon/karma/karma-netbeans.conf.js %%DATADIR%%/webcommon/mocha/netbeans-reporter.js %%DATADIR%%/webcommon/modules/ext/dd-plist.jar -%%DATADIR%%/webcommon/modules/ext/js-1.0.0-rc12.jar +%%DATADIR%%/webcommon/modules/ext/icu4j-62.1.jar +%%DATADIR%%/webcommon/modules/ext/js-19.0.0.jar %%DATADIR%%/webcommon/modules/ext/libs.jstestdriver-ext.jar -%%DATADIR%%/webcommon/modules/ext/regex-1.0.0-rc12.jar -%%DATADIR%%/webcommon/modules/ext/truffle-api-1.0.0-rc12.jar +%%DATADIR%%/webcommon/modules/ext/regex-19.0.0.jar +%%DATADIR%%/webcommon/modules/ext/truffle-api-19.0.0.jar %%DATADIR%%/webcommon/modules/org-netbeans-api-knockout.jar %%DATADIR%%/webcommon/modules/org-netbeans-lib-v8debug.jar %%DATADIR%%/webcommon/modules/org-netbeans-libs-graaljs.jar -- cgit From 28064ddf3636f3023abde2c203aa93d2c4ea0c43 Mon Sep 17 00:00:00 2001 From: riggs Date: Wed, 7 Aug 2019 16:20:34 +0000 Subject: Enable support for logging through syslog, bump PORTREVISION PR: 239671 Submitted by: bsdpr@phoe.frmug.org MFH: 2019Q3 (hat: ports-secteam) --- audio/musicpd/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 30e4bba1ad2f..713c9c1485cf 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -2,7 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.21.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio ipv6 MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -27,6 +27,7 @@ MESON_ARGS= -Dauto_features=disabled \ -Dicu=enabled \ -Doss=enabled \ -Dpipe=true \ + -Dsyslog=enabled \ -Dzlib=enabled CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include -- cgit From 3e42f4d2c9ee6e788e5af9ae32892478036e7a98 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 7 Aug 2019 16:28:34 +0000 Subject: Mark BROKEN: wrong LIB_DEPENDS ===> vv-1.4.0.271_7 depends on shared library: libITKLabelMap-4.13.so - not found Reported by: pkg-fallout --- graphics/vv/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/vv/Makefile b/graphics/vv/Makefile index 2bd0b8192824..3612777443f2 100644 --- a/graphics/vv/Makefile +++ b/graphics/vv/Makefile @@ -13,6 +13,8 @@ COMMENT= Fast and simple 4D image viewer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt +BROKEN= wrong LIB_DEPENDS + LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libgdcmCommon.so:devel/gdcm \ -- cgit From 7ac8d7074f91190dc4dc7bb9da133d81b7416a0d Mon Sep 17 00:00:00 2001 From: pkubaj Date: Wed, 7 Aug 2019 16:37:22 +0000 Subject: devel/libosinfo: fix build with GCC-based architectures C11 is now required: ../osinfo/osinfo_tree.h:63: error: redefinition of typedef 'OsinfoTree' ../osinfo/osinfo_install_script.h:44: error: previous declaration of 'OsinfoTree' was here Approved by: mentors (implicit approval) --- devel/libosinfo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/libosinfo/Makefile b/devel/libosinfo/Makefile index 54127d32275a..4ffd8e0655a8 100644 --- a/devel/libosinfo/Makefile +++ b/devel/libosinfo/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ osinfo-db-import:sysutils/osinfo-db-tools \ ${LOCALBASE}/share/osinfo/VERSION:misc/osinfo-db -USES= gettext-tools gmake libtool pathfix pkgconfig +USES= compiler:c11 gettext-tools gmake libtool pathfix pkgconfig USE_GNOME= glib20 libxml2 libxslt introspection:build intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes -- cgit From b7b63ec94d57a9ed1e963612f07a93861c8a5bd7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:30 +0000 Subject: Update to 3.9.1 Changes: https://github.com/protocolbuffers/protobuf/releases --- devel/protobuf/Makefile | 2 +- devel/protobuf/distinfo | 6 +++--- devel/protobuf/pkg-plist | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile index c3e34ab16b3a..7b79fa82dec4 100644 --- a/devel/protobuf/Makefile +++ b/devel/protobuf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= protobuf -PORTVERSION= 3.9.0 +PORTVERSION= 3.9.1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/ diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo index d54729650e47..07f06047f299 100644 --- a/devel/protobuf/distinfo +++ b/devel/protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563013404 -SHA256 (protobuf-all-3.9.0.tar.gz) = 3fd2faf435246a60537b7ad7a2d273df2eecad5cf76f812529dbde7183b2e6b7 -SIZE (protobuf-all-3.9.0.tar.gz) = 7162423 +TIMESTAMP = 1565190814 +SHA256 (protobuf-all-3.9.1.tar.gz) = 3040a5b946d9df7aa89c0bf6981330bf92b7844fd90e71b61da0c721e421a421 +SIZE (protobuf-all-3.9.1.tar.gz) = 7183726 diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist index d311c0241174..31eea3f1b41d 100644 --- a/devel/protobuf/pkg-plist +++ b/devel/protobuf/pkg-plist @@ -117,14 +117,14 @@ include/google/protobuf/wrappers.proto lib/libprotobuf-lite.a lib/libprotobuf-lite.so lib/libprotobuf-lite.so.20 -lib/libprotobuf-lite.so.20.0.0 +lib/libprotobuf-lite.so.20.0.1 lib/libprotobuf.a lib/libprotobuf.so lib/libprotobuf.so.20 -lib/libprotobuf.so.20.0.0 +lib/libprotobuf.so.20.0.1 lib/libprotoc.a lib/libprotoc.so lib/libprotoc.so.20 -lib/libprotoc.so.20.0.0 +lib/libprotoc.so.20.0.1 libdata/pkgconfig/protobuf-lite.pc libdata/pkgconfig/protobuf.pc -- cgit From 26c9e5fdbcbfdf9e42f41c1966d36d16dc73aa6e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:36 +0000 Subject: Update texi2dvi and texinfo.tex - Bump PORTREVISION for package change Changes: https://git.savannah.gnu.org/cgit/texinfo.git/log/util/htmlxref.cnf https://git.savannah.gnu.org/cgit/texinfo.git/log/doc/texinfo.tex --- print/texinfo/Makefile | 6 +++--- print/texinfo/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile index d005dc2e7922..c2ba88087619 100644 --- a/print/texinfo/Makefile +++ b/print/texinfo/Makefile @@ -3,7 +3,7 @@ PORTNAME= texinfo PORTVERSION= 6.6 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= print MASTER_SITES= GNU \ @@ -43,9 +43,9 @@ USE_TEX= yes INFO= info-stnd texinfo -HTMLXREF_CNF_RELDATE= 20190324 +HTMLXREF_CNF_RELDATE= 20190611 TEXI2DVI_RELDATE= 20190331 -TEXINFO_TEX_RELDATE= 20190216 +TEXINFO_TEX_RELDATE= 20190601 CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R} diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo index 34fe105caf7e..09442e5c77f8 100644 --- a/print/texinfo/distinfo +++ b/print/texinfo/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1555240701 +TIMESTAMP = 1565193697 SHA256 (texinfo/texinfo-6.6.tar.xz) = 9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66 SIZE (texinfo/texinfo-6.6.tar.xz) = 4946900 -SHA256 (texinfo/htmlxref.cnf-20190324) = a93bf53552865bfee3e46a1579d0a420c22ed04c99a72b2bcb5b2af7723268d8 -SIZE (texinfo/htmlxref.cnf-20190324) = 20035 +SHA256 (texinfo/htmlxref.cnf-20190611) = 2f08396322badedca94e4042ebbc2ab5b90cf144eacd5c1dc0c6549e49b0a717 +SIZE (texinfo/htmlxref.cnf-20190611) = 20112 SHA256 (texinfo/texi2dvi-20190331) = 71c787b08eec1a71b12ffc0c8c3ab48f5d0ace657e5b1ca102182f4154748e60 SIZE (texinfo/texi2dvi-20190331) = 60439 -SHA256 (texinfo/texinfo.tex-20190216) = b19a421624076a9d1335d1a17c33329a26d02a0a3430b43c2a3cbd51708f1cdf -SIZE (texinfo/texinfo.tex-20190216) = 380503 +SHA256 (texinfo/texinfo.tex-20190601) = 20ec24cc6e7cf4cee044154e1b26f3f548088d09e8ce0170cfbe8c15cc935030 +SIZE (texinfo/texinfo.tex-20190601) = 376684 -- cgit From 53bb95b8275991f005c0c5f3d66f7a337c6a718c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:41 +0000 Subject: Update to 12.3 Changes: https://salsa.debian.org/debian/debhelper/-/tags --- sysutils/debhelper/Makefile | 2 +- sysutils/debhelper/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile index ee7eefce6c09..e4ea4aae8260 100644 --- a/sysutils/debhelper/Makefile +++ b/sysutils/debhelper/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debhelper -PORTVERSION= 12.2.3 +PORTVERSION= 12.3 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo index 448eb7f620fc..f8aa1aa688fa 100644 --- a/sysutils/debhelper/distinfo +++ b/sysutils/debhelper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563640667 -SHA256 (debhelper_12.2.3.tar.xz) = 4c279d7ad09b843ca29e45d5134197e700814c95e46f5c45673790d77be6eaa1 -SIZE (debhelper_12.2.3.tar.xz) = 492468 +TIMESTAMP = 1565190824 +SHA256 (debhelper_12.3.tar.xz) = c9b016603580d5b9c87e26f841555e79e97f3b0045823de4608b937f90fb556d +SIZE (debhelper_12.3.tar.xz) = 493796 -- cgit From 0bb415f79fad4bf76f292d4915b55dd60fb77cdb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:46 +0000 Subject: Update to 3.9.1 Changes: https://github.com/protocolbuffers/protobuf/releases --- devel/pecl-protobuf/Makefile | 2 +- devel/pecl-protobuf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/pecl-protobuf/Makefile b/devel/pecl-protobuf/Makefile index 4607bbd5444d..7ac80df26d7a 100644 --- a/devel/pecl-protobuf/Makefile +++ b/devel/pecl-protobuf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= protobuf -PORTVERSION= 3.9.0 +PORTVERSION= 3.9.1 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org diff --git a/devel/pecl-protobuf/distinfo b/devel/pecl-protobuf/distinfo index 6969507d7381..b833c51f06af 100644 --- a/devel/pecl-protobuf/distinfo +++ b/devel/pecl-protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563013409 -SHA256 (PECL/protobuf-3.9.0.tgz) = 700e37d89e0f35b1d655f760fe4768ca1fbf73fbcafb45a82aefffd55ceecedf -SIZE (PECL/protobuf-3.9.0.tgz) = 217089 +TIMESTAMP = 1565190829 +SHA256 (PECL/protobuf-3.9.1.tgz) = 900cafea4d2e2384979d0c2654d4c33e50bebc23a633dffc57f1afaee780dcb1 +SIZE (PECL/protobuf-3.9.1.tgz) = 217099 -- cgit From e2e6fe62b07bda4e34a35c6d2940b2896bf6893b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:51 +0000 Subject: Update to 1.3.0 Changes: https://www.pyinvoke.org/changelog.html https://github.com/pyinvoke/invoke/blob/master/sites/www/changelog.rst --- devel/py-invoke/Makefile | 3 +-- devel/py-invoke/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile index 1a76180fcada..ecc28a504124 100644 --- a/devel/py-invoke/Makefile +++ b/devel/py-invoke/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= invoke -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-invoke/distinfo b/devel/py-invoke/distinfo index 75135ba6be7c..52b58f26551b 100644 --- a/devel/py-invoke/distinfo +++ b/devel/py-invoke/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546373000 -SHA256 (invoke-1.2.0.tar.gz) = dc492f8f17a0746e92081aec3f86ae0b4750bf41607ea2ad87e5a7b5705121b7 -SIZE (invoke-1.2.0.tar.gz) = 319116 +TIMESTAMP = 1565190835 +SHA256 (invoke-1.3.0.tar.gz) = c52274d2e8a6d64ef0d61093e1983268ea1fc0cd13facb9448c4ef0c9a7ac7da +SIZE (invoke-1.3.0.tar.gz) = 326196 -- cgit From 08d55cd64a5e536a6ea74df28ec9f28fbf66cb74 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:42:57 +0000 Subject: Update to 3.9.1 Changes: https://github.com/protocolbuffers/protobuf/releases --- devel/py-protobuf/Makefile | 2 +- devel/py-protobuf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile index 056382a79497..5287dc610208 100644 --- a/devel/py-protobuf/Makefile +++ b/devel/py-protobuf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= protobuf -PORTVERSION= 3.9.0 +PORTVERSION= 3.9.1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo index dd36b43c9fb6..026b8617cec3 100644 --- a/devel/py-protobuf/distinfo +++ b/devel/py-protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563013414 -SHA256 (protobuf-3.9.0.tar.gz) = b3452bbda12b1cbe2187d416779de07b2ab4c497d83a050e43c344778763721d -SIZE (protobuf-3.9.0.tar.gz) = 260057 +TIMESTAMP = 1565190840 +SHA256 (protobuf-3.9.1.tar.gz) = d831b047bd69becaf64019a47179eb22118a50dd008340655266a906c69c6417 +SIZE (protobuf-3.9.1.tar.gz) = 259690 -- cgit From 5f79edec528f3891fd351a89bc934ffaf08ce007 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:02 +0000 Subject: Update to 0.4.2.5 Changes: https://github.com/KimiNewt/pyshark/releases https://github.com/KimiNewt/pyshark/commits/master --- net/py-pyshark/Makefile | 2 +- net/py-pyshark/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index 0358642b56ba..8dce13d3ac70 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyshark -PORTVERSION= 0.4.2.4 +PORTVERSION= 0.4.2.5 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyshark/distinfo b/net/py-pyshark/distinfo index 3c057eaf946f..9c2fc282ef15 100644 --- a/net/py-pyshark/distinfo +++ b/net/py-pyshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562608002 -SHA256 (pyshark-0.4.2.4.tar.gz) = ec91b30149f23d87e56aa9e6385a0db6c1308aaf0d112d924fa13c931a71600b -SIZE (pyshark-0.4.2.4.tar.gz) = 19841 +TIMESTAMP = 1565190845 +SHA256 (pyshark-0.4.2.5.tar.gz) = 5fc70614323893788d61667235d01a03688c2e87393998963bd390dd1a4a05a5 +SIZE (pyshark-0.4.2.5.tar.gz) = 19848 -- cgit From fff3c636af61308254460aff0c23fef156b577fd Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:07 +0000 Subject: Update to 5.0 Changes: https://github.com/wagtail/django-modelcluster/releases --- www/py-django-modelcluster/Makefile | 6 +++--- www/py-django-modelcluster/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/py-django-modelcluster/Makefile b/www/py-django-modelcluster/Makefile index 7f2752a8c1a9..72bee6aee0a0 100644 --- a/www/py-django-modelcluster/Makefile +++ b/www/py-django-modelcluster/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-modelcluster -PORTVERSION= 4.4 +PORTVERSION= 5.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2015.2:devel/py-pytz@${PY_FLAVOR} -USES= python -USE_PYTHON= autoplist concurrent distutils +USES= python:3.5+ +USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/www/py-django-modelcluster/distinfo b/www/py-django-modelcluster/distinfo index d1c33c929982..24fcea92091c 100644 --- a/www/py-django-modelcluster/distinfo +++ b/www/py-django-modelcluster/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554486027 -SHA256 (django-modelcluster-4.4.tar.gz) = 59672386191d38c69d6f994c3f9aaab3ff93910ec71e78a0bb6aa9abd4d1b90a -SIZE (django-modelcluster-4.4.tar.gz) = 22244 +TIMESTAMP = 1565190851 +SHA256 (django-modelcluster-5.0.tar.gz) = a293a1875cb97c1b6e131f53857f0c47e297330c1b5df47737afa54bc10a967d +SIZE (django-modelcluster-5.0.tar.gz) = 22123 -- cgit From d573503bb7a475e86acaa106564eeb94c71430a1 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:12 +0000 Subject: Update to 2.11.327 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 34c54444fd16..7f1ada56bb51 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.326 +DISTVERSION= 2.11.327 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 774a77ee3541..2e7f93ad2989 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565108382 -SHA256 (rubygem/aws-sdk-2.11.326.gem) = 6dc5edff191fc2ca5aba422513688c6d8c52bb4317ef3a2d4950a37c83a0a146 -SIZE (rubygem/aws-sdk-2.11.326.gem) = 4608 +TIMESTAMP = 1565190853 +SHA256 (rubygem/aws-sdk-2.11.327.gem) = e494cb12164356b6246a395b30157d844a10c20b39ae3143fd3903e1f554b08d +SIZE (rubygem/aws-sdk-2.11.327.gem) = 4608 -- cgit From f314257e6edc9af6da0fd07d86004dac8b22cd80 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:18 +0000 Subject: Update to 2.11.327 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index dede773eca3c..8a7a33028a7d 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.326 +DISTVERSION= 2.11.327 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index d49168f87645..7475a0bfe4c6 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565108384 -SHA256 (rubygem/aws-sdk-core-2.11.326.gem) = 522ae5d7b5663a59d0923b3ec92473f7f23f6107bc4b65d6a4bc11256ef98bd3 -SIZE (rubygem/aws-sdk-core-2.11.326.gem) = 1631232 +TIMESTAMP = 1565190860 +SHA256 (rubygem/aws-sdk-core-2.11.327.gem) = e39ab1b80574305d238e06fd7a31e2f1971b221af1fbad903850467d7775451c +SIZE (rubygem/aws-sdk-core-2.11.327.gem) = 1631232 -- cgit From 040b0ac998170db74a3aaa08091530512c942e1d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:23 +0000 Subject: Update to 2.11.327 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 6f04f1d9f8a0..d18272677fe3 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.326 +DISTVERSION= 2.11.327 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 59f95b6df02a..adce9a867528 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565108386 -SHA256 (rubygem/aws-sdk-resources-2.11.326.gem) = 4da005b6c0a963b6b6f244e4a52adbee7725cb648f86777b5f9aa1dd4d669a38 -SIZE (rubygem/aws-sdk-resources-2.11.326.gem) = 48640 +TIMESTAMP = 1565190862 +SHA256 (rubygem/aws-sdk-resources-2.11.327.gem) = 90d0b757fe9beab587067a0784996c56e49ed430eaa1fd961bdcb9329d8fe0e8 +SIZE (rubygem/aws-sdk-resources-2.11.327.gem) = 48640 -- cgit From ea2bb1533e4a195d955b63018d81583ee75343e2 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:29 +0000 Subject: Update to 0.26.0 Changes: https://github.com/DataDog/dd-trace-rb/releases --- devel/rubygem-ddtrace/Makefile | 2 +- devel/rubygem-ddtrace/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-ddtrace/Makefile b/devel/rubygem-ddtrace/Makefile index f508d652bc19..40a398ef9a15 100644 --- a/devel/rubygem-ddtrace/Makefile +++ b/devel/rubygem-ddtrace/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ddtrace -PORTVERSION= 0.25.1 +PORTVERSION= 0.26.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-ddtrace/distinfo b/devel/rubygem-ddtrace/distinfo index 3b7b577f984f..5649c84288af 100644 --- a/devel/rubygem-ddtrace/distinfo +++ b/devel/rubygem-ddtrace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563472161 -SHA256 (rubygem/ddtrace-0.25.1.gem) = e6578c7096b1d790d1761841250cef2530f2abe8f0606982060b20aefac36aff -SIZE (rubygem/ddtrace-0.25.1.gem) = 151552 +TIMESTAMP = 1565190869 +SHA256 (rubygem/ddtrace-0.26.0.gem) = a0589347ef67d6465acbf33303465dbb1004c809da73c141921868092d005114 +SIZE (rubygem/ddtrace-0.26.0.gem) = 150528 -- cgit From 9f23202385792fba761ad3e6b3d91e1cbca446db Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:34 +0000 Subject: Update to 1.0.2 Changes: https://github.com/podigee/device_detector/blob/develop/CHANGELOG.md --- devel/rubygem-device_detector/Makefile | 7 ++++--- devel/rubygem-device_detector/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-device_detector/Makefile b/devel/rubygem-device_detector/Makefile index c6bc8922e42c..ef721e35b696 100644 --- a/devel/rubygem-device_detector/Makefile +++ b/devel/rubygem-device_detector/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= device_detector -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,8 +12,9 @@ COMMENT= User agent parser and device detector LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/devel/rubygem-device_detector/distinfo b/devel/rubygem-device_detector/distinfo index cb2e9f52b20e..999139049a7e 100644 --- a/devel/rubygem-device_detector/distinfo +++ b/devel/rubygem-device_detector/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527077079 -SHA256 (rubygem/device_detector-1.0.1.gem) = 49d82d5abd1023734cb0bdb915ae89fc52d7375724bb4fda0f089e2ac062f9e7 -SIZE (rubygem/device_detector-1.0.1.gem) = 261632 +TIMESTAMP = 1565190877 +SHA256 (rubygem/device_detector-1.0.2.gem) = da28c7af988331e94f4c8d9b23bb44c49a8a5066d02076ffe81783e0d4ba1b5d +SIZE (rubygem/device_detector-1.0.2.gem) = 392704 -- cgit From 34763e5f677e00308bb54d6866b4bf2c29289325 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:39 +0000 Subject: Update to 0.66.0 Changes: https://github.com/excon/excon/blob/master/changelog.txt --- devel/rubygem-excon/Makefile | 2 +- devel/rubygem-excon/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-excon/Makefile b/devel/rubygem-excon/Makefile index 78b09ea23cd5..b3c3972904bd 100644 --- a/devel/rubygem-excon/Makefile +++ b/devel/rubygem-excon/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= excon -PORTVERSION= 0.65.0 +PORTVERSION= 0.66.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-excon/distinfo b/devel/rubygem-excon/distinfo index ddaee03196aa..b1fbd173f7d6 100644 --- a/devel/rubygem-excon/distinfo +++ b/devel/rubygem-excon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563897193 -SHA256 (rubygem/excon-0.65.0.gem) = f2a8901c39139a64344929f7f1cf1d01d479adc424728ee299108278acf186d5 -SIZE (rubygem/excon-0.65.0.gem) = 168960 +TIMESTAMP = 1565190881 +SHA256 (rubygem/excon-0.66.0.gem) = f942a620f7addcb68920f498399599848571d86d2e800fee5e7729444fcf1517 +SIZE (rubygem/excon-0.66.0.gem) = 168960 -- cgit From 90114a0adee046a720468a967ca70cc03b0de2e6 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:45 +0000 Subject: Update to 3.9.1 Changes: https://github.com/protocolbuffers/protobuf/releases --- devel/rubygem-google-protobuf/Makefile | 2 +- devel/rubygem-google-protobuf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-google-protobuf/Makefile b/devel/rubygem-google-protobuf/Makefile index fb8bedd690c5..443a02817c80 100644 --- a/devel/rubygem-google-protobuf/Makefile +++ b/devel/rubygem-google-protobuf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= google-protobuf -PORTVERSION= 3.9.0 +PORTVERSION= 3.9.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-protobuf/distinfo b/devel/rubygem-google-protobuf/distinfo index 71ed09e3e6a5..d5c6440a5006 100644 --- a/devel/rubygem-google-protobuf/distinfo +++ b/devel/rubygem-google-protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563013417 -SHA256 (rubygem/google-protobuf-3.9.0.gem) = cfde97e26258b85f02178d7970200d3171f2af35f9220a241ba03e06860ff92c -SIZE (rubygem/google-protobuf-3.9.0.gem) = 262656 +TIMESTAMP = 1565190884 +SHA256 (rubygem/google-protobuf-3.9.1.gem) = 6aba0b9f6f9f63bfc431b5866165d372c47ec457f9b2435b930028ff01d8675d +SIZE (rubygem/google-protobuf-3.9.1.gem) = 262656 -- cgit From 7c3c0634866df90a3bb884a898e6f6d0aab15a91 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:50 +0000 Subject: Update to 0.5.1 Changes: https://github.com/piotrmurach/tty-editor/blob/master/CHANGELOG.md --- devel/rubygem-tty-editor/Makefile | 4 ++-- devel/rubygem-tty-editor/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/rubygem-tty-editor/Makefile b/devel/rubygem-tty-editor/Makefile index e057d169185d..89fe78a0bcf9 100644 --- a/devel/rubygem-tty-editor/Makefile +++ b/devel/rubygem-tty-editor/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tty-editor -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ COMMENT= Opens a file or text in the user preferred editor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-tty-prompt>=0.18:devel/rubygem-tty-prompt \ +RUN_DEPENDS= rubygem-tty-prompt>=0.19:devel/rubygem-tty-prompt \ rubygem-tty-which>=0.4:devel/rubygem-tty-which USES= gem diff --git a/devel/rubygem-tty-editor/distinfo b/devel/rubygem-tty-editor/distinfo index 7c0872321c90..1b045a0830a5 100644 --- a/devel/rubygem-tty-editor/distinfo +++ b/devel/rubygem-tty-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546271473 -SHA256 (rubygem/tty-editor-0.5.0.gem) = cf2a976f38404a17d68385a9e908b588a6701ea316b20b6a03218816a2d101e9 -SIZE (rubygem/tty-editor-0.5.0.gem) = 12800 +TIMESTAMP = 1565190887 +SHA256 (rubygem/tty-editor-0.5.1.gem) = f2e699ba07fbbd15749cdd9538ae7af802ee6f73ea4344d4f025ea3d6b4ff5e0 +SIZE (rubygem/tty-editor-0.5.1.gem) = 12800 -- cgit From 73f94ea19981df9383db2cb9c2fec9140adcb0fb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Wed, 7 Aug 2019 16:43:55 +0000 Subject: Update to 3.8.0 Changes: https://github.com/rouge-ruby/rouge/releases https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md --- textproc/rubygem-rouge/Makefile | 2 +- textproc/rubygem-rouge/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/rubygem-rouge/Makefile b/textproc/rubygem-rouge/Makefile index ee90fec1ba61..4835b35b8a24 100644 --- a/textproc/rubygem-rouge/Makefile +++ b/textproc/rubygem-rouge/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rouge -PORTVERSION= 3.7.0 +PORTVERSION= 3.8.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-rouge/distinfo b/textproc/rubygem-rouge/distinfo index 6a8cf7b30f1b..30c60eddba6f 100644 --- a/textproc/rubygem-rouge/distinfo +++ b/textproc/rubygem-rouge/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564157981 -SHA256 (rubygem/rouge-3.7.0.gem) = 5ba7593212a675ce5ef31f6f425e5aea0f7af1006068b9d1be3752851712665f -SIZE (rubygem/rouge-3.7.0.gem) = 367104 +TIMESTAMP = 1565190892 +SHA256 (rubygem/rouge-3.8.0.gem) = da39146334d75d6018700c9a872652550c63095410bb17f29c52358907e89e81 +SIZE (rubygem/rouge-3.8.0.gem) = 374784 -- cgit From 198e063164c8991032205ab358002d8a7d765947 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 7 Aug 2019 16:49:18 +0000 Subject: Cleanup LIB_DEPENDS --- comms/flrig/Makefile | 2 +- games/armagetronad/Makefile | 2 +- math/mandelbulber2/Makefile | 2 +- misc/adios2/Makefile | 2 +- multimedia/butt/Makefile | 2 +- x11/xlockmore/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile index 8a64cacb848e..6be092bd6a99 100644 --- a/comms/flrig/Makefile +++ b/comms/flrig/Makefile @@ -11,7 +11,7 @@ COMMENT= Ham Radio rig control program, cooperates with fldigi LICENSE= GPLv2 -LIB_DEPENDS= libpng16.so:graphics/png \ +LIB_DEPENDS= libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig \ libfltk.so:x11-toolkits/fltk diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile index 6378c69abc68..321f8dd7a413 100644 --- a/games/armagetronad/Makefile +++ b/games/armagetronad/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libpng16.so:graphics/png +LIB_DEPENDS= libpng.so:graphics/png USES= autoreconf desktop-file-utils gl gmake gnome jpeg sdl GNU_CONFIGURE= yes diff --git a/math/mandelbulber2/Makefile b/math/mandelbulber2/Makefile index d6f326ab1d33..9d2d59f66258 100644 --- a/math/mandelbulber2/Makefile +++ b/math/mandelbulber2/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libgsl.so:math/gsl \ liblzo2.so:archivers/lzo2 \ libomp.so:devel/openmp \ libOpenCL.so:devel/ocl-icd \ - libpng16.so:graphics/png \ + libpng.so:graphics/png \ libsndfile.so:audio/libsndfile \ libtiff.so:graphics/tiff diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile index 34a523fecd16..62deac01ddc8 100644 --- a/misc/adios2/Makefile +++ b/misc/adios2/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libfabric.so:net/libfabric \ libffi.so:devel/libffi \ libmpi.so:net/openmpi \ - libpng16.so:graphics/png \ + libpng.so:graphics/png \ libzfp.so:devel/zfp RUN_DEPENDS= bash:shells/bash diff --git a/multimedia/butt/Makefile b/multimedia/butt/Makefile index 1db0d1757a2c..d46f9bd894ad 100644 --- a/multimedia/butt/Makefile +++ b/multimedia/butt/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libopus.so:audio/opus \ - libpng16.so:graphics/png \ + libpng.so:graphics/png \ libportaudio.so:audio/portaudio \ libsamplerate.so:audio/libsamplerate \ libvorbis.so:audio/libvorbis diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index c259ec82f4ee..d2118c634653 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ USE_XORG= x11 xaw ice sm xpm xext xinerama LIB_DEPENDS+= libfreetype.so:print/freetype2 \ - libpng16.so:graphics/png + libpng.so:graphics/png OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \ -- cgit From c8b02c9f6a3308cd06fb71af59ad81f972721807 Mon Sep 17 00:00:00 2001 From: gerald Date: Wed, 7 Aug 2019 17:01:38 +0000 Subject: Update to the 201900804 snapshot of GCC 10.0.0. --- lang/gcc10-devel/Makefile | 2 +- lang/gcc10-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/gcc10-devel/Makefile b/lang/gcc10-devel/Makefile index 57274bcc39eb..c18f6e7f6369 100644 --- a/lang/gcc10-devel/Makefile +++ b/lang/gcc10-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 10.0.0.s20190728 +PORTVERSION= 10.0.0.s20190804 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc10-devel/distinfo b/lang/gcc10-devel/distinfo index d79f5a0be6a3..f35d139f3138 100644 --- a/lang/gcc10-devel/distinfo +++ b/lang/gcc10-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564382278 -SHA256 (gcc-10-20190728.tar.xz) = f37fc6aff49bd787f9e43f929254b2c673bac8c59f258494e65c4029aa871239 -SIZE (gcc-10-20190728.tar.xz) = 69427632 +TIMESTAMP = 1564996671 +SHA256 (gcc-10-20190804.tar.xz) = a88a4b0ca81f6fc8888a218ed9cf83d541c587764f68cbc9095ec72ba88b29ad +SIZE (gcc-10-20190804.tar.xz) = 69464476 -- cgit From 6818f2b141b896f72fbb25d65c9c06626328d6ad Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 7 Aug 2019 17:04:47 +0000 Subject: lang/mujs: Update 1.0.5-35 -> 1.0.6 Reported by: repology --- lang/mujs/Makefile | 6 ++---- lang/mujs/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lang/mujs/Makefile b/lang/mujs/Makefile index 3618abb8c650..ba2241371377 100644 --- a/lang/mujs/Makefile +++ b/lang/mujs/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PORTNAME= mujs -DISTVERSION= 1.0.5-35 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -g00d4606 +DISTVERSION= 1.0.6 CATEGORIES= lang devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= d9a1f4c57f976eeb67d877101fcdca89ecc047ed.patch:-p1 +PATCHFILES= d9a1f4c57f976eeb67d877101fcdca89ecc047ed.patch:-p1 # Enable readline on FreeBSD MAINTAINER= yuri@FreeBSD.org COMMENT= Embeddable Javascript interpreter in C diff --git a/lang/mujs/distinfo b/lang/mujs/distinfo index e50ef742e28b..0b48bf15bde1 100644 --- a/lang/mujs/distinfo +++ b/lang/mujs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1555180546 -SHA256 (ccxvii-mujs-1.0.5-35-g00d4606_GH0.tar.gz) = 7341112d4128aab2e9a27a902c326e6eb3bd470e39fbfb8fb7296b15ef59a565 -SIZE (ccxvii-mujs-1.0.5-35-g00d4606_GH0.tar.gz) = 121296 +TIMESTAMP = 1565197211 +SHA256 (ccxvii-mujs-1.0.6_GH0.tar.gz) = a444d8ea22b18eff89acbc7f9e45cc95e5b63b30ae8f4b8000b858cd17006f2d +SIZE (ccxvii-mujs-1.0.6_GH0.tar.gz) = 121385 SHA256 (d9a1f4c57f976eeb67d877101fcdca89ecc047ed.patch) = de236ceb1d7df002bf0930ff31f07f58260e0faf780edef72f05d478185cb279 SIZE (d9a1f4c57f976eeb67d877101fcdca89ecc047ed.patch) = 589 -- cgit From 5fe3edd6a41e7fd50f113b3f83a32d20f0110676 Mon Sep 17 00:00:00 2001 From: rigoletto Date: Wed, 7 Aug 2019 17:46:11 +0000 Subject: x11-themes/Kvantum: Update to 0.11.2 Approved by: tcberner (mentor) --- x11-themes/Kvantum/Makefile | 4 ++-- x11-themes/Kvantum/distinfo | 6 +++--- x11-themes/Kvantum/files/patch-style_style.pro | 4 ++-- .../files/patch-style_themeconfig_ThemeConfig.cpp | 18 +++++++++--------- x11-themes/Kvantum/pkg-plist | 6 ++++++ 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/x11-themes/Kvantum/Makefile b/x11-themes/Kvantum/Makefile index 049203900c60..cbf5d70a4e2a 100644 --- a/x11-themes/Kvantum/Makefile +++ b/x11-themes/Kvantum/Makefile @@ -2,8 +2,7 @@ PORTNAME= Kvantum DISTVERSIONPREFIX= V -DISTVERSION= 0.11.1 -PORTREVISION= 1 +DISTVERSION= 0.11.2 CATEGORIES= x11-themes PKGNAMESUFFIX= -qt5 @@ -18,6 +17,7 @@ USES= compiler:c++11-lang kde:5 qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= tsujan +USE_GL= gl USE_LDCONFIG= yes USE_KDE= windowsystem USE_QT= core gui svg widgets x11extras buildtools_build \ diff --git a/x11-themes/Kvantum/distinfo b/x11-themes/Kvantum/distinfo index cb7d71518ae1..bd16b2229c27 100644 --- a/x11-themes/Kvantum/distinfo +++ b/x11-themes/Kvantum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557737490 -SHA256 (tsujan-Kvantum-V0.11.1_GH0.tar.gz) = c91101157873803e3365607d83d31a02e17364390f074d7defd6860ae01bdd51 -SIZE (tsujan-Kvantum-V0.11.1_GH0.tar.gz) = 2360179 +TIMESTAMP = 1564517577 +SHA256 (tsujan-Kvantum-V0.11.2_GH0.tar.gz) = b57689ec8107d3e89fa1c4ad2a3f5f4cf1bc5f6259aa9f1dbaa5908fdd3b6161 +SIZE (tsujan-Kvantum-V0.11.2_GH0.tar.gz) = 2404969 diff --git a/x11-themes/Kvantum/files/patch-style_style.pro b/x11-themes/Kvantum/files/patch-style_style.pro index 5851e484401c..16904bc53736 100644 --- a/x11-themes/Kvantum/files/patch-style_style.pro +++ b/x11-themes/Kvantum/files/patch-style_style.pro @@ -1,6 +1,6 @@ ---- style/style.pro.orig 2019-03-19 23:11:41 UTC +--- style/style.pro.orig 2019-07-30 23:03:59 UTC +++ style/style.pro -@@ -62,7 +62,6 @@ unix { +@@ -69,7 +69,6 @@ unix { isEmpty(PREFIX) { PREFIX = /usr } diff --git a/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp b/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp index 0f9b78ecb770..382b634d1a31 100644 --- a/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp +++ b/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp @@ -1,4 +1,4 @@ ---- style/themeconfig/ThemeConfig.cpp.orig 2019-02-08 18:10:24 UTC +--- style/themeconfig/ThemeConfig.cpp.orig 2019-07-30 23:05:10 UTC +++ style/themeconfig/ThemeConfig.cpp @@ -19,7 +19,7 @@ #include @@ -7,7 +7,7 @@ -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD #include - #if QT_VERSION >= 0x050000 + #if (QT_VERSION >= QT_VERSION_CHECK(5,0,0)) #include @@ -37,7 +37,7 @@ ThemeConfig::ThemeConfig(const QString& theme) : { @@ -15,15 +15,15 @@ Later, a better method should be found. */ -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD - #if QT_VERSION < 0x050200 - isX11_ = true; + #if (QT_VERSION >= QT_VERSION_CHECK(5,2,0)) + isX11_ = QX11Info::isPlatformX11(); #else -@@ -544,7 +544,7 @@ theme_spec ThemeConfig::getCompositeSpec() - default_theme_spec(r); - QVariant v; +@@ -549,7 +549,7 @@ theme_spec ThemeConfig::getCompositeSpec() + { + bool compositing(false); -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD /* set to false if no compositing manager is running */ - #if QT_VERSION < 0x050200 - if (QX11Info::isCompositingManagerRunning()) + #if (QT_VERSION >= QT_VERSION_CHECK(5,2,0)) + if (isX11_) diff --git a/x11-themes/Kvantum/pkg-plist b/x11-themes/Kvantum/pkg-plist index 8287bcb1a7f6..6e94bd6a3a23 100644 --- a/x11-themes/Kvantum/pkg-plist +++ b/x11-themes/Kvantum/pkg-plist @@ -15,6 +15,8 @@ bin/kvantumpreview %%DATADIR%%/KvArcDark/KvArcDark.svg %%DATADIR%%/KvBeige/KvBeige.kvconfig %%DATADIR%%/KvBeige/KvBeige.svg +%%DATADIR%%/KvBlender/KvBlender.kvconfig +%%DATADIR%%/KvBlender/KvBlender.svg %%DATADIR%%/KvBrown/KvBrown.kvconfig %%DATADIR%%/KvBrown/KvBrown.svg %%DATADIR%%/KvCurves/KvCurves.kvconfig @@ -71,6 +73,7 @@ share/color-schemes/KvAmbience.colors share/color-schemes/KvArc.colors share/color-schemes/KvArcDark.colors share/color-schemes/KvBeige.colors +share/color-schemes/KvBlender.colors share/color-schemes/KvBrown.colors share/color-schemes/KvCurves.colors share/color-schemes/KvCurvesLight.colors @@ -103,15 +106,18 @@ share/kvantummanager/translations/kvantummanager_et.qm share/kvantummanager/translations/kvantummanager_fr.qm share/kvantummanager/translations/kvantummanager_id.qm share/kvantummanager/translations/kvantummanager_it.qm +share/kvantummanager/translations/kvantummanager_ja.qm share/kvantummanager/translations/kvantummanager_lt.qm share/kvantummanager/translations/kvantummanager_nl.qm share/kvantummanager/translations/kvantummanager_pl.qm share/kvantummanager/translations/kvantummanager_pt_BR.qm +share/kvantummanager/translations/kvantummanager_sk_SK.qm share/kvantumpreview/translations/kvantumpreview_cy.qm share/kvantumpreview/translations/kvantumpreview_de.qm share/kvantumpreview/translations/kvantumpreview_eo.qm share/kvantumpreview/translations/kvantumpreview_es.qm share/kvantumpreview/translations/kvantumpreview_fr.qm +share/kvantumpreview/translations/kvantumpreview_ja.qm share/kvantumpreview/translations/kvantumpreview_lt.qm share/kvantumpreview/translations/kvantumpreview_nl.qm share/kvantumpreview/translations/kvantumpreview_pt_BR.qm -- cgit From 06761019d7260353e94626bbd291b572b5b96bef Mon Sep 17 00:00:00 2001 From: bofh Date: Wed, 7 Aug 2019 17:51:56 +0000 Subject: textproc/groonga: Update version 9.0.5=>9.0.6 --- textproc/groonga/Makefile | 3 +-- textproc/groonga/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index 96c4a83ab6ae..0683c5bd56a7 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= groonga -PORTVERSION= 9.0.5 -PORTREVISION= 1 +PORTVERSION= 9.0.6 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo index 7d6c37309718..a924805846aa 100644 --- a/textproc/groonga/distinfo +++ b/textproc/groonga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564528147 -SHA256 (groonga-9.0.5.tar.gz) = 836b76ce4107f69511e8958a02ec4a67af189c2f927c22e8a289c7bf5b6bc597 -SIZE (groonga-9.0.5.tar.gz) = 15891676 +TIMESTAMP = 1565200196 +SHA256 (groonga-9.0.6.tar.gz) = 874e14b409ced9559152cfdcce872503bd0501e1411174ed1ff0a486cf463734 +SIZE (groonga-9.0.6.tar.gz) = 15961897 -- cgit From b6091deddb89e3cfc28b1fed45c3b21fcb877fbb Mon Sep 17 00:00:00 2001 From: tcberner Date: Wed, 7 Aug 2019 18:08:42 +0000 Subject: databaes/libiodbc: update to 3.52.13 Release Notes [1] * Added extra validation for SQLAllocHandle (SQL_HANDLE_DESC, ...) * Added GCC __attribute__ for checking format string * Added missing define SQL_CONVERT_GUID * Fixed issue using heap after free in SQLConnect_internal * Fixed issue with global mutex in SQLError, SQLGetDiagRec, and SQLGetDiagField * Fixed SQLSetStmtAttr to cache the correct values for SQL_ATTR_ROW_ARRAY_SIZE and SQL_ATTR_ROW_BIND_TYPE * Fixed format specifiers and some casts to fix trace output * Fixed missing check for section in SQLGetPrivateProfileString * Fixed non-void function needs to return a value * Fixed issue in Mac Cocoa code * Fixed iODBC apps/frameworks CFBundleGetInfoString attribute * Fixes an issue where build fails on Alpine * Fixed package versioning * Fixed small memory leaks [1] http://www.iodbc.org/dataspace/doc/iodbc/wiki/iodbcWiki/ChangeNotes#2019-07-23%20-%20iODBC%20Stable%20Version%203.52.13%20Released --- databases/libiodbc/Makefile | 11 ++++++----- databases/libiodbc/distinfo | 6 +++--- databases/libiodbc/files/patch-Makefile.am | 11 +++++++++++ databases/libiodbc/pkg-plist | 8 ++++---- 4 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 databases/libiodbc/files/patch-Makefile.am diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile index 53a304c4e831..69fa8a093be2 100644 --- a/databases/libiodbc/Makefile +++ b/databases/libiodbc/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= libiodbc -PORTVERSION= 3.52.12 +DISTVERSIONPREFIX= v +DISTVERSION= 3.52.13 CATEGORIES= databases -MASTER_SITES= SF/iodbc/iodbc/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ODBC 3.x driver manager, for universal data source access @@ -14,13 +14,16 @@ LICENSE_COMB= dual LICENSE_FILE_BSD= ${WRKSRC}/LICENSE.BSD LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.LGPL -USES= libtool pathfix pkgconfig +USES= autoreconf libtool pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR} \ --includedir=${LOCALBASE}/include/libiodbc \ --disable-libodbc INSTALL_TARGET= install-strip USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= openlink +GH_PROJECT= iODBC OPTIONS_DEFINE= GTK2 DOCS EXAMPLES OPTIONS_SUB= yes @@ -33,8 +36,6 @@ GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ GTK2_CONFIGURE_ENABLE= gui post-patch: - @${REINPLACE_CMD} -e \ - '/^SUBDIRS/s|samples||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-ldl||g' ${WRKSRC}/admin/libiodbc.pc.in diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo index fd1efa27a686..fcc5540a2805 100644 --- a/databases/libiodbc/distinfo +++ b/databases/libiodbc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472678293 -SHA256 (libiodbc-3.52.12.tar.gz) = 51c5ff3a7d9a54202486cb77a3514e0e379a135beefcd5d12b96d1901f9dfb62 -SIZE (libiodbc-3.52.12.tar.gz) = 1134054 +TIMESTAMP = 1565199385 +SHA256 (openlink-iODBC-v3.52.13_GH0.tar.gz) = 4bf67fc6d4d237a4db19b292b5dd255ee09a0b2daa4e4058cf3a918bc5102135 +SIZE (openlink-iODBC-v3.52.13_GH0.tar.gz) = 777789 diff --git a/databases/libiodbc/files/patch-Makefile.am b/databases/libiodbc/files/patch-Makefile.am new file mode 100644 index 000000000000..267a2f7a3283 --- /dev/null +++ b/databases/libiodbc/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2019-08-07 17:55:25 UTC ++++ Makefile.am +@@ -73,7 +73,7 @@ + + AUTOMAKE_OPTIONS = gnu dist-zip 1.9.6 + +-SUBDIRS = admin bin etc man include iodbcinst iodbc iodbcadm drvproxy samples ++SUBDIRS = admin bin etc man include iodbcinst iodbc iodbcadm drvproxy + + ACLOCAL_AMFLAGS = -I admin + diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist index 6fe086f88ca7..14b6e17c6b90 100644 --- a/databases/libiodbc/pkg-plist +++ b/databases/libiodbc/pkg-plist @@ -16,19 +16,19 @@ include/libiodbc/sqlucode.h %%GTK2%%lib/libdrvproxy.a %%GTK2%%lib/libdrvproxy.so %%GTK2%%lib/libdrvproxy.so.2 -%%GTK2%%lib/libdrvproxy.so.2.1.25 +%%GTK2%%lib/libdrvproxy.so.2.1.27 lib/libiodbc.a lib/libiodbc.so lib/libiodbc.so.2 -lib/libiodbc.so.2.1.25 +lib/libiodbc.so.2.1.27 %%GTK2%%lib/libiodbcadm.a %%GTK2%%lib/libiodbcadm.so %%GTK2%%lib/libiodbcadm.so.2 -%%GTK2%%lib/libiodbcadm.so.2.1.25 +%%GTK2%%lib/libiodbcadm.so.2.1.27 lib/libiodbcinst.a lib/libiodbcinst.so lib/libiodbcinst.so.2 -lib/libiodbcinst.so.2.1.25 +lib/libiodbcinst.so.2.1.27 libdata/pkgconfig/libiodbc.pc man/man1/iodbc-config.1.gz %%GTK2%%man/man1/iodbcadm-gtk.1.gz -- cgit From 382f8dd059fca2e2582396d6fb917b5097e95bd9 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 7 Aug 2019 18:31:13 +0000 Subject: Fix: $ ksh93 $ time ../src/cmd/ksh93/sh/xec.c:2171: failed assertion 'tb.tv_sec' Abort trap (core dumped) $ ksh93 $ times ../src/cmd/ksh93/sh/xec.c:2171: failed assertion 'tb.tv_sec' Abort trap (core dumped) PR: 239701 Suggested by: w.schwarzenfeld@utanet.at MFH: 2019Q3 --- shells/ksh93/Makefile | 2 +- shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 89a60d099913..69034ecc9b39 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -3,7 +3,7 @@ PORTNAME= ksh93 DISTVERSION=2020.0.0-alpha1 PORTEPOCH= 1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MAINTAINER= cy@freebsd.org diff --git a/shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c b/shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c new file mode 100644 index 000000000000..62237cf768b6 --- /dev/null +++ b/shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c @@ -0,0 +1,11 @@ +--- src/cmd/ksh93/sh/xec.c.orig 2019-04-16 20:04:19 UTC ++++ src/cmd/ksh93/sh/xec.c +@@ -2167,7 +2167,7 @@ int sh_exec(Shell_t *shp, const Shnode_t *t, int flags + } + #ifdef timeofday + times(&after); +- timeofday(&ta); ++ timeofday(&tb); + assert(tb.tv_sec); + at = shp->gd->lim.clk_tck * (ta.tv_sec - tb.tv_sec); + at += ((shp->gd->lim.clk_tck * -- cgit From 7abcf7f5ad97cbca7d1d8622502e9b4b7bd378ea Mon Sep 17 00:00:00 2001 From: bofh Date: Wed, 7 Aug 2019 18:57:38 +0000 Subject: devel/gsoap: Update version 2.8.88=>2.8.89 --- devel/gsoap/Makefile | 2 +- devel/gsoap/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index 10f99f400925..01431645654f 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.88 +PORTVERSION= 2.8.89 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo index a89fd9991de4..ab52d9d675c1 100644 --- a/devel/gsoap/distinfo +++ b/devel/gsoap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564753350 -SHA256 (gsoap_2.8.88.zip) = effbf8a4533917b9eb3aa0e79db13573ef52e768158f5b4eb93d49b0c5cb2fa8 -SIZE (gsoap_2.8.88.zip) = 32547861 +TIMESTAMP = 1565173034 +SHA256 (gsoap_2.8.89.zip) = d9b10ca2611b00932fab98cbf67b514ddad24f22cbbda91d9d68ea45821c54f2 +SIZE (gsoap_2.8.89.zip) = 32553046 -- cgit From 27e00707b3f508298a60260ff9364703a903fec0 Mon Sep 17 00:00:00 2001 From: kai Date: Wed, 7 Aug 2019 19:20:15 +0000 Subject: net/3proxy: Update to 0.8.13 * Sort variables according the PHB while I'm here. Changelog: * Fixed: Out-of-bound write and few minor bugs on configuration saving in admin * Fixed: $ is not correctly handled in the beginning of quoted line on configuration parsing https://github.com/z3APA3A/3proxy/releases/tag/0.8.13 PR: 239677 Submitted by: timp87@gmail.com (maintainer) MFH: 2019Q3 (bugfix blanket) --- net/3proxy/Makefile | 14 ++++++++------ net/3proxy/distinfo | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile index 37e3d63c8f1f..e435b466d054 100644 --- a/net/3proxy/Makefile +++ b/net/3proxy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= 3proxy -PORTVERSION= 0.8.12 +PORTVERSION= 0.8.13 CATEGORIES= net MAINTAINER= timp87@gmail.com @@ -11,19 +11,21 @@ COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP) LICENSE= APACHE20 BSD3CLAUSE GPLv2+ LGPL21+ LICENSE_COMB= dual -OPTIONS_DEFINE= DOCS - -3PROXY_LOGDIR= /var/log/${PORTNAME} - -MAKEFILE= Makefile.unix USE_RC_SUBR= 3proxy USE_GITHUB= yes GH_ACCOUNT= z3APA3A + +MAKEFILE= Makefile.unix + PLIST_SUB= PORTNAME=${PORTNAME} \ 3PROXY_LOGDIR=${3PROXY_LOGDIR} PORTDOCS= README +OPTIONS_DEFINE= DOCS + +3PROXY_LOGDIR= /var/log/${PORTNAME} + post-patch: @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo index e2ce737568d1..b383b8f1ba19 100644 --- a/net/3proxy/distinfo +++ b/net/3proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498592146 -SHA256 (z3APA3A-3proxy-0.8.12_GH0.tar.gz) = c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849 -SIZE (z3APA3A-3proxy-0.8.12_GH0.tar.gz) = 528990 +TIMESTAMP = 1565155136 +SHA256 (z3APA3A-3proxy-0.8.13_GH0.tar.gz) = a6d3cf9dd264315fa6ec848f6fe6c9057db005ce4ca8ed1deb00f6e1c3900f88 +SIZE (z3APA3A-3proxy-0.8.13_GH0.tar.gz) = 529072 -- cgit From 9943cfae12eca25740a39116a28606064ca620e6 Mon Sep 17 00:00:00 2001 From: jgh Date: Wed, 7 Aug 2019 19:30:11 +0000 Subject: - remove old documentation as part of optional documentation to install * docs from 2006 (probably out-of-date) - pet portlint - bump portrevision Old docs are still accessible here: https://people.freebsd.org/~mezz/distfiles/ M fluxbox/Makefile M fluxbox/distinfo M fluxbox/files/patch-util_fbsetbg --- x11-wm/fluxbox/Makefile | 31 ++----------------------------- x11-wm/fluxbox/distinfo | 5 +---- x11-wm/fluxbox/files/patch-util_fbsetbg | 8 ++++---- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 5f56bd08beb7..50d6304061b2 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -3,11 +3,9 @@ PORTNAME= fluxbox PORTVERSION= 1.3.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= SF -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jgh@FreeBSD.org COMMENT= Small and fast window manager based on BlackBox @@ -28,13 +26,9 @@ GNU_CONFIGURE= yes PORTDATA= * PORTDOCS= * -DOCSVERSION= 20060629 - -OPTIONS_DEFINE= DOCS DOCHTML PDFDOCS DEBUG IMLIB2 XINERAMA \ +OPTIONS_DEFINE= DOCS DEBUG IMLIB2 XINERAMA \ XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR OPTIONS_DEFAULT= XRENDER SLIT SYSTRAY REMEMBER TOOLBAR XINERAMA -DOCHTML_DESC= Install html documentation -PDFDOCS_DESC= Build and install PDF documentation REMEMBER_DESC= Enable remember feature SLIT_DESC= Enable slit feature SYSTRAY_DESC= Enable systray feature @@ -57,16 +51,6 @@ XINERAMA_USE= XORG=xinerama XRENDER_USE= XORG=xrender XRENDER_CONFIGURE_ENABLE= xrender -# http://fluxbox.org/docbook/en/tarballs/ -DOCHTML_MASTER_SITES= LOCAL/mezz:html \ - http://people.freebsd.org/~mezz/distfiles/:html -DOCHTML_DISTFILES= fb-doc-mfhtml-${DOCSVERSION}.tgz:html -DOCHTML_EXTRACT_ONLY= fb-doc-mfhtml-${DOCSVERSION}.tgz -# http://fluxbox.org/docbook/en/pdf/ -PDFDOCS_MASTER_SITES= LOCAL/mezz:pdf \ - http://people.freebsd.org/~mezz/distfiles/:pdf -PDFDOCS_DISTFILES= fluxbook-${DOCSVERSION}.pdf:pdf - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg @@ -79,15 +63,4 @@ post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog NEWS README TODO" \ ${STAGEDIR}${DOCSDIR}) -post-install-PDFDOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf - ${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \ - ${STAGEDIR}${DOCSDIR}/pdf/ - -post-install-DOCHTML-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html -. for h in *.css *.html - (cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${STAGEDIR}${DOCSDIR}/html) -. endfor - .include diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo index 4a0f9e764a4f..72788b404ddb 100644 --- a/x11-wm/fluxbox/distinfo +++ b/x11-wm/fluxbox/distinfo @@ -1,6 +1,3 @@ +TIMESTAMP = 1565199689 SHA256 (fluxbox-1.3.7.tar.gz) = c99e2baa06fff1e96342b20415059d12ff1fa2917ade0173c75b2fa570295b9f SIZE (fluxbox-1.3.7.tar.gz) = 1267833 -SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec -SIZE (fb-doc-mfhtml-20060629.tgz) = 115560 -SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde -SIZE (fluxbook-20060629.pdf) = 430351 diff --git a/x11-wm/fluxbox/files/patch-util_fbsetbg b/x11-wm/fluxbox/files/patch-util_fbsetbg index b92d65f4ac17..3d09a4779d78 100644 --- a/x11-wm/fluxbox/files/patch-util_fbsetbg +++ b/x11-wm/fluxbox/files/patch-util_fbsetbg @@ -1,6 +1,6 @@ ---- util/fbsetbg.orig 2008-09-22 13:47:05.000000000 -0500 -+++ util/fbsetbg 2008-09-22 13:52:03.000000000 -0500 -@@ -49,7 +49,7 @@ +--- util/fbsetbg.orig 2015-02-08 10:44:45 UTC ++++ util/fbsetbg +@@ -49,7 +49,7 @@ lastwallpaper="${HOME}/.fluxbox/lastwallpaper" WHOAMI=`whoami` @@ -9,7 +9,7 @@ command="`basename \"$0\"`" -@@ -129,9 +129,28 @@ +@@ -133,9 +133,28 @@ Common tips to use with $command: EOF } -- cgit From f34988a0b06686ceedb2eb85825323b9d5575cf6 Mon Sep 17 00:00:00 2001 From: brooks Date: Wed, 7 Aug 2019 19:53:26 +0000 Subject: Assorted minor improvements: - Add a build conflict for commonmark-cmark-* when DOCS are enabled. This prevents a failure later on in the build. [0] - Add a new option BE_AMDGPU which can be used to enable the AMDGPU backed used by mesa when BE_NATIVE or BE_FREEBSD is set. Enable this option by default to limit later surprises. [1] - Use LLVM_ENABLE_Z3_SOLVER instead of the now removed CLANG_ANALYZER_ENABLE_Z3_SOLVER to disable Z3 discovery and linkage. PR: 239636 [0], 230789 [1] --- devel/llvm90/Makefile | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index f3211f7e1e79..d57517116967 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 9.0.0rc1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang .if ${DISTVERSION:M*rc*} MASTER_SITES= http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -56,6 +56,7 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} # redefine CMAKE_INSTALL_MANDIR CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 +CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \ -DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so @@ -65,19 +66,20 @@ CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP -OPTIONS_DEFAULT= BE_STANDARD CLANG EXTRAS LIT LLD LLDB +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes +BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures BE_FREEBSD_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}" -BE_NATIVE_DESC= Backend(s) for this architecture (${NATIVE_BACKENDS}) +BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD @@ -86,8 +88,7 @@ BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/| CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} -CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ - -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF +CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries @@ -96,6 +97,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} +DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ @@ -110,7 +112,6 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_LIB_DEPENDS= libz3.so:math/z3 LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} @@ -264,23 +265,29 @@ COMMANDS+= ${LLDB_COMMANDS} .include .include "${.CURDIR}/Makefile.COMMANDS" -FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC RISCV Sparc X86 +_FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC RISCV Sparc X86 +FREEBSD_BACKENDS= ${_FREEBSD_BACKENDS} .if ${ARCH} == amd64 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH} == arm64 -NATIVE_BACKENDS= AAarch64 +_NATIVE_BACKENDS= AAarch64 .elif ${ARCH:Marmv*} -NATIVE_BACKENDS= ARM +_NATIVE_BACKENDS= ARM .elif ${ARCH} == i386 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH:Mmips*} -NATIVE_BACKENDS= Mips +_NATIVE_BACKENDS= Mips .elif ${ARCH:Mpowerpc*} -NATIVE_BACKENDS= PowerPC +_NATIVE_BACKENDS= PowerPC .elif ${ARCH:Mriscv*} -NATIVE_BACKENDS= RISCV +_NATIVE_BACKENDS= RISCV .endif -STANDARD_BACKENDS= ${FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ +NATIVE_BACKENDS= ${_NATIVE_BACKENDS} +.if ${PORT_OPTIONS:MBE_AMDGPU} +FREEBSD_BACKENDS+= AMDGPU +NATIVE_BACKENDS+= AMDGPU +.endif +STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ NVPTX SystemZ WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils -- cgit From 11d02f4a90338a586f340f4aec51ec0dce30fba5 Mon Sep 17 00:00:00 2001 From: lwhsu Date: Wed, 7 Aug 2019 20:15:00 +0000 Subject: - Update to 2.189 Sponsored by: The FreeBSD Foundation --- devel/jenkins/Makefile | 2 +- devel/jenkins/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index d4f888f55caf..50b69c479407 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.187 +PORTVERSION= 2.189 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo index 786b7a73176f..8889a9857b35 100644 --- a/devel/jenkins/distinfo +++ b/devel/jenkins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564033659 -SHA256 (jenkins/2.187/jenkins.war) = ee58e028cd7520e5152abdea7bc19d73d194fb7283234edd8b9476d6e1e8a4bb -SIZE (jenkins/2.187/jenkins.war) = 77652362 +TIMESTAMP = 1565208727 +SHA256 (jenkins/2.189/jenkins.war) = 59a6476c7d02bb03bfac36920856a12268f35bdc9b40ef235b14f2f6504b67ea +SIZE (jenkins/2.189/jenkins.war) = 78236431 -- cgit From 5fc75a898c446277f1e506085bee80820091f26d Mon Sep 17 00:00:00 2001 From: jmd Date: Wed, 7 Aug 2019 21:14:59 +0000 Subject: devel/oclgrind: update to tip of repository Most notably fixes a bunch of memory leaks. --- devel/oclgrind/Makefile | 5 ++--- devel/oclgrind/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index 303cea183f68..9ee398083d21 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= oclgrind -PORTVERSION= 20190218 +PORTVERSION= 20190807 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jmd@FreeBSD.org @@ -22,7 +21,7 @@ USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= jrprice GH_PROJECT= Oclgrind -GH_TAGNAME= 689daab +GH_TAGNAME= cd8cad1 USE_LDCONFIG= yes CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/share/llvm/cmake diff --git a/devel/oclgrind/distinfo b/devel/oclgrind/distinfo index 601f529cd6d9..927e39a5f2bd 100644 --- a/devel/oclgrind/distinfo +++ b/devel/oclgrind/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552324033 -SHA256 (jrprice-Oclgrind-v20190218-689daab_GH0.tar.gz) = 8f9c6e1c150df0ff49258f0c9e65d0bbe54b976a634a4b4d2716ddeeca6a6035 -SIZE (jrprice-Oclgrind-v20190218-689daab_GH0.tar.gz) = 196783 +TIMESTAMP = 1565212188 +SHA256 (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = afc653cba9ca0e936d0b24303b703c63efa689356e5189738e05cba9ed8a0db6 +SIZE (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = 196613 -- cgit From 4bf933a98614e5f6578df1b37c770df439da7c41 Mon Sep 17 00:00:00 2001 From: lwhsu Date: Wed, 7 Aug 2019 21:47:04 +0000 Subject: Add devel/s390x-binutils, GNU binutils for s390x cross-development PR: 215939 Submitted by: bz --- devel/Makefile | 1 + devel/binutils/files/patch-s390x.diff | 57 +++++++++++++++++++ devel/s390x-binutils/Makefile | 9 +++ devel/s390x-binutils/pkg-plist | 101 ++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) create mode 100644 devel/binutils/files/patch-s390x.diff create mode 100644 devel/s390x-binutils/Makefile create mode 100644 devel/s390x-binutils/pkg-plist diff --git a/devel/Makefile b/devel/Makefile index 61943d11c734..c4a6a6e15767 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -6053,6 +6053,7 @@ SUBDIR += rust-cbindgen SUBDIR += rvi SUBDIR += rvm + SUBDIR += s390x-binutils SUBDIR += sabre SUBDIR += safe-iop SUBDIR += samurai diff --git a/devel/binutils/files/patch-s390x.diff b/devel/binutils/files/patch-s390x.diff new file mode 100644 index 000000000000..aa4fe70569e2 --- /dev/null +++ b/devel/binutils/files/patch-s390x.diff @@ -0,0 +1,57 @@ +--- ./ld/configure.tgt.orig 2019-01-19 16:01:33.000000000 +0000 ++++ ./ld/configure.tgt 2019-08-07 20:41:31.800693000 +0000 +@@ -651,6 +651,10 @@ rs6000-*-aix*) targ_emul=aixrs6 + ;; + rl78-*-*) targ_emul=elf32rl78 ;; + rx-*-*) targ_emul=elf32rx ;; ++s390x-*-freebsd*) targ_emul=elf64_s390 ++ targ_extra_emuls=elf_s390 ++ targ_extra_libpath=$targ_extra_emuls ++ tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;; + s390x-*-linux*) targ_emul=elf64_s390 + targ_extra_emuls=elf_s390 + targ_extra_libpath=$targ_extra_emuls +--- ./gas/configure.orig 2019-02-02 15:50:20.000000000 +0000 ++++ ./gas/configure 2019-08-07 20:44:45.468441000 +0000 +@@ -7095,6 +7095,7 @@ ia64-*-hpux*) + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ ++s390*-*freebsd*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +@@ -7125,6 +7126,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; ++ s390x-*freebsd*) ++ LD="${LD-ld} -m elf_s390" ++ ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; +@@ -7146,6 +7150,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*freebsd*) ++ LD="${LD-ld} -m elf64_s390" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" +--- ./bfd/config.bfd.orig 2019-08-07 20:35:52.161591000 +0000 ++++ ./bfd/config.bfd 2019-08-07 20:40:33.579807000 +0000 +@@ -1213,6 +1213,11 @@ case "${targ}" in + want64=true + ;; + #ifdef BFD64 ++ s390x-*-freebsd*) ++ targ_defvec=s390_elf64_vec ++ targ_selvecs=s390_elf32_vec ++ want64=true ++ ;; + s390x-*-linux*) + targ_defvec=s390_elf64_vec + targ_selvecs=s390_elf32_vec diff --git a/devel/s390x-binutils/Makefile b/devel/s390x-binutils/Makefile new file mode 100644 index 000000000000..a9bd1cfe303d --- /dev/null +++ b/devel/s390x-binutils/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +COMMENT= GNU binutils for s390x cross-development +PKGNAMEPREFIX= s390x- +PLIST= ${.CURDIR}/pkg-plist + +MASTERDIR= ${.CURDIR}/../binutils + +.include "${MASTERDIR}/Makefile" diff --git a/devel/s390x-binutils/pkg-plist b/devel/s390x-binutils/pkg-plist new file mode 100644 index 000000000000..891e13179e56 --- /dev/null +++ b/devel/s390x-binutils/pkg-plist @@ -0,0 +1,101 @@ +bin/%%BUTARGET%%-addr2line +bin/%%BUTARGET%%-ar +bin/%%BUTARGET%%-as +bin/%%BUTARGET%%-c++filt +bin/%%BUTARGET%%-elfedit +bin/%%BUTARGET%%-gprof +bin/%%BUTARGET%%-ld +bin/%%BUTARGET%%-ld.bfd +bin/%%BUTARGET%%-nm +bin/%%BUTARGET%%-objcopy +bin/%%BUTARGET%%-objdump +bin/%%BUTARGET%%-ranlib +bin/%%BUTARGET%%-readelf +bin/%%BUTARGET%%-size +bin/%%BUTARGET%%-strings +bin/%%BUTARGET%%-strip +man/man1/%%BUTARGET%%-addr2line.1.gz +man/man1/%%BUTARGET%%-ar.1.gz +man/man1/%%BUTARGET%%-as.1.gz +man/man1/%%BUTARGET%%-c++filt.1.gz +man/man1/%%BUTARGET%%-dlltool.1.gz +man/man1/%%BUTARGET%%-elfedit.1.gz +man/man1/%%BUTARGET%%-gprof.1.gz +man/man1/%%BUTARGET%%-ld.1.gz +man/man1/%%BUTARGET%%-nm.1.gz +man/man1/%%BUTARGET%%-objcopy.1.gz +man/man1/%%BUTARGET%%-objdump.1.gz +man/man1/%%BUTARGET%%-ranlib.1.gz +man/man1/%%BUTARGET%%-readelf.1.gz +man/man1/%%BUTARGET%%-size.1.gz +man/man1/%%BUTARGET%%-strings.1.gz +man/man1/%%BUTARGET%%-strip.1.gz +man/man1/%%BUTARGET%%-windmc.1.gz +man/man1/%%BUTARGET%%-windres.1.gz +%%BUTARGET%%/bin/ar +%%BUTARGET%%/bin/as +%%BUTARGET%%/bin/ld +%%BUTARGET%%/bin/ld.bfd +%%BUTARGET%%/bin/nm +%%BUTARGET%%/bin/objcopy +%%BUTARGET%%/bin/objdump +%%BUTARGET%%/bin/ranlib +%%BUTARGET%%/bin/readelf +%%BUTARGET%%/bin/size +%%BUTARGET%%/bin/strip +%%BUTARGET%%/lib/ldscripts/elf_s390.x +%%BUTARGET%%/lib/ldscripts/elf_s390.xbn +%%BUTARGET%%/lib/ldscripts/elf_s390.xc +%%BUTARGET%%/lib/ldscripts/elf_s390.xce +%%BUTARGET%%/lib/ldscripts/elf_s390.xd +%%BUTARGET%%/lib/ldscripts/elf_s390.xdc +%%BUTARGET%%/lib/ldscripts/elf_s390.xdce +%%BUTARGET%%/lib/ldscripts/elf_s390.xde +%%BUTARGET%%/lib/ldscripts/elf_s390.xdw +%%BUTARGET%%/lib/ldscripts/elf_s390.xdwe +%%BUTARGET%%/lib/ldscripts/elf_s390.xe +%%BUTARGET%%/lib/ldscripts/elf_s390.xn +%%BUTARGET%%/lib/ldscripts/elf_s390.xr +%%BUTARGET%%/lib/ldscripts/elf_s390.xs +%%BUTARGET%%/lib/ldscripts/elf_s390.xsc +%%BUTARGET%%/lib/ldscripts/elf_s390.xsce +%%BUTARGET%%/lib/ldscripts/elf_s390.xse +%%BUTARGET%%/lib/ldscripts/elf_s390.xsw +%%BUTARGET%%/lib/ldscripts/elf_s390.xswe +%%BUTARGET%%/lib/ldscripts/elf_s390.xu +%%BUTARGET%%/lib/ldscripts/elf_s390.xw +%%BUTARGET%%/lib/ldscripts/elf_s390.xwe +%%BUTARGET%%/lib/ldscripts/elf64_s390.x +%%BUTARGET%%/lib/ldscripts/elf64_s390.xbn +%%BUTARGET%%/lib/ldscripts/elf64_s390.xc +%%BUTARGET%%/lib/ldscripts/elf64_s390.xce +%%BUTARGET%%/lib/ldscripts/elf64_s390.xceo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xco +%%BUTARGET%%/lib/ldscripts/elf64_s390.xd +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdc +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdce +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdceo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdco +%%BUTARGET%%/lib/ldscripts/elf64_s390.xde +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdeo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdw +%%BUTARGET%%/lib/ldscripts/elf64_s390.xdwe +%%BUTARGET%%/lib/ldscripts/elf64_s390.xe +%%BUTARGET%%/lib/ldscripts/elf64_s390.xeo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xn +%%BUTARGET%%/lib/ldscripts/elf64_s390.xo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xr +%%BUTARGET%%/lib/ldscripts/elf64_s390.xs +%%BUTARGET%%/lib/ldscripts/elf64_s390.xsc +%%BUTARGET%%/lib/ldscripts/elf64_s390.xsce +%%BUTARGET%%/lib/ldscripts/elf64_s390.xsceo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xsco +%%BUTARGET%%/lib/ldscripts/elf64_s390.xse +%%BUTARGET%%/lib/ldscripts/elf64_s390.xseo +%%BUTARGET%%/lib/ldscripts/elf64_s390.xso +%%BUTARGET%%/lib/ldscripts/elf64_s390.xsw +%%BUTARGET%%/lib/ldscripts/elf64_s390.xswe +%%BUTARGET%%/lib/ldscripts/elf64_s390.xu +%%BUTARGET%%/lib/ldscripts/elf64_s390.xw +%%BUTARGET%%/lib/ldscripts/elf64_s390.xwe -- cgit From ad167d51665a9610e565ab7f294a9de1dcba1981 Mon Sep 17 00:00:00 2001 From: woodsb02 Date: Wed, 7 Aug 2019 22:18:50 +0000 Subject: net-p2p/gtk-gnutella: Update to 1.1.15 Also change port to use GitHub as the new upstream repo Changes this release: https://github.com/gtk-gnutella/gtk-gnutella/blob/v1.1.15/ChangeLog --- net-p2p/gtk-gnutella/Makefile | 5 +++-- net-p2p/gtk-gnutella/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile index 363e16e5cf03..8285e0925a56 100644 --- a/net-p2p/gtk-gnutella/Makefile +++ b/net-p2p/gtk-gnutella/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= gtk-gnutella -PORTVERSION= 1.1.14 +PORTVERSION= 1.1.15 +DISTVERSIONPREFIX=v CATEGORIES= net-p2p ipv6 -MASTER_SITES= SF MAINTAINER= woodsb02@FreeBSD.org COMMENT= GTK based Gnutella client @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 USES= gnome iconv localbase:ldflags pkgconfig tar:xz +USE_GITHUB= yes USE_GNOME= glib20 libxml2 HAS_CONFIGURE= yes diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo index b3b4bce653f3..48a151a6e2e6 100644 --- a/net-p2p/gtk-gnutella/distinfo +++ b/net-p2p/gtk-gnutella/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548644742 -SHA256 (gtk-gnutella-1.1.14.tar.xz) = 31eeaf02ae989aa81791af9f6b4aa3c26c39adc58605dc430edf59451494926a -SIZE (gtk-gnutella-1.1.14.tar.xz) = 19372716 +TIMESTAMP = 1565005144 +SHA256 (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = a72fd0b57bbc458c8fe5556bd171cd3cae940fa131c5783ab4114f29d85d9122 +SIZE (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = 22899323 -- cgit From adaa210e9076f299d9cff4fd6dd95a159eb165de Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 01:25:44 +0000 Subject: audio/calf-lv2: Add SSE options; Strip binary PR: 234331 Submitted by: Daniel Shafer --- audio/calf-lv2/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/audio/calf-lv2/Makefile b/audio/calf-lv2/Makefile index 893559c299e2..0a1552258ab9 100644 --- a/audio/calf-lv2/Makefile +++ b/audio/calf-lv2/Makefile @@ -3,6 +3,7 @@ PORTNAME= calf DISTVERSION= 0.90.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://calf-studio-gear.org/files/ PKGNAMESUFFIX= -lv2 @@ -28,14 +29,21 @@ USE_CXXSTD= c++11 INSTALL_TARGET= install-strip INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_GCC= yes # workaround for https://github.com/calf-studio-gear/calf/issues/227 +USE_GCC= yes # workaround for https://github.com/calf-studio-gear/calf/issues/227, supposedly fixed in clang-8.0.1-+rc4-1 OPTIONS_DEFINE= DOCS LASH OPTIONS_DEFAULT= LASH +OPTIONS_DEFINE_amd64= SSE +OPTIONS_DEFINE_i386= SSE +OPTIONS_DEFAULT_amd64= SSE +OPTIONS_DEFAULT_i386= SSE + LASH_LIB_DEPENDS= liblash.so:audio/lash LASH_CONFIGURE_WITH= lash +SSE_CONFIGURE_ENABLE= sse + PORTDOCS= * .include @@ -47,5 +55,6 @@ CXXFLAGS+= -finline-limit=80 -finline-functions -finline-functions-called-once post-install: # fix absolute symbolic link to be relative @${RM} ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calf.so @${RLN} ${STAGEDIR}${PREFIX}/lib/calf/libcalf.so ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calf.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calflv2gui.so # https://github.com/calf-studio-gear/calf/issues/235 .include -- cgit From b7bc30893713ff00bf834212fcf8b208b4b42e8f Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 01:37:14 +0000 Subject: science/lammps: patch_6Aug2019 -> stable_7Aug2019 Reported by: portscout --- science/lammps/Makefile | 2 +- science/lammps/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/science/lammps/Makefile b/science/lammps/Makefile index 63f457510f95..b15df292028e 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -15,7 +15,7 @@ CONFLICTS_BUILD= ga # conflicts with include/error.h, already fixed in the head USES= blaslapack:openblas cmake:noninja eigen:3 fortran localbase:ldflags shebangfix USE_GITHUB= yes -GH_TAGNAME= patch_6Aug2019 +GH_TAGNAME= stable_7Aug2019 SHEBANG_GLOB= *.sh *.bash SHEBANG_FILES= lib/kokkos/bin/nvcc_wrapper diff --git a/science/lammps/distinfo b/science/lammps/distinfo index edb88a96b825..0ce5735a2058 100644 --- a/science/lammps/distinfo +++ b/science/lammps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565047417 -SHA256 (lammps-lammps-2019.08.6-patch_6Aug2019_GH0.tar.gz) = 3c05615e6d1462e260515aa5a5d8ad624f213fb7119f97f40b67a9ed5cc7b6c0 -SIZE (lammps-lammps-2019.08.6-patch_6Aug2019_GH0.tar.gz) = 105307941 +TIMESTAMP = 1565227747 +SHA256 (lammps-lammps-2019.08.7-stable_7Aug2019_GH0.tar.gz) = 5380c1689a93d7922e3d65d9c186401d429878bb3cbe9a692580d3470d6a253f +SIZE (lammps-lammps-2019.08.7-stable_7Aug2019_GH0.tar.gz) = 105316393 -- cgit From f7200f32109e63d7b868f0647cf09cbcf24c1b15 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 01:42:05 +0000 Subject: science/simbody: Add VISUALIZER_DESC for the VISUALIZER option --- science/simbody/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/science/simbody/Makefile b/science/simbody/Makefile index 9e7a98df88b7..ba6c70fca795 100644 --- a/science/simbody/Makefile +++ b/science/simbody/Makefile @@ -31,6 +31,7 @@ OPTIONS_SUB= yes DOCS_CMAKE_BOOL= INSTALL_DOCS +VISUALIZER_DESC= Build the visualizer component VISUALIZER_CMAKE_BOOL= BUILD_VISUALIZER VISUALIZER_USES= gl VISUALIZER_USE= GL=gl,glu,glut XORG=xi,xmu -- cgit From efcf0e3aca57e2025cabc585a8b3af02745dbc4d Mon Sep 17 00:00:00 2001 From: leres Date: Thu, 8 Aug 2019 02:46:20 +0000 Subject: dns/dsp: Update to 2.0.1 - add DESTDIR - autoreconf include fix - configure Perl program check - Update m4 scripts to latest version PR: 239691 Submitted by: Leo Vandewoestijne (maintainer) Approved by: ler (mentor, implicit) --- dns/dsp/Makefile | 2 +- dns/dsp/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dns/dsp/Makefile b/dns/dsp/Makefile index 6b768572c9c7..abf0b13f5e6e 100644 --- a/dns/dsp/Makefile +++ b/dns/dsp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dsp -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= dns MASTER_SITES= https://www.dns-oarc.net/files/dsc/ \ https://dns.company/files/dsc/ diff --git a/dns/dsp/distinfo b/dns/dsp/distinfo index 485dadcdbb9c..2dcb2a8ec039 100644 --- a/dns/dsp/distinfo +++ b/dns/dsp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520905401 -SHA256 (dsp-2.0.0.tar.gz) = f56e28ebd2f963c1281a5019c7aa89c69d544166f94348d0cec215e567eff7de -SIZE (dsp-2.0.0.tar.gz) = 148665 +TIMESTAMP = 1565097843 +SHA256 (dsp-2.0.1.tar.gz) = 56911f2f28ce8d8c600e457319f57bb630a64f2a89895c6d80452c847b48b029 +SIZE (dsp-2.0.1.tar.gz) = 147978 -- cgit From 86acece31ce49667ef40313f0c225d65c4c100b2 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 04:06:03 +0000 Subject: science/simbody: Add the option EXAMPLE_PROGRAMS that builds and installs example programs --- science/simbody/Makefile | 12 ++++++++---- science/simbody/files/patch-examples_CMakeLists.txt | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 science/simbody/files/patch-examples_CMakeLists.txt diff --git a/science/simbody/Makefile b/science/simbody/Makefile index ba6c70fca795..f85906763258 100644 --- a/science/simbody/Makefile +++ b/science/simbody/Makefile @@ -3,7 +3,7 @@ PORTNAME= simbody DISTVERSIONPREFIX= Simbody- DISTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science biology PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ @@ -22,10 +22,10 @@ USES= blaslapack:openblas cmake compiler:c++11-lang fortran # fortran only for USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_OFF= BUILD_TESTING BUILD_EXAMPLES -CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so +CMAKE_OFF= BUILD_TESTING +CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR} -OPTIONS_DEFINE= DOCS VISUALIZER +OPTIONS_DEFINE= DOCS VISUALIZER EXAMPLE_PROGRAMS # EXAMPLE_PROGRAMS significanly increases the build time and package size, so it is not called EXAMPLES to prevent it from being installed by default OPTIONS_DEFAULT= VISUALIZER OPTIONS_SUB= yes @@ -36,7 +36,11 @@ VISUALIZER_CMAKE_BOOL= BUILD_VISUALIZER VISUALIZER_USES= gl VISUALIZER_USE= GL=gl,glu,glut XORG=xi,xmu +EXAMPLE_PROGRAMS_DESC= Build and install example programs +EXAMPLE_PROGRAMS_CMAKE_BOOL= BUILD_EXAMPLES + PORTDOCS= * +# this port installs examples into ${EXAMPLESDIR} when EXAMPLE_PROGRAMS=ON, but check-plist doesn't complain for some reason post-install-DOCS-on: # https://github.com/simbody/simbody/issues/652 @${RMDIR} ${STAGEDIR}${DOCSDIR}/api diff --git a/science/simbody/files/patch-examples_CMakeLists.txt b/science/simbody/files/patch-examples_CMakeLists.txt new file mode 100644 index 000000000000..600efcb37ee9 --- /dev/null +++ b/science/simbody/files/patch-examples_CMakeLists.txt @@ -0,0 +1,20 @@ +--- examples/CMakeLists.txt.orig 2018-06-12 01:04:33 UTC ++++ examples/CMakeLists.txt +@@ -67,7 +67,7 @@ if(WIN32) + set(EXAMPLES_INSTALL_BIN examples/bin/) + set(EXAMPLES_INSTALL_SRC examples/src/) + else() +- set(EXAMPLES_INSTALL_BIN ${CMAKE_INSTALL_LIBDIR}/simbody/examples/) # if this changes, change the corresponding ++ set(EXAMPLES_INSTALL_BIN ${FREEBSD_EXAMPLESDIR}) # if this changes, change the corresponding + # FULL version in file(RELATIVE_PATH ) command + set(EXAMPLES_INSTALL_SRC ${CMAKE_INSTALL_DOCDIR}/examples/src/) + # Use full paths for the following as it will be used to create a symlink +@@ -75,7 +75,7 @@ else() + set(EXAMPLES_SYMLINK_BIN ${CMAKE_INSTALL_FULL_DOCDIR}/examples) + file(RELATIVE_PATH EXAMPLE_INSTALL_BIN_REL_TO_DOC + ${EXAMPLES_SYMLINK_BIN} +- ${CMAKE_INSTALL_FULL_LIBDIR}/simbody/examples/) ++ ${FREEBSD_EXAMPLESDIR}) + endif() + + # Set RPATH for all example targets in this directory and in subdirectories. -- cgit From 531580f63ddfdb1162fb293855bd27331e58af63 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 04:53:25 +0000 Subject: science/simbody: Backport the pull request that fixed the pathname handling on BSDs, and one failing testcase. --- science/simbody/Makefile | 7 ++++--- science/simbody/distinfo | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/science/simbody/Makefile b/science/simbody/Makefile index f85906763258..e02332537c09 100644 --- a/science/simbody/Makefile +++ b/science/simbody/Makefile @@ -3,12 +3,13 @@ PORTNAME= simbody DISTVERSIONPREFIX= Simbody- DISTVERSION= 3.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science biology PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ PATCHFILES= 1b306f66bcd15e9bf6b27882e2daa6375ac4cd2e.patch:-p1 \ - eaff90b304291ab9ffdf60d7abfb48e23e102ecb.patch:-p1 + eaff90b304291ab9ffdf60d7abfb48e23e102ecb.patch:-p1 \ + 54f04cfef5f184c72df479c8c8eddd6d5eaf1f5b.patch:-p1 MAINTAINER= yuri@FreeBSD.org COMMENT= Multibody dynamics library for (bio)mechanical systems simulation @@ -45,7 +46,7 @@ PORTDOCS= * post-install-DOCS-on: # https://github.com/simbody/simbody/issues/652 @${RMDIR} ${STAGEDIR}${DOCSDIR}/api -do-test: # one test is known to fail: https://github.com/simbody/simbody/issues/653 +do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ diff --git a/science/simbody/distinfo b/science/simbody/distinfo index 54173024bcc0..c9b06eabe72f 100644 --- a/science/simbody/distinfo +++ b/science/simbody/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1542263337 +TIMESTAMP = 1565239605 SHA256 (simbody-simbody-Simbody-3.6.1_GH0.tar.gz) = 7716d6ea20b950e71e8535faa4353ac89716c03fd7a445dd802eb6a630796639 SIZE (simbody-simbody-Simbody-3.6.1_GH0.tar.gz) = 47178543 SHA256 (1b306f66bcd15e9bf6b27882e2daa6375ac4cd2e.patch) = 42468083313fc489c763ad2562c7a4baeeca02b7c81f35a94dad3368e4c7c4b8 SIZE (1b306f66bcd15e9bf6b27882e2daa6375ac4cd2e.patch) = 1473 SHA256 (eaff90b304291ab9ffdf60d7abfb48e23e102ecb.patch) = 8098b7efa4509a70d1561cad84d3d84549a58a4ac83f3af7d0a94e3cdd7ec4c4 SIZE (eaff90b304291ab9ffdf60d7abfb48e23e102ecb.patch) = 1350 +SHA256 (54f04cfef5f184c72df479c8c8eddd6d5eaf1f5b.patch) = 0bdd19c64a625a89847702b2a14ceb51828b961989323419bcbcb56ed2b44bd6 +SIZE (54f04cfef5f184c72df479c8c8eddd6d5eaf1f5b.patch) = 1080 -- cgit From 6075f983a616596703fdc79890eea6210ad62a1c Mon Sep 17 00:00:00 2001 From: rigoletto Date: Thu, 8 Aug 2019 05:16:28 +0000 Subject: x11/polybar: Update to 3.4.0. - the manual pages were removed because upstream moved to sphinx and require a version considerably newer than we have. Approved by: tcberner (mentor) --- x11/polybar/Makefile | 13 +++++-------- x11/polybar/distinfo | 10 +++------- x11/polybar/files/patch-doc_CMakeLists.txt | 11 ----------- x11/polybar/files/patch-lib_xpp_CMakeLists.txt | 11 +---------- x11/polybar/files/patch-man_CMakeLists.txt | 8 -------- x11/polybar/pkg-plist | 1 - 6 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 x11/polybar/files/patch-doc_CMakeLists.txt delete mode 100644 x11/polybar/files/patch-man_CMakeLists.txt diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile index 0ee106b2b06a..d7324b620825 100644 --- a/x11/polybar/Makefile +++ b/x11/polybar/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= polybar -DISTVERSION= 3.3.1 -PORTREVISION= 2 +DISTVERSION= 3.4.0 CATEGORIES= x11 +MASTER_SITES= https://github.com/polybar/polybar/releases/download/${DISTVERSION}/ MAINTAINER= rigoletto@FreeBSD.org COMMENT= Fast and easy-to-use status bar @@ -23,12 +23,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ # compiler:c++11-lang is needed for powerpc64 USES= cmake compiler:c++11-lang gnome localbase:ldflags \ - pkgconfig python:2.7,build - -USE_GITHUB= yes -GH_ACCOUNT= jaagr -GH_TUPLE= jaagr:i3ipcpp:v0.7.1-4-gd4e4786:i3ipcpp/lib/i3ipcpp \ - jaagr:xpp:1.4.0-8-gab6247b:xpp/lib/xpp + pkgconfig python:2.7,build tar USE_GNOME= cairo USE_XORG= xcb @@ -81,6 +76,8 @@ TESTS_CMAKE_BOOL= BUILD_TESTS XKEYBOARD_CMAKE_BOOL= ENABLE_XKEYBOARD XKEYBOARD_LIB_DEPENDS= libxcb-xkb.so:x11/libxcb +WRKSRC= ${WRKDIR}/${PORTNAME} + do-test-TESTS-on: cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \ ${SH} ${WRKSRC}/common/travis/tests.sh diff --git a/x11/polybar/distinfo b/x11/polybar/distinfo index 879d4d66c2b0..4835bcf6ca26 100644 --- a/x11/polybar/distinfo +++ b/x11/polybar/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1554317325 -SHA256 (jaagr-polybar-3.3.1_GH0.tar.gz) = d0a0ad987abb9da74c5b1ea4a57f7b17aec1653876b0a26c7da72fc669b53ee7 -SIZE (jaagr-polybar-3.3.1_GH0.tar.gz) = 248790 -SHA256 (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 2154bf1a0b0a211bddcf5904ba97f99eb86ef6faded5dd864858e2a1a2389cec -SIZE (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 191511 -SHA256 (jaagr-xpp-1.4.0-8-gab6247b_GH0.tar.gz) = ff95905e60da13b6ac8a5670dd259cc0cdd4ebf8ebae985c8bba16c54bbe69ad -SIZE (jaagr-xpp-1.4.0-8-gab6247b_GH0.tar.gz) = 84294 +TIMESTAMP = 1564027994 +SHA256 (polybar-3.4.0.tar) = 69a098f22d7a72eb594030aff687801252b18520b097c12f5c7894a99c4bcd1b +SIZE (polybar-3.4.0.tar) = 2713600 diff --git a/x11/polybar/files/patch-doc_CMakeLists.txt b/x11/polybar/files/patch-doc_CMakeLists.txt deleted file mode 100644 index ab0d726aa2db..000000000000 --- a/x11/polybar/files/patch-doc_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/CMakeLists.txt.orig 2017-12-03 17:03:49 UTC -+++ doc/CMakeLists.txt -@@ -85,7 +85,7 @@ configure_file( - ESCAPE_QUOTES @ONLY) - - install(FILES config -- DESTINATION share/doc/polybar -+ DESTINATION share/examples/polybar - COMPONENT config) - - # }}} diff --git a/x11/polybar/files/patch-lib_xpp_CMakeLists.txt b/x11/polybar/files/patch-lib_xpp_CMakeLists.txt index ac69a6617af1..e7aa9fc62e69 100644 --- a/x11/polybar/files/patch-lib_xpp_CMakeLists.txt +++ b/x11/polybar/files/patch-lib_xpp_CMakeLists.txt @@ -1,4 +1,4 @@ ---- lib/xpp/CMakeLists.txt.orig 2019-01-12 15:06:55 UTC +--- lib/xpp/CMakeLists.txt.orig 2019-07-25 04:34:56 UTC +++ lib/xpp/CMakeLists.txt @@ -48,7 +48,7 @@ set(XPP_LIBRARIES # @@ -9,12 +9,3 @@ message(STATUS "Searching for xcbgen with " ${CURRENT_EXECUTABLE}) execute_process(COMMAND "${CURRENT_EXECUTABLE}" "-c" -@@ -161,7 +161,7 @@ foreach(PROTO ${PROTO_LIST}) - set(OUTPUT_FILE ${PROJECT_SOURCE_DIR}/include/xpp/proto/${PROTO_OUTPUT}.hpp) - add_custom_command( - OUTPUT ${OUTPUT_FILE} -- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}" -+ COMMAND ${PYTHON_EXECUTABLE} -B ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}" - ${XCBPROTO_XCBINCLUDEDIR}/${PROTO}.xml > ${OUTPUT_FILE}) - list(APPEND PROTO_HEADER_FILES ${OUTPUT_FILE}) - endforeach(PROTO) diff --git a/x11/polybar/files/patch-man_CMakeLists.txt b/x11/polybar/files/patch-man_CMakeLists.txt deleted file mode 100644 index ba0793336649..000000000000 --- a/x11/polybar/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- man/CMakeLists.txt.orig 2018-05-18 04:58:51 UTC -+++ man/CMakeLists.txt -@@ -1,4 +1,4 @@ - set(MAN_PAGES_1 polybar.1) - INSTALL(FILES ${MAN_PAGES_1} -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1 - COMPONENT doc) diff --git a/x11/polybar/pkg-plist b/x11/polybar/pkg-plist index b52f02cf089c..1cd6ace0a6d6 100644 --- a/x11/polybar/pkg-plist +++ b/x11/polybar/pkg-plist @@ -1,6 +1,5 @@ bin/polybar %%IPC%%bin/polybar-msg -man/man1/polybar.1.gz share/bash-completion/completions/polybar share/zsh/site-functions/_polybar share/zsh/site-functions/_polybar_msg -- cgit From a8c518d44619b487e5ac5a10fe5e81d40d66bbee Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 8 Aug 2019 05:46:36 +0000 Subject: graphics/dataplot: replace numberingn to preserve the time/version continuum Pointed out by: mat Approved by: thierry (mentor) --- graphics/dataplot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index f5c9b4ed6623..08bff1cb9073 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dataplot -DISTVERSION= g20190426 +DISTVERSION= 20190426 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org -- cgit From 939de99a480c1ff3c8d1fe557fca92445e75d8f0 Mon Sep 17 00:00:00 2001 From: meta Date: Thu, 8 Aug 2019 07:45:55 +0000 Subject: sysutils/rubygem-tmuxinator: Update to 1.1.1 This commit is intended to support tmux 2.9 and 2.9a in particular. PR: 239670 Submitted by: myself Reported by: freebsd@rail.eu.org Relnotes: https://github.com/tmuxinator/tmuxinator/releases/tag/v0.15.0 https://github.com/tmuxinator/tmuxinator/releases/tag/v0.16.0 https://github.com/tmuxinator/tmuxinator/releases/tag/v1.0.0 https://github.com/tmuxinator/tmuxinator/releases/tag/v1.1.0 https://github.com/tmuxinator/tmuxinator/releases/tag/v1.1.1 Sponsored by: HAW International, Inc. --- sysutils/rubygem-tmuxinator/Makefile | 5 ++--- sysutils/rubygem-tmuxinator/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sysutils/rubygem-tmuxinator/Makefile b/sysutils/rubygem-tmuxinator/Makefile index 11075ba49b5c..7e43642eb9ca 100644 --- a/sysutils/rubygem-tmuxinator/Makefile +++ b/sysutils/rubygem-tmuxinator/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tmuxinator -PORTVERSION= 0.14.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= sysutils ruby MASTER_SITES= RG @@ -14,7 +13,7 @@ LICENSE= MIT RUN_DEPENDS= rubygem-erubis>=2.6:www/rubygem-erubis \ rubygem-thor>=0.15.0:devel/rubygem-thor \ - rubygem-xdg2>=2.2.3:devel/rubygem-xdg2 + rubygem-xdg2>=2.2.5:devel/rubygem-xdg2 USES= gem USE_RUBY= yes diff --git a/sysutils/rubygem-tmuxinator/distinfo b/sysutils/rubygem-tmuxinator/distinfo index a4dd3a718a0f..7fae73d0c39d 100644 --- a/sysutils/rubygem-tmuxinator/distinfo +++ b/sysutils/rubygem-tmuxinator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544397436 -SHA256 (rubygem/tmuxinator-0.14.0.gem) = 845cfa0e2d04e9e9bb950c214100cb706a369c6db25296040b589ab4d9ea5344 -SIZE (rubygem/tmuxinator-0.14.0.gem) = 32256 +TIMESTAMP = 1565142879 +SHA256 (rubygem/tmuxinator-1.1.1.gem) = 899c1b70d01cc2d27dac30a6a2ceb440574f42d3fa89dff0366ed413dcc91269 +SIZE (rubygem/tmuxinator-1.1.1.gem) = 32256 -- cgit From 1075fcfe6074b3f9dafda218023a6d0a4ebb90e1 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 07:59:02 +0000 Subject: New port: mail/astroid: Graphical email client for notmuch, inspired by sup and others PR: 226829 Submitted by: Mylan Connolly --- mail/Makefile | 1 + mail/astroid/Makefile | 37 +++++++++++++++++++++++++++++++++ mail/astroid/distinfo | 3 +++ mail/astroid/files/patch-CMakeLists.txt | 11 ++++++++++ mail/astroid/pkg-descr | 7 +++++++ mail/astroid/pkg-plist | 28 +++++++++++++++++++++++++ 6 files changed, 87 insertions(+) create mode 100644 mail/astroid/Makefile create mode 100644 mail/astroid/distinfo create mode 100644 mail/astroid/files/patch-CMakeLists.txt create mode 100644 mail/astroid/pkg-descr create mode 100644 mail/astroid/pkg-plist diff --git a/mail/Makefile b/mail/Makefile index 996038b1952a..8baa4f9a3511 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -23,6 +23,7 @@ SUBDIR += ask SUBDIR += asmail SUBDIR += assp + SUBDIR += astroid SUBDIR += automx SUBDIR += autorespond SUBDIR += autosig diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile new file mode 100644 index 000000000000..2fe66a68e23f --- /dev/null +++ b/mail/astroid/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= astroid +DISTVERSIONPREFIX= v +DISTVERSION= 0.15 +CATEGORIES= mail + +MAINTAINER= mylan.connolly@gmail.com +COMMENT= Graphical email client for notmuch, inspired by sup and others + +LICENSE= GPLv3+ LGPL21+ +LICENSE_COMB= dual +LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.GPL-3.0+ +LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL-2.1+ + +BUILD_DEPENDS= scdoc:textproc/scdoc \ + notmuch>0:mail/notmuch +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \ + libgmime-3.0.so:mail/gmime30 \ + libgnutls.so:security/gnutls \ + libpcre2-8.so:devel/pcre2 \ + libpeas-1.0.so:devel/libpeas \ + libprotobuf.so:devel/protobuf \ + libsass.so:textproc/libsass \ + libsoup-2.4.so:devel/libsoup +RUN_DEPENDS= notmuch:mail/notmuch + +USES= cmake desktop-file-utils gettext-runtime gnome pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= astroidmail +GH_PROJECT= astroid +USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk30 gtkmm30 introspection libsigc++20 pango pangomm vte3 + +INSTALLS_ICONS= yes + +.include diff --git a/mail/astroid/distinfo b/mail/astroid/distinfo new file mode 100644 index 000000000000..37cbf78fb4ca --- /dev/null +++ b/mail/astroid/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565244146 +SHA256 (astroidmail-astroid-v0.15_GH0.tar.gz) = 8581bbdbc71bd00d4cdd473cfad8bc604628bb15616fe5eab5c623461f686c65 +SIZE (astroidmail-astroid-v0.15_GH0.tar.gz) = 3365732 diff --git a/mail/astroid/files/patch-CMakeLists.txt b/mail/astroid/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..738a688ce8c8 --- /dev/null +++ b/mail/astroid/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-08-08 06:21:44 UTC ++++ CMakeLists.txt +@@ -543,7 +543,7 @@ install ( TARGETS tvextension + # Install man page + if (NOT DISABLE_DOCS) + install ( FILES ${CMAKE_BINARY_DIR}/astroid.1.gz +- DESTINATION share/man/man1 ++ DESTINATION man/man1 + ) + endif () + diff --git a/mail/astroid/pkg-descr b/mail/astroid/pkg-descr new file mode 100644 index 000000000000..3e6d89c241ef --- /dev/null +++ b/mail/astroid/pkg-descr @@ -0,0 +1,7 @@ +Astroid is a lightweight and fast Mail User Agent that provides a graphical +interface to searching, display and composing email, organized in thread and +tags. Astroid uses the notmuch backend for blazingly fast searches through tons +of email. Astroid searches, displays and composes emails - and relies on other +programs for fetching, syncing and sending email. + +WWW: http://astroidmail.github.io/ diff --git a/mail/astroid/pkg-plist b/mail/astroid/pkg-plist new file mode 100644 index 000000000000..0a878b11d471 --- /dev/null +++ b/mail/astroid/pkg-plist @@ -0,0 +1,28 @@ +bin/astroid +lib/astroid/web-extensions/libtvextension.so +lib/girepository-1.0/Astroid-0.2.typelib +man/man1/astroid.1.gz +share/applications/astroid.desktop +%%DATADIR%%/ui/edit-message.glade +%%DATADIR%%/ui/icons/LICENSE +%%DATADIR%%/ui/icons/astroid.png +%%DATADIR%%/ui/icons/astroid.svg +%%DATADIR%%/ui/icons/horizontal_color.png +%%DATADIR%%/ui/icons/horizontal_color.svg +%%DATADIR%%/ui/icons/horizontal_white.png +%%DATADIR%%/ui/icons/horizontal_white.svg +%%DATADIR%%/ui/icons/icon_color.png +%%DATADIR%%/ui/icons/icon_color.svg +%%DATADIR%%/ui/icons/icon_white.png +%%DATADIR%%/ui/icons/icon_white.svg +%%DATADIR%%/ui/icons/vertical_color.png +%%DATADIR%%/ui/icons/vertical_color.svg +%%DATADIR%%/ui/icons/vertical_white.png +%%DATADIR%%/ui/icons/vertical_white.svg +%%DATADIR%%/ui/no-mail.png +%%DATADIR%%/ui/part.scss +%%DATADIR%%/ui/thread-view.html +%%DATADIR%%/ui/thread-view.scss +share/gir-1.0/Astroid-0.2.gir +share/icons/hicolor/512x512/apps/astroid.png +share/icons/hicolor/scalable/apps/astroid.svg -- cgit From 95fc31b97626398f2bca3fb43819cb9b6a98b567 Mon Sep 17 00:00:00 2001 From: pizzamig Date: Thu, 8 Aug 2019 09:01:04 +0000 Subject: devel/electron4: Update to 4.2.9 Changes: https://github.com/electron/electron/releases/tag/v4.2.9 Submitted by: maintainer (via github) --- devel/electron4/Makefile | 5 ++--- devel/electron4/distinfo | 10 +++++----- devel/electron4/files/package-lock.json | 2 +- devel/electron4/files/package.json | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/devel/electron4/Makefile b/devel/electron4/Makefile index 1621e3d6871e..477a9d0bab4c 100644 --- a/devel/electron4/Makefile +++ b/devel/electron4/Makefile @@ -3,7 +3,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v4.1.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -63,7 +62,7 @@ GH_TUPLE= electron:node:8bc5d171a0873c0ba49f9433798bc8b67399788c:node # yaml:pyyaml:3.12:pyyaml \ # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests -ELECTRON_VER= 4.2.8 +ELECTRON_VER= 4.2.9 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 69.0.3497.128 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH @@ -156,7 +155,7 @@ TEST_ALL_TARGET+= third_party/electron_node:headers POST_BUILD_TARGETS= licenses version POST_BUILD_DIST_TARGETS= dist.zip chromedriver.zip mksnapshot.zip -NPM_TIMESTAMP= 1563963161 +NPM_TIMESTAMP= 1565176036 PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} diff --git a/devel/electron4/distinfo b/devel/electron4/distinfo index cb61da1d7e5d..27355ab99b51 100644 --- a/devel/electron4/distinfo +++ b/devel/electron4/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1563963324 +TIMESTAMP = 1565176191 SHA256 (electron/chromium-69.0.3497.128.tar.xz) = af2b0ee2d16255fd28c3ef23a1481eebe58d6604f238b154594072e17ac643ed SIZE (electron/chromium-69.0.3497.128.tar.xz) = 1363607512 SHA256 (electron/050c85d20f7cedd7f5c39533c1ba89dcdfa56a08) = d2e12fe5e144628f70536d1fea30fa817b7639f067e69f6a9e926f7311c9ec00 SIZE (electron/050c85d20f7cedd7f5c39533c1ba89dcdfa56a08) = 4535767 -SHA256 (electron/electron-npm-modules-4.2.8.tar.xz) = 8fd94822ad10a878c942b53ddea34e30dc6857724c1daa7ec297ac95d1a8d818 -SIZE (electron/electron-npm-modules-4.2.8.tar.xz) = 15027636 +SHA256 (electron/electron-npm-modules-4.2.9.tar.xz) = dc06738638b00fec4f04254ea212f0ce292193f9e0077e5064859589dc63bf68 +SIZE (electron/electron-npm-modules-4.2.9.tar.xz) = 15033460 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927 -SHA256 (electron/electron-electron-v4.2.8_GH0.tar.gz) = 5d53c7f2095167f2ac5a10d395616a76776cb9f403bbb427f2399cf3fb6aa4dd -SIZE (electron/electron-electron-v4.2.8_GH0.tar.gz) = 6531740 +SHA256 (electron/electron-electron-v4.2.9_GH0.tar.gz) = a710da8d07aa330d9982a2dba061c0245531bbf1eabd28a1c28259e8865c320b +SIZE (electron/electron-electron-v4.2.9_GH0.tar.gz) = 6531752 SHA256 (electron/electron-node-8bc5d171a0873c0ba49f9433798bc8b67399788c_GH0.tar.gz) = bc94083d3904643f17181c83db83a1c7d6557044e957185d0d73d88e82472b90 SIZE (electron/electron-node-8bc5d171a0873c0ba49f9433798bc8b67399788c_GH0.tar.gz) = 56885474 diff --git a/devel/electron4/files/package-lock.json b/devel/electron4/files/package-lock.json index b1bda1748616..9cf35350885c 100644 --- a/devel/electron4/files/package-lock.json +++ b/devel/electron4/files/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.8", + "version": "4.2.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/devel/electron4/files/package.json b/devel/electron4/files/package.json index f29093dca7b8..85e33943fb91 100644 --- a/devel/electron4/files/package.json +++ b/devel/electron4/files/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.8", + "version": "4.2.9", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { -- cgit From 3bd4a1b98a436355d3d6ed107dd02bef52d31adc Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Thu, 8 Aug 2019 09:02:31 +0000 Subject: - Update WWW Approved by: portmgr blanket --- net/cvsync/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/cvsync/pkg-descr b/net/cvsync/pkg-descr index 0e1d6498ce6c..c6376747031a 100644 --- a/net/cvsync/pkg-descr +++ b/net/cvsync/pkg-descr @@ -2,4 +2,4 @@ cvsync is a portable CVS repository synchronization utility, written in C and POSIX pthread library, released under BSD license. It is very similar to CVSup but not compatible with it. -WWW: http://www.cvsync.org/ +WWW: https://www.cvsync.org/ -- cgit From 64639f9522266e465a8402acb15f01a88d2ccf55 Mon Sep 17 00:00:00 2001 From: pi Date: Thu, 8 Aug 2019 09:30:04 +0000 Subject: security/clamav: upgrade 0.101.2 -> 0.101.3, partial security fix - please note another fix is coming soonish: https://www.openwall.com/lists/oss-security/2019/08/06/3 - see also https://bugzilla.clamav.net/show_bug.cgi?id=12356 PR: 239684 Approved by: delphij (ports-secteam) Relnotes: https://blog.clamav.net/2019/08/clamav-01013-security-patch-release-and.html MFH: 2019Q3 Security: CVE-2019-13232 --- security/clamav/Makefile | 2 +- security/clamav/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index dfa58f8d7000..0bcf3469383c 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 0.101.2 +PORTVERSION= 0.101.3 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.clamav.net/downloads/production/ diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 5a7c9560c5df..f6aae366535d 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553639567 -SHA256 (clamav-0.101.2.tar.gz) = 0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 -SIZE (clamav-0.101.2.tar.gz) = 21722932 +TIMESTAMP = 1565176798 +SHA256 (clamav-0.101.3.tar.gz) = 68d42aac4a9cbde293288533a9a3c3d55863de38f2b8707c1ef2d987b1260338 +SIZE (clamav-0.101.3.tar.gz) = 21389753 -- cgit From 2a6969df7100a1b8e6bde0e4139cc45468516502 Mon Sep 17 00:00:00 2001 From: wen Date: Thu, 8 Aug 2019 09:52:52 +0000 Subject: - Add TEST_DEPENDS and do-test --- www/py-django22/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile index b0ffecedbdb5..859054c14d38 100644 --- a/www/py-django22/Makefile +++ b/www/py-django22/Makefile @@ -19,6 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR} NO_ARCH= yes USES= cpe python:3.5+ shebangfix @@ -62,4 +63,7 @@ post-install-HTMLDOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} ${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR} +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite + .include -- cgit From b3ad31136446718eccc527b2539807cd04e73427 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Thu, 8 Aug 2019 09:57:32 +0000 Subject: graphics/jp: Terminal charts, plots, histograms and maps from JSON and CSV jp is a dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported. It reads data on stdin and prints plots to stdout. WWW: https://github.com/sgreben/jp PR: 227271 --- graphics/Makefile | 1 + graphics/jp/Makefile | 31 +++++++++++++++++++++++++++++++ graphics/jp/distinfo | 3 +++ graphics/jp/pkg-descr | 5 +++++ graphics/jp/pkg-plist | 13 +++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 graphics/jp/Makefile create mode 100644 graphics/jp/distinfo create mode 100644 graphics/jp/pkg-descr create mode 100644 graphics/jp/pkg-plist diff --git a/graphics/Makefile b/graphics/Makefile index 9500950a0e32..1154ccc1c62a 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -378,6 +378,7 @@ SUBDIR += jhead SUBDIR += jogamp-jogl SUBDIR += jogl + SUBDIR += jp SUBDIR += jp2a SUBDIR += jpatch SUBDIR += jpeg diff --git a/graphics/jp/Makefile b/graphics/jp/Makefile new file mode 100644 index 000000000000..40314c7ba04a --- /dev/null +++ b/graphics/jp/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= jp +DISTVERSION= 1.1.12 +CATEGORIES= graphics + +MAINTAINER= 0mp@FreeBSD.org +COMMENT= Terminal charts, plots, histograms and maps from JSON and CSV + +LICENSE= MIT APACHE20 +LICENSE_COMB= multi + +USES= go +USE_GITHUB= yes +GH_ACCOUNT= sgreben +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME}/cmd/${PORTNAME} + +OPTIONS_DEFINE= DOCS EXAMPLES + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR}) + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + +.include diff --git a/graphics/jp/distinfo b/graphics/jp/distinfo new file mode 100644 index 000000000000..6b06ae6c17d1 --- /dev/null +++ b/graphics/jp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565253325 +SHA256 (sgreben-jp-1.1.12_GH0.tar.gz) = 8c9cddf8b9d9bfae72be448218ca0e18d24e755d36c915842b12398fefdc7a64 +SIZE (sgreben-jp-1.1.12_GH0.tar.gz) = 1301104 diff --git a/graphics/jp/pkg-descr b/graphics/jp/pkg-descr new file mode 100644 index 000000000000..0f14af6f8e8b --- /dev/null +++ b/graphics/jp/pkg-descr @@ -0,0 +1,5 @@ +jp is a dead simple terminal plots from JSON (or CSV) data. Bar charts, line +charts, scatter plots, histograms and heatmaps are supported. It reads data on +stdin and prints plots to stdout. + +WWW: https://github.com/sgreben/jp diff --git a/graphics/jp/pkg-plist b/graphics/jp/pkg-plist new file mode 100644 index 000000000000..c04164a91283 --- /dev/null +++ b/graphics/jp/pkg-plist @@ -0,0 +1,13 @@ +bin/jp +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/docs/bar_chart.png +%%PORTDOCS%%%%DOCSDIR%%/docs/bar_chart_full_escape.png +%%PORTDOCS%%%%DOCSDIR%%/docs/hist2d_full_escape.png +%%PORTDOCS%%%%DOCSDIR%%/docs/line_chart.png +%%PORTDOCS%%%%DOCSDIR%%/docs/scatter_plot.png +%%PORTDOCS%%%%DOCSDIR%%/docs/sin.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eth.csv +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mvrnorm.json +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sin.csv +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sin.json +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp-time.json -- cgit From 0d4a5b4b508eb7e19cad4ba17086478328991b11 Mon Sep 17 00:00:00 2001 From: ericbsd Date: Thu, 8 Aug 2019 11:02:45 +0000 Subject: update x11/terminator to 1.97 and added slick-greeter in x11/Makefile PR: 239421 Approved by: mentors (implicit) --- x11/Makefile | 1 + x11/terminator/Makefile | 11 ++++------- x11/terminator/distinfo | 6 +++--- x11/terminator/pkg-plist | 9 +++++++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/x11/Makefile b/x11/Makefile index ad75890dbb86..2bcb68257876 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -297,6 +297,7 @@ SUBDIR += simdock SUBDIR += simplestroke SUBDIR += sisctrl + SUBDIR += slick-greeter SUBDIR += slim SUBDIR += slock SUBDIR += slop diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile index add755cbc479..1cdb8b65765b 100644 --- a/x11/terminator/Makefile +++ b/x11/terminator/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= terminator -PORTVERSION= 1.0 +PORTVERSION= 1.91 CATEGORIES= x11 python -MASTER_SITES= http://launchpad.net/terminator/trunk/1.0/+download/ +MASTER_SITES= http://launchpad.net/terminator/gtk3/${PORTVERSION}/+download/ MAINTAINER= tom@hur.st COMMENT= Multiple GNOME terminals in one window @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} USES= gnome python:2.7 shebangfix -USE_GNOME= pygtk2 intltool +USE_GNOME= pygobject3 intltool USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Terminator @@ -26,11 +26,8 @@ INSTALLS_ICONS= yes SHEBANG_FILES= terminator.wrapper -OPTIONS_DEFINE= NLS GCONF -OPTIONS_DEFAULT= GCONF +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -GCONF_DESC= Use GNOME Terminal settings -GCONF_USE= GNOME=pygnome2 NLS_USES= gettext .include diff --git a/x11/terminator/distinfo b/x11/terminator/distinfo index 38adb79363e6..c6d2dfc41a4a 100644 --- a/x11/terminator/distinfo +++ b/x11/terminator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551503788 -SHA256 (terminator-1.0.tar.gz) = 88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd -SIZE (terminator-1.0.tar.gz) = 881675 +TIMESTAMP = 1563965307 +SHA256 (terminator-1.91.tar.gz) = 95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69 +SIZE (terminator-1.91.tar.gz) = 910536 diff --git a/x11/terminator/pkg-plist b/x11/terminator/pkg-plist index 55e9f27e5267..28462a6769c8 100644 --- a/x11/terminator/pkg-plist +++ b/x11/terminator/pkg-plist @@ -219,6 +219,7 @@ share/icons/hicolor/scalable/apps/terminator.svg %%NLS%%share/locale/ka/LC_MESSAGES/terminator.mo %%NLS%%share/locale/kk/LC_MESSAGES/terminator.mo %%NLS%%share/locale/ko/LC_MESSAGES/terminator.mo +%%NLS%%share/locale/ku/LC_MESSAGES/terminator.mo %%NLS%%share/locale/la/LC_MESSAGES/terminator.mo %%NLS%%share/locale/lt/LC_MESSAGES/terminator.mo %%NLS%%share/locale/lv/LC_MESSAGES/terminator.mo @@ -257,3 +258,11 @@ share/icons/hicolor/scalable/apps/terminator.svg %%NLS%%share/locale/zh_HK/LC_MESSAGES/terminator.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/terminator.mo share/pixmaps/terminator.png +%%DATADIR%%/terminatorlib/themes/Adwaita/gtk-3.0/apps/terminator.css +%%DATADIR%%/terminatorlib/themes/Ambiance/gtk-3.0/apps/terminator.css +%%DATADIR%%/terminatorlib/themes/Ambiance/gtk-3.0/apps/terminator_styling.css +%%DATADIR%%/terminatorlib/themes/Breeze/gtk-3.0/apps/terminator.css +%%DATADIR%%/terminatorlib/themes/HighContrast/gtk-3.0/apps/terminator.css +%%DATADIR%%/terminatorlib/themes/Radiance/gtk-3.0/apps/terminator.css +%%DATADIR%%/terminatorlib/themes/Radiance/gtk-3.0/apps/terminator_styling.css +%%DATADIR%%/terminatorlib/themes/Raleigh/gtk-3.0/apps/terminator.css -- cgit From 4f68e6f93217778d9646c47c5db61b73c85ff241 Mon Sep 17 00:00:00 2001 From: jbeich Date: Thu, 8 Aug 2019 11:13:05 +0000 Subject: textproc/nuspell: update to 2.3.0 Changes: https://github.com/nuspell/nuspell/releases/tag/v2.3.0 Changes: https://github.com/nuspell/nuspell/compare/v2.2.0...v2.3.0 Reported by: GitHub (watch releases) --- textproc/nuspell/Makefile | 8 +------- textproc/nuspell/distinfo | 12 +++--------- textproc/nuspell/pkg-plist | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile index ffbab858cc35..e9f5d1728729 100644 --- a/textproc/nuspell/Makefile +++ b/textproc/nuspell/Makefile @@ -2,15 +2,9 @@ PORTNAME= nuspell DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -PORTREVISION= 3 +DISTVERSION= 2.3.0 CATEGORIES= textproc -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 35ae2bd38585.patch:-p1 -PATCHFILES+= 1d4c96d3fe0f.patch:-p1 -PATCHFILES+= ad0eea5e8028.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Free and open source C++ spell checking library diff --git a/textproc/nuspell/distinfo b/textproc/nuspell/distinfo index c3ac8cf67be4..bea0551ca758 100644 --- a/textproc/nuspell/distinfo +++ b/textproc/nuspell/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1553005126 -SHA256 (nuspell-nuspell-v2.2.0_GH0.tar.gz) = c6d7664be74e84505f4227836d302c2885f65b165411ef86cc9cffbc1228d0c4 -SIZE (nuspell-nuspell-v2.2.0_GH0.tar.gz) = 400415 -SHA256 (35ae2bd38585.patch) = 72e683f0ad6ecbbd42e2559b729dde8f31e667f42a960b12c50af69ef511fff6 -SIZE (35ae2bd38585.patch) = 4634 -SHA256 (1d4c96d3fe0f.patch) = 064feccad9472467069213d4d5c36467ca990cc90fdf8d157197a5b9a5406522 -SIZE (1d4c96d3fe0f.patch) = 2176 -SHA256 (ad0eea5e8028.patch) = 27a2ad9ea1c7c29dc9a730fe44fdbc52766a541706c4542599f3d96f19ff8bf4 -SIZE (ad0eea5e8028.patch) = 991 +TIMESTAMP = 1565253019 +SHA256 (nuspell-nuspell-v2.3.0_GH0.tar.gz) = c81cfd50f851b5863ca26cd0c6bf9ebb7281a160c277f05c8583239321cacf3b +SIZE (nuspell-nuspell-v2.3.0_GH0.tar.gz) = 399632 diff --git a/textproc/nuspell/pkg-plist b/textproc/nuspell/pkg-plist index 68aae05c9e95..eae1f11bbf5a 100644 --- a/textproc/nuspell/pkg-plist +++ b/textproc/nuspell/pkg-plist @@ -11,6 +11,6 @@ lib/cmake/nuspell/NuspellTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nuspell/NuspellTargets.cmake lib/libnuspell.so lib/libnuspell.so.2 -lib/libnuspell.so.2.2.0 +lib/libnuspell.so.2.3.0 libdata/pkgconfig/nuspell.pc %%PORTDOCS%%man/man1/nuspell.1.gz -- cgit From d1d9c0910b7bc80959f09569c64ffe1f51fab7e9 Mon Sep 17 00:00:00 2001 From: tobik Date: Thu, 8 Aug 2019 11:42:05 +0000 Subject: security/afl++: Update to latest commit This makes it work with devel/llvm90. PR: 239682 --- security/afl++/Makefile | 6 ++---- security/afl++/distinfo | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/security/afl++/Makefile b/security/afl++/Makefile index d63947ee063c..9fba502821fd 100644 --- a/security/afl++/Makefile +++ b/security/afl++/Makefile @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.53c +PORTVERSION= 2.53d.a1 CATEGORIES= security PKGNAMESUFFIX= ++ -PATCH_SITES= https://github.com/vanhauser-thc/AFLplusplus/commit/ -PATCHFILES= 30586e634ddb58bad08e9cb662f0ccc44f45b91a.patch:-p1 - MAINTAINER= tobik@FreeBSD.org COMMENT= Fast instrumented fuzzer @@ -24,6 +21,7 @@ USES= gmake tar:tgz USE_GITHUB= yes GH_ACCOUNT= vanhauser-thc GH_PROJECT= AFLplusplus +GH_TAGNAME= 8b6a4e575978fac83155efd90d39030c84b2a755 ALL_TARGET= all libdislocator TEST_TARGET= test_build diff --git a/security/afl++/distinfo b/security/afl++/distinfo index 7a65c114fe01..a9bb60d14e2c 100644 --- a/security/afl++/distinfo +++ b/security/afl++/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1564147654 -SHA256 (vanhauser-thc-AFLplusplus-2.53c_GH0.tar.gz) = 3147d44f01378b46c4234090781e5cb13c9721a72701c28ed4f18b7256d452e7 -SIZE (vanhauser-thc-AFLplusplus-2.53c_GH0.tar.gz) = 934915 -SHA256 (30586e634ddb58bad08e9cb662f0ccc44f45b91a.patch) = f3c22bbac12426d30e06a1d9521e7669e884c41e898df2ee4b66759bdb61aef6 -SIZE (30586e634ddb58bad08e9cb662f0ccc44f45b91a.patch) = 2252 +TIMESTAMP = 1565263563 +SHA256 (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 07fffb04760637c4537e396c12d7cccf4ba061330fc36a4133123712b22300c9 +SIZE (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 936061 -- cgit From 2c41ea40caede7fea6858fe5a12172e94ac95245 Mon Sep 17 00:00:00 2001 From: tobik Date: Thu, 8 Aug 2019 12:12:56 +0000 Subject: Reset MAINTAINER of Stefan Hagen's ports He no longer has time to maintain them. Submitted by: maintainer (via ports) --- print/pdfstitch/Makefile | 2 +- www/luakit/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/print/pdfstitch/Makefile b/print/pdfstitch/Makefile index c90e8e1acea8..2a536e2e9869 100644 --- a/print/pdfstitch/Makefile +++ b/print/pdfstitch/Makefile @@ -6,7 +6,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.6 CATEGORIES= print -MAINTAINER= ports@textmail.me +MAINTAINER= ports@FreeBSD.org COMMENT= Crop and stitch pages from PDF to larger, single-page PDF LICENSE= AGPLv3 diff --git a/www/luakit/Makefile b/www/luakit/Makefile index 3aebc583757a..6913253ea886 100644 --- a/www/luakit/Makefile +++ b/www/luakit/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 2017.08.10 PORTREVISION= 2 CATEGORIES= www -MAINTAINER= ports@textmail.me +MAINTAINER= ports@FreeBSD.org COMMENT= Fast, small, webkit2 based browser framework extensible with Lua LICENSE= GPLv3 -- cgit From 2b5ce226e107dea4b2204eb399dfd6dc5546b721 Mon Sep 17 00:00:00 2001 From: madpilot Date: Thu, 8 Aug 2019 12:41:53 +0000 Subject: Update xfce4-whiskermenu-plugin to 2.3.3 --- x11/xfce4-whiskermenu-plugin/Makefile | 3 +-- x11/xfce4-whiskermenu-plugin/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile index 81d5144432ec..57f09dd86f88 100644 --- a/x11/xfce4-whiskermenu-plugin/Makefile +++ b/x11/xfce4-whiskermenu-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-whiskermenu-plugin -PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTVERSION= 2.3.3 CATEGORIES= x11 xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo index 4269b86a5569..71a71b9f9254 100644 --- a/x11/xfce4-whiskermenu-plugin/distinfo +++ b/x11/xfce4-whiskermenu-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553593897 -SHA256 (xfce4/xfce4-whiskermenu-plugin-2.3.2.tar.bz2) = f1bf6be37f7778a486b16ef115d4c05120cc12c87e4af3af9c5001276bdcb7cc -SIZE (xfce4/xfce4-whiskermenu-plugin-2.3.2.tar.bz2) = 159652 +TIMESTAMP = 1565232203 +SHA256 (xfce4/xfce4-whiskermenu-plugin-2.3.3.tar.bz2) = e0c6cc4fc1e685bc9601ec217a803d5489ca3276f4008bf056600471c6ac1848 +SIZE (xfce4/xfce4-whiskermenu-plugin-2.3.3.tar.bz2) = 160277 -- cgit From c8a8b7dfc7cebb7ddc31dfb6e0227ecf8e2b5510 Mon Sep 17 00:00:00 2001 From: gahr Date: Thu, 8 Aug 2019 13:07:08 +0000 Subject: textproc/re-flex: update to 1.3.4 Release notes: https://github.com/Genivia/RE-flex/releases/tag/v1.3.3 https://github.com/Genivia/RE-flex/releases/tag/v1.3.4 --- textproc/re-flex/Makefile | 2 +- textproc/re-flex/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile index 0e8363f053c3..a9813bbef5ad 100644 --- a/textproc/re-flex/Makefile +++ b/textproc/re-flex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= re-flex -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/re-flex/distinfo b/textproc/re-flex/distinfo index 44fe143e915d..980b3f441820 100644 --- a/textproc/re-flex/distinfo +++ b/textproc/re-flex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564563249 -SHA256 (Genivia-RE-flex-v1.3.2_GH0.tar.gz) = aaad0c9b7c7907567c3ccf4fd0abcc9a8e5f8d1caa653557c36997443ce3189f -SIZE (Genivia-RE-flex-v1.3.2_GH0.tar.gz) = 4086274 +TIMESTAMP = 1565261665 +SHA256 (Genivia-RE-flex-v1.3.4_GH0.tar.gz) = bccceaab7967fce2587a83c68c14c59cd94e661e9771ccb77a6596752aa83a7a +SIZE (Genivia-RE-flex-v1.3.4_GH0.tar.gz) = 4086439 -- cgit From 14bf9cae9e7465dba2220fd10d7f2cc1ddc47902 Mon Sep 17 00:00:00 2001 From: jbeich Date: Thu, 8 Aug 2019 13:18:37 +0000 Subject: lang/crystal: unbreak runtime after r507877 $ cat >foo.cr require "http/client" HTTP::Client.get "http://api.icndb.com/jokes/1" $ crystal foo.cr [warn] event_reinit: forked from the event_loop. Unhandled exception in spawn: Error reinitializing libevent (Exception) [warn] event_reinit: forked from the event_loop. Unhandled exception in spawn: Error reinitializing libevent (Exception) [warn] event_reinit: forked from the event_loop. Unhandled exception in spawn: Error reinitializing libevent (Exception) [warn] event_reinit: forked from the event_loop. [warn] event_reinit: forked from the event_loop. [...] PR: 206355 Reported by: Petr Fischer Submitted by: Walter Schwarzenfeld Approved by: Greg V (maintainer) --- lang/crystal/Makefile | 5 ++++- lang/crystal/distinfo | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lang/crystal/Makefile b/lang/crystal/Makefile index 4de0cdd2674d..6b6c3c3a1c3d 100644 --- a/lang/crystal/Makefile +++ b/lang/crystal/Makefile @@ -2,13 +2,16 @@ PORTNAME= crystal DISTVERSION= 0.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= https://unrelentingtech.s3.dualstack.eu-west-1.amazonaws.com/crystal/:bootstrap DISTFILES= ${BOOTSTRAP_PATH}:bootstrap DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 2fafc7d60825.patch:-p1 + MAINTAINER= greg@unrelenting.technology COMMENT= Language with Ruby-like syntax and static type checking diff --git a/lang/crystal/distinfo b/lang/crystal/distinfo index 3ea8bd7ee0e6..9eed42298af3 100644 --- a/lang/crystal/distinfo +++ b/lang/crystal/distinfo @@ -7,3 +7,5 @@ SHA256 (crystal/crystal-0.27.2-freebsd12-aarch64) = d50b23d2b7b0302e91d57d1a43cc SIZE (crystal/crystal-0.27.2-freebsd12-aarch64) = 9692352 SHA256 (crystal/crystal-lang-crystal-0.28.0_GH0.tar.gz) = 4206f57c6345454504ec4cd8cbd1b9354b9be29fae4cdcdd173f4a28cc13b102 SIZE (crystal/crystal-lang-crystal-0.28.0_GH0.tar.gz) = 2108702 +SHA256 (crystal/2fafc7d60825.patch) = bb7022add31c2042132978e0edaedf4340689bb8d1f057d5dc4b5cccf20fb1ee +SIZE (crystal/2fafc7d60825.patch) = 1974 -- cgit From bd7e268919ca154e4681f1148b802b10bdbf8f22 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:43:55 +0000 Subject: - Update to 1.16.6 --- editors/le/Makefile | 2 +- editors/le/distinfo | 6 +++--- editors/le/pkg-plist | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/editors/le/Makefile b/editors/le/Makefile index e98b9c951019..bda2d4ebb949 100644 --- a/editors/le/Makefile +++ b/editors/le/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= le -PORTVERSION= 1.16.5 +PORTVERSION= 1.16.6 CATEGORIES= editors MASTER_SITES= http://lav.yar.ru/download/${PORTNAME}/ \ ZI diff --git a/editors/le/distinfo b/editors/le/distinfo index c7e20dc34837..13adb05cde6c 100644 --- a/editors/le/distinfo +++ b/editors/le/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527043714 -SHA256 (le-1.16.5.tar.bz2) = 730e4afdd0ab3af83e0ae9fd5e82c3164a8d6e3de524ac128fc05ecf78291790 -SIZE (le-1.16.5.tar.bz2) = 804300 +TIMESTAMP = 1565271622 +SHA256 (le-1.16.6.tar.bz2) = cf8be8ee171fb8c4254b453f66347dbca81ccd32f2123d71ab0e03eb908e6e1a +SIZE (le-1.16.6.tar.bz2) = 810400 diff --git a/editors/le/pkg-plist b/editors/le/pkg-plist index 75c4c8aa821d..3731ba76107b 100644 --- a/editors/le/pkg-plist +++ b/editors/le/pkg-plist @@ -18,6 +18,8 @@ man/man1/le.1.gz %%DATADIR%%/syntax.d/ada %%DATADIR%%/syntax.d/as %%DATADIR%%/syntax.d/awk +%%DATADIR%%/syntax.d/c +%%DATADIR%%/syntax.d/c++ %%DATADIR%%/syntax.d/c++-comment %%DATADIR%%/syntax.d/c-comment %%DATADIR%%/syntax.d/c-literal @@ -43,6 +45,7 @@ man/man1/le.1.gz %%DATADIR%%/syntax.d/perl %%DATADIR%%/syntax.d/php %%DATADIR%%/syntax.d/pod +%%DATADIR%%/syntax.d/puppet %%DATADIR%%/syntax.d/python %%DATADIR%%/syntax.d/sather %%DATADIR%%/syntax.d/shell -- cgit From 17e9ed57ede552a0efb83286a22642fc595e3028 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:45:29 +0000 Subject: - Update to 1.11.2 --- security/duo/Makefile | 2 +- security/duo/distinfo | 6 +++--- security/duo/pkg-plist | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/security/duo/Makefile b/security/duo/Makefile index ea17ac446122..2338c8a80e14 100644 --- a/security/duo/Makefile +++ b/security/duo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= duo -PORTVERSION= 1.11.1 +PORTVERSION= 1.11.2 CATEGORIES= security MASTER_SITES= https://dl.duosecurity.com/ \ ZI diff --git a/security/duo/distinfo b/security/duo/distinfo index 4d4059c082d8..a49d28ba3304 100644 --- a/security/duo/distinfo +++ b/security/duo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550888030 -SHA256 (duo_unix-1.11.1.tar.gz) = d1249501a1780c663c4e07e8be0a6e6fcf26198ea22b8cbada7527faac9937cf -SIZE (duo_unix-1.11.1.tar.gz) = 471716 +TIMESTAMP = 1565271671 +SHA256 (duo_unix-1.11.2.tar.gz) = de58fb7c82eb69d1a13f1a7f50ee20b53834cd7f1a02adf739e7d185e63c8684 +SIZE (duo_unix-1.11.2.tar.gz) = 513915 diff --git a/security/duo/pkg-plist b/security/duo/pkg-plist index fc6f659130f4..35357bdc4f54 100644 --- a/security/duo/pkg-plist +++ b/security/duo/pkg-plist @@ -1,6 +1,9 @@ @sample(sshd,,0600) etc/login_duo.conf.sample @sample(,,0600) etc/pam_duo.conf.sample +include/duo/common_ini_test.h include/duo/duo.h +include/duo/duo_private.h +include/duo/unity.h include/duo/util.h include/duo/shell.h libdata/pkgconfig/libduo.pc -- cgit From 5510974d8d868b5c2e5c5c557b643d359cf7666a Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:46:43 +0000 Subject: - Update to 5.55 --- security/stunnel/Makefile | 2 +- security/stunnel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index a49f5fc4a3e1..3b15701652c2 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 5.54 +PORTVERSION= 5.55 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 6810edd88553..d0f0515c90e8 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558102465 -SHA256 (stunnel-5.54.tar.gz) = 5e8588a6c274b46b1d63e1b50f0725f4908dec736f6588eb48d1eb3d20c87902 -SIZE (stunnel-5.54.tar.gz) = 985587 +TIMESTAMP = 1565271956 +SHA256 (stunnel-5.55.tar.gz) = 90de69f41c58342549e74c82503555a6426961b29af3ed92f878192727074c62 +SIZE (stunnel-5.55.tar.gz) = 986873 -- cgit From 51b0609820f0111c95d8e3859fba86f99a394ba9 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:47:57 +0000 Subject: - Update to 20190611 --- sysutils/vpnc-scripts/Makefile | 2 +- sysutils/vpnc-scripts/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/vpnc-scripts/Makefile b/sysutils/vpnc-scripts/Makefile index 001e0c23a065..277b095f918c 100644 --- a/sysutils/vpnc-scripts/Makefile +++ b/sysutils/vpnc-scripts/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vpnc-scripts -PORTVERSION= 20190117 +PORTVERSION= 20190611 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.infradead.org/pub/${PORTNAME}/ \ ZI diff --git a/sysutils/vpnc-scripts/distinfo b/sysutils/vpnc-scripts/distinfo index acb70119dadb..d32ae64dfb2c 100644 --- a/sysutils/vpnc-scripts/distinfo +++ b/sysutils/vpnc-scripts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548338176 -SHA256 (vpnc-scripts-20190117.tar.gz) = 41c41ff506292a17acbd0393f8bf6ecc6d750f6a716b7bae184c54d2ff67f854 -SIZE (vpnc-scripts-20190117.tar.gz) = 21412 +TIMESTAMP = 1565272029 +SHA256 (vpnc-scripts-20190611.tar.gz) = e0953af7aa336fa9f50d4db6325239024f0d6e5a95ea4ad260918c791ca96473 +SIZE (vpnc-scripts-20190611.tar.gz) = 21439 -- cgit From 6fba36dff7faa136e2f6b4e52d8b7d2c7367e038 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:51:20 +0000 Subject: - Pass maintainership of this port to ports@ --- devel/github-backup-utils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/github-backup-utils/Makefile b/devel/github-backup-utils/Makefile index b224f5b5d942..0d4b724785dd 100644 --- a/devel/github-backup-utils/Makefile +++ b/devel/github-backup-utils/Makefile @@ -7,7 +7,7 @@ DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= devel -MAINTAINER= zi@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= GitHub Enterprise Backup Utilities LICENSE= MIT -- cgit From f43a40968e87473555b1a8b2ed57835e92756ad2 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:52:48 +0000 Subject: - Update to 2.3.11 --- www/mod_auth_openidc/Makefile | 2 +- www/mod_auth_openidc/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile index bb79807df2d0..7f7bfad2300e 100644 --- a/www/mod_auth_openidc/Makefile +++ b/www/mod_auth_openidc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_auth_openidc -PORTVERSION= 2.3.10.2 +PORTVERSION= 2.3.11 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} diff --git a/www/mod_auth_openidc/distinfo b/www/mod_auth_openidc/distinfo index b587ef0ecafd..33eccad0a823 100644 --- a/www/mod_auth_openidc/distinfo +++ b/www/mod_auth_openidc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548779441 -SHA256 (pingidentity-mod_auth_openidc-v2.3.10.2_GH0.tar.gz) = 66b597fd066996d0482598b8e6a65d3ea0f784dc5ee68ca30464ed04387f120a -SIZE (pingidentity-mod_auth_openidc-v2.3.10.2_GH0.tar.gz) = 229907 +TIMESTAMP = 1565272110 +SHA256 (pingidentity-mod_auth_openidc-v2.3.11_GH0.tar.gz) = f178c4fa668b55975c60bc144ff0053ce2258521bece62f49d7003779f961897 +SIZE (pingidentity-mod_auth_openidc-v2.3.11_GH0.tar.gz) = 230648 -- cgit From 709a52a0bf3fdcfb54077bfd944d318addb76750 Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 13:57:56 +0000 Subject: - Update to 0.16 --- www/p5-LWP-Authen-OAuth2/Makefile | 2 +- www/p5-LWP-Authen-OAuth2/distinfo | 6 +++--- www/p5-LWP-Authen-OAuth2/pkg-plist | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/www/p5-LWP-Authen-OAuth2/Makefile b/www/p5-LWP-Authen-OAuth2/Makefile index 11bedd565ab2..1b55fc3e6f1b 100644 --- a/www/p5-LWP-Authen-OAuth2/Makefile +++ b/www/p5-LWP-Authen-OAuth2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= LWP-Authen-OAuth2 -PORTVERSION= 0.15 +PORTVERSION= 0.16 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-LWP-Authen-OAuth2/distinfo b/www/p5-LWP-Authen-OAuth2/distinfo index dc6b57d3e755..432b0ca07699 100644 --- a/www/p5-LWP-Authen-OAuth2/distinfo +++ b/www/p5-LWP-Authen-OAuth2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551108168 -SHA256 (LWP-Authen-OAuth2-0.15.tar.gz) = dc67e11a724eaf4f14f7e1441cff3610c05e78c5fdcb5ffc22da0ea379099924 -SIZE (LWP-Authen-OAuth2-0.15.tar.gz) = 40448 +TIMESTAMP = 1565272385 +SHA256 (LWP-Authen-OAuth2-0.16.tar.gz) = 7c70821cf112f047c8a5c764c33dbcae54426babb8957bd8a7a531eb111a60dc +SIZE (LWP-Authen-OAuth2-0.16.tar.gz) = 41235 diff --git a/www/p5-LWP-Authen-OAuth2/pkg-plist b/www/p5-LWP-Authen-OAuth2/pkg-plist index ed9c65f7070a..d3379ad25ab3 100644 --- a/www/p5-LWP-Authen-OAuth2/pkg-plist +++ b/www/p5-LWP-Authen-OAuth2/pkg-plist @@ -9,6 +9,7 @@ %%SITE_PERL%%/LWP/Authen/OAuth2/ServiceProvider/Line.pm %%SITE_PERL%%/LWP/Authen/OAuth2/ServiceProvider/Line/AccessToken.pm %%SITE_PERL%%/LWP/Authen/OAuth2/ServiceProvider/Strava.pm +%%SITE_PERL%%/LWP/Authen/OAuth2/ServiceProvider/Yahoo.pm %%PERL5_MAN3%%/LWP::Authen::OAuth2.3.gz %%PERL5_MAN3%%/LWP::Authen::OAuth2::AccessToken.3.gz %%PERL5_MAN3%%/LWP::Authen::OAuth2::AccessToken::Bearer.3.gz @@ -18,3 +19,4 @@ %%PERL5_MAN3%%/LWP::Authen::OAuth2::ServiceProvider::Google.3.gz %%PERL5_MAN3%%/LWP::Authen::OAuth2::ServiceProvider::Line.3.gz %%PERL5_MAN3%%/LWP::Authen::OAuth2::ServiceProvider::Strava.3.gz +%%PERL5_MAN3%%/LWP::Authen::OAuth2::ServiceProvider::Yahoo.3.gz -- cgit From e1f12f0b1795f211b39d69eb9ff6bff70993518f Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 14:05:22 +0000 Subject: - Update to 4.7.13 --- www/rubygem-tinymce-rails/Makefile | 2 +- www/rubygem-tinymce-rails/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/rubygem-tinymce-rails/Makefile b/www/rubygem-tinymce-rails/Makefile index 28a8f95f5a70..790fe56ab91f 100644 --- a/www/rubygem-tinymce-rails/Makefile +++ b/www/rubygem-tinymce-rails/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tinymce-rails -PORTVERSION= 4.7.4 +PORTVERSION= 4.7.13 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-tinymce-rails/distinfo b/www/rubygem-tinymce-rails/distinfo index 9b417bd97cd9..0c6aa7c3ebbf 100644 --- a/www/rubygem-tinymce-rails/distinfo +++ b/www/rubygem-tinymce-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515425902 -SHA256 (rubygem/tinymce-rails-4.7.4.gem) = ae4de23fbdce2833a21e02475d928238df2b428b48a9e1797321ea9089e09bbd -SIZE (rubygem/tinymce-rails-4.7.4.gem) = 838144 +TIMESTAMP = 1565272696 +SHA256 (rubygem/tinymce-rails-4.7.13.gem) = abc35d29a525880acf3e4090d6022247c6b29dcacb6d5f689dd2ae425f332674 +SIZE (rubygem/tinymce-rails-4.7.13.gem) = 687104 -- cgit From ab2178d23fae73c4a2e64721c81636eef91c614e Mon Sep 17 00:00:00 2001 From: zi Date: Thu, 8 Aug 2019 14:07:21 +0000 Subject: - Update to 0.004015 --- devel/p5-IO-Prompter/Makefile | 3 +-- devel/p5-IO-Prompter/distinfo | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/p5-IO-Prompter/Makefile b/devel/p5-IO-Prompter/Makefile index 76ea156dc20b..dfe8445a01a5 100644 --- a/devel/p5-IO-Prompter/Makefile +++ b/devel/p5-IO-Prompter/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Prompter -PORTVERSION= 0.004014 -PORTREVISION= 1 +PORTVERSION= 0.004015 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-IO-Prompter/distinfo b/devel/p5-IO-Prompter/distinfo index bebe7bca3027..04509bdc3f4d 100644 --- a/devel/p5-IO-Prompter/distinfo +++ b/devel/p5-IO-Prompter/distinfo @@ -1,2 +1,3 @@ -SHA256 (IO-Prompter-0.004014.tar.gz) = e90b43a8c7ba0dafc9a3f324b8cf19f3f25c3ec70dbe79c7b40c93de4509b3ae -SIZE (IO-Prompter-0.004014.tar.gz) = 43919 +TIMESTAMP = 1565273094 +SHA256 (IO-Prompter-0.004015.tar.gz) = 173192b3989b1e47e606ce9ba2cacc1da3d07de216002931288318eecf8e3ffb +SIZE (IO-Prompter-0.004015.tar.gz) = 44292 -- cgit From 679e975e934c210a3c733156805d2de138b60914 Mon Sep 17 00:00:00 2001 From: vsevolod Date: Thu, 8 Aug 2019 15:08:31 +0000 Subject: - Update to 2.1 - Use autoreconf - Add pango dependency - Remove obsoleted master site - Add patches to avoid malloc.h include PR: 234081 Submitted by: ManFree --- cad/tkgate/Makefile | 12 +- cad/tkgate/distinfo | 5 +- cad/tkgate/files/patch-config.h.in | 11 + cad/tkgate/files/patch-configure | 29 --- cad/tkgate/files/patch-configure.ac | 34 +++ cad/tkgate/files/patch-src_common_list.c | 10 + cad/tkgate/pkg-plist | 342 ++++++++++++++++++++++++------- 7 files changed, 330 insertions(+), 113 deletions(-) create mode 100644 cad/tkgate/files/patch-config.h.in delete mode 100644 cad/tkgate/files/patch-configure create mode 100644 cad/tkgate/files/patch-configure.ac create mode 100644 cad/tkgate/files/patch-src_common_list.c diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index fe120ff24498..be698447ff73 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= tkgate -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.1 CATEGORIES= cad -MASTER_SITES= http://highsecure.ru/distfiles/ \ - http://cdn.bitbucket.org/starling13/tkgate/downloads/ +MASTER_SITES= http://cdn.bitbucket.org/starling13/tkgate/downloads/ MAINTAINER= vsevolod@FreeBSD.org COMMENT= Event driven digital circuit simulator @@ -14,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES+= iconv:translit tk:build,run - +USES+= iconv:translit tk:build,run autoreconf +USE_GNOME= pango OPTIONS_DEFINE= DOCS post-patch: @@ -24,7 +22,7 @@ post-patch: 's|%%TCL_VER%%|${TCL_VER}|g; \ s|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure.ac # Remove backup files somehow installed to the stagedir post-install: diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo index 2949c199bf08..8f5ac84edd5c 100644 --- a/cad/tkgate/distinfo +++ b/cad/tkgate/distinfo @@ -1,2 +1,3 @@ -SHA256 (tkgate-2.0.0.tar.gz) = 4a9829ec8e8082ef7ceb26b358a9a3e8c632c5726a24eccb389777db701ed10a -SIZE (tkgate-2.0.0.tar.gz) = 8916887 +TIMESTAMP = 1565260422 +SHA256 (tkgate-2.1.tar.gz) = 3cafc1fbad59bca139736da1208635a99daff39a43f0e148b3d338f1fb705bc0 +SIZE (tkgate-2.1.tar.gz) = 10598271 diff --git a/cad/tkgate/files/patch-config.h.in b/cad/tkgate/files/patch-config.h.in new file mode 100644 index 000000000000..e72b1779881a --- /dev/null +++ b/cad/tkgate/files/patch-config.h.in @@ -0,0 +1,11 @@ +--- config.h.in.orig 2019-08-08 11:15:24 UTC ++++ config.h.in +@@ -57,7 +57,7 @@ + #undef HAVE_MALLOC + + /* Define to 1 if you have the header file. */ +-#undef HAVE_MALLOC_H ++/* #undef HAVE_MALLOC_H */ + + /* Define to 1 if you have the `memmove' function. */ + #undef HAVE_MEMMOVE diff --git a/cad/tkgate/files/patch-configure b/cad/tkgate/files/patch-configure deleted file mode 100644 index 64662a658613..000000000000 --- a/cad/tkgate/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2015-06-24 14:08:08 UTC -+++ configure -@@ -2887,22 +2887,22 @@ $as_echo "#define TKGATE_COPYRIGHT \"Cop - # - # Tcl/Tk version we will try to use (from most favored to least favored) - # --TKGATE_TCLTK_VERSIONS="8.6 8.5 8.4 8.3" -+TKGATE_TCLTK_VERSIONS="%%TCL_VER%%" - - # - # Directories to search for include files - # --TKGATE_INCDIRS="/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include /opt/local/include" -+TKGATE_INCDIRS="%%LOCALBASE%%/include %%TCL_INCLUDEDIR%%" - - # - # Directories to search for library files - # --TKGATE_LIBDIRS="/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib /opt/local/lib /usr/local/lib/tcl /usr/lib64" -+TKGATE_LIBDIRS="%%LOCALBASE%%/lib" - - # - # Libraries we may need if available. - # --#TKGATE_OPTLIBNAMES="dl socket nsl m" -+TKGATE_OPTLIBNAMES="m" - - - ############################################################################# diff --git a/cad/tkgate/files/patch-configure.ac b/cad/tkgate/files/patch-configure.ac new file mode 100644 index 000000000000..0e38cf9f9cb1 --- /dev/null +++ b/cad/tkgate/files/patch-configure.ac @@ -0,0 +1,34 @@ +--- configure.ac.orig 2018-12-14 11:38:37 UTC ++++ configure.ac +@@ -31,27 +31,25 @@ AC_DEFINE(TKGATE_HOMEPAGE, "https://bitbucket.org/star + # + # Configuration options. + # +- + # + # Tcl/Tk version we will try to use (from most favored to least favored) + # +-TKGATE_TCLTK_VERSIONS="8.6 8.5 8.4 8.3" ++TKGATE_TCLTK_VERSIONS="8.6" + + # + # Directories to search for include files + # +-TKGATE_INCDIRS="/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include /opt/local/include" ++TKGATE_INCDIRS="/usr/local/include /usr/local/include/tcl8.6" + + # + # Directories to search for library files + # +-TKGATE_LIBDIRS="/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib /opt/local/lib /usr/local/lib/tcl /usr/lib64" ++TKGATE_LIBDIRS="/usr/local/lib" + + # + # Libraries we may need if available. + # +-#TKGATE_OPTLIBNAMES="dl socket nsl m" +- ++TKGATE_OPTLIBNAMES="m" + + ############################################################################# + # diff --git a/cad/tkgate/files/patch-src_common_list.c b/cad/tkgate/files/patch-src_common_list.c new file mode 100644 index 000000000000..e3d427796673 --- /dev/null +++ b/cad/tkgate/files/patch-src_common_list.c @@ -0,0 +1,10 @@ +--- src/common/list.c.orig 2019-08-08 12:43:30 UTC ++++ src/common/list.c +@@ -16,7 +16,6 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ****************************************************************************/ + #include +-#include + #include "misc.h" + #include "list.h" + diff --git a/cad/tkgate/pkg-plist b/cad/tkgate/pkg-plist index 6e2b8b2e4085..b4a1370bcfad 100644 --- a/cad/tkgate/pkg-plist +++ b/cad/tkgate/pkg-plist @@ -17,6 +17,31 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/bindings/windows %%DATADIR%%/doc/74xx.txt %%DATADIR%%/doc/adding_gate_types.txt +%%DATADIR%%/doc/docbook/index.xml +%%DATADIR%%/doc/docbook/index.xsl +%%DATADIR%%/doc/docbook/index_fo.xsl +%%DATADIR%%/doc/docbook/titlepage.templates.xml +%%DATADIR%%/doc/docbook/titlepage.xsl +%%DATADIR%%/doc/en/gateEdit.html +%%DATADIR%%/doc/en/gateGmac.html +%%DATADIR%%/doc/en/gateHDL.html +%%DATADIR%%/doc/en/gateInterface.html +%%DATADIR%%/doc/en/gateIntro.html +%%DATADIR%%/doc/en/gateLibrary.html +%%DATADIR%%/doc/en/gateModules.html +%%DATADIR%%/doc/en/gateOptions.html +%%DATADIR%%/doc/en/gateSim.html +%%DATADIR%%/doc/en/gateTypeList.html +%%DATADIR%%/doc/en/index.html +%%DATADIR%%/doc/en/menagerie.html +%%DATADIR%%/doc/en/menuList.html +%%DATADIR%%/doc/en/popupmenu.html +%%DATADIR%%/doc/en/simErrors.html +%%DATADIR%%/doc/en/systemTasks.html +%%DATADIR%%/doc/en/temp.html +%%DATADIR%%/doc/en/toolbarList.html +%%DATADIR%%/doc/en/verga.html +%%DATADIR%%/doc/en/vpdCreation.html %%DATADIR%%/doc/favicon.ico %%DATADIR%%/doc/fig/adder_circuit.gif %%DATADIR%%/doc/fig/adder_circuit2.gif @@ -37,6 +62,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/before_andinv.gif %%DATADIR%%/doc/fig/before_cut.gif %%DATADIR%%/doc/fig/biggatelogo.gif +%%DATADIR%%/doc/fig/biggatelogo20.gif %%DATADIR%%/doc/fig/bittap.gif %%DATADIR%%/doc/fig/blk_claim.gif %%DATADIR%%/doc/fig/blk_close.gif @@ -54,7 +80,9 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/break.gif %%DATADIR%%/doc/fig/chdir.gif %%DATADIR%%/doc/fig/chip.gif +%%DATADIR%%/doc/fig/circprop_general-small.png %%DATADIR%%/doc/fig/circprop_general.gif +%%DATADIR%%/doc/fig/circprop_general.png %%DATADIR%%/doc/fig/circprop_simulation.gif %%DATADIR%%/doc/fig/cokemachine.gif %%DATADIR%%/doc/fig/cokemachinewin.gif @@ -72,8 +100,11 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/cpathcirc.gif %%DATADIR%%/doc/fig/cpathdlg.gif %%DATADIR%%/doc/fig/create1.gif +%%DATADIR%%/doc/fig/create1.png %%DATADIR%%/doc/fig/create2.gif +%%DATADIR%%/doc/fig/create2.png %%DATADIR%%/doc/fig/create3.gif +%%DATADIR%%/doc/fig/create3.png %%DATADIR%%/doc/fig/cretin.gif %%DATADIR%%/doc/fig/cretinout.gif %%DATADIR%%/doc/fig/cretout.gif @@ -114,6 +145,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/file_saveas.gif %%DATADIR%%/doc/fig/filemenu.gif %%DATADIR%%/doc/fig/fileopen.gif +%%DATADIR%%/doc/fig/fileopen.png %%DATADIR%%/doc/fig/forward.gif %%DATADIR%%/doc/fig/g_add.gif %%DATADIR%%/doc/fig/g_and.gif @@ -165,7 +197,9 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/inv_curs.gif %%DATADIR%%/doc/fig/invaddel.gif %%DATADIR%%/doc/fig/label.gif +%%DATADIR%%/doc/fig/libmanager-small.png %%DATADIR%%/doc/fig/libmanager.gif +%%DATADIR%%/doc/fig/libmanager.png %%DATADIR%%/doc/fig/librariesOpts.gif %%DATADIR%%/doc/fig/log.gif %%DATADIR%%/doc/fig/logic.gif @@ -177,6 +211,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/logicx.gif %%DATADIR%%/doc/fig/logicz.gif %%DATADIR%%/doc/fig/majortabs.gif +%%DATADIR%%/doc/fig/majortabs.png %%DATADIR%%/doc/fig/makeand.gif %%DATADIR%%/doc/fig/makemodinst1.gif %%DATADIR%%/doc/fig/makemodinst2.gif @@ -327,6 +362,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/solder.gif %%DATADIR%%/doc/fig/ss_done.gif %%DATADIR%%/doc/fig/statusbar.gif +%%DATADIR%%/doc/fig/statusbar.png %%DATADIR%%/doc/fig/symed_autobold.gif %%DATADIR%%/doc/fig/symed_bold.gif %%DATADIR%%/doc/fig/symed_ccwrotate.gif @@ -349,40 +385,27 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/doc/fig/symed_select_S.gif %%DATADIR%%/doc/fig/text.gif %%DATADIR%%/doc/fig/tkgate.gif +%%DATADIR%%/doc/fig/tkgatewindow-small.png +%%DATADIR%%/doc/fig/tkgatewindow.png %%DATADIR%%/doc/fig/toolbarOpts.gif %%DATADIR%%/doc/fig/tty.gif %%DATADIR%%/doc/fig/ttywindow.gif %%DATADIR%%/doc/fig/txchar.gif %%DATADIR%%/doc/fig/unknown.gif %%DATADIR%%/doc/fig/unused.gif +%%DATADIR%%/doc/fig/valid-html401.png %%DATADIR%%/doc/fig/wiretype.gif %%DATADIR%%/doc/fig/wsize.gif +%%DATADIR%%/doc/fig/xgate-small.png %%DATADIR%%/doc/fig/xgate.gif +%%DATADIR%%/doc/fig/xgate.png %%DATADIR%%/doc/fig/xmark.gif %%DATADIR%%/doc/fig/zoom_in.gif %%DATADIR%%/doc/fig/zoom_out.gif -%%DATADIR%%/doc/gateEdit.html -%%DATADIR%%/doc/gateGmac.html -%%DATADIR%%/doc/gateHDL.html -%%DATADIR%%/doc/gateInterface.html -%%DATADIR%%/doc/gateIntro.html -%%DATADIR%%/doc/gateLibrary.html -%%DATADIR%%/doc/gateModules.html -%%DATADIR%%/doc/gateOptions.html -%%DATADIR%%/doc/gateSim.html -%%DATADIR%%/doc/gateTypeList.html -%%DATADIR%%/doc/index.html %%DATADIR%%/doc/menagerie.gm -%%DATADIR%%/doc/menagerie.html -%%DATADIR%%/doc/menuList.html -%%DATADIR%%/doc/popupmenu.html -%%DATADIR%%/doc/simErrors.html -%%DATADIR%%/doc/systemTasks.html -%%DATADIR%%/doc/temp.html +%%DATADIR%%/doc/ru/index.html %%DATADIR%%/doc/tkgate.css -%%DATADIR%%/doc/toolbarList.html -%%DATADIR%%/doc/verga.html -%%DATADIR%%/doc/vpdCreation.html +%%DATADIR%%/doc/valid-html401.png %%DATADIR%%/gdf/default.gdf %%DATADIR%%/gdf/pat.gdf %%DATADIR%%/images/Ucat1.gif @@ -452,6 +475,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/images/bigdetails.gif %%DATADIR%%/images/biggatelogo.gif %%DATADIR%%/images/biggatelogo.xbm +%%DATADIR%%/images/biggatelogo20.gif %%DATADIR%%/images/bigiface.gif %%DATADIR%%/images/bigleftarrow.b %%DATADIR%%/images/bigleftarrow.gif @@ -756,6 +780,8 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/images/portrait.gif %%DATADIR%%/images/printer.gif %%DATADIR%%/images/probe.b +%%DATADIR%%/images/pulldown.b +%%DATADIR%%/images/pullup.b %%DATADIR%%/images/ram.b %%DATADIR%%/images/reg.b %%DATADIR%%/images/regLR.b @@ -950,21 +976,48 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/images/zoom_out.gif %%DATADIR%%/libexec/tkgate %%DATADIR%%/libexec/verga +%%DATADIR%%/locale/ar/messages +%%DATADIR%%/locale/az/messages +%%DATADIR%%/locale/bg/messages %%DATADIR%%/locale/ca/messages +%%DATADIR%%/locale/cs/examples/ex1/combinational.v +%%DATADIR%%/locale/cs/examples/ex2/flipflop.v +%%DATADIR%%/locale/cs/examples/ex3/counter.v +%%DATADIR%%/locale/cs/examples/ex4/trff.v +%%DATADIR%%/locale/cs/examples/ex5/menagerie.gm +%%DATADIR%%/locale/cs/examples/ex5/menagerie.gss +%%DATADIR%%/locale/cs/examples/ex5/menagerie.map +%%DATADIR%%/locale/cs/examples/ex5/menagerie.mem +%%DATADIR%%/locale/cs/examples/ex5/menagerie.v +%%DATADIR%%/locale/cs/examples/ex5/menagerie.vs +%%DATADIR%%/locale/cs/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/cs/examples/ex6/coke.v +%%DATADIR%%/locale/cs/examples/ex7/stdlogic.v +%%DATADIR%%/locale/cs/examples/index.v %%DATADIR%%/locale/cs/messages -%%DATADIR%%/locale/cs/messages.iso-8859-2 +%%DATADIR%%/locale/cs/tutorials/advanced.v +%%DATADIR%%/locale/cs/tutorials/combinational1.v +%%DATADIR%%/locale/cs/tutorials/combinational2.v +%%DATADIR%%/locale/cs/tutorials/combinational3.v +%%DATADIR%%/locale/cs/tutorials/combinational4.v +%%DATADIR%%/locale/cs/tutorials/combinational5.v +%%DATADIR%%/locale/cs/tutorials/create.v +%%DATADIR%%/locale/cs/tutorials/gates.v +%%DATADIR%%/locale/cs/tutorials/group.v +%%DATADIR%%/locale/cs/tutorials/index.v +%%DATADIR%%/locale/cs/tutorials/interface.txt +%%DATADIR%%/locale/cs/tutorials/modules.v +%%DATADIR%%/locale/cs/tutorials/options.v +%%DATADIR%%/locale/cs/tutorials/sequential1.v +%%DATADIR%%/locale/cs/tutorials/sequential2.v +%%DATADIR%%/locale/cs/tutorials/sequential3.v +%%DATADIR%%/locale/cs/tutorials/sequential4.v +%%DATADIR%%/locale/cs/tutorials/sequential5.v +%%DATADIR%%/locale/cs/tutorials/verilog.v +%%DATADIR%%/locale/cs/tutorials/welcome.v +%%DATADIR%%/locale/cs/tutorials/wires.v %%DATADIR%%/locale/cy/messages -%%DATADIR%%/locale/de/examples.18/ex1/combinational.v -%%DATADIR%%/locale/de/examples.18/ex2/flipflop.v -%%DATADIR%%/locale/de/examples.18/ex3/counter.v -%%DATADIR%%/locale/de/examples.18/ex4/trff.v -%%DATADIR%%/locale/de/examples.18/ex5/menagerie.gm -%%DATADIR%%/locale/de/examples.18/ex5/menagerie.gss -%%DATADIR%%/locale/de/examples.18/ex5/menagerie.map -%%DATADIR%%/locale/de/examples.18/ex5/menagerie.mem -%%DATADIR%%/locale/de/examples.18/ex5/menagerie.v -%%DATADIR%%/locale/de/examples.18/ex5/x-menagerie.mem -%%DATADIR%%/locale/de/examples.18/index.v +%%DATADIR%%/locale/da/messages %%DATADIR%%/locale/de/examples/ex1/combinational.v %%DATADIR%%/locale/de/examples/ex2/flipflop.v %%DATADIR%%/locale/de/examples/ex3/counter.v @@ -977,17 +1030,9 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/de/examples/ex5/menagerie.vs %%DATADIR%%/locale/de/examples/ex5/x-menagerie.mem %%DATADIR%%/locale/de/examples/ex6/coke.v +%%DATADIR%%/locale/de/examples/ex7/stdlogic.v %%DATADIR%%/locale/de/examples/index.v %%DATADIR%%/locale/de/messages -%%DATADIR%%/locale/de/messages.iso8859 -%%DATADIR%%/locale/de/tutorials.18/create_tut.v -%%DATADIR%%/locale/de/tutorials.18/edit1_tut.v -%%DATADIR%%/locale/de/tutorials.18/edit2_tut.v -%%DATADIR%%/locale/de/tutorials.18/edwire_tut.v -%%DATADIR%%/locale/de/tutorials.18/module_tut.v -%%DATADIR%%/locale/de/tutorials.18/seqsim_tut.v -%%DATADIR%%/locale/de/tutorials.18/sim_tut.v -%%DATADIR%%/locale/de/tutorials.18/welcome_tut.v %%DATADIR%%/locale/de/tutorials/advanced.v %%DATADIR%%/locale/de/tutorials/combinational1.v %%DATADIR%%/locale/de/tutorials/combinational2.v @@ -996,13 +1041,10 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/de/tutorials/combinational5.v %%DATADIR%%/locale/de/tutorials/create.v %%DATADIR%%/locale/de/tutorials/gates.v -%%DATADIR%%/locale/de/tutorials/glossary.v %%DATADIR%%/locale/de/tutorials/group.v %%DATADIR%%/locale/de/tutorials/index.v %%DATADIR%%/locale/de/tutorials/interface.txt -%%DATADIR%%/locale/de/tutorials/moddef_tut.v %%DATADIR%%/locale/de/tutorials/modules.v -%%DATADIR%%/locale/de/tutorials/notes.v %%DATADIR%%/locale/de/tutorials/options.v %%DATADIR%%/locale/de/tutorials/sequential1.v %%DATADIR%%/locale/de/tutorials/sequential2.v @@ -1011,9 +1053,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/de/tutorials/sequential5.v %%DATADIR%%/locale/de/tutorials/verilog.v %%DATADIR%%/locale/de/tutorials/welcome.v -%%DATADIR%%/locale/de/tutorials/wire2.v %%DATADIR%%/locale/de/tutorials/wires.v -%%DATADIR%%/locale/en/all.txt %%DATADIR%%/locale/en/examples/ex1/combinational.v %%DATADIR%%/locale/en/examples/ex2/flipflop.v %%DATADIR%%/locale/en/examples/ex3/counter.v @@ -1026,8 +1066,8 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/en/examples/ex5/menagerie.vs %%DATADIR%%/locale/en/examples/ex5/x-menagerie.mem %%DATADIR%%/locale/en/examples/ex6/coke.v +%%DATADIR%%/locale/en/examples/ex7/stdlogic.v %%DATADIR%%/locale/en/examples/index.v -%%DATADIR%%/locale/en/license.txt %%DATADIR%%/locale/en/messages %%DATADIR%%/locale/en/tutorials/advanced.v %%DATADIR%%/locale/en/tutorials/combinational1.v @@ -1050,33 +1090,98 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/en/tutorials/verilog.v %%DATADIR%%/locale/en/tutorials/welcome.v %%DATADIR%%/locale/en/tutorials/wires.v -%%DATADIR%%/locale/en/unused.txt +%%DATADIR%%/locale/es/examples/ex1/combinational.v +%%DATADIR%%/locale/es/examples/ex2/flipflop.v +%%DATADIR%%/locale/es/examples/ex3/counter.v +%%DATADIR%%/locale/es/examples/ex4/trff.v +%%DATADIR%%/locale/es/examples/ex5/menagerie.gm +%%DATADIR%%/locale/es/examples/ex5/menagerie.gss +%%DATADIR%%/locale/es/examples/ex5/menagerie.map +%%DATADIR%%/locale/es/examples/ex5/menagerie.mem +%%DATADIR%%/locale/es/examples/ex5/menagerie.v +%%DATADIR%%/locale/es/examples/ex5/menagerie.vs +%%DATADIR%%/locale/es/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/es/examples/ex6/coke.v +%%DATADIR%%/locale/es/examples/ex7/stdlogic.v +%%DATADIR%%/locale/es/examples/index.v %%DATADIR%%/locale/es/messages +%%DATADIR%%/locale/es/tutorials/advanced.v +%%DATADIR%%/locale/es/tutorials/combinational1.v +%%DATADIR%%/locale/es/tutorials/combinational2.v +%%DATADIR%%/locale/es/tutorials/combinational3.v +%%DATADIR%%/locale/es/tutorials/combinational4.v +%%DATADIR%%/locale/es/tutorials/combinational5.v +%%DATADIR%%/locale/es/tutorials/create.v +%%DATADIR%%/locale/es/tutorials/gates.v +%%DATADIR%%/locale/es/tutorials/group.v +%%DATADIR%%/locale/es/tutorials/index.v +%%DATADIR%%/locale/es/tutorials/interface.txt +%%DATADIR%%/locale/es/tutorials/modules.v +%%DATADIR%%/locale/es/tutorials/options.v +%%DATADIR%%/locale/es/tutorials/sequential1.v +%%DATADIR%%/locale/es/tutorials/sequential2.v +%%DATADIR%%/locale/es/tutorials/sequential3.v +%%DATADIR%%/locale/es/tutorials/sequential4.v +%%DATADIR%%/locale/es/tutorials/sequential5.v +%%DATADIR%%/locale/es/tutorials/verilog.v +%%DATADIR%%/locale/es/tutorials/welcome.v +%%DATADIR%%/locale/es/tutorials/wires.v %%DATADIR%%/locale/fr/messages -%%DATADIR%%/locale/it/examples.18/ex1/combinational.v -%%DATADIR%%/locale/it/examples.18/ex2/flipflop.v -%%DATADIR%%/locale/it/examples.18/ex3/counter.v -%%DATADIR%%/locale/it/examples.18/ex4/trff.v -%%DATADIR%%/locale/it/examples.18/ex5/menagerie.gm -%%DATADIR%%/locale/it/examples.18/ex5/menagerie.gss -%%DATADIR%%/locale/it/examples.18/ex5/menagerie.map -%%DATADIR%%/locale/it/examples.18/ex5/menagerie.mem -%%DATADIR%%/locale/it/examples.18/ex5/menagerie.v -%%DATADIR%%/locale/it/examples.18/ex5/x-menagerie.mem -%%DATADIR%%/locale/it/examples.18/index.v +%%DATADIR%%/locale/gl/messages +%%DATADIR%%/locale/hr/messages +%%DATADIR%%/locale/id/messages +%%DATADIR%%/locale/is/messages +%%DATADIR%%/locale/it/examples/ex1/combinational.v +%%DATADIR%%/locale/it/examples/ex2/flipflop.v +%%DATADIR%%/locale/it/examples/ex3/counter.v +%%DATADIR%%/locale/it/examples/ex4/trff.v +%%DATADIR%%/locale/it/examples/ex5/menagerie.gm +%%DATADIR%%/locale/it/examples/ex5/menagerie.gss +%%DATADIR%%/locale/it/examples/ex5/menagerie.map +%%DATADIR%%/locale/it/examples/ex5/menagerie.mem +%%DATADIR%%/locale/it/examples/ex5/menagerie.v +%%DATADIR%%/locale/it/examples/ex5/menagerie.vs +%%DATADIR%%/locale/it/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/it/examples/ex6/coke.v +%%DATADIR%%/locale/it/examples/ex7/stdlogic.v +%%DATADIR%%/locale/it/examples/index.v %%DATADIR%%/locale/it/messages -%%DATADIR%%/locale/it/tutorials.18/create_tut.v -%%DATADIR%%/locale/it/tutorials.18/edit1_tut.v -%%DATADIR%%/locale/it/tutorials.18/edit2_tut.v -%%DATADIR%%/locale/it/tutorials.18/edwire_tut.v -%%DATADIR%%/locale/it/tutorials.18/module_tut.v -%%DATADIR%%/locale/it/tutorials.18/seqsim_tut.v -%%DATADIR%%/locale/it/tutorials.18/sim_tut.v -%%DATADIR%%/locale/it/tutorials.18/welcome_tut.v +%%DATADIR%%/locale/it/tutorials/advanced.v +%%DATADIR%%/locale/it/tutorials/combinational1.v +%%DATADIR%%/locale/it/tutorials/combinational2.v +%%DATADIR%%/locale/it/tutorials/combinational3.v +%%DATADIR%%/locale/it/tutorials/combinational4.v +%%DATADIR%%/locale/it/tutorials/combinational5.v +%%DATADIR%%/locale/it/tutorials/create.v +%%DATADIR%%/locale/it/tutorials/gates.v +%%DATADIR%%/locale/it/tutorials/group.v +%%DATADIR%%/locale/it/tutorials/index.v +%%DATADIR%%/locale/it/tutorials/interface.txt +%%DATADIR%%/locale/it/tutorials/modules.v +%%DATADIR%%/locale/it/tutorials/options.v +%%DATADIR%%/locale/it/tutorials/sequential1.v +%%DATADIR%%/locale/it/tutorials/sequential2.v +%%DATADIR%%/locale/it/tutorials/sequential3.v +%%DATADIR%%/locale/it/tutorials/sequential4.v +%%DATADIR%%/locale/it/tutorials/sequential5.v +%%DATADIR%%/locale/it/tutorials/verilog.v +%%DATADIR%%/locale/it/tutorials/welcome.v +%%DATADIR%%/locale/it/tutorials/wires.v +%%DATADIR%%/locale/ja/examples/ex1/combinational.v +%%DATADIR%%/locale/ja/examples/ex2/flipflop.v +%%DATADIR%%/locale/ja/examples/ex3/counter.v +%%DATADIR%%/locale/ja/examples/ex4/trff.v +%%DATADIR%%/locale/ja/examples/ex5/menagerie.gm +%%DATADIR%%/locale/ja/examples/ex5/menagerie.gss +%%DATADIR%%/locale/ja/examples/ex5/menagerie.map +%%DATADIR%%/locale/ja/examples/ex5/menagerie.mem +%%DATADIR%%/locale/ja/examples/ex5/menagerie.v +%%DATADIR%%/locale/ja/examples/ex5/menagerie.vs +%%DATADIR%%/locale/ja/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/ja/examples/ex6/coke.v +%%DATADIR%%/locale/ja/examples/ex7/stdlogic.v +%%DATADIR%%/locale/ja/examples/index.v %%DATADIR%%/locale/ja/messages -%%DATADIR%%/locale/ja/messages.euc -%%DATADIR%%/locale/ja/messages.utf8 -%%DATADIR%%/locale/ja/messages.xxx %%DATADIR%%/locale/ja/tutorials/advanced.v %%DATADIR%%/locale/ja/tutorials/combinational1.v %%DATADIR%%/locale/ja/tutorials/combinational2.v @@ -1085,13 +1190,10 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/ja/tutorials/combinational5.v %%DATADIR%%/locale/ja/tutorials/create.v %%DATADIR%%/locale/ja/tutorials/gates.v -%%DATADIR%%/locale/ja/tutorials/glossary.v %%DATADIR%%/locale/ja/tutorials/group.v %%DATADIR%%/locale/ja/tutorials/index.v %%DATADIR%%/locale/ja/tutorials/interface.txt -%%DATADIR%%/locale/ja/tutorials/moddef_tut.v %%DATADIR%%/locale/ja/tutorials/modules.v -%%DATADIR%%/locale/ja/tutorials/notes.v %%DATADIR%%/locale/ja/tutorials/options.v %%DATADIR%%/locale/ja/tutorials/sequential1.v %%DATADIR%%/locale/ja/tutorials/sequential2.v @@ -1100,8 +1202,49 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/ja/tutorials/sequential5.v %%DATADIR%%/locale/ja/tutorials/verilog.v %%DATADIR%%/locale/ja/tutorials/welcome.v -%%DATADIR%%/locale/ja/tutorials/wire2.v %%DATADIR%%/locale/ja/tutorials/wires.v +%%DATADIR%%/locale/lt/messages +%%DATADIR%%/locale/ms/messages +%%DATADIR%%/locale/nl/messages +%%DATADIR%%/locale/oc/messages +%%DATADIR%%/locale/pl/examples/ex1/combinational.v +%%DATADIR%%/locale/pl/examples/ex2/flipflop.v +%%DATADIR%%/locale/pl/examples/ex3/counter.v +%%DATADIR%%/locale/pl/examples/ex4/trff.v +%%DATADIR%%/locale/pl/examples/ex5/menagerie.gm +%%DATADIR%%/locale/pl/examples/ex5/menagerie.gss +%%DATADIR%%/locale/pl/examples/ex5/menagerie.map +%%DATADIR%%/locale/pl/examples/ex5/menagerie.mem +%%DATADIR%%/locale/pl/examples/ex5/menagerie.v +%%DATADIR%%/locale/pl/examples/ex5/menagerie.vs +%%DATADIR%%/locale/pl/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/pl/examples/ex6/coke.v +%%DATADIR%%/locale/pl/examples/ex7/stdlogic.v +%%DATADIR%%/locale/pl/examples/index.v +%%DATADIR%%/locale/pl/messages +%%DATADIR%%/locale/pl/tutorials/advanced.v +%%DATADIR%%/locale/pl/tutorials/combinational1.v +%%DATADIR%%/locale/pl/tutorials/combinational2.v +%%DATADIR%%/locale/pl/tutorials/combinational3.v +%%DATADIR%%/locale/pl/tutorials/combinational4.v +%%DATADIR%%/locale/pl/tutorials/combinational5.v +%%DATADIR%%/locale/pl/tutorials/create.v +%%DATADIR%%/locale/pl/tutorials/gates.v +%%DATADIR%%/locale/pl/tutorials/group.v +%%DATADIR%%/locale/pl/tutorials/index.v +%%DATADIR%%/locale/pl/tutorials/interface.txt +%%DATADIR%%/locale/pl/tutorials/modules.v +%%DATADIR%%/locale/pl/tutorials/options.v +%%DATADIR%%/locale/pl/tutorials/sequential1.v +%%DATADIR%%/locale/pl/tutorials/sequential2.v +%%DATADIR%%/locale/pl/tutorials/sequential3.v +%%DATADIR%%/locale/pl/tutorials/sequential4.v +%%DATADIR%%/locale/pl/tutorials/sequential5.v +%%DATADIR%%/locale/pl/tutorials/verilog.v +%%DATADIR%%/locale/pl/tutorials/welcome.v +%%DATADIR%%/locale/pl/tutorials/wires.v +%%DATADIR%%/locale/pt/messages +%%DATADIR%%/locale/pt_BR/messages %%DATADIR%%/locale/ru/examples/ex1/combinational.v %%DATADIR%%/locale/ru/examples/ex2/flipflop.v %%DATADIR%%/locale/ru/examples/ex3/counter.v @@ -1116,7 +1259,6 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/ru/examples/ex6/coke.v %%DATADIR%%/locale/ru/examples/ex7/stdlogic.v %%DATADIR%%/locale/ru/examples/index.v -%%DATADIR%%/locale/ru/license.txt %%DATADIR%%/locale/ru/messages %%DATADIR%%/locale/ru/tutorials/advanced.v %%DATADIR%%/locale/ru/tutorials/combinational1.v @@ -1128,6 +1270,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/ru/tutorials/gates.v %%DATADIR%%/locale/ru/tutorials/group.v %%DATADIR%%/locale/ru/tutorials/index.v +%%DATADIR%%/locale/ru/tutorials/interface.txt %%DATADIR%%/locale/ru/tutorials/modules.v %%DATADIR%%/locale/ru/tutorials/options.v %%DATADIR%%/locale/ru/tutorials/sequential1.v @@ -1138,6 +1281,46 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/locale/ru/tutorials/verilog.v %%DATADIR%%/locale/ru/tutorials/welcome.v %%DATADIR%%/locale/ru/tutorials/wires.v +%%DATADIR%%/locale/sk/messages +%%DATADIR%%/locale/sr/messages +%%DATADIR%%/locale/sv/messages +%%DATADIR%%/locale/tr/messages +%%DATADIR%%/locale/uk/examples/ex1/combinational.v +%%DATADIR%%/locale/uk/examples/ex2/flipflop.v +%%DATADIR%%/locale/uk/examples/ex3/counter.v +%%DATADIR%%/locale/uk/examples/ex4/trff.v +%%DATADIR%%/locale/uk/examples/ex5/menagerie.gm +%%DATADIR%%/locale/uk/examples/ex5/menagerie.gss +%%DATADIR%%/locale/uk/examples/ex5/menagerie.map +%%DATADIR%%/locale/uk/examples/ex5/menagerie.mem +%%DATADIR%%/locale/uk/examples/ex5/menagerie.v +%%DATADIR%%/locale/uk/examples/ex5/menagerie.vs +%%DATADIR%%/locale/uk/examples/ex5/x-menagerie.mem +%%DATADIR%%/locale/uk/examples/ex6/coke.v +%%DATADIR%%/locale/uk/examples/ex7/stdlogic.v +%%DATADIR%%/locale/uk/examples/index.v +%%DATADIR%%/locale/uk/messages +%%DATADIR%%/locale/uk/tutorials/advanced.v +%%DATADIR%%/locale/uk/tutorials/combinational1.v +%%DATADIR%%/locale/uk/tutorials/combinational2.v +%%DATADIR%%/locale/uk/tutorials/combinational3.v +%%DATADIR%%/locale/uk/tutorials/combinational4.v +%%DATADIR%%/locale/uk/tutorials/combinational5.v +%%DATADIR%%/locale/uk/tutorials/create.v +%%DATADIR%%/locale/uk/tutorials/gates.v +%%DATADIR%%/locale/uk/tutorials/group.v +%%DATADIR%%/locale/uk/tutorials/index.v +%%DATADIR%%/locale/uk/tutorials/interface.txt +%%DATADIR%%/locale/uk/tutorials/modules.v +%%DATADIR%%/locale/uk/tutorials/options.v +%%DATADIR%%/locale/uk/tutorials/sequential1.v +%%DATADIR%%/locale/uk/tutorials/sequential2.v +%%DATADIR%%/locale/uk/tutorials/sequential3.v +%%DATADIR%%/locale/uk/tutorials/sequential4.v +%%DATADIR%%/locale/uk/tutorials/sequential5.v +%%DATADIR%%/locale/uk/tutorials/verilog.v +%%DATADIR%%/locale/uk/tutorials/welcome.v +%%DATADIR%%/locale/uk/tutorials/wires.v %%DATADIR%%/primitives/README %%DATADIR%%/primitives/adder.v %%DATADIR%%/primitives/and.v @@ -1220,6 +1403,7 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/scripts/tkgate.tcl %%DATADIR%%/scripts/toolbar.tcl %%DATADIR%%/scripts/tree.tcl +%%DATADIR%%/scripts/tree.tcl.bak %%DATADIR%%/scripts/undo.tcl %%DATADIR%%/scripts/vpd.tcl %%DATADIR%%/scripts/wizard.tcl @@ -1303,6 +1487,10 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/test/verga/fibonacci.v %%DATADIR%%/test/verga/fork1.out %%DATADIR%%/test/verga/fork1.v +%%DATADIR%%/test/verga/gatelevel.out +%%DATADIR%%/test/verga/gatelevel.v +%%DATADIR%%/test/verga/gatelevel1.out +%%DATADIR%%/test/verga/gatelevel1.v %%DATADIR%%/test/verga/grammar.out %%DATADIR%%/test/verga/grammar.v %%DATADIR%%/test/verga/loops.out @@ -1385,13 +1573,17 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/test/verga/trireg1.v %%DATADIR%%/test/verga/tristate1.out %%DATADIR%%/test/verga/tristate1.v +%%DATADIR%%/test/verga/tristate2.out +%%DATADIR%%/test/verga/tristate2.v %%DATADIR%%/test/verga/uops.out %%DATADIR%%/test/verga/uops.v %%DATADIR%%/test/verga/verga.out %%DATADIR%%/test/verga/wire1.out %%DATADIR%%/test/verga/wire1.v %%DATADIR%%/vlib/74xx.v +%%DATADIR%%/vlib/74xxGateLevel.v %%DATADIR%%/vlib/coke.v +%%DATADIR%%/vlib/m68xx.v %%DATADIR%%/vlib/timer.v %%DATADIR%%/vlib/timer.xv %%DATADIR%%/vlib/tty.v -- cgit From 9bc42512ca9ae06095314bf2a6dd5f1c974f7365 Mon Sep 17 00:00:00 2001 From: jgh Date: Thu, 8 Aug 2019 15:28:13 +0000 Subject: - reclaim --- deskutils/dailystrips/Makefile | 2 +- deskutils/menumaker/Makefile | 9 +++++---- deskutils/xpad/Makefile | 2 +- deskutils/xpad3/Makefile | 2 +- devel/libvc/Makefile | 2 +- dns/py-namebench/Makefile | 2 +- editors/leafpad/Makefile | 2 +- games/blackjackclient/Makefile | 2 +- games/java-games-suite/Makefile | 2 +- games/jchessboard/Makefile | 2 +- mail/mutt_vc_query/Makefile | 2 +- ports-mgmt/port-authoring-tools/Makefile | 2 +- ports-mgmt/port-maintenance-tools/Makefile | 2 +- sysutils/clonehdd/Makefile | 2 +- sysutils/jvmtop/Makefile | 2 +- sysutils/pstree/Makefile | 2 +- www/py-trello/Makefile | 2 +- x11-wm/fluxter/Makefile | 2 +- x11/fluxbg/Makefile | 2 +- 19 files changed, 23 insertions(+), 22 deletions(-) diff --git a/deskutils/dailystrips/Makefile b/deskutils/dailystrips/Makefile index 61fd16212b31..f8d522fcf077 100644 --- a/deskutils/dailystrips/Makefile +++ b/deskutils/dailystrips/Makefile @@ -8,7 +8,7 @@ PORTEPOCH= 1 CATEGORIES= deskutils www MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Utility to download or view your favorite online comic strips daily LICENSE= GPLv2 diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile index 931f7359d3c5..ea2a8e4bd269 100644 --- a/deskutils/menumaker/Makefile +++ b/deskutils/menumaker/Makefile @@ -2,21 +2,22 @@ # $FreeBSD$ PORTNAME= menumaker -PORTVERSION= 0.99.10 -PORTREVISION= 1 +PORTVERSION= 0.99.11 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Menu generator for X Window Managers and desktop environments LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake python +USES= gmake python shebangfix GNU_CONFIGURE= yes NO_ARCH= yes +SHEBANG_FILES= ${WRKSRC}/mmaker + INFO= mmaker .include diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index c0ee092079fa..eb6246d25815 100644 --- a/deskutils/xpad/Makefile +++ b/deskutils/xpad/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Virtual note-pad system for your X11 desktop LICENSE= GPLv3 diff --git a/deskutils/xpad3/Makefile b/deskutils/xpad3/Makefile index 44b14a6ea586..92b4dc23ec7e 100644 --- a/deskutils/xpad3/Makefile +++ b/deskutils/xpad3/Makefile @@ -8,7 +8,7 @@ CATEGORIES= deskutils MASTER_SITES= http://launchpad.net/xpad/stable/${PORTVERSION}/+download/ PKGNAMESUFFIX= 3 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Virtual note-pad system for your X11 desktop LICENSE= GPLv3 diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile index 442468388ae4..950349e033b2 100644 --- a/devel/libvc/Makefile +++ b/devel/libvc/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/rolo/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= vCard library USES= bison libtool tar:bzip2 diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile index 77aef7c4367b..3f6443693991 100644 --- a/dns/py-namebench/Makefile +++ b/dns/py-namebench/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/bsdsrc/${.CURDIR:T} \ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Open Source DNS benchmark utility LICENSE= APACHE20 diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile index 43bd2bf94f23..2b01743572d6 100644 --- a/editors/leafpad/Makefile +++ b/editors/leafpad/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= SAVANNAH -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= GTK+ based simple text editor LICENSE= GPLv2 diff --git a/games/blackjackclient/Makefile b/games/blackjackclient/Makefile index b153581bbf82..00a89e86f35e 100644 --- a/games/blackjackclient/Makefile +++ b/games/blackjackclient/Makefile @@ -7,7 +7,7 @@ CATEGORIES= games java MASTER_SITES= SF/t-blackjack/ DISTNAME= t-blackjack-beta -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Simple Blackjack game in Java USES= zip diff --git a/games/java-games-suite/Makefile b/games/java-games-suite/Makefile index 8c739ef6d733..55f9d4c94b36 100644 --- a/games/java-games-suite/Makefile +++ b/games/java-games-suite/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.0 CATEGORIES= games java MASTER_SITES= SF/javagamessuite -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Simple Java games collection USE_JAVA= yes diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile index 2c6f7e433021..48358d06ac11 100644 --- a/games/jchessboard/Makefile +++ b/games/jchessboard/Makefile @@ -8,7 +8,7 @@ CATEGORIES= games java MASTER_SITES= SF DISTNAME= JChessBoard-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Chess game and PGN viewer/editor written in Java LICENSE= GPLv2 diff --git a/mail/mutt_vc_query/Makefile b/mail/mutt_vc_query/Makefile index 184a2f72b23f..7215ed907158 100644 --- a/mail/mutt_vc_query/Makefile +++ b/mail/mutt_vc_query/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 002 CATEGORIES= mail MASTER_SITES= SF/rolo/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= vCard query utility for mutt BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/ports-mgmt/port-authoring-tools/Makefile b/ports-mgmt/port-authoring-tools/Makefile index 0be5f5282ff8..5895f6e35613 100644 --- a/ports-mgmt/port-authoring-tools/Makefile +++ b/ports-mgmt/port-authoring-tools/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= ports-mgmt -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= "meta-port" for tools to test and submit changes to ports USES= metaport diff --git a/ports-mgmt/port-maintenance-tools/Makefile b/ports-mgmt/port-maintenance-tools/Makefile index b2d9edbd13d4..08073ee0549a 100644 --- a/ports-mgmt/port-maintenance-tools/Makefile +++ b/ports-mgmt/port-maintenance-tools/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0 PORTREVISION= 3 CATEGORIES= ports-mgmt -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Meta-port for administrative tools to maintain ports USES= metaport diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile index 86ac5e35f361..6889e37c26d6 100644 --- a/sysutils/clonehdd/Makefile +++ b/sysutils/clonehdd/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Tool for clone HDD on FreeBSD LICENSE= GPLv2 diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile index 771e89028390..141b1e127a3f 100644 --- a/sysutils/jvmtop/Makefile +++ b/sysutils/jvmtop/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.8.0 PORTREVISION= 1 CATEGORIES= sysutils java -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Lightweight console application to monitor running jvms LICENSE= GPLv2 diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index 03e729a66b01..702e7116a565 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -7,7 +7,7 @@ CATEGORIES= sysutils MASTER_SITES= ftp://ftp.thp.uni-due.de/pub/source/ \ LOCAL/jgh/sysutils/${PORTNAME}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= List processes as a tree USES= alias diff --git a/www/py-trello/Makefile b/www/py-trello/Makefile index d407974c2364..c9c461a47d54 100644 --- a/www/py-trello/Makefile +++ b/www/py-trello/Makefile @@ -8,7 +8,7 @@ CATEGORIES= www devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Python library for interacting with the Trello API LICENSE= FOG diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile index 98efbc95c903..1055839f9c05 100644 --- a/x11-wm/fluxter/Makefile +++ b/x11-wm/fluxter/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.hydrus.org.uk/downloads/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Desktop pager for the Fluxbox Slit LICENSE= GPLv2 diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile index e6f99567abf6..7220c2753e5c 100644 --- a/x11/fluxbg/Makefile +++ b/x11/fluxbg/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 15 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Background changer for fluxbox/blackbox LIB_DEPENDS= libgtkmm-2.0.so:x11-toolkits/gtkmm20 -- cgit From 1896875b545da34ef7ebddfb011e4749b080a56d Mon Sep 17 00:00:00 2001 From: girgen Date: Thu, 8 Aug 2019 15:29:38 +0000 Subject: Add security information for PostgreSQL --- security/vuxml/vuln.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index e74f68852239..f51c654dc0e2 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -58,6 +58,80 @@ Notes: * Do not forget port variants (linux-f10-libxml2, libxml2, etc.) --> + + PostgresSQL -- TYPE in pg_temp execute arbitrary SQL during `SECURITY DEFINER` execution + + + postgresql11-server + 11.5 + + + postgresql10-server + 10.10 + + + postgresql96-server + 9.6.15 + + + postgresql95-server + 9.5.19 + + + postgresql94-server + 9.4.24 + + + + +

The PostgreSQL project reports:

+
+

+ Versions Affected: 9.4 - 11 +

+

+ Given a suitable `SECURITY DEFINER` function, an attacker can execute arbitrary + SQL under the identity of the function owner. An attack requires `EXECUTE` + permission on the function, which must itself contain a function call having + inexact argument type match. For example, `length('foo'::varchar)` and + `length('foo')` are inexact, while `length('foo'::text)` is exact. + As part of exploiting this vulnerability, the attacker uses `CREATE DOMAIN` + to create a type in a `pg_temp` schema. The attack pattern and fix are similar + to that for CVE-2007-2138. +

+

+ Writing `SECURITY DEFINER` functions continues to require following + the considerations noted in the documentation: +

+

+ https://www.postgresql.org/docs/devel/sql-createfunction.html#SQL-CREATEFUNCTION-SECURITY +

+
+
+

+ Versions Affected: 11 +

+

+ In a database containing hypothetical, user-defined hash equality operators, + an attacker could read arbitrary bytes of server memory. For an attack to + become possible, a superuser would need to create unusual operators. + It is possible for operators not purpose-crafted for attack to have + the properties that enable an attack, but we are not aware of specific examples. +

+
+ +
+ + https://www.postgresql.org/about/news/1960/ + CVE-2019-10208 + CVE-2019-10209 + + + 2019-08-08 + 2019-08-08 + +
+ Django -- multiple vulnerabilities -- cgit From e0d9bc6b7619e4bb98beaf958e1d133c19503bcb Mon Sep 17 00:00:00 2001 From: girgen Date: Thu, 8 Aug 2019 15:33:02 +0000 Subject: iThe PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 11.5, 10.10, 9.6.15, 9.5.19, and 9.4.24, as well as the third beta of PostgreSQL 12. This release fixes two security issues in the PostgreSQL server, two security issues found in one of the PostgreSQL Windows installers, and over 40 bugs reported since the previous release. Users should install these updates as soon as possible. A Note on the PostgreSQL 12 Beta ================================ In the spirit of the open source PostgreSQL community, we strongly encourage you to test the new features of PostgreSQL 12 in your database systems to help us eliminate any bugs or other issues that may exist. While we do not advise you to run PostgreSQL 12 Beta 3 in your production environments, we encourage you to find ways to run your typical application workloads against this beta release. Your testing and feedback will help the community ensure that the PostgreSQL 12 release upholds our standards of providing a stable, reliable release of the world's most advanced open source relational database. Security Issues =============== Two security vulnerabilities have been closed by this release: * CVE-2019-10208: `TYPE` in `pg_temp` executes arbitrary SQL during `SECURITY DEFINER` execution Versions Affected: 9.4 - 11 Given a suitable `SECURITY DEFINER` function, an attacker can execute arbitrary SQL under the identity of the function owner. An attack requires `EXECUTE` permission on the function, which must itself contain a function call having inexact argument type match. For example, `length('foo'::varchar)` and `length('foo')` are inexact, while `length('foo'::text)` is exact. As part of exploiting this vulnerability, the attacker uses `CREATE DOMAIN` to create a type in a `pg_temp` schema. The attack pattern and fix are similar to that for CVE-2007-2138. Writing `SECURITY DEFINER` functions continues to require following the considerations noted in the documentation: https://www.postgresql.org/docs/devel/sql-createfunction.html#SQL-CREATEFUNCTION-SECURITY The PostgreSQL project thanks Tom Lane for reporting this problem. * CVE-2019-10209: Memory disclosure in cross-type comparison for hashed subplan Versions Affected: 11 In a database containing hypothetical, user-defined hash equality operators, an attacker could read arbitrary bytes of server memory. For an attack to become possible, a superuser would need to create unusual operators. It is possible for operators not purpose-crafted for attack to have the properties that enable an attack, but we are not aware of specific examples. The PostgreSQL project thanks Andreas Seltenreich for reporting this problem. --- Mk/Uses/pgsql.mk | 2 +- databases/postgresql10-client/Makefile | 2 +- databases/postgresql10-contrib/Makefile | 2 +- databases/postgresql10-docs/Makefile | 2 +- databases/postgresql10-pgtcl/Makefile | 2 +- databases/postgresql10-plperl/Makefile | 2 +- databases/postgresql10-plpython/Makefile | 2 +- databases/postgresql10-pltcl/Makefile | 2 +- databases/postgresql10-server/Makefile | 6 +- databases/postgresql10-server/distinfo | 6 +- databases/postgresql11-client/Makefile | 2 +- databases/postgresql11-contrib/Makefile | 2 +- databases/postgresql11-docs/Makefile | 2 +- databases/postgresql11-pgtcl/Makefile | 2 +- databases/postgresql11-plperl/Makefile | 2 +- databases/postgresql11-plpython/Makefile | 2 +- databases/postgresql11-pltcl/Makefile | 2 +- databases/postgresql11-server/Makefile | 294 +--- databases/postgresql11-server/distinfo | 6 +- databases/postgresql12-client/Makefile | 21 + databases/postgresql12-contrib/Makefile | 40 + databases/postgresql12-contrib/pkg-descr | 23 + databases/postgresql12-docs/Makefile | 46 + databases/postgresql12-pgtcl/Makefile | 11 + databases/postgresql12-plperl/Makefile | 27 + databases/postgresql12-plpython/Makefile | 27 + databases/postgresql12-plpython/pkg-descr | 6 + databases/postgresql12-pltcl/Makefile | 32 + databases/postgresql12-server/Makefile | 308 ++++ databases/postgresql12-server/distinfo | 3 + databases/postgresql12-server/files/502.pgsql.in | 116 ++ databases/postgresql12-server/files/dot.cshrc.in | 11 + databases/postgresql12-server/files/dot.profile.in | 22 + .../postgresql12-server/files/patch-doc-Makefile | 9 + .../files/patch-doc-src-sgml-Makefile | 41 + .../files/patch-src-Makefile.shlib | 11 + .../files/patch-src-backend-Makefile | 11 + ...h-src_backend_utils_misc_postgresql.conf.sample | 21 + .../files/pkg-message-client.in | 32 + .../files/pkg-message-contrib.in | 3 + .../files/pkg-message-plperl.in | 3 + .../files/pkg-message-plpython.in | 3 + .../postgresql12-server/files/pkg-message-pltcl.in | 3 + .../files/pkg-message-server.in | 64 + .../postgresql12-server/files/pkgIndex.tcl.in | 4 + databases/postgresql12-server/files/postgresql.in | 117 ++ databases/postgresql12-server/pkg-descr | 23 + databases/postgresql12-server/pkg-install-server | 24 + databases/postgresql12-server/pkg-plist-client | 1229 ++++++++++++++++ databases/postgresql12-server/pkg-plist-contrib | 265 ++++ databases/postgresql12-server/pkg-plist-plperl | 11 + databases/postgresql12-server/pkg-plist-plpython | 26 + databases/postgresql12-server/pkg-plist-pltcl | 8 + databases/postgresql12-server/pkg-plist-server | 1539 ++++++++++++++++++++ databases/postgresql94-client/Makefile | 2 +- databases/postgresql94-contrib/Makefile | 2 +- databases/postgresql94-docs/Makefile | 2 +- databases/postgresql94-pgtcl/Makefile | 2 +- databases/postgresql94-plperl/Makefile | 2 +- databases/postgresql94-plpython/Makefile | 2 +- databases/postgresql94-pltcl/Makefile | 2 +- databases/postgresql94-server/Makefile | 6 +- databases/postgresql94-server/distinfo | 6 +- databases/postgresql95-client/Makefile | 2 +- databases/postgresql95-contrib/Makefile | 2 +- databases/postgresql95-docs/Makefile | 2 +- databases/postgresql95-pgtcl/Makefile | 2 +- databases/postgresql95-plperl/Makefile | 25 +- databases/postgresql95-plpython/Makefile | 26 +- databases/postgresql95-pltcl/Makefile | 2 +- databases/postgresql95-server/Makefile | 6 +- databases/postgresql95-server/distinfo | 6 +- databases/postgresql96-client/Makefile | 2 +- databases/postgresql96-contrib/Makefile | 2 +- databases/postgresql96-docs/Makefile | 44 +- databases/postgresql96-pgtcl/Makefile | 2 +- databases/postgresql96-plperl/Makefile | 2 +- databases/postgresql96-plpython/Makefile | 2 +- databases/postgresql96-pltcl/Makefile | 30 +- databases/postgresql96-server/Makefile | 10 +- databases/postgresql96-server/distinfo | 6 +- 81 files changed, 4214 insertions(+), 467 deletions(-) create mode 100644 databases/postgresql12-client/Makefile create mode 100644 databases/postgresql12-contrib/Makefile create mode 100644 databases/postgresql12-contrib/pkg-descr create mode 100644 databases/postgresql12-docs/Makefile create mode 100644 databases/postgresql12-pgtcl/Makefile create mode 100644 databases/postgresql12-plperl/Makefile create mode 100644 databases/postgresql12-plpython/Makefile create mode 100644 databases/postgresql12-plpython/pkg-descr create mode 100644 databases/postgresql12-pltcl/Makefile create mode 100644 databases/postgresql12-server/Makefile create mode 100644 databases/postgresql12-server/distinfo create mode 100644 databases/postgresql12-server/files/502.pgsql.in create mode 100644 databases/postgresql12-server/files/dot.cshrc.in create mode 100644 databases/postgresql12-server/files/dot.profile.in create mode 100644 databases/postgresql12-server/files/patch-doc-Makefile create mode 100644 databases/postgresql12-server/files/patch-doc-src-sgml-Makefile create mode 100644 databases/postgresql12-server/files/patch-src-Makefile.shlib create mode 100644 databases/postgresql12-server/files/patch-src-backend-Makefile create mode 100644 databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample create mode 100644 databases/postgresql12-server/files/pkg-message-client.in create mode 100644 databases/postgresql12-server/files/pkg-message-contrib.in create mode 100644 databases/postgresql12-server/files/pkg-message-plperl.in create mode 100644 databases/postgresql12-server/files/pkg-message-plpython.in create mode 100644 databases/postgresql12-server/files/pkg-message-pltcl.in create mode 100644 databases/postgresql12-server/files/pkg-message-server.in create mode 100644 databases/postgresql12-server/files/pkgIndex.tcl.in create mode 100644 databases/postgresql12-server/files/postgresql.in create mode 100644 databases/postgresql12-server/pkg-descr create mode 100644 databases/postgresql12-server/pkg-install-server create mode 100644 databases/postgresql12-server/pkg-plist-client create mode 100644 databases/postgresql12-server/pkg-plist-contrib create mode 100644 databases/postgresql12-server/pkg-plist-plperl create mode 100644 databases/postgresql12-server/pkg-plist-plpython create mode 100644 databases/postgresql12-server/pkg-plist-pltcl create mode 100644 databases/postgresql12-server/pkg-plist-server diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk index ee2f668259b8..f475dadc0e35 100644 --- a/Mk/Uses/pgsql.mk +++ b/Mk/Uses/pgsql.mk @@ -41,7 +41,7 @@ _INCLUDE_USES_PGSQL_MK= yes # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -VALID_PGSQL_VER= 9.4 9.5 9.6 10 11 +VALID_PGSQL_VER= 9.4 9.5 9.6 10 11 12 # Override non-default LIBVERS like this: #PGSQL99_LIBVER=6 diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile index 2769726fb2a2..1aa7c3203c07 100644 --- a/databases/postgresql10-client/Makefile +++ b/databases/postgresql10-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile index bff176be5960..d2d5002b6b2b 100644 --- a/databases/postgresql10-contrib/Makefile +++ b/databases/postgresql10-contrib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org diff --git a/databases/postgresql10-docs/Makefile b/databases/postgresql10-docs/Makefile index 72abd6479086..ed6dda10534d 100644 --- a/databases/postgresql10-docs/Makefile +++ b/databases/postgresql10-docs/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER=10 -.include "${.CURDIR}/../postgresql96-docs/Makefile" +.include "${.CURDIR}/../postgresql12-docs/Makefile" diff --git a/databases/postgresql10-pgtcl/Makefile b/databases/postgresql10-pgtcl/Makefile index f873d5c4dcfd..9f66e61ef73c 100644 --- a/databases/postgresql10-pgtcl/Makefile +++ b/databases/postgresql10-pgtcl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -postgresql10 CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile index a7d098d55326..f79739e44c37 100644 --- a/databases/postgresql10-plperl/Makefile +++ b/databases/postgresql10-plperl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 10 -.include "${.CURDIR}/../postgresql95-plperl/Makefile" +.include "${.CURDIR}/../postgresql12-plperl/Makefile" diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile index d38f30cc0e97..fa36738cb601 100644 --- a/databases/postgresql10-plpython/Makefile +++ b/databases/postgresql10-plpython/Makefile @@ -2,4 +2,4 @@ WANT_PGSQL_VER= 10 -.include "${.CURDIR}/../postgresql95-plpython/Makefile" +.include "${.CURDIR}/../postgresql12-plpython/Makefile" diff --git a/databases/postgresql10-pltcl/Makefile b/databases/postgresql10-pltcl/Makefile index 396d69fafc6c..df3220c742a0 100644 --- a/databases/postgresql10-pltcl/Makefile +++ b/databases/postgresql10-pltcl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 10 -.include "${.CURDIR}/../postgresql96-pltcl/Makefile" +.include "${.CURDIR}/../postgresql12-pltcl/Makefile" diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile index 2e4c541fe24d..ba97add23d4c 100644 --- a/databases/postgresql10-server/Makefile +++ b/databases/postgresql10-server/Makefile @@ -1,10 +1,10 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 10.9 +DISTVERSION?= 10.10 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -24,4 +24,4 @@ PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 -.include "${.CURDIR}/../postgresql11-server/Makefile" +.include "${.CURDIR}/../postgresql12-server/Makefile" diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo index 27f5a399608e..77316db802ec 100644 --- a/databases/postgresql10-server/distinfo +++ b/databases/postgresql10-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561409430 -SHA256 (postgresql/postgresql-10.9.tar.bz2) = 958b317fb007e94f3bef7e2a6641875db8f7f9d73db9f283324f3d6e8f5b0f54 -SIZE (postgresql/postgresql-10.9.tar.bz2) = 18981395 +TIMESTAMP = 1565174246 +SHA256 (postgresql/postgresql-10.10.tar.bz2) = ad4f9b8575f98ed6091bf9bb2cb16f0e52795a5f66546c1f499ca5c69b21f253 +SIZE (postgresql/postgresql-10.10.tar.bz2) = 19012049 diff --git a/databases/postgresql11-client/Makefile b/databases/postgresql11-client/Makefile index f37a6308abe0..89146c4867bc 100644 --- a/databases/postgresql11-client/Makefile +++ b/databases/postgresql11-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile index a945abb7c48f..56a02b0852a6 100644 --- a/databases/postgresql11-contrib/Makefile +++ b/databases/postgresql11-contrib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org diff --git a/databases/postgresql11-docs/Makefile b/databases/postgresql11-docs/Makefile index 93a74452bd62..7f18a8e34509 100644 --- a/databases/postgresql11-docs/Makefile +++ b/databases/postgresql11-docs/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER=11 -.include "${.CURDIR}/../postgresql96-docs/Makefile" +.include "${.CURDIR}/../postgresql12-docs/Makefile" diff --git a/databases/postgresql11-pgtcl/Makefile b/databases/postgresql11-pgtcl/Makefile index d5319461f0ab..c2f45b76f055 100644 --- a/databases/postgresql11-pgtcl/Makefile +++ b/databases/postgresql11-pgtcl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -postgresql11 CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-* diff --git a/databases/postgresql11-plperl/Makefile b/databases/postgresql11-plperl/Makefile index 92edfea7de02..cdee9960f5b9 100644 --- a/databases/postgresql11-plperl/Makefile +++ b/databases/postgresql11-plperl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 11 -.include "${.CURDIR}/../postgresql95-plperl/Makefile" +.include "${.CURDIR}/../postgresql12-plperl/Makefile" diff --git a/databases/postgresql11-plpython/Makefile b/databases/postgresql11-plpython/Makefile index fdadd0b0842d..eaca03b4199e 100644 --- a/databases/postgresql11-plpython/Makefile +++ b/databases/postgresql11-plpython/Makefile @@ -2,4 +2,4 @@ WANT_PGSQL_VER= 11 -.include "${.CURDIR}/../postgresql95-plpython/Makefile" +.include "${.CURDIR}/../postgresql12-plpython/Makefile" diff --git a/databases/postgresql11-pltcl/Makefile b/databases/postgresql11-pltcl/Makefile index a476768861fe..2ff15ce7ecd1 100644 --- a/databases/postgresql11-pltcl/Makefile +++ b/databases/postgresql11-pltcl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 11 -.include "${.CURDIR}/../postgresql96-pltcl/Makefile" +.include "${.CURDIR}/../postgresql12-pltcl/Makefile" diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile index 25140995bb4e..af5383f62e48 100644 --- a/databases/postgresql11-server/Makefile +++ b/databases/postgresql11-server/Makefile @@ -1,54 +1,13 @@ # Created by: Marc G. Fournier # $FreeBSD$ -PORTNAME?= postgresql -DISTVERSION?= 11.4 +DISTVERSION?= 11.5 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 -CATEGORIES?= databases -MASTER_SITES= PGSQL/source/v${DISTVERSION} -PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} +PORTREVISION?= 0 +PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org -COMMENT?= PostgreSQL is the most advanced open-source database available anywhere - -LICENSE= PostgreSQL - -.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 10 -CONFLICTS+= ${PORTNAME}9* ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]* -.else -CONFLICTS+= ${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}1[0-9]* -.endif - -WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} -DIST_SUBDIR= postgresql - -OPTIONS_SUB= yes - -PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 cpe -.if !defined(NO_BUILD) -USES+= gmake -GNU_CONFIGURE= yes -.endif - -PG_USER?= postgres -PG_GROUP?= postgres -PG_UID?= 770 - -LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES+= -I${LOCALBASE}/include -CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/include \ - --enable-thread-safety -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ - PTHREAD_LIBS="-lpthread" \ - LDFLAGS_SL="${LDFLAGS_SL}" -LDFLAGS+= -lpthread -MAKE_ENV= MAKELEVEL=0 - -PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ @@ -61,247 +20,8 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade -BUILD_DIRS?= src/port ${INSTALL_DIRS} -INSTALL_TARGET?=install-strip - -.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) -SERVER_ONLY= yes -COMPONENT= -server -USE_RC_SUBR= postgresql -USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} -USERS= ${PG_USER} -GROUPS= ${PG_GROUP} -SUB_FILES+= 502.pgsql -.endif - -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+=LIBEDIT DOCS -LIBEDIT_DESC= Use non-GPL libedit instead of readline -USES+= perl5 -.else -MAKE_ENV+= PATH=${PREFIX}/bin:${PATH} -CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} -.endif - -.if defined(SERVER_ONLY) -OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML DOCS -LDAP_DESC= Build with LDAP authentication support -DTRACE_DESC= Build with DTrace probes -TZDATA_DESC= Use internal timezone database -XML_DESC= Build with XML data type - -.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 -OPTIONS_DEFINE+=LLVM -LLVM_DESC= Build with support for JIT-compiling expressions -.endif - -.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 -# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS_DEFINE+= ICU -ICU_DESC= Use ICU for unicode collation -.else -CONFIGURE_ARGS+=--with-icu -LIB_DEPENDS+= libicudata.so:devel/icu -USES+= pkgconfig -.endif - -# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info -# (requires dump/restore if modified.) -OPTIONS_DEFINE+= INTDATE -INTDATE_DESC= Builds with 64-bit date/time type -OPTIONS_DEFAULT+= TZDATA INTDATE -.endif - -.if !defined(SLAVE_ONLY) -OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS -. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 - OPTIONS_RADIO= KRB5 - OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 -. endif - -KRB5_DESC= Build with kerberos provider support -NLS_DESC= Use internationalized messages -PAM_DESC= Build with PAM Support -MIT_KRB5_DESC= Build with MIT kerberos support -HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos -GSSAPI_DESC= Build with GSSAPI support -OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) - -OPTIONS_DEFINE+= SSL -SSL_DESC= Build with OpenSSL support - -OPTIONS_DEFAULT+= SSL -.endif # !SLAVE_ONLY - -.if defined(CLIENT_ONLY) -LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred -LIBEDIT_USES= libedit -LIBEDIT_USES_OFF= readline -.endif # CLIENT_ONLY - -SSL_USES= ssl -SSL_CONFIGURE_WITH= openssl - -PAM_CONFIGURE_WITH= pam - -XML_CONFIGURE_WITH= libxml -XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 - -TZDATA_CONFIGURE_OFF= --with-system-tzdata=/usr/share/zoneinfo - -INTDATE_CONFIGURE_OFF= --disable-integer-datetimes - -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext - -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes - -OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops - -DEBUG_CONFIGURE_ENABLE= debug - -PLIST_SUB+= PG_USER=${PG_USER} \ - PG_GROUP=${PG_GROUP} -SUB_LIST+= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} - -.include - -.if ${ARCH} == "i386" -USES+= compiler:gcc-c++11-lib -.endif - -.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} -BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} -CONFIGURE_ARGS+= --with-llvm -PLIST_SUB+= LLVM="" -INSTALL_DIRS+= src/backend/jit/llvm -. else -PLIST_SUB+= LLVM="@comment " -CONFIGURE_ARGS+= --without-llvm -. endif -.endif - -.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 -. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) -USES+= autoreconf -CONFIGURE_ARGS+=--with-icu -PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= ${ICU_PATCHFILE}:icu -LIB_DEPENDS+= libicudata.so:devel/icu -. endif -.endif # server && version < 10 - -.if !defined(SLAVE_ONLY) - -PATCH_DIST_STRIP=-p1 - -. if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -LDFLAGS+=-lelf -INSTALL_TARGET= install -. endif - -.if ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--with-gssapi -.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) -# Kerberos libraries will pull the proper GSSAPI library -# via linker dependencies, but otherwise we must specify -# it explicitely: ld --as-needed is used for compilation, -# so configure's -lgssapi_krb5 won't go. -LDFLAGS+= -lgssapi -LDFLAGS_SL+= -lgssapi -.endif -.else -CONFIGURE_ARGS+=--without-gssapi -.endif - -. if ${PORT_OPTIONS:MMIT_KRB5} -. if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) -IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB -. else -CONFIGURE_ARGS+=--with-krb5 -# Allow defining a home built MIT Kerberos by setting KRB5_HOME -. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) -LIB_DEPENDS+= libkrb5.so.3:security/krb5 -. endif -. endif -. endif - -. if ${PORT_OPTIONS:MHEIMDAL_KRB5} -CONFIGURE_ARGS+=--with-krb5 -. endif - -.endif # !SLAVE_ONLY - -# For testing files in FILESDIR -.include - -.if defined(SERVER_ONLY) -pre-build: - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - -.if !defined(NO_BUILD) && !target(do-build) - -do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks - @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ - done - -. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) -SUB_FILES+= pkg-message${COMPONENT} -PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} -. endif -. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) -SUB_FILES+= pkg-install${COMPONENT} -PLIST_SUB+= PG_USER=${PG_USER} -. endif - -post-patch: -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} - @${REINPLACE_CMD} \ - -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ - -e '/icu/s/_57//' \ - ${WRKSRC}/configure.in -. endif - -do-install: - @for dir in ${INSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ - done -. if defined(SERVER_ONLY) - @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ - ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ - ${STAGEDIR}${PREFIX}/etc/periodic/daily -. endif # SERVER_ONLY -. if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local -. endif - @ if [ -r ${PKGMESSAGE} ]; then \ - ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ - fi -.endif # !NO_BUILD - -.if defined(SERVER_ONLY) -check: - @if [ `id -u` != 0 ] ; then \ - ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${MAKE_CMD} check ;\ - else \ - ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ - ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ - fi -.endif +PG_USER?= postgres +PG_GROUP?= postgres +PG_UID?= 770 -.include +.include "${.CURDIR}/../postgresql12-server/Makefile" diff --git a/databases/postgresql11-server/distinfo b/databases/postgresql11-server/distinfo index 2d4af53d7c18..ab0faed377fe 100644 --- a/databases/postgresql11-server/distinfo +++ b/databases/postgresql11-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561409449 -SHA256 (postgresql/postgresql-11.4.tar.bz2) = 02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b -SIZE (postgresql/postgresql-11.4.tar.bz2) = 19759635 +TIMESTAMP = 1565174257 +SHA256 (postgresql/postgresql-11.5.tar.bz2) = 7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180 +SIZE (postgresql/postgresql-11.5.tar.bz2) = 19773087 diff --git a/databases/postgresql12-client/Makefile b/databases/postgresql12-client/Makefile new file mode 100644 index 000000000000..ea252a344e0b --- /dev/null +++ b/databases/postgresql12-client/Makefile @@ -0,0 +1,21 @@ +# Created by: Palle Girgensohn +# $FreeBSD$ + +PORTNAME= postgresql +PORTREVISION= 0 + +COMMENT= PostgreSQL database (client) + +MASTERDIR= ${.CURDIR}/../postgresql12-server + +BUILD_DIRS= config src/include src/interfaces src/port \ + src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ + src/bin/pgbench doc src/makefiles src/test/regress +INSTALL_DIRS= ${BUILD_DIRS} + +CLIENT_ONLY= yes +COMPONENT= -client +USE_LDCONFIG= yes +USES= pkgconfig + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile new file mode 100644 index 000000000000..1c8dc612d65a --- /dev/null +++ b/databases/postgresql12-contrib/Makefile @@ -0,0 +1,40 @@ +# Created by: Palle Girgensohn +# $FreeBSD$ + +PORTNAME= postgresql +PORTREVISION= 0 +CATEGORIES= databases + +MAINTAINER= pgsql@FreeBSD.org +COMMENT= The contrib utilities from the PostgreSQL distribution + +LIB_DEPENDS= libxslt.so:textproc/libxslt \ + libxml2.so:textproc/libxml2 + +MASTERDIR= ${.CURDIR}/../postgresql12-server + +USES= bison pgsql:12 + +BUILD_DIRS= src/port src/include src/common contrib +INSTALL_DIRS= contrib + +SLAVE_ONLY= yes +COMPONENT= -contrib +CONFIGURE_ARGS= --with-libxslt --with-libxml --disable-nls --with-uuid=bsd +LDFLAGS+= -lpthread -L${PREFIX}/lib + +OPTIONS_DEFINE= DOCS OPENSSL +OPTIONS_DEFAULT=OPENSSL +OPTIONS_SUB= yes + +OPENSSL_DESC= Build with OpenSSL support +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= openssl + +post-configure: + @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + +post-install: + @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-contrib/pkg-descr b/databases/postgresql12-contrib/pkg-descr new file mode 100644 index 000000000000..18c3c1351c3b --- /dev/null +++ b/databases/postgresql12-contrib/pkg-descr @@ -0,0 +1,23 @@ +This is the port for all stuff that comes in the contrib subtree of +the postgresql distribution. This subtree contains porting tools, +analysis utilities, and plug-in features that are not part of the core +PostgreSQL system, mainly because they address a limited audience or +are too experimental to be part of the main source tree. This does +not preclude their usefulness. + +Each subdirectory contains a README file with information about the +module. Some directories supply new user-defined functions, operators, +or types. After you have installed the files you need to register the +new entities in the database system by running the commands in the +supplied .sql file. For example, + + $ psql -d dbname -f module.sql + +The .sql files are installed into /usr/local/share/postgresql/contrib + +For more information, please see +/usr/local/share/doc/postgresql/contrib/README* + +This software is part of the standard PostgreSQL distribution. + +WWW: https://www.postgresql.org/ diff --git a/databases/postgresql12-docs/Makefile b/databases/postgresql12-docs/Makefile new file mode 100644 index 000000000000..1043ace58c7f --- /dev/null +++ b/databases/postgresql12-docs/Makefile @@ -0,0 +1,46 @@ +# Created by: Palle Girgensohn +# $FreeBSD$ + +PORTNAME= postgresql +PORTREVISION= 0 +PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs + +MAINTAINER= pgsql@FreeBSD.org +COMMENT= The PostgreSQL documentation set + +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +WANT_PGSQL_VER?=12 + +DISTV= ${DISTVERSION:R} + +SLAVE_ONLY= YES +COMPONENT= -docs + +PGDOCSREL?= ${DOCSDIR_REL}/release-${PGSQL_VER} +PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} + +sgmldir= ${LOCALBASE}/share/sgml +dbdir= ${sgmldir}/docbook + +BUILD_DEPENDS+= onsgmls:textproc/opensp \ + openjade:textproc/openjade \ + ${sgmldir}/iso8879/catalog:textproc/iso8879 \ + ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ + docbook-sgml>0:textproc/docbook-sgml +CONFIGURE_ARGS= --without-readline +NO_ARCH= yes + +do-build: + ${MAKE_CMD} -C ${WRKSRC} html + +do-install: + @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} + ( cd ${WRKSRC}/doc/src/sgml/html && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) + +post-install: + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \ + ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST} + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-pgtcl/Makefile b/databases/postgresql12-pgtcl/Makefile new file mode 100644 index 000000000000..45164fb64a65 --- /dev/null +++ b/databases/postgresql12-pgtcl/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -postgresql12 + +CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[013-9]-* + +PGTCL_SLAVE= 12 +MASTERDIR= ${.CURDIR}/../pgtcl + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile new file mode 100644 index 000000000000..07394cd9557d --- /dev/null +++ b/databases/postgresql12-plperl/Makefile @@ -0,0 +1,27 @@ +# Created by: Palle Girgensohn +# $FreeBSD$ + +PORTNAME= postgresql +# Keep the ?=, this port is used as master by the other plperl. +PORTREVISION?= 0 +CATEGORIES= databases perl5 +PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} + +MAINTAINER= pgsql@FreeBSD.org +COMMENT= Write SQL functions for PostgreSQL using Perl5 + +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server + +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server + +WANT_PGSQL_VER?=12 + +USES+= perl5 readline +CONFIGURE_ARGS= --with-perl + +BUILD_DIRS= src/backend src/pl/plperl +INSTALL_DIRS= src/pl/plperl +SLAVE_ONLY= yes +COMPONENT= -plperl + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile new file mode 100644 index 000000000000..dea6d0d02cec --- /dev/null +++ b/databases/postgresql12-plpython/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= postgresql +CATEGORIES= databases python +# Keep the ?=, it is used as master by the other plpython ports. +PORTREVISION?= 0 +PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} + +MAINTAINER= pgsql@FreeBSD.org +COMMENT= Module for using Python to write SQL functions + +USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} +WANT_PGSQL= server + +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server + +WANT_PGSQL_VER?= 12 +WANT_PYTHON_USE?= python + +CONFIGURE_ARGS= --with-python +COMPONENT= -plpython + +BUILD_DIRS= src/backend src/pl/plpython +INSTALL_DIRS= src/pl/plpython +SLAVE_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-plpython/pkg-descr b/databases/postgresql12-plpython/pkg-descr new file mode 100644 index 000000000000..416cce467d37 --- /dev/null +++ b/databases/postgresql12-plpython/pkg-descr @@ -0,0 +1,6 @@ +PL/Python allows one to write PostgeSQL stored functions and +procedures in Python (http://www.python.org/). + +This software is part of the standard PostgreSQL distribution. + +WWW: https://www.postgresql.org/ diff --git a/databases/postgresql12-pltcl/Makefile b/databases/postgresql12-pltcl/Makefile new file mode 100644 index 000000000000..ced441b7ee7f --- /dev/null +++ b/databases/postgresql12-pltcl/Makefile @@ -0,0 +1,32 @@ +# Created by: Palle Girgensohn +# $FreeBSD$ + +PORTNAME= postgresql +# Keep the ?=, it is used by the other pltcl ports. +PORTREVISION?= 0 +CATEGORIES= databases tcl +PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} + +MAINTAINER= pgsql@FreeBSD.org +COMMENT= Module for using Tcl to write SQL functions + +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server + +WANT_PGSQL_VER?=12 + +USES+= tcl pgsql:${WANT_PGSQL_VER} +WANT_PGSQL= server + +CONFIGURE_ARGS= --with-tcl --without-tk \ + --with-tclconfig="${TCL_LIBDIR}" \ + --with-includes="${TCL_INCLUDEDIR}" + +CONFIGURE_ENV+= TCLSH="${TCLSH}" +MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" + +BUILD_DIRS= src/backend src/pl/tcl +INSTALL_DIRS= src/pl/tcl +SLAVE_ONLY= yes +COMPONENT= -pltcl + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile new file mode 100644 index 000000000000..c80722ce7024 --- /dev/null +++ b/databases/postgresql12-server/Makefile @@ -0,0 +1,308 @@ +# Created by: Marc G. Fournier +# $FreeBSD$ + +PORTNAME?= postgresql +DISTVERSION?= 12beta3 +# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and +# not their own. Probably best to keep it at ?=0 when reset here too. +PORTREVISION?= 0 +CATEGORIES?= databases +MASTER_SITES= PGSQL/source/v${DISTVERSION} +PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} + +MAINTAINER?= pgsql@FreeBSD.org +COMMENT?= PostgreSQL is the most advanced open-source database available anywhere + +LICENSE= PostgreSQL + +.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 10 +CONFLICTS+= ${PORTNAME}9* ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]* +.else +CONFLICTS+= ${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}1[0-9]* +.endif + +WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} +DIST_SUBDIR= postgresql + +OPTIONS_SUB= yes + +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} +USES+= tar:bzip2 cpe +.if !defined(NO_BUILD) +USES+= gmake +GNU_CONFIGURE= yes +.endif + +PG_USER?= postgres +PG_GROUP?= postgres +PG_UID?= 770 + +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ + --enable-thread-safety +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ + PTHREAD_LIBS="-lpthread" \ + LDFLAGS_SL="${LDFLAGS_SL}" +LDFLAGS+= -lpthread +MAKE_ENV= MAKELEVEL=0 + +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} + +INSTALL_DIRS?= src/common src/timezone src/backend \ + src/backend/utils/mb/conversion_procs \ + src/backend/snowball src/backend/replication/libpqwalreceiver \ + src/backend/replication/pgoutput \ + src/bin/initdb src/bin/pg_ctl \ + src/bin/pg_archivecleanup src/bin/pg_basebackup \ + src/bin/pg_checksums \ + src/bin/pg_controldata src/bin/pg_resetwal src/pl \ + src/bin/pg_rewind \ + src/bin/pg_test_fsync src/bin/pg_test_timing \ + src/bin/pg_waldump src/bin/pg_upgrade + +BUILD_DIRS?= src/port ${INSTALL_DIRS} +INSTALL_TARGET?=install-strip + +.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) +SERVER_ONLY= yes +COMPONENT= -server +USE_RC_SUBR= postgresql +USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} +SUB_FILES+= 502.pgsql +.endif + +.if defined(CLIENT_ONLY) +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +USES+= perl5 +.else +MAKE_ENV+= PATH=${PREFIX}/bin:${PATH} +CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} +.endif + +.if defined(SERVER_ONLY) +OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML DOCS +LDAP_DESC= Build with LDAP authentication support +DTRACE_DESC= Build with DTrace probes +TZDATA_DESC= Use internal timezone database +XML_DESC= Build with XML data type + +.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 +OPTIONS_DEFINE+=LLVM +LLVM_DESC= Build with support for JIT-compiling expressions +.endif + +.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 +# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info +OPTIONS_DEFINE+= ICU +ICU_DESC= Use ICU for unicode collation +.else +CONFIGURE_ARGS+=--with-icu +LIB_DEPENDS+= libicudata.so:devel/icu +USES+= pkgconfig +.endif + +# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info +# (requires dump/restore if modified.) +OPTIONS_DEFINE+= INTDATE +INTDATE_DESC= Builds with 64-bit date/time type +OPTIONS_DEFAULT+= TZDATA INTDATE +.endif + +.if !defined(SLAVE_ONLY) +OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS +. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 + OPTIONS_RADIO= KRB5 + OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 +. endif + +KRB5_DESC= Build with kerberos provider support +NLS_DESC= Use internationalized messages +PAM_DESC= Build with PAM Support +MIT_KRB5_DESC= Build with MIT kerberos support +HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos +GSSAPI_DESC= Build with GSSAPI support +OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) + +OPTIONS_DEFINE+= SSL +SSL_DESC= Build with OpenSSL support + +OPTIONS_DEFAULT+= SSL +.endif # !SLAVE_ONLY + +.if defined(CLIENT_ONLY) +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF= readline +.endif # CLIENT_ONLY + +SSL_USES= ssl +SSL_CONFIGURE_WITH= openssl + +PAM_CONFIGURE_WITH= pam + +XML_CONFIGURE_WITH= libxml +XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 + +TZDATA_CONFIGURE_OFF= --with-system-tzdata=/usr/share/zoneinfo + +INTDATE_CONFIGURE_OFF= --disable-integer-datetimes + +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext + +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + +OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops + +DEBUG_CONFIGURE_ENABLE= debug + +PLIST_SUB+= PG_USER=${PG_USER} \ + PG_GROUP=${PG_GROUP} +SUB_LIST+= PG_GROUP=${PG_GROUP} \ + PG_USER=${PG_USER} \ + PG_UID=${PG_UID} + +.include + +.if ${ARCH} == "i386" +USES+= compiler:gcc-c++11-lib +.endif + +.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 +. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} +BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} +CONFIGURE_ARGS+= --with-llvm +PLIST_SUB+= LLVM="" +INSTALL_DIRS+= src/backend/jit/llvm +. else +PLIST_SUB+= LLVM="@comment " +CONFIGURE_ARGS+= --without-llvm +. endif +.endif + +.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 +. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) +USES+= autoreconf +CONFIGURE_ARGS+=--with-icu +PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu +PATCHFILES+= ${ICU_PATCHFILE}:icu +LIB_DEPENDS+= libicudata.so:devel/icu +. endif +.endif # server && version < 10 + +.if !defined(SLAVE_ONLY) + +PATCH_DIST_STRIP=-p1 + +. if ${PORT_OPTIONS:MDTRACE} +CONFIGURE_ARGS+=--enable-dtrace +LDFLAGS+=-lelf +INSTALL_TARGET= install +. endif + +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--with-gssapi +.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) +# Kerberos libraries will pull the proper GSSAPI library +# via linker dependencies, but otherwise we must specify +# it explicitely: ld --as-needed is used for compilation, +# so configure's -lgssapi_krb5 won't go. +LDFLAGS+= -lgssapi +LDFLAGS_SL+= -lgssapi +.endif +.else +CONFIGURE_ARGS+=--without-gssapi +.endif + +. if ${PORT_OPTIONS:MMIT_KRB5} +. if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) +IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB +. else +CONFIGURE_ARGS+=--with-krb5 +# Allow defining a home built MIT Kerberos by setting KRB5_HOME +. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) +LIB_DEPENDS+= libkrb5.so.3:security/krb5 +. endif +. endif +. endif + +. if ${PORT_OPTIONS:MHEIMDAL_KRB5} +CONFIGURE_ARGS+=--with-krb5 +. endif + +.endif # !SLAVE_ONLY + +# For testing files in FILESDIR +.include + +.if defined(SERVER_ONLY) +pre-build: + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +.endif + +.if !defined(NO_BUILD) && !target(do-build) + +do-build: + @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @ for dir in ${BUILD_DIRS}; do \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ + done + +. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) +SUB_FILES+= pkg-message${COMPONENT} +PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} +. endif +. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) +SUB_FILES+= pkg-install${COMPONENT} +PLIST_SUB+= PG_USER=${PG_USER} +. endif + +post-patch: +. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} + @${REINPLACE_CMD} \ + -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ + -e '/icu/s/_57//' \ + ${WRKSRC}/configure.in +. endif + +do-install: + @for dir in ${INSTALL_DIRS}; do \ + cd ${WRKSRC}/$${dir} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + done +. if defined(SERVER_ONLY) + @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ + ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ + ${STAGEDIR}${PREFIX}/etc/periodic/daily +. endif # SERVER_ONLY +. if defined(CLIENT_ONLY) + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local +. endif + @ if [ -r ${PKGMESSAGE} ]; then \ + ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ + fi +.endif # !NO_BUILD + +.if defined(SERVER_ONLY) +check: + @if [ `id -u` != 0 ] ; then \ + ${ECHO} "Running postgresql regressions tests" ;\ + cd ${WRKSRC}; ${MAKE_CMD} check ;\ + else \ + ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ + ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ + fi +.endif + +.include diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo new file mode 100644 index 000000000000..ff53c2fe4bf8 --- /dev/null +++ b/databases/postgresql12-server/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565174257 +SHA256 (postgresql/postgresql-12beta3.tar.bz2) = e4a4079c75bf049349c70a02f705beecbb8263684ff2d4e13a582a3ff50332aa +SIZE (postgresql/postgresql-12beta3.tar.bz2) = 20698785 diff --git a/databases/postgresql12-server/files/502.pgsql.in b/databases/postgresql12-server/files/502.pgsql.in new file mode 100644 index 000000000000..06026b1d831f --- /dev/null +++ b/databases/postgresql12-server/files/502.pgsql.in @@ -0,0 +1,116 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Maintenance shell script to vacuum and backup database +# Put this in /usr/local/etc/periodic/daily, and it will be run +# every night +# +# Written by Palle Girgensohn +# +# In public domain, do what you like with it, +# and use it at your own risk... :) +# + +# Define these variables in either /etc/periodic.conf or +# /etc/periodic.conf.local to override the default values. +# +# daily_pgsql_backup_enable="YES" # do backup of all databases +# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases +# daily_pgsql_vacuum_enable="YES" # do vacuum + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +: ${daily_pgsql_user:="%%PG_USER%%"} +: ${daily_pgsql_port:=5432} +: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"} +: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"} +: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"} +# backupdir is relative to ~pgsql home directory unless it begins with a slash: +: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"} +: ${daily_pgsql_savedays:="7"} + +# allow '~´ in dir name +eval backupdir=${daily_pgsql_backupdir} + +rc=0 + +pgsql_backup() { + # daily_pgsql_backupdir must be writeable by user %%PG_USER%% + # ~%%PG_USER%% is just that under normal circumstances, + # but this might not be where you want the backups... + if [ ! -d ${backupdir} ] ; then + echo Creating ${backupdir} + mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir} + fi + + echo + echo "PostgreSQL backups" + + # Protect the data + umask 077 + rc=$? + now=`date "+%Y-%m-%dT%H:%M:%S"` + file=${daily_pgsql_backupdir}/pgglobals_${now} + su -l ${daily_pgsql_user} -c \ + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" + + db=$1 + while shift; do + echo -n " $db" + file=${backupdir}/pgdump_${db}_${now} + su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" + [ $? -gt 0 ] && rc=3 + db=$1 + done + + if [ $rc -gt 0 ]; then + echo + echo "Errors were reported during backup." + fi + + # cleaning up old data + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ + -a -mtime +${daily_pgsql_savedays} -delete + echo +} + +case "$daily_pgsql_backup_enable" in + [Yy][Ee][Ss]) + dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` + pgsql_backup $dbnames + ;; + + [Nn][Oo]) + ;; + + "") + ;; + + *) + pgsql_backup $daily_pgsql_backup_enable + ;; +esac + +case "$daily_pgsql_vacuum_enable" in + [Yy][Ee][Ss]) + + echo + echo "PostgreSQL vacuum" + su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}" + if [ $? -gt 0 ] + then + echo + echo "Errors were reported during vacuum." + rc=3 + fi + ;; +esac + +exit $rc diff --git a/databases/postgresql12-server/files/dot.cshrc.in b/databases/postgresql12-server/files/dot.cshrc.in new file mode 100644 index 000000000000..17c9ee69a7d0 --- /dev/null +++ b/databases/postgresql12-server/files/dot.cshrc.in @@ -0,0 +1,11 @@ +setenv PGLIB %%PREFIX%%/lib + +# note: PGDATA can be overridden by the -D startup option +setenv PGDATA $HOME/data96 + +#You might want to set some locale stuff here +#setenv PGDATESTYLE ISO +#setenv LC_ALL sv_SE.ISO_8859-1 + +# if you want to make regression tests use this TZ +#setenv TZ PST8PDT diff --git a/databases/postgresql12-server/files/dot.profile.in b/databases/postgresql12-server/files/dot.profile.in new file mode 100644 index 000000000000..5be3e6a36ca9 --- /dev/null +++ b/databases/postgresql12-server/files/dot.profile.in @@ -0,0 +1,22 @@ +PGLIB=%%PREFIX%%/lib + +# note: PGDATA can be overridden by the -D startup option +PGDATA=${HOME}/data96 + +export PATH PGLIB PGDATA + +# if you use the periodic script from share/postgresql/502.pgsql, you +# can set these +#PGDUMP_ARGS="-b -F c" +#PGBACKUPDIR=${HOME}/backups +#PGBACKUP_SAVE_DAYS=7 +#export PGBACKUPDIR PGDUMP_ARGS PGBACKUP_SAVE_DAYS + +#You might want to set some locale stuff here +#PGDATESTYLE=ISO +#LC_ALL=sv_SE.ISO_8859-1 +#export PGDATESTYLE LC_ALL + +# if you want to make regression tests use this TZ +#TZ=PST8PDT +#export TZ diff --git a/databases/postgresql12-server/files/patch-doc-Makefile b/databases/postgresql12-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..d5176bfb64b5 --- /dev/null +++ b/databases/postgresql12-server/files/patch-doc-Makefile @@ -0,0 +1,9 @@ +--- doc/Makefile.orig 2015-10-08 21:45:57.360084007 +0200 ++++ doc/Makefile 2015-10-08 21:46:04.353084097 +0200 +@@ -12,5 +12,5 @@ + top_builddir = .. + include $(top_builddir)/src/Makefile.global + +-all distprep html man install installdirs uninstall clean distclean maintainer-clean: ++all distprep man install installdirs uninstall clean distclean maintainer-clean: + $(MAKE) -C src $@ diff --git a/databases/postgresql12-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql12-server/files/patch-doc-src-sgml-Makefile new file mode 100644 index 000000000000..36f5d2a8224c --- /dev/null +++ b/databases/postgresql12-server/files/patch-doc-src-sgml-Makefile @@ -0,0 +1,41 @@ +--- doc/src/sgml/Makefile.orig 2018-10-15 23:12:02.000000000 +0200 ++++ doc/src/sgml/Makefile 2018-10-18 22:34:13.656029000 +0200 +@@ -15,7 +15,7 @@ + + # Make "html" the default target, since that is what most people tend + # to want to use. +-html: ++man: + + # We don't need the tree-wide headers or install support here. + NO_GENERATED_HEADERS=yes +@@ -26,7 +26,7 @@ + include $(top_builddir)/src/Makefile.global + + +-all: html man ++all: man + + distprep: html distprep-man + +@@ -62,7 +62,6 @@ + ## Man pages + ## + +-man distprep-man: man-stamp + + man-stamp: stylesheet-man.xsl postgres.sgml $(ALLSGML) + $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^) +@@ -212,10 +211,10 @@ + ## Install + ## + +-install: install-html install-man ++install: install-man + + installdirs: +- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) ++ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) + + # If the install used a man directory shared with other applications, this will remove all files. + uninstall: diff --git a/databases/postgresql12-server/files/patch-src-Makefile.shlib b/databases/postgresql12-server/files/patch-src-Makefile.shlib new file mode 100644 index 000000000000..2435ffe1d280 --- /dev/null +++ b/databases/postgresql12-server/files/patch-src-Makefile.shlib @@ -0,0 +1,11 @@ +--- src/Makefile.shlib.bak 2013-05-06 22:57:06.000000000 +0200 ++++ src/Makefile.shlib 2013-05-12 23:33:16.000000000 +0200 +@@ -87,7 +87,7 @@ + # Testing the soname variable is a reliable way to determine whether a + # linkable library is being built. + soname = $(shlib_major) +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + else + # Naming convention for dynamically loadable modules + shlib = $(NAME)$(DLSUFFIX) diff --git a/databases/postgresql12-server/files/patch-src-backend-Makefile b/databases/postgresql12-server/files/patch-src-backend-Makefile new file mode 100644 index 000000000000..ce8a8d558de1 --- /dev/null +++ b/databases/postgresql12-server/files/patch-src-backend-Makefile @@ -0,0 +1,11 @@ +--- src/backend/Makefile.orig 2009-07-07 15:58:33.000000000 +0200 ++++ src/backend/Makefile 2009-07-07 15:58:57.000000000 +0200 +@@ -107,6 +107,8 @@ + # Update the commonly used headers before building the subdirectories + $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h + ++symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/storage/lwlocknames.h ++ + + # The postgres.o target is needed by the rule in Makefile.global that + # creates the exports file when MAKE_EXPORTS = true. diff --git a/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample new file mode 100644 index 000000000000..a82826b3b5f1 --- /dev/null +++ b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample @@ -0,0 +1,21 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2016-10-24 20:08:51 UTC ++++ src/backend/utils/misc/postgresql.conf.sample +@@ -330,6 +330,7 @@ + + # - Where to Log - + ++log_destination = 'syslog' + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog, and eventlog, + # depending on platform. csvlog +@@ -464,7 +465,9 @@ + + #cluster_name = '' # added to process titles if nonempty + # (change requires restart) +-#update_process_title = on ++ ++# On FreeBSD, this is a performance hog, so keep it off if you need speed ++update_process_title = off + + + #------------------------------------------------------------------------------ diff --git a/databases/postgresql12-server/files/pkg-message-client.in b/databases/postgresql12-server/files/pkg-message-client.in new file mode 100644 index 000000000000..0255f5ea747c --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-client.in @@ -0,0 +1,32 @@ +The PostgreSQL port has a collection of "side orders": + +postgresql-docs + For all of the html documentation + +p5-Pg + A perl5 API for client access to PostgreSQL databases. + +postgresql-tcltk + If you want tcl/tk client support. + +postgresql-jdbc + For Java JDBC support. + +postgresql-odbc + For client access from unix applications using ODBC as access + method. Not needed to access unix PostgreSQL servers from Win32 + using ODBC. See below. + +ruby-postgres, py-psycopg2 + For client access to PostgreSQL databases using the ruby & python + languages. + +postgresql-plperl, postgresql-pltcl & postgresql-plruby + For using perl5, tcl & ruby as procedural languages. + +postgresql-contrib + Lots of contributed utilities, postgresql functions and + datatypes. There you find pg_standby, pgcrypto and many other cool + things. + +etc... diff --git a/databases/postgresql12-server/files/pkg-message-contrib.in b/databases/postgresql12-server/files/pkg-message-contrib.in new file mode 100644 index 000000000000..2b29ffd33041 --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-contrib.in @@ -0,0 +1,3 @@ +The PostgreSQL contrib utilities have been installed. Please see +%%PREFIX%%/share/doc/postgresql/contrib/README +for more information. diff --git a/databases/postgresql12-server/files/pkg-message-plperl.in b/databases/postgresql12-server/files/pkg-message-plperl.in new file mode 100644 index 000000000000..5d0c83920563 --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-plperl.in @@ -0,0 +1,3 @@ +PL/Perl has been installed. Check the createlang(l) manpage for more +info. You can install PL/Perl as trusted or untrusted, by using either +"createlang plperl" or "createlang plperlu". diff --git a/databases/postgresql12-server/files/pkg-message-plpython.in b/databases/postgresql12-server/files/pkg-message-plpython.in new file mode 100644 index 000000000000..c413582b6295 --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-plpython.in @@ -0,0 +1,3 @@ +PL/Python has been installed. Check the createlang(l) manpage for more +info. You can install PL/Python by using "createlang plpythonu" (it +exists as an untrusted language only). diff --git a/databases/postgresql12-server/files/pkg-message-pltcl.in b/databases/postgresql12-server/files/pkg-message-pltcl.in new file mode 100644 index 000000000000..0902b858de0b --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-pltcl.in @@ -0,0 +1,3 @@ +PL/Tcl has been installed. Check the createlang(l) manpage for more +info. You can install pltcl as trusted or untrusted, by using either +"createlang pltcl" or "createlang pltclu". diff --git a/databases/postgresql12-server/files/pkg-message-server.in b/databases/postgresql12-server/files/pkg-message-server.in new file mode 100644 index 000000000000..8df5b8198903 --- /dev/null +++ b/databases/postgresql12-server/files/pkg-message-server.in @@ -0,0 +1,64 @@ +For procedural languages and postgresql functions, please note that +you might have to update them when updating the server. + +If you have many tables and many clients running, consider raising +kern.maxfiles using sysctl(8), or reconfigure your kernel +appropriately. + +The port is set up to use autovacuum for new databases, but you might +also want to vacuum and perhaps backup your database regularly. There +is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that +you may find useful. You can use it to backup and perform vacuum on all +databases nightly. Per default, it performs `vacuum analyze'. See the +script for instructions. For autovacuum settings, please review +~pgsql/data/postgresql.conf. + +If you plan to access your PostgreSQL server using ODBC, please +consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql +to get the functions required for ODBC compliance. + +Please note that if you use the rc script, +%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode +(UTF-8) will be used to store character data by default. Set +postgresql_initdb_flags or use login.conf settings described below to +alter this behaviour. See the start rc script for more info. + +To set limits, environment stuff like locale and collation and other +things, you can set up a class in /etc/login.conf before initializing +the database. Add something similar to this to /etc/login.conf: +--- +postgres:\ + :lang=en_US.UTF-8:\ + :setenv=LC_COLLATE=C:\ + :tc=default: +--- +and run `cap_mkdb /etc/login.conf'. +Then add 'postgresql_class="postgres"' to /etc/rc.conf. + +====================================================================== + +To initialize the database, run + + %%PREFIX%%/etc/rc.d/postgresql initdb + +You can then start PostgreSQL by running: + + %%PREFIX%%/etc/rc.d/postgresql start + +For postmaster settings, see ~pgsql/data/postgresql.conf + +NB. FreeBSD's PostgreSQL port logs to syslog by default + See ~pgsql/data/postgresql.conf for more info + +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + +====================================================================== + +To run PostgreSQL at startup, add +'postgresql_enable="YES"' to /etc/rc.conf + diff --git a/databases/postgresql12-server/files/pkgIndex.tcl.in b/databases/postgresql12-server/files/pkgIndex.tcl.in new file mode 100644 index 000000000000..bd8329b15c69 --- /dev/null +++ b/databases/postgresql12-server/files/pkgIndex.tcl.in @@ -0,0 +1,4 @@ +# Package-index file for Pgtcl-package. Enables you to load PostgreSQL +# interface functions right into you TCL-interpreter as simply as +# package require Pgtcl +package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so" diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in new file mode 100644 index 000000000000..6716757deca0 --- /dev/null +++ b/databases/postgresql12-server/files/postgresql.in @@ -0,0 +1,117 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: postgresql +# REQUIRE: sshd +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable PostgreSQL: +# +# postgresql_enable="YES" +# # optional +# postgresql_data="/var/db/%%PG_USER%%/data11" +# postgresql_flags="-w -s -m fast" +# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" +# postgresql_class="default" +# postgresql_profiles="" +# +# See %%PREFIX%%/share/doc/postgresql/README-server for more info +# +# This scripts takes one of the following commands: +# +# start stop restart reload status initdb +# +# For postmaster startup options, edit ${postgresql_data}/postgresql.conf + +command=%%PREFIX%%/bin/pg_ctl + +. /etc/rc.subr + +load_rc_config postgresql + +# set defaults +postgresql_enable=${postgresql_enable:-"NO"} +postgresql_flags=${postgresql_flags:-"-w -s -m fast"} +postgresql_user=${postgresql_user:-"%%PG_USER%%"} +eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data11"} +postgresql_class=${postgresql_class:-"default"} +postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} + +name=postgresql +rcvar=postgresql_enable +extra_commands="reload initdb" + +start_cmd="postgresql_command start" +stop_cmd="postgresql_command stop" +restart_cmd="postgresql_command restart" +reload_cmd="postgresql_command reload" +status_cmd="postgresql_command status" +promote_cmd="postgresql_command promote" + +initdb_cmd="postgresql_initdb" + +su_cmd="/usr/bin/su" + +if [ -n "$2" ]; then + profile="$2" + if [ "x${postgresql_profiles}" != "x" ]; then + eval postgresql_data="\${postgresql_${profile}_data:-}" + if [ "x${postgresql_data}" = "x" ]; then + echo "You must define a data directory (postgresql_${profile}_data)" + exit 1 + fi + eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" + eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" + eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" + eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + fi +else + if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then + for profile in ${postgresql_profiles}; do + eval _enable="\${postgresql_${profile}_enable}" + case "x${_enable:-${postgresql_enable}}" in + x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) + continue + ;; + x[Yy][Ee][Ss]) + ;; + *) + if test -z "$_enable"; then + _var=postgresql_enable + else + _var=postgresql_"${profile}"_enable + fi + echo "Bad value" \ + "'${_enable:-${postgresql_enable}}'" \ + "for ${_var}. " \ + "Profile ${profile} skipped." + continue + ;; + esac + echo "===> postgresql profile: ${profile}" + %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} + retcode="$?" + if [ "0${retcode}" -ne 0 ]; then + failed="${profile} (${retcode}) ${failed:-}" + else + success="${profile} ${success:-}" + fi + done + exit 0 + fi +fi + +command_args="-D ${postgresql_data} ${postgresql_flags}" + +postgresql_command() +{ + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" +} + +postgresql_initdb() +{ + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" +} + +run_rc_command "$1" diff --git a/databases/postgresql12-server/pkg-descr b/databases/postgresql12-server/pkg-descr new file mode 100644 index 000000000000..1b3c3db53e96 --- /dev/null +++ b/databases/postgresql12-server/pkg-descr @@ -0,0 +1,23 @@ +PostgreSQL is a sophisticated Object-Relational DBMS, supporting +almost all SQL constructs, including subselects, transactions, and +user-defined types and functions. It is the most advanced open-source +database available anywhere. Commercial Support is also available. + +The original Postgres code was the effort of many graduate students, +undergraduate students, and staff programmers working under the direction of +Professor Michael Stonebraker at the University of California, Berkeley. In +1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query +language to SQL and created a new database system which came to known as +Postgres95. Many others contributed to the porting, testing, debugging and +enhancement of the Postgres95 code. As the code improved, and 1995 faded into +memory, PostgreSQL was born. + +PostgreSQL development is presently being performed by a team of Internet +developers who are now responsible for all current and future development. The +development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG). +Support is available from the PostgreSQL developer/user community through the +support mailing list (questions@PostgreSQL.ORG). + +PostgreSQL is free and the complete source is available. + +WWW: https://www.postgresql.org/ diff --git a/databases/postgresql12-server/pkg-install-server b/databases/postgresql12-server/pkg-install-server new file mode 100644 index 000000000000..dff2f434764f --- /dev/null +++ b/databases/postgresql12-server/pkg-install-server @@ -0,0 +1,24 @@ +#! /bin/sh + +# $FreeBSD$ + +PATH=/bin:/usr/bin:/usr/sbin + +backupwarning() { +cat < 8.4), a dump + and restore of all databases is + required. This is *NOT* done by the port! + =========================================== +EOF +} + +case $2 in +PRE-INSTALL) + backupwarning + ;; +esac diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client new file mode 100644 index 000000000000..d636f517296e --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-client @@ -0,0 +1,1229 @@ +bin/clusterdb +bin/createdb +bin/createuser +bin/dropdb +bin/dropuser +bin/ecpg +bin/pg_config +bin/pg_dump +bin/pg_dumpall +bin/pg_isready +bin/pg_restore +bin/pgbench +bin/psql +bin/reindexdb +bin/vacuumdb +include/ecpg_config.h +include/ecpg_informix.h +include/ecpgerrno.h +include/ecpglib.h +include/ecpgtype.h +include/libpq-events.h +include/libpq-fe.h +include/libpq/libpq-fs.h +include/pg_config.h +include/pg_config_ext.h +include/pg_config_manual.h +include/pg_config_os.h +include/pgtypes.h +include/pgtypes_date.h +include/pgtypes_error.h +include/pgtypes_interval.h +include/pgtypes_numeric.h +include/pgtypes_timestamp.h +include/postgres_ext.h +include/postgresql/informix/esql/datetime.h +include/postgresql/informix/esql/decimal.h +include/postgresql/informix/esql/sqltypes.h +include/postgresql/internal/c.h +include/postgresql/internal/libpq-int.h +include/postgresql/internal/libpq/pqcomm.h +include/postgresql/internal/port.h +include/postgresql/internal/postgres_fe.h +include/postgresql/internal/pqexpbuffer.h +include/postgresql/server/access/amapi.h +include/postgresql/server/access/amvalidate.h +include/postgresql/server/access/attnum.h +include/postgresql/server/access/brin.h +include/postgresql/server/access/brin_internal.h +include/postgresql/server/access/brin_page.h +include/postgresql/server/access/brin_pageops.h +include/postgresql/server/access/brin_revmap.h +include/postgresql/server/access/brin_tuple.h +include/postgresql/server/access/brin_xlog.h +include/postgresql/server/access/bufmask.h +include/postgresql/server/access/clog.h +include/postgresql/server/access/commit_ts.h +include/postgresql/server/access/genam.h +include/postgresql/server/access/generic_xlog.h +include/postgresql/server/access/gin.h +include/postgresql/server/access/gin_private.h +include/postgresql/server/access/ginblock.h +include/postgresql/server/access/ginxlog.h +include/postgresql/server/access/gist.h +include/postgresql/server/access/gist_private.h +include/postgresql/server/access/gistscan.h +include/postgresql/server/access/gistxlog.h +include/postgresql/server/access/hash.h +include/postgresql/server/access/hash_xlog.h +include/postgresql/server/access/heapam.h +include/postgresql/server/access/heapam_xlog.h +include/postgresql/server/access/hio.h +include/postgresql/server/access/htup.h +include/postgresql/server/access/htup_details.h +include/postgresql/server/access/itup.h +include/postgresql/server/access/multixact.h +include/postgresql/server/access/nbtree.h +include/postgresql/server/access/nbtxlog.h +include/postgresql/server/access/parallel.h +include/postgresql/server/access/printsimple.h +include/postgresql/server/access/printtup.h +include/postgresql/server/access/relation.h +include/postgresql/server/access/reloptions.h +include/postgresql/server/access/relscan.h +include/postgresql/server/access/rewriteheap.h +include/postgresql/server/access/rmgr.h +include/postgresql/server/access/rmgrlist.h +include/postgresql/server/access/sdir.h +include/postgresql/server/access/session.h +include/postgresql/server/access/skey.h +include/postgresql/server/access/slru.h +include/postgresql/server/access/spgist.h +include/postgresql/server/access/spgist_private.h +include/postgresql/server/access/spgxlog.h +include/postgresql/server/access/stratnum.h +include/postgresql/server/access/subtrans.h +include/postgresql/server/access/sysattr.h +include/postgresql/server/access/table.h +include/postgresql/server/access/tableam.h +include/postgresql/server/access/timeline.h +include/postgresql/server/access/transam.h +include/postgresql/server/access/tsmapi.h +include/postgresql/server/access/tupconvert.h +include/postgresql/server/access/tupdesc.h +include/postgresql/server/access/tupdesc_details.h +include/postgresql/server/access/tupmacs.h +include/postgresql/server/access/tuptoaster.h +include/postgresql/server/access/twophase.h +include/postgresql/server/access/twophase_rmgr.h +include/postgresql/server/access/valid.h +include/postgresql/server/access/visibilitymap.h +include/postgresql/server/access/xact.h +include/postgresql/server/access/xlog.h +include/postgresql/server/access/xlog_internal.h +include/postgresql/server/access/xlogdefs.h +include/postgresql/server/access/xloginsert.h +include/postgresql/server/access/xlogreader.h +include/postgresql/server/access/xlogrecord.h +include/postgresql/server/access/xlogutils.h +include/postgresql/server/bootstrap/bootstrap.h +include/postgresql/server/c.h +include/postgresql/server/catalog/binary_upgrade.h +include/postgresql/server/catalog/catalog.h +include/postgresql/server/catalog/catversion.h +include/postgresql/server/catalog/dependency.h +include/postgresql/server/catalog/genbki.h +include/postgresql/server/catalog/heap.h +include/postgresql/server/catalog/index.h +include/postgresql/server/catalog/indexing.h +include/postgresql/server/catalog/namespace.h +include/postgresql/server/catalog/objectaccess.h +include/postgresql/server/catalog/objectaddress.h +include/postgresql/server/catalog/opfam_internal.h +include/postgresql/server/catalog/partition.h +include/postgresql/server/catalog/pg_aggregate.h +include/postgresql/server/catalog/pg_aggregate_d.h +include/postgresql/server/catalog/pg_am.h +include/postgresql/server/catalog/pg_am_d.h +include/postgresql/server/catalog/pg_amop.h +include/postgresql/server/catalog/pg_amop_d.h +include/postgresql/server/catalog/pg_amproc.h +include/postgresql/server/catalog/pg_amproc_d.h +include/postgresql/server/catalog/pg_attrdef.h +include/postgresql/server/catalog/pg_attrdef_d.h +include/postgresql/server/catalog/pg_attribute.h +include/postgresql/server/catalog/pg_attribute_d.h +include/postgresql/server/catalog/pg_auth_members.h +include/postgresql/server/catalog/pg_auth_members_d.h +include/postgresql/server/catalog/pg_authid.h +include/postgresql/server/catalog/pg_authid_d.h +include/postgresql/server/catalog/pg_cast.h +include/postgresql/server/catalog/pg_cast_d.h +include/postgresql/server/catalog/pg_class.h +include/postgresql/server/catalog/pg_class_d.h +include/postgresql/server/catalog/pg_collation.h +include/postgresql/server/catalog/pg_collation_d.h +include/postgresql/server/catalog/pg_constraint.h +include/postgresql/server/catalog/pg_constraint_d.h +include/postgresql/server/catalog/pg_control.h +include/postgresql/server/catalog/pg_conversion.h +include/postgresql/server/catalog/pg_conversion_d.h +include/postgresql/server/catalog/pg_database.h +include/postgresql/server/catalog/pg_database_d.h +include/postgresql/server/catalog/pg_db_role_setting.h +include/postgresql/server/catalog/pg_db_role_setting_d.h +include/postgresql/server/catalog/pg_default_acl.h +include/postgresql/server/catalog/pg_default_acl_d.h +include/postgresql/server/catalog/pg_depend.h +include/postgresql/server/catalog/pg_depend_d.h +include/postgresql/server/catalog/pg_description.h +include/postgresql/server/catalog/pg_description_d.h +include/postgresql/server/catalog/pg_enum.h +include/postgresql/server/catalog/pg_enum_d.h +include/postgresql/server/catalog/pg_event_trigger.h +include/postgresql/server/catalog/pg_event_trigger_d.h +include/postgresql/server/catalog/pg_extension.h +include/postgresql/server/catalog/pg_extension_d.h +include/postgresql/server/catalog/pg_foreign_data_wrapper.h +include/postgresql/server/catalog/pg_foreign_data_wrapper_d.h +include/postgresql/server/catalog/pg_foreign_server.h +include/postgresql/server/catalog/pg_foreign_server_d.h +include/postgresql/server/catalog/pg_foreign_table.h +include/postgresql/server/catalog/pg_foreign_table_d.h +include/postgresql/server/catalog/pg_index.h +include/postgresql/server/catalog/pg_index_d.h +include/postgresql/server/catalog/pg_inherits.h +include/postgresql/server/catalog/pg_inherits_d.h +include/postgresql/server/catalog/pg_init_privs.h +include/postgresql/server/catalog/pg_init_privs_d.h +include/postgresql/server/catalog/pg_language.h +include/postgresql/server/catalog/pg_language_d.h +include/postgresql/server/catalog/pg_largeobject.h +include/postgresql/server/catalog/pg_largeobject_d.h +include/postgresql/server/catalog/pg_largeobject_metadata.h +include/postgresql/server/catalog/pg_largeobject_metadata_d.h +include/postgresql/server/catalog/pg_namespace.h +include/postgresql/server/catalog/pg_namespace_d.h +include/postgresql/server/catalog/pg_opclass.h +include/postgresql/server/catalog/pg_opclass_d.h +include/postgresql/server/catalog/pg_operator.h +include/postgresql/server/catalog/pg_operator_d.h +include/postgresql/server/catalog/pg_opfamily.h +include/postgresql/server/catalog/pg_opfamily_d.h +include/postgresql/server/catalog/pg_partitioned_table.h +include/postgresql/server/catalog/pg_partitioned_table_d.h +include/postgresql/server/catalog/pg_pltemplate.h +include/postgresql/server/catalog/pg_pltemplate_d.h +include/postgresql/server/catalog/pg_policy.h +include/postgresql/server/catalog/pg_policy_d.h +include/postgresql/server/catalog/pg_proc.h +include/postgresql/server/catalog/pg_proc_d.h +include/postgresql/server/catalog/pg_publication.h +include/postgresql/server/catalog/pg_publication_d.h +include/postgresql/server/catalog/pg_publication_rel.h +include/postgresql/server/catalog/pg_publication_rel_d.h +include/postgresql/server/catalog/pg_range.h +include/postgresql/server/catalog/pg_range_d.h +include/postgresql/server/catalog/pg_replication_origin.h +include/postgresql/server/catalog/pg_replication_origin_d.h +include/postgresql/server/catalog/pg_rewrite.h +include/postgresql/server/catalog/pg_rewrite_d.h +include/postgresql/server/catalog/pg_seclabel.h +include/postgresql/server/catalog/pg_seclabel_d.h +include/postgresql/server/catalog/pg_sequence.h +include/postgresql/server/catalog/pg_sequence_d.h +include/postgresql/server/catalog/pg_shdepend.h +include/postgresql/server/catalog/pg_shdepend_d.h +include/postgresql/server/catalog/pg_shdescription.h +include/postgresql/server/catalog/pg_shdescription_d.h +include/postgresql/server/catalog/pg_shseclabel.h +include/postgresql/server/catalog/pg_shseclabel_d.h +include/postgresql/server/catalog/pg_statistic.h +include/postgresql/server/catalog/pg_statistic_d.h +include/postgresql/server/catalog/pg_statistic_ext.h +include/postgresql/server/catalog/pg_statistic_ext_d.h +include/postgresql/server/catalog/pg_statistic_ext_data.h +include/postgresql/server/catalog/pg_statistic_ext_data_d.h +include/postgresql/server/catalog/pg_subscription.h +include/postgresql/server/catalog/pg_subscription_d.h +include/postgresql/server/catalog/pg_subscription_rel.h +include/postgresql/server/catalog/pg_subscription_rel_d.h +include/postgresql/server/catalog/pg_tablespace.h +include/postgresql/server/catalog/pg_tablespace_d.h +include/postgresql/server/catalog/pg_transform.h +include/postgresql/server/catalog/pg_transform_d.h +include/postgresql/server/catalog/pg_trigger.h +include/postgresql/server/catalog/pg_trigger_d.h +include/postgresql/server/catalog/pg_ts_config.h +include/postgresql/server/catalog/pg_ts_config_d.h +include/postgresql/server/catalog/pg_ts_config_map.h +include/postgresql/server/catalog/pg_ts_config_map_d.h +include/postgresql/server/catalog/pg_ts_dict.h +include/postgresql/server/catalog/pg_ts_dict_d.h +include/postgresql/server/catalog/pg_ts_parser.h +include/postgresql/server/catalog/pg_ts_parser_d.h +include/postgresql/server/catalog/pg_ts_template.h +include/postgresql/server/catalog/pg_ts_template_d.h +include/postgresql/server/catalog/pg_type.h +include/postgresql/server/catalog/pg_type_d.h +include/postgresql/server/catalog/pg_user_mapping.h +include/postgresql/server/catalog/pg_user_mapping_d.h +include/postgresql/server/catalog/schemapg.h +include/postgresql/server/catalog/storage.h +include/postgresql/server/catalog/storage_xlog.h +include/postgresql/server/catalog/toasting.h +include/postgresql/server/commands/alter.h +include/postgresql/server/commands/async.h +include/postgresql/server/commands/cluster.h +include/postgresql/server/commands/collationcmds.h +include/postgresql/server/commands/comment.h +include/postgresql/server/commands/conversioncmds.h +include/postgresql/server/commands/copy.h +include/postgresql/server/commands/createas.h +include/postgresql/server/commands/dbcommands.h +include/postgresql/server/commands/dbcommands_xlog.h +include/postgresql/server/commands/defrem.h +include/postgresql/server/commands/discard.h +include/postgresql/server/commands/event_trigger.h +include/postgresql/server/commands/explain.h +include/postgresql/server/commands/extension.h +include/postgresql/server/commands/lockcmds.h +include/postgresql/server/commands/matview.h +include/postgresql/server/commands/policy.h +include/postgresql/server/commands/portalcmds.h +include/postgresql/server/commands/prepare.h +include/postgresql/server/commands/proclang.h +include/postgresql/server/commands/progress.h +include/postgresql/server/commands/publicationcmds.h +include/postgresql/server/commands/schemacmds.h +include/postgresql/server/commands/seclabel.h +include/postgresql/server/commands/sequence.h +include/postgresql/server/commands/subscriptioncmds.h +include/postgresql/server/commands/tablecmds.h +include/postgresql/server/commands/tablespace.h +include/postgresql/server/commands/trigger.h +include/postgresql/server/commands/typecmds.h +include/postgresql/server/commands/user.h +include/postgresql/server/commands/vacuum.h +include/postgresql/server/commands/variable.h +include/postgresql/server/commands/view.h +include/postgresql/server/common/base64.h +include/postgresql/server/common/config_info.h +include/postgresql/server/common/controldata_utils.h +include/postgresql/server/common/fe_memutils.h +include/postgresql/server/common/file_perm.h +include/postgresql/server/common/file_utils.h +include/postgresql/server/common/int.h +include/postgresql/server/common/int128.h +include/postgresql/server/common/ip.h +include/postgresql/server/common/keywords.h +include/postgresql/server/common/kwlookup.h +include/postgresql/server/common/link-canary.h +include/postgresql/server/common/logging.h +include/postgresql/server/common/md5.h +include/postgresql/server/common/pg_lzcompress.h +include/postgresql/server/common/relpath.h +include/postgresql/server/common/restricted_token.h +include/postgresql/server/common/saslprep.h +include/postgresql/server/common/scram-common.h +include/postgresql/server/common/sha2.h +include/postgresql/server/common/shortest_dec.h +include/postgresql/server/common/string.h +include/postgresql/server/common/unicode_norm.h +include/postgresql/server/common/unicode_norm_table.h +include/postgresql/server/common/username.h +include/postgresql/server/datatype/timestamp.h +include/postgresql/server/executor/execExpr.h +include/postgresql/server/executor/execParallel.h +include/postgresql/server/executor/execPartition.h +include/postgresql/server/executor/execdebug.h +include/postgresql/server/executor/execdesc.h +include/postgresql/server/executor/executor.h +include/postgresql/server/executor/functions.h +include/postgresql/server/executor/hashjoin.h +include/postgresql/server/executor/instrument.h +include/postgresql/server/executor/nodeAgg.h +include/postgresql/server/executor/nodeAppend.h +include/postgresql/server/executor/nodeBitmapAnd.h +include/postgresql/server/executor/nodeBitmapHeapscan.h +include/postgresql/server/executor/nodeBitmapIndexscan.h +include/postgresql/server/executor/nodeBitmapOr.h +include/postgresql/server/executor/nodeCtescan.h +include/postgresql/server/executor/nodeCustom.h +include/postgresql/server/executor/nodeForeignscan.h +include/postgresql/server/executor/nodeFunctionscan.h +include/postgresql/server/executor/nodeGather.h +include/postgresql/server/executor/nodeGatherMerge.h +include/postgresql/server/executor/nodeGroup.h +include/postgresql/server/executor/nodeHash.h +include/postgresql/server/executor/nodeHashjoin.h +include/postgresql/server/executor/nodeIndexonlyscan.h +include/postgresql/server/executor/nodeIndexscan.h +include/postgresql/server/executor/nodeLimit.h +include/postgresql/server/executor/nodeLockRows.h +include/postgresql/server/executor/nodeMaterial.h +include/postgresql/server/executor/nodeMergeAppend.h +include/postgresql/server/executor/nodeMergejoin.h +include/postgresql/server/executor/nodeModifyTable.h +include/postgresql/server/executor/nodeNamedtuplestorescan.h +include/postgresql/server/executor/nodeNestloop.h +include/postgresql/server/executor/nodeProjectSet.h +include/postgresql/server/executor/nodeRecursiveunion.h +include/postgresql/server/executor/nodeResult.h +include/postgresql/server/executor/nodeSamplescan.h +include/postgresql/server/executor/nodeSeqscan.h +include/postgresql/server/executor/nodeSetOp.h +include/postgresql/server/executor/nodeSort.h +include/postgresql/server/executor/nodeSubplan.h +include/postgresql/server/executor/nodeSubqueryscan.h +include/postgresql/server/executor/nodeTableFuncscan.h +include/postgresql/server/executor/nodeTidscan.h +include/postgresql/server/executor/nodeUnique.h +include/postgresql/server/executor/nodeValuesscan.h +include/postgresql/server/executor/nodeWindowAgg.h +include/postgresql/server/executor/nodeWorktablescan.h +include/postgresql/server/executor/spi.h +include/postgresql/server/executor/spi_priv.h +include/postgresql/server/executor/tablefunc.h +include/postgresql/server/executor/tqueue.h +include/postgresql/server/executor/tstoreReceiver.h +include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/conditional.h +include/postgresql/server/fe_utils/connect.h +include/postgresql/server/fe_utils/mbprint.h +include/postgresql/server/fe_utils/print.h +include/postgresql/server/fe_utils/psqlscan.h +include/postgresql/server/fe_utils/psqlscan_int.h +include/postgresql/server/fe_utils/simple_list.h +include/postgresql/server/fe_utils/string_utils.h +include/postgresql/server/fmgr.h +include/postgresql/server/foreign/fdwapi.h +include/postgresql/server/foreign/foreign.h +include/postgresql/server/funcapi.h +include/postgresql/server/getaddrinfo.h +include/postgresql/server/getopt_long.h +include/postgresql/server/jit/jit.h +include/postgresql/server/jit/llvmjit.h +include/postgresql/server/jit/llvmjit_emit.h +include/postgresql/server/lib/binaryheap.h +include/postgresql/server/lib/bipartite_match.h +include/postgresql/server/lib/bloomfilter.h +include/postgresql/server/lib/dshash.h +include/postgresql/server/lib/hyperloglog.h +include/postgresql/server/lib/ilist.h +include/postgresql/server/lib/integerset.h +include/postgresql/server/lib/knapsack.h +include/postgresql/server/lib/pairingheap.h +include/postgresql/server/lib/rbtree.h +include/postgresql/server/lib/simplehash.h +include/postgresql/server/lib/stringinfo.h +include/postgresql/server/libpq/auth.h +include/postgresql/server/libpq/be-fsstubs.h +include/postgresql/server/libpq/be-gssapi-common.h +include/postgresql/server/libpq/crypt.h +include/postgresql/server/libpq/hba.h +include/postgresql/server/libpq/ifaddr.h +include/postgresql/server/libpq/libpq-be.h +include/postgresql/server/libpq/libpq-fs.h +include/postgresql/server/libpq/libpq.h +include/postgresql/server/libpq/pqcomm.h +include/postgresql/server/libpq/pqformat.h +include/postgresql/server/libpq/pqmq.h +include/postgresql/server/libpq/pqsignal.h +include/postgresql/server/libpq/scram.h +include/postgresql/server/mb/pg_wchar.h +include/postgresql/server/miscadmin.h +include/postgresql/server/nodes/bitmapset.h +include/postgresql/server/nodes/execnodes.h +include/postgresql/server/nodes/extensible.h +include/postgresql/server/nodes/lockoptions.h +include/postgresql/server/nodes/makefuncs.h +include/postgresql/server/nodes/memnodes.h +include/postgresql/server/nodes/nodeFuncs.h +include/postgresql/server/nodes/nodes.h +include/postgresql/server/nodes/params.h +include/postgresql/server/nodes/parsenodes.h +include/postgresql/server/nodes/pathnodes.h +include/postgresql/server/nodes/pg_list.h +include/postgresql/server/nodes/plannodes.h +include/postgresql/server/nodes/primnodes.h +include/postgresql/server/nodes/print.h +include/postgresql/server/nodes/readfuncs.h +include/postgresql/server/nodes/replnodes.h +include/postgresql/server/nodes/supportnodes.h +include/postgresql/server/nodes/tidbitmap.h +include/postgresql/server/nodes/value.h +include/postgresql/server/optimizer/appendinfo.h +include/postgresql/server/optimizer/clauses.h +include/postgresql/server/optimizer/cost.h +include/postgresql/server/optimizer/geqo.h +include/postgresql/server/optimizer/geqo_copy.h +include/postgresql/server/optimizer/geqo_gene.h +include/postgresql/server/optimizer/geqo_misc.h +include/postgresql/server/optimizer/geqo_mutation.h +include/postgresql/server/optimizer/geqo_pool.h +include/postgresql/server/optimizer/inherit.h +include/postgresql/server/optimizer/optimizer.h +include/postgresql/server/partitioning/partdesc.h +include/postgresql/server/port/pg_bitutils.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_indonesian.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_irish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_hungarian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_arabic.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_indonesian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_irish.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_lithuanian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_nepali.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_tamil.h +include/postgresql/server/storage/md.h +include/postgresql/server/storage/sync.h +include/postgresql/server/utils/float.h +include/postgresql/server/utils/jsonpath.h +lib/libecpg.so.7 +lib/libpgport_shlib.a +man/man1/pg_checksums.1.gz +man/man3/SPI_commit_and_chain.3.gz +man/man3/SPI_rollback_and_chain.3.gz +include/postgresql/server/optimizer/geqo_recombination.h +include/postgresql/server/optimizer/geqo_selection.h +include/postgresql/server/optimizer/joininfo.h +include/postgresql/server/optimizer/orclauses.h +include/postgresql/server/optimizer/paramassign.h +include/postgresql/server/optimizer/pathnode.h +include/postgresql/server/optimizer/paths.h +include/postgresql/server/optimizer/placeholder.h +include/postgresql/server/optimizer/plancat.h +include/postgresql/server/optimizer/planmain.h +include/postgresql/server/optimizer/planner.h +include/postgresql/server/optimizer/prep.h +include/postgresql/server/optimizer/restrictinfo.h +include/postgresql/server/optimizer/subselect.h +include/postgresql/server/optimizer/tlist.h +include/postgresql/server/parser/analyze.h +include/postgresql/server/parser/gram.h +include/postgresql/server/parser/gramparse.h +include/postgresql/server/parser/kwlist.h +include/postgresql/server/parser/parse_agg.h +include/postgresql/server/parser/parse_clause.h +include/postgresql/server/parser/parse_coerce.h +include/postgresql/server/parser/parse_collate.h +include/postgresql/server/parser/parse_cte.h +include/postgresql/server/parser/parse_enr.h +include/postgresql/server/parser/parse_expr.h +include/postgresql/server/parser/parse_func.h +include/postgresql/server/parser/parse_node.h +include/postgresql/server/parser/parse_oper.h +include/postgresql/server/parser/parse_param.h +include/postgresql/server/parser/parse_relation.h +include/postgresql/server/parser/parse_target.h +include/postgresql/server/parser/parse_type.h +include/postgresql/server/parser/parse_utilcmd.h +include/postgresql/server/parser/parser.h +include/postgresql/server/parser/parsetree.h +include/postgresql/server/parser/scanner.h +include/postgresql/server/parser/scansup.h +include/postgresql/server/partitioning/partbounds.h +include/postgresql/server/partitioning/partdefs.h +include/postgresql/server/partitioning/partprune.h +include/postgresql/server/pg_config.h +include/postgresql/server/pg_config_ext.h +include/postgresql/server/pg_config_manual.h +include/postgresql/server/pg_config_os.h +include/postgresql/server/pg_getopt.h +include/postgresql/server/pg_trace.h +include/postgresql/server/pgstat.h +include/postgresql/server/pgtar.h +include/postgresql/server/pgtime.h +include/postgresql/server/port.h +include/postgresql/server/port/aix.h +include/postgresql/server/port/atomics.h +include/postgresql/server/port/atomics/arch-arm.h +include/postgresql/server/port/atomics/arch-hppa.h +include/postgresql/server/port/atomics/arch-ia64.h +include/postgresql/server/port/atomics/arch-ppc.h +include/postgresql/server/port/atomics/arch-x86.h +include/postgresql/server/port/atomics/fallback.h +include/postgresql/server/port/atomics/generic-acc.h +include/postgresql/server/port/atomics/generic-gcc.h +include/postgresql/server/port/atomics/generic-msvc.h +include/postgresql/server/port/atomics/generic-sunpro.h +include/postgresql/server/port/atomics/generic-xlc.h +include/postgresql/server/port/atomics/generic.h +include/postgresql/server/port/cygwin.h +include/postgresql/server/port/darwin.h +include/postgresql/server/port/freebsd.h +include/postgresql/server/port/hpux.h +include/postgresql/server/port/linux.h +include/postgresql/server/port/netbsd.h +include/postgresql/server/port/openbsd.h +include/postgresql/server/port/pg_bswap.h +include/postgresql/server/port/pg_crc32c.h +include/postgresql/server/port/solaris.h +include/postgresql/server/port/win32.h +include/postgresql/server/port/win32/arpa/inet.h +include/postgresql/server/port/win32/dlfcn.h +include/postgresql/server/port/win32/grp.h +include/postgresql/server/port/win32/netdb.h +include/postgresql/server/port/win32/netinet/in.h +include/postgresql/server/port/win32/pwd.h +include/postgresql/server/port/win32/sys/socket.h +include/postgresql/server/port/win32/sys/wait.h +include/postgresql/server/port/win32_msvc/dirent.h +include/postgresql/server/port/win32_msvc/sys/file.h +include/postgresql/server/port/win32_msvc/sys/param.h +include/postgresql/server/port/win32_msvc/sys/time.h +include/postgresql/server/port/win32_msvc/unistd.h +include/postgresql/server/port/win32_msvc/utime.h +include/postgresql/server/port/win32_port.h +include/postgresql/server/portability/instr_time.h +include/postgresql/server/portability/mem.h +include/postgresql/server/postgres.h +include/postgresql/server/postgres_ext.h +include/postgresql/server/postgres_fe.h +include/postgresql/server/postmaster/autovacuum.h +include/postgresql/server/postmaster/bgworker.h +include/postgresql/server/postmaster/bgworker_internals.h +include/postgresql/server/postmaster/bgwriter.h +include/postgresql/server/postmaster/fork_process.h +include/postgresql/server/postmaster/pgarch.h +include/postgresql/server/postmaster/postmaster.h +include/postgresql/server/postmaster/startup.h +include/postgresql/server/postmaster/syslogger.h +include/postgresql/server/postmaster/walwriter.h +include/postgresql/server/regex/regcustom.h +include/postgresql/server/regex/regerrs.h +include/postgresql/server/regex/regex.h +include/postgresql/server/regex/regexport.h +include/postgresql/server/regex/regguts.h +include/postgresql/server/replication/basebackup.h +include/postgresql/server/replication/decode.h +include/postgresql/server/replication/logical.h +include/postgresql/server/replication/logicalfuncs.h +include/postgresql/server/replication/logicallauncher.h +include/postgresql/server/replication/logicalproto.h +include/postgresql/server/replication/logicalrelation.h +include/postgresql/server/replication/logicalworker.h +include/postgresql/server/replication/message.h +include/postgresql/server/replication/origin.h +include/postgresql/server/replication/output_plugin.h +include/postgresql/server/replication/pgoutput.h +include/postgresql/server/replication/reorderbuffer.h +include/postgresql/server/replication/slot.h +include/postgresql/server/replication/snapbuild.h +include/postgresql/server/replication/syncrep.h +include/postgresql/server/replication/walreceiver.h +include/postgresql/server/replication/walsender.h +include/postgresql/server/replication/walsender_private.h +include/postgresql/server/replication/worker_internal.h +include/postgresql/server/rewrite/prs2lock.h +include/postgresql/server/rewrite/rewriteDefine.h +include/postgresql/server/rewrite/rewriteHandler.h +include/postgresql/server/rewrite/rewriteManip.h +include/postgresql/server/rewrite/rewriteRemove.h +include/postgresql/server/rewrite/rewriteSupport.h +include/postgresql/server/rewrite/rowsecurity.h +include/postgresql/server/rusagestub.h +include/postgresql/server/snowball/header.h +include/postgresql/server/snowball/libstemmer/api.h +include/postgresql/server/snowball/libstemmer/header.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h +include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h +include/postgresql/server/statistics/extended_stats_internal.h +include/postgresql/server/statistics/statistics.h +include/postgresql/server/storage/backendid.h +include/postgresql/server/storage/barrier.h +include/postgresql/server/storage/block.h +include/postgresql/server/storage/buf.h +include/postgresql/server/storage/buf_internals.h +include/postgresql/server/storage/buffile.h +include/postgresql/server/storage/bufmgr.h +include/postgresql/server/storage/bufpage.h +include/postgresql/server/storage/checksum.h +include/postgresql/server/storage/checksum_impl.h +include/postgresql/server/storage/condition_variable.h +include/postgresql/server/storage/copydir.h +include/postgresql/server/storage/dsm.h +include/postgresql/server/storage/dsm_impl.h +include/postgresql/server/storage/fd.h +include/postgresql/server/storage/freespace.h +include/postgresql/server/storage/fsm_internals.h +include/postgresql/server/storage/indexfsm.h +include/postgresql/server/storage/ipc.h +include/postgresql/server/storage/item.h +include/postgresql/server/storage/itemid.h +include/postgresql/server/storage/itemptr.h +include/postgresql/server/storage/large_object.h +include/postgresql/server/storage/latch.h +include/postgresql/server/storage/lmgr.h +include/postgresql/server/storage/lock.h +include/postgresql/server/storage/lockdefs.h +include/postgresql/server/storage/lwlock.h +include/postgresql/server/storage/lwlocknames.h +include/postgresql/server/storage/off.h +include/postgresql/server/storage/pg_sema.h +include/postgresql/server/storage/pg_shmem.h +include/postgresql/server/storage/pmsignal.h +include/postgresql/server/storage/predicate.h +include/postgresql/server/storage/predicate_internals.h +include/postgresql/server/storage/proc.h +include/postgresql/server/storage/procarray.h +include/postgresql/server/storage/proclist.h +include/postgresql/server/storage/proclist_types.h +include/postgresql/server/storage/procsignal.h +include/postgresql/server/storage/reinit.h +include/postgresql/server/storage/relfilenode.h +include/postgresql/server/storage/s_lock.h +include/postgresql/server/storage/sharedfileset.h +include/postgresql/server/storage/shm_mq.h +include/postgresql/server/storage/shm_toc.h +include/postgresql/server/storage/shmem.h +include/postgresql/server/storage/sinval.h +include/postgresql/server/storage/sinvaladt.h +include/postgresql/server/storage/smgr.h +include/postgresql/server/storage/spin.h +include/postgresql/server/storage/standby.h +include/postgresql/server/storage/standbydefs.h +include/postgresql/server/tcop/deparse_utility.h +include/postgresql/server/tcop/dest.h +include/postgresql/server/tcop/fastpath.h +include/postgresql/server/tcop/pquery.h +include/postgresql/server/tcop/tcopprot.h +include/postgresql/server/tcop/utility.h +include/postgresql/server/tsearch/dicts/regis.h +include/postgresql/server/tsearch/dicts/spell.h +include/postgresql/server/tsearch/ts_cache.h +include/postgresql/server/tsearch/ts_locale.h +include/postgresql/server/tsearch/ts_public.h +include/postgresql/server/tsearch/ts_type.h +include/postgresql/server/tsearch/ts_utils.h +include/postgresql/server/utils/acl.h +include/postgresql/server/utils/aclchk_internal.h +include/postgresql/server/utils/array.h +include/postgresql/server/utils/arrayaccess.h +include/postgresql/server/utils/ascii.h +include/postgresql/server/utils/attoptcache.h +include/postgresql/server/utils/builtins.h +include/postgresql/server/utils/bytea.h +include/postgresql/server/utils/cash.h +include/postgresql/server/utils/catcache.h +include/postgresql/server/utils/combocid.h +include/postgresql/server/utils/date.h +include/postgresql/server/utils/datetime.h +include/postgresql/server/utils/datum.h +include/postgresql/server/utils/dsa.h +include/postgresql/server/utils/dynahash.h +include/postgresql/server/utils/elog.h +include/postgresql/server/utils/errcodes.h +include/postgresql/server/utils/evtcache.h +include/postgresql/server/utils/expandeddatum.h +include/postgresql/server/utils/expandedrecord.h +include/postgresql/server/utils/fmgroids.h +include/postgresql/server/utils/fmgrprotos.h +include/postgresql/server/utils/fmgrtab.h +include/postgresql/server/utils/formatting.h +include/postgresql/server/utils/freepage.h +include/postgresql/server/utils/geo_decls.h +include/postgresql/server/utils/guc.h +include/postgresql/server/utils/guc_tables.h +include/postgresql/server/utils/hashutils.h +include/postgresql/server/utils/help_config.h +include/postgresql/server/utils/hsearch.h +include/postgresql/server/utils/index_selfuncs.h +include/postgresql/server/utils/inet.h +include/postgresql/server/utils/int8.h +include/postgresql/server/utils/inval.h +include/postgresql/server/utils/json.h +include/postgresql/server/utils/jsonapi.h +include/postgresql/server/utils/jsonb.h +include/postgresql/server/utils/logtape.h +include/postgresql/server/utils/lsyscache.h +include/postgresql/server/utils/memdebug.h +include/postgresql/server/utils/memutils.h +include/postgresql/server/utils/numeric.h +include/postgresql/server/utils/palloc.h +include/postgresql/server/utils/partcache.h +include/postgresql/server/utils/pg_crc.h +include/postgresql/server/utils/pg_locale.h +include/postgresql/server/utils/pg_lsn.h +include/postgresql/server/utils/pg_rusage.h +include/postgresql/server/utils/pidfile.h +include/postgresql/server/utils/plancache.h +include/postgresql/server/utils/portal.h +include/postgresql/server/utils/probes.h +include/postgresql/server/utils/ps_status.h +include/postgresql/server/utils/queryenvironment.h +include/postgresql/server/utils/rangetypes.h +include/postgresql/server/utils/regproc.h +include/postgresql/server/utils/rel.h +include/postgresql/server/utils/relcache.h +include/postgresql/server/utils/relfilenodemap.h +include/postgresql/server/utils/relmapper.h +include/postgresql/server/utils/relptr.h +include/postgresql/server/utils/reltrigger.h +include/postgresql/server/utils/resowner.h +include/postgresql/server/utils/resowner_private.h +include/postgresql/server/utils/rls.h +include/postgresql/server/utils/ruleutils.h +include/postgresql/server/utils/sampling.h +include/postgresql/server/utils/selfuncs.h +include/postgresql/server/utils/sharedtuplestore.h +include/postgresql/server/utils/snapmgr.h +include/postgresql/server/utils/snapshot.h +include/postgresql/server/utils/sortsupport.h +include/postgresql/server/utils/spccache.h +include/postgresql/server/utils/syscache.h +include/postgresql/server/utils/timeout.h +include/postgresql/server/utils/timestamp.h +include/postgresql/server/utils/tuplesort.h +include/postgresql/server/utils/tuplestore.h +include/postgresql/server/utils/typcache.h +include/postgresql/server/utils/tzparser.h +include/postgresql/server/utils/uuid.h +include/postgresql/server/utils/varbit.h +include/postgresql/server/utils/varlena.h +include/postgresql/server/utils/xml.h +include/postgresql/server/windowapi.h +include/sql3types.h +include/sqlca.h +include/sqlda-compat.h +include/sqlda-native.h +include/sqlda.h +lib/libecpg.a +lib/libecpg.so +lib/libecpg_compat.a +lib/libecpg_compat.so +lib/libecpg_compat.so.3 +lib/libpgport.a +lib/libpgtypes.a +lib/libpgtypes.so +lib/libpgtypes.so.3 +lib/libpq.a +lib/libpq.so +lib/libpq.so.5 +lib/postgresql/pgxs/config/install-sh +lib/postgresql/pgxs/config/missing +lib/postgresql/pgxs/src/Makefile.global +lib/postgresql/pgxs/src/Makefile.port +lib/postgresql/pgxs/src/Makefile.shlib +lib/postgresql/pgxs/src/makefiles/pgxs.mk +lib/postgresql/pgxs/src/nls-global.mk +lib/postgresql/pgxs/src/test/regress/pg_regress +libdata/pkgconfig/libecpg.pc +libdata/pkgconfig/libecpg_compat.pc +libdata/pkgconfig/libpgtypes.pc +libdata/pkgconfig/libpq.pc +man/man1/clusterdb.1.gz +man/man1/createdb.1.gz +man/man1/createuser.1.gz +man/man1/dropdb.1.gz +man/man1/dropuser.1.gz +man/man1/ecpg.1.gz +man/man1/initdb.1.gz +man/man1/oid2name.1.gz +man/man1/pg_archivecleanup.1.gz +man/man1/pg_basebackup.1.gz +man/man1/pg_config.1.gz +man/man1/pg_controldata.1.gz +man/man1/pg_ctl.1.gz +man/man1/pg_dump.1.gz +man/man1/pg_dumpall.1.gz +man/man1/pg_isready.1.gz +man/man1/pg_receivewal.1.gz +man/man1/pg_recvlogical.1.gz +man/man1/pg_resetwal.1.gz +man/man1/pg_restore.1.gz +man/man1/pg_rewind.1.gz +man/man1/pg_standby.1.gz +man/man1/pg_test_fsync.1.gz +man/man1/pg_test_timing.1.gz +man/man1/pg_upgrade.1.gz +man/man1/pg_waldump.1.gz +man/man1/pgbench.1.gz +man/man1/postgres.1.gz +man/man1/postmaster.1.gz +man/man1/psql.1.gz +man/man1/reindexdb.1.gz +man/man1/vacuumdb.1.gz +man/man1/vacuumlo.1.gz +man/man3/SPI_commit.3.gz +man/man3/SPI_connect.3.gz +man/man3/SPI_connect_ext.3.gz +man/man3/SPI_copytuple.3.gz +man/man3/SPI_cursor_close.3.gz +man/man3/SPI_cursor_fetch.3.gz +man/man3/SPI_cursor_find.3.gz +man/man3/SPI_cursor_move.3.gz +man/man3/SPI_cursor_open.3.gz +man/man3/SPI_cursor_open_with_args.3.gz +man/man3/SPI_cursor_open_with_paramlist.3.gz +man/man3/SPI_exec.3.gz +man/man3/SPI_execp.3.gz +man/man3/SPI_execute.3.gz +man/man3/SPI_execute_plan.3.gz +man/man3/SPI_execute_plan_with_paramlist.3.gz +man/man3/SPI_execute_with_args.3.gz +man/man3/SPI_finish.3.gz +man/man3/SPI_fname.3.gz +man/man3/SPI_fnumber.3.gz +man/man3/SPI_freeplan.3.gz +man/man3/SPI_freetuple.3.gz +man/man3/SPI_freetuptable.3.gz +man/man3/SPI_getargcount.3.gz +man/man3/SPI_getargtypeid.3.gz +man/man3/SPI_getbinval.3.gz +man/man3/SPI_getnspname.3.gz +man/man3/SPI_getrelname.3.gz +man/man3/SPI_gettype.3.gz +man/man3/SPI_gettypeid.3.gz +man/man3/SPI_getvalue.3.gz +man/man3/SPI_is_cursor_plan.3.gz +man/man3/SPI_keepplan.3.gz +man/man3/SPI_modifytuple.3.gz +man/man3/SPI_palloc.3.gz +man/man3/SPI_pfree.3.gz +man/man3/SPI_prepare.3.gz +man/man3/SPI_prepare_cursor.3.gz +man/man3/SPI_prepare_params.3.gz +man/man3/SPI_register_relation.3.gz +man/man3/SPI_register_trigger_data.3.gz +man/man3/SPI_repalloc.3.gz +man/man3/SPI_result_code_string.3.gz +man/man3/SPI_returntuple.3.gz +man/man3/SPI_rollback.3.gz +man/man3/SPI_saveplan.3.gz +man/man3/SPI_scroll_cursor_fetch.3.gz +man/man3/SPI_scroll_cursor_move.3.gz +man/man3/SPI_start_transaction.3.gz +man/man3/SPI_unregister_relation.3.gz +man/man3/dblink.3.gz +man/man3/dblink_build_sql_delete.3.gz +man/man3/dblink_build_sql_insert.3.gz +man/man3/dblink_build_sql_update.3.gz +man/man3/dblink_cancel_query.3.gz +man/man3/dblink_close.3.gz +man/man3/dblink_connect.3.gz +man/man3/dblink_connect_u.3.gz +man/man3/dblink_disconnect.3.gz +man/man3/dblink_error_message.3.gz +man/man3/dblink_exec.3.gz +man/man3/dblink_fetch.3.gz +man/man3/dblink_get_connections.3.gz +man/man3/dblink_get_notify.3.gz +man/man3/dblink_get_pkey.3.gz +man/man3/dblink_get_result.3.gz +man/man3/dblink_is_busy.3.gz +man/man3/dblink_open.3.gz +man/man3/dblink_send_query.3.gz +man/man7/ABORT.7.gz +man/man7/ALTER_AGGREGATE.7.gz +man/man7/ALTER_COLLATION.7.gz +man/man7/ALTER_CONVERSION.7.gz +man/man7/ALTER_DATABASE.7.gz +man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz +man/man7/ALTER_DOMAIN.7.gz +man/man7/ALTER_EVENT_TRIGGER.7.gz +man/man7/ALTER_EXTENSION.7.gz +man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz +man/man7/ALTER_FOREIGN_TABLE.7.gz +man/man7/ALTER_FUNCTION.7.gz +man/man7/ALTER_GROUP.7.gz +man/man7/ALTER_INDEX.7.gz +man/man7/ALTER_LANGUAGE.7.gz +man/man7/ALTER_LARGE_OBJECT.7.gz +man/man7/ALTER_MATERIALIZED_VIEW.7.gz +man/man7/ALTER_OPERATOR.7.gz +man/man7/ALTER_OPERATOR_CLASS.7.gz +man/man7/ALTER_OPERATOR_FAMILY.7.gz +man/man7/ALTER_POLICY.7.gz +man/man7/ALTER_PROCEDURE.7.gz +man/man7/ALTER_PUBLICATION.7.gz +man/man7/ALTER_ROLE.7.gz +man/man7/ALTER_ROUTINE.7.gz +man/man7/ALTER_RULE.7.gz +man/man7/ALTER_SCHEMA.7.gz +man/man7/ALTER_SEQUENCE.7.gz +man/man7/ALTER_SERVER.7.gz +man/man7/ALTER_STATISTICS.7.gz +man/man7/ALTER_SUBSCRIPTION.7.gz +man/man7/ALTER_SYSTEM.7.gz +man/man7/ALTER_TABLE.7.gz +man/man7/ALTER_TABLESPACE.7.gz +man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz +man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/ALTER_TRIGGER.7.gz +man/man7/ALTER_TYPE.7.gz +man/man7/ALTER_USER.7.gz +man/man7/ALTER_USER_MAPPING.7.gz +man/man7/ALTER_VIEW.7.gz +man/man7/ANALYZE.7.gz +man/man7/BEGIN.7.gz +man/man7/CALL.7.gz +man/man7/CHECKPOINT.7.gz +man/man7/CLOSE.7.gz +man/man7/CLUSTER.7.gz +man/man7/COMMENT.7.gz +man/man7/COMMIT.7.gz +man/man7/COMMIT_PREPARED.7.gz +man/man7/COPY.7.gz +man/man7/CREATE_ACCESS_METHOD.7.gz +man/man7/CREATE_AGGREGATE.7.gz +man/man7/CREATE_CAST.7.gz +man/man7/CREATE_COLLATION.7.gz +man/man7/CREATE_CONVERSION.7.gz +man/man7/CREATE_DATABASE.7.gz +man/man7/CREATE_DOMAIN.7.gz +man/man7/CREATE_EVENT_TRIGGER.7.gz +man/man7/CREATE_EXTENSION.7.gz +man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz +man/man7/CREATE_FOREIGN_TABLE.7.gz +man/man7/CREATE_FUNCTION.7.gz +man/man7/CREATE_GROUP.7.gz +man/man7/CREATE_INDEX.7.gz +man/man7/CREATE_LANGUAGE.7.gz +man/man7/CREATE_MATERIALIZED_VIEW.7.gz +man/man7/CREATE_OPERATOR.7.gz +man/man7/CREATE_OPERATOR_CLASS.7.gz +man/man7/CREATE_OPERATOR_FAMILY.7.gz +man/man7/CREATE_POLICY.7.gz +man/man7/CREATE_PROCEDURE.7.gz +man/man7/CREATE_PUBLICATION.7.gz +man/man7/CREATE_ROLE.7.gz +man/man7/CREATE_RULE.7.gz +man/man7/CREATE_SCHEMA.7.gz +man/man7/CREATE_SEQUENCE.7.gz +man/man7/CREATE_SERVER.7.gz +man/man7/CREATE_STATISTICS.7.gz +man/man7/CREATE_SUBSCRIPTION.7.gz +man/man7/CREATE_TABLE.7.gz +man/man7/CREATE_TABLESPACE.7.gz +man/man7/CREATE_TABLE_AS.7.gz +man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz +man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/CREATE_TRANSFORM.7.gz +man/man7/CREATE_TRIGGER.7.gz +man/man7/CREATE_TYPE.7.gz +man/man7/CREATE_USER.7.gz +man/man7/CREATE_USER_MAPPING.7.gz +man/man7/CREATE_VIEW.7.gz +man/man7/DEALLOCATE.7.gz +man/man7/DECLARE.7.gz +man/man7/DELETE.7.gz +man/man7/DISCARD.7.gz +man/man7/DO.7.gz +man/man7/DROP_ACCESS_METHOD.7.gz +man/man7/DROP_AGGREGATE.7.gz +man/man7/DROP_CAST.7.gz +man/man7/DROP_COLLATION.7.gz +man/man7/DROP_CONVERSION.7.gz +man/man7/DROP_DATABASE.7.gz +man/man7/DROP_DOMAIN.7.gz +man/man7/DROP_EVENT_TRIGGER.7.gz +man/man7/DROP_EXTENSION.7.gz +man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz +man/man7/DROP_FOREIGN_TABLE.7.gz +man/man7/DROP_FUNCTION.7.gz +man/man7/DROP_GROUP.7.gz +man/man7/DROP_INDEX.7.gz +man/man7/DROP_LANGUAGE.7.gz +man/man7/DROP_MATERIALIZED_VIEW.7.gz +man/man7/DROP_OPERATOR.7.gz +man/man7/DROP_OPERATOR_CLASS.7.gz +man/man7/DROP_OPERATOR_FAMILY.7.gz +man/man7/DROP_OWNED.7.gz +man/man7/DROP_POLICY.7.gz +man/man7/DROP_PROCEDURE.7.gz +man/man7/DROP_PUBLICATION.7.gz +man/man7/DROP_ROLE.7.gz +man/man7/DROP_ROUTINE.7.gz +man/man7/DROP_RULE.7.gz +man/man7/DROP_SCHEMA.7.gz +man/man7/DROP_SEQUENCE.7.gz +man/man7/DROP_SERVER.7.gz +man/man7/DROP_STATISTICS.7.gz +man/man7/DROP_SUBSCRIPTION.7.gz +man/man7/DROP_TABLE.7.gz +man/man7/DROP_TABLESPACE.7.gz +man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/DROP_TEXT_SEARCH_PARSER.7.gz +man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/DROP_TRANSFORM.7.gz +man/man7/DROP_TRIGGER.7.gz +man/man7/DROP_TYPE.7.gz +man/man7/DROP_USER.7.gz +man/man7/DROP_USER_MAPPING.7.gz +man/man7/DROP_VIEW.7.gz +man/man7/END.7.gz +man/man7/EXECUTE.7.gz +man/man7/EXPLAIN.7.gz +man/man7/FETCH.7.gz +man/man7/GRANT.7.gz +man/man7/IMPORT_FOREIGN_SCHEMA.7.gz +man/man7/INSERT.7.gz +man/man7/LISTEN.7.gz +man/man7/LOAD.7.gz +man/man7/LOCK.7.gz +man/man7/MOVE.7.gz +man/man7/NOTIFY.7.gz +man/man7/PREPARE.7.gz +man/man7/PREPARE_TRANSACTION.7.gz +man/man7/REASSIGN_OWNED.7.gz +man/man7/REFRESH_MATERIALIZED_VIEW.7.gz +man/man7/REINDEX.7.gz +man/man7/RELEASE_SAVEPOINT.7.gz +man/man7/RESET.7.gz +man/man7/REVOKE.7.gz +man/man7/ROLLBACK.7.gz +man/man7/ROLLBACK_PREPARED.7.gz +man/man7/ROLLBACK_TO_SAVEPOINT.7.gz +man/man7/SAVEPOINT.7.gz +man/man7/SECURITY_LABEL.7.gz +man/man7/SELECT.7.gz +man/man7/SELECT_INTO.7.gz +man/man7/SET.7.gz +man/man7/SET_CONSTRAINTS.7.gz +man/man7/SET_ROLE.7.gz +man/man7/SET_SESSION_AUTHORIZATION.7.gz +man/man7/SET_TRANSACTION.7.gz +man/man7/SHOW.7.gz +man/man7/START_TRANSACTION.7.gz +man/man7/TABLE.7.gz +man/man7/TRUNCATE.7.gz +man/man7/UNLISTEN.7.gz +man/man7/UPDATE.7.gz +man/man7/VACUUM.7.gz +man/man7/VALUES.7.gz +man/man7/WITH.7.gz +%%PORTDOCS%%%%DOCSDIR%%/README-client +%%NLS%%include/postgresql/server/optimizer/geqo_random.h +%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib7-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-12.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-12.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-12.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-12.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-12.mo +%%DATADIR%%/pg_service.conf.sample +%%DATADIR%%/psqlrc.sample + diff --git a/databases/postgresql12-server/pkg-plist-contrib b/databases/postgresql12-server/pkg-plist-contrib new file mode 100644 index 000000000000..b329ba6a9bcc --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-contrib @@ -0,0 +1,265 @@ +bin/oid2name +bin/pg_standby +bin/vacuumlo +include/postgresql/server/extension/cube/cubedata.h +include/postgresql/server/extension/hstore/hstore.h +include/postgresql/server/extension/isn/isn.h +include/postgresql/server/extension/ltree/ltree.h +include/postgresql/server/extension/seg/segdata.h +lib/postgresql/_int.so +lib/postgresql/adminpack.so +lib/postgresql/amcheck.so +lib/postgresql/auth_delay.so +lib/postgresql/auto_explain.so +lib/postgresql/autoinc.so +lib/postgresql/bloom.so +lib/postgresql/btree_gin.so +lib/postgresql/btree_gist.so +lib/postgresql/citext.so +lib/postgresql/cube.so +lib/postgresql/dblink.so +lib/postgresql/dict_int.so +lib/postgresql/dict_xsyn.so +lib/postgresql/earthdistance.so +lib/postgresql/file_fdw.so +lib/postgresql/fuzzystrmatch.so +lib/postgresql/hstore.so +lib/postgresql/insert_username.so +lib/postgresql/isn.so +lib/postgresql/lo.so +lib/postgresql/ltree.so +lib/postgresql/moddatetime.so +lib/postgresql/pageinspect.so +lib/postgresql/passwordcheck.so +lib/postgresql/pg_buffercache.so +lib/postgresql/pg_freespacemap.so +lib/postgresql/pg_prewarm.so +lib/postgresql/pg_stat_statements.so +lib/postgresql/pg_trgm.so +lib/postgresql/pg_visibility.so +lib/postgresql/pgcrypto.so +lib/postgresql/pgrowlocks.so +lib/postgresql/pgstattuple.so +lib/postgresql/pgxml.so +lib/postgresql/postgres_fdw.so +lib/postgresql/refint.so +lib/postgresql/seg.so +%%OPENSSL%%lib/postgresql/sslinfo.so +lib/postgresql/tablefunc.so +lib/postgresql/tcn.so +lib/postgresql/test_decoding.so +lib/postgresql/tsm_system_rows.so +lib/postgresql/tsm_system_time.so +lib/postgresql/unaccent.so +lib/postgresql/uuid-ossp.so +%%PORTDOCS%%%%DOCSDIR%%/README-contrib +%%PORTDOCS%%%%DOCSDIR%%/extension/README +%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example +%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example +%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example +%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example +%%DATADIR%%/extension/adminpack--1.0--1.1.sql +%%DATADIR%%/extension/adminpack--1.0.sql +%%DATADIR%%/extension/adminpack--1.1--2.0.sql +%%DATADIR%%/extension/adminpack.control +%%DATADIR%%/extension/amcheck--1.0--1.1.sql +%%DATADIR%%/extension/amcheck--1.0.sql +%%DATADIR%%/extension/amcheck.control +%%DATADIR%%/extension/autoinc--1.0.sql +%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql +%%DATADIR%%/extension/autoinc.control +%%DATADIR%%/extension/bloom--1.0.sql +%%DATADIR%%/extension/bloom.control +%%DATADIR%%/extension/btree_gin--1.0--1.1.sql +%%DATADIR%%/extension/btree_gin--1.0.sql +%%DATADIR%%/extension/btree_gin--1.1--1.2.sql +%%DATADIR%%/extension/btree_gin--1.2--1.3.sql +%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql +%%DATADIR%%/extension/btree_gin.control +%%DATADIR%%/extension/btree_gist--1.0--1.1.sql +%%DATADIR%%/extension/btree_gist--1.1--1.2.sql +%%DATADIR%%/extension/btree_gist--1.2--1.3.sql +%%DATADIR%%/extension/btree_gist--1.2.sql +%%DATADIR%%/extension/btree_gist--1.3--1.4.sql +%%DATADIR%%/extension/btree_gist--1.4--1.5.sql +%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql +%%DATADIR%%/extension/btree_gist.control +%%DATADIR%%/extension/citext--1.0--1.1.sql +%%DATADIR%%/extension/citext--1.1--1.2.sql +%%DATADIR%%/extension/citext--1.2--1.3.sql +%%DATADIR%%/extension/citext--1.3--1.4.sql +%%DATADIR%%/extension/citext--1.4--1.5.sql +%%DATADIR%%/extension/citext--1.4.sql +%%DATADIR%%/extension/citext--unpackaged--1.0.sql +%%DATADIR%%/extension/citext.control +%%DATADIR%%/extension/cube--1.0--1.1.sql +%%DATADIR%%/extension/cube--1.1--1.2.sql +%%DATADIR%%/extension/cube--1.2--1.3.sql +%%DATADIR%%/extension/cube--1.2.sql +%%DATADIR%%/extension/cube--1.3--1.4.sql +%%DATADIR%%/extension/cube--unpackaged--1.0.sql +%%DATADIR%%/extension/cube.control +%%DATADIR%%/extension/dblink--1.0--1.1.sql +%%DATADIR%%/extension/dblink--1.1--1.2.sql +%%DATADIR%%/extension/dblink--1.2.sql +%%DATADIR%%/extension/dblink--unpackaged--1.0.sql +%%DATADIR%%/extension/dblink.control +%%DATADIR%%/extension/dict_int--1.0.sql +%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql +%%DATADIR%%/extension/dict_int.control +%%DATADIR%%/extension/dict_xsyn--1.0.sql +%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql +%%DATADIR%%/extension/dict_xsyn.control +%%DATADIR%%/extension/earthdistance--1.0--1.1.sql +%%DATADIR%%/extension/earthdistance--1.1.sql +%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql +%%DATADIR%%/extension/amcheck--1.1--1.2.sql +%%DATADIR%%/extension/citext--1.5--1.6.sql +%%DATADIR%%/extension/hstore--1.5--1.6.sql +%%DATADIR%%/extension/pg_stat_statements--1.6--1.7.sql +%%DATADIR%%/extension/earthdistance.control +%%DATADIR%%/extension/file_fdw--1.0.sql +%%DATADIR%%/extension/file_fdw.control +%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql +%%DATADIR%%/extension/fuzzystrmatch--1.1.sql +%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql +%%DATADIR%%/extension/fuzzystrmatch.control +%%DATADIR%%/extension/hstore--1.0--1.1.sql +%%DATADIR%%/extension/hstore--1.1--1.2.sql +%%DATADIR%%/extension/hstore--1.2--1.3.sql +%%DATADIR%%/extension/hstore--1.3--1.4.sql +%%DATADIR%%/extension/hstore--1.4--1.5.sql +%%DATADIR%%/extension/hstore--1.4.sql +%%DATADIR%%/extension/hstore--unpackaged--1.0.sql +%%DATADIR%%/extension/hstore.control +%%DATADIR%%/extension/insert_username--1.0.sql +%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql +%%DATADIR%%/extension/insert_username.control +%%DATADIR%%/extension/intagg--1.0--1.1.sql +%%DATADIR%%/extension/intagg--1.1.sql +%%DATADIR%%/extension/intagg--unpackaged--1.0.sql +%%DATADIR%%/extension/intagg.control +%%DATADIR%%/extension/intarray--1.0--1.1.sql +%%DATADIR%%/extension/intarray--1.1--1.2.sql +%%DATADIR%%/extension/intarray--1.2.sql +%%DATADIR%%/extension/intarray--unpackaged--1.0.sql +%%DATADIR%%/extension/intarray.control +%%DATADIR%%/extension/isn--1.0--1.1.sql +%%DATADIR%%/extension/isn--1.1--1.2.sql +%%DATADIR%%/extension/isn--1.1.sql +%%DATADIR%%/extension/isn--unpackaged--1.0.sql +%%DATADIR%%/extension/isn.control +%%DATADIR%%/extension/lo--1.0--1.1.sql +%%DATADIR%%/extension/lo--1.1.sql +%%DATADIR%%/extension/lo--unpackaged--1.0.sql +%%DATADIR%%/extension/lo.control +%%DATADIR%%/extension/ltree--1.0--1.1.sql +%%DATADIR%%/extension/ltree--1.1.sql +%%DATADIR%%/extension/ltree--unpackaged--1.0.sql +%%DATADIR%%/extension/ltree.control +%%DATADIR%%/extension/moddatetime--1.0.sql +%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql +%%DATADIR%%/extension/moddatetime.control +%%DATADIR%%/extension/pageinspect--1.0--1.1.sql +%%DATADIR%%/extension/pageinspect--1.1--1.2.sql +%%DATADIR%%/extension/pageinspect--1.2--1.3.sql +%%DATADIR%%/extension/pageinspect--1.3--1.4.sql +%%DATADIR%%/extension/pageinspect--1.4--1.5.sql +%%DATADIR%%/extension/pageinspect--1.5--1.6.sql +%%DATADIR%%/extension/pageinspect--1.5.sql +%%DATADIR%%/extension/pageinspect--1.6--1.7.sql +%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql +%%DATADIR%%/extension/pageinspect.control +%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql +%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql +%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql +%%DATADIR%%/extension/pg_buffercache--1.2.sql +%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql +%%DATADIR%%/extension/pg_buffercache.control +%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql +%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql +%%DATADIR%%/extension/pg_freespacemap--1.1.sql +%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql +%%DATADIR%%/extension/pg_freespacemap.control +%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql +%%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql +%%DATADIR%%/extension/pg_prewarm--1.1.sql +%%DATADIR%%/extension/pg_prewarm.control +%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql +%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql +%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql +%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql +%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql +%%DATADIR%%/extension/pg_stat_statements--1.4.sql +%%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql +%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql +%%DATADIR%%/extension/pg_stat_statements.control +%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql +%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql +%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql +%%DATADIR%%/extension/pg_trgm--1.3--1.4.sql +%%DATADIR%%/extension/pg_trgm--1.3.sql +%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql +%%DATADIR%%/extension/pg_trgm.control +%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql +%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql +%%DATADIR%%/extension/pg_visibility--1.1.sql +%%DATADIR%%/extension/pg_visibility.control +%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql +%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql +%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql +%%DATADIR%%/extension/pgcrypto--1.3.sql +%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql +%%DATADIR%%/extension/pgcrypto.control +%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql +%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql +%%DATADIR%%/extension/pgrowlocks--1.2.sql +%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql +%%DATADIR%%/extension/pgrowlocks.control +%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql +%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql +%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql +%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql +%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql +%%DATADIR%%/extension/pgstattuple--1.4.sql +%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql +%%DATADIR%%/extension/pgstattuple.control +%%DATADIR%%/extension/postgres_fdw--1.0.sql +%%DATADIR%%/extension/postgres_fdw.control +%%DATADIR%%/extension/refint--1.0.sql +%%DATADIR%%/extension/refint--unpackaged--1.0.sql +%%DATADIR%%/extension/refint.control +%%DATADIR%%/extension/seg--1.0--1.1.sql +%%DATADIR%%/extension/seg--1.1--1.2.sql +%%DATADIR%%/extension/seg--1.1.sql +%%DATADIR%%/extension/seg--1.2--1.3.sql +%%DATADIR%%/extension/seg--unpackaged--1.0.sql +%%DATADIR%%/extension/seg.control +%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql +%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql +%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql +%%OPENSSL%%%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql +%%OPENSSL%%%%DATADIR%%/extension/sslinfo.control +%%DATADIR%%/extension/tablefunc--1.0.sql +%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql +%%DATADIR%%/extension/tablefunc.control +%%DATADIR%%/extension/tcn--1.0.sql +%%DATADIR%%/extension/tcn.control +%%DATADIR%%/extension/tsm_system_rows--1.0.sql +%%DATADIR%%/extension/tsm_system_rows.control +%%DATADIR%%/extension/tsm_system_time--1.0.sql +%%DATADIR%%/extension/tsm_system_time.control +%%DATADIR%%/extension/unaccent--1.0--1.1.sql +%%DATADIR%%/extension/unaccent--1.1.sql +%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql +%%DATADIR%%/extension/unaccent.control +%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql +%%DATADIR%%/extension/uuid-ossp--1.1.sql +%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql +%%DATADIR%%/extension/uuid-ossp.control +%%DATADIR%%/extension/xml2--1.0--1.1.sql +%%DATADIR%%/extension/xml2--1.1.sql +%%DATADIR%%/extension/xml2--unpackaged--1.0.sql +%%DATADIR%%/extension/xml2.control +%%DATADIR%%/tsearch_data/unaccent.rules +%%DATADIR%%/tsearch_data/xsyn_sample.rules diff --git a/databases/postgresql12-server/pkg-plist-plperl b/databases/postgresql12-server/pkg-plist-plperl new file mode 100644 index 000000000000..d2923d23d6d6 --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-plperl @@ -0,0 +1,11 @@ +include/postgresql/server/plperl.h +include/postgresql/server/plperl_helpers.h +include/postgresql/server/ppport.h +%%DATADIR%%/extension/plperlu--1.0.sql +%%DATADIR%%/extension/plperl.control +%%DATADIR%%/extension/plperl--1.0.sql +%%DATADIR%%/extension/plperlu.control +%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql +%%DATADIR%%/extension/plperl--unpackaged--1.0.sql +%%DOCSDIR%%/README-plperl +lib/postgresql/plperl.so diff --git a/databases/postgresql12-server/pkg-plist-plpython b/databases/postgresql12-server/pkg-plist-plpython new file mode 100644 index 000000000000..da847844d322 --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-plpython @@ -0,0 +1,26 @@ +include/postgresql/server/plpy_cursorobject.h +include/postgresql/server/plpy_elog.h +include/postgresql/server/plpy_exec.h +include/postgresql/server/plpy_main.h +include/postgresql/server/plpy_planobject.h +include/postgresql/server/plpy_plpymodule.h +include/postgresql/server/plpy_procedure.h +include/postgresql/server/plpy_resultobject.h +include/postgresql/server/plpy_spi.h +include/postgresql/server/plpy_subxactobject.h +include/postgresql/server/plpy_typeio.h +include/postgresql/server/plpy_util.h +include/postgresql/server/plpython.h +lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk +%%DOCSDIR%%/README-plpython +%%PYTHON2%%lib/postgresql/plpython2.so +%%PYTHON3%%lib/postgresql/plpython3.so +%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql +%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql +%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control +%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql +%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql +%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control +%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql +%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql +%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control diff --git a/databases/postgresql12-server/pkg-plist-pltcl b/databases/postgresql12-server/pkg-plist-pltcl new file mode 100644 index 000000000000..348e5921ddce --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-pltcl @@ -0,0 +1,8 @@ +%%DATADIR%%/extension/pltcl--1.0.sql +%%DATADIR%%/extension/pltcl.control +%%DATADIR%%/extension/pltclu.control +%%DATADIR%%/extension/pltclu--1.0.sql +%%DATADIR%%/extension/pltcl--unpackaged--1.0.sql +%%DATADIR%%/extension/pltclu--unpackaged--1.0.sql +%%DOCSDIR%%/README-pltcl +lib/postgresql/pltcl.so diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server new file mode 100644 index 000000000000..862be134189b --- /dev/null +++ b/databases/postgresql12-server/pkg-plist-server @@ -0,0 +1,1539 @@ +bin/initdb +bin/pg_archivecleanup +bin/pg_basebackup +bin/pg_checksums +bin/pg_controldata +bin/pg_ctl +bin/pg_receivewal +bin/pg_recvlogical +bin/pg_resetwal +bin/pg_rewind +bin/pg_test_fsync +bin/pg_test_timing +bin/pg_upgrade +bin/pg_waldump +bin/postgres +bin/postmaster +etc/periodic/daily/502.pgsql +include/postgresql/server/plpgsql.h +lib/libpgcommon_shlib.a +lib/postgresql/ascii_and_mic.so +lib/postgresql/cyrillic_and_mic.so +lib/postgresql/dict_snowball.so +lib/postgresql/euc2004_sjis2004.so +lib/postgresql/euc_cn_and_mic.so +lib/postgresql/euc_jp_and_sjis.so +lib/postgresql/euc_kr_and_mic.so +lib/postgresql/euc_tw_and_big5.so +lib/postgresql/latin2_and_win1250.so +lib/postgresql/latin_and_mic.so +lib/postgresql/libpqwalreceiver.so +lib/postgresql/pgoutput.so +lib/postgresql/plpgsql.so +lib/postgresql/utf8_and_ascii.so +lib/postgresql/utf8_and_big5.so +lib/postgresql/utf8_and_cyrillic.so +lib/postgresql/utf8_and_euc2004.so +lib/postgresql/utf8_and_euc_cn.so +lib/postgresql/utf8_and_euc_jp.so +lib/postgresql/utf8_and_euc_kr.so +lib/postgresql/utf8_and_euc_tw.so +lib/postgresql/utf8_and_gb18030.so +lib/postgresql/utf8_and_gbk.so +lib/postgresql/utf8_and_iso8859.so +lib/postgresql/utf8_and_iso8859_1.so +lib/postgresql/utf8_and_johab.so +lib/postgresql/utf8_and_sjis.so +lib/postgresql/utf8_and_sjis2004.so +lib/postgresql/utf8_and_uhc.so +lib/postgresql/utf8_and_win.so +%%LLVM%%lib/postgresql/bitcode/postgres.index.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_inclusion.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_pageops.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_revmap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_tuple.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_validate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_xlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/bufmask.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/heaptuple.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/indextuple.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printsimple.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printtup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/relation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/reloptions.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/scankey.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/session.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupconvert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginarrayproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbtree.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbulk.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gindatapage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginentrypage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginfast.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginget.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gininsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginlogic.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginpostinglist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginutil.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvacuum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginxlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuild.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuildbuffers.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistget.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistsplit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistutil.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvacuum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistxlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash_xlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashfunc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashinsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashovfl.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashpage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsearch.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsort.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashutil.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_handler.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_visibility.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/hio.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/pruneheap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/rewriteheap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/syncscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/tuptoaster.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/vacuumlazy.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/visibilitymap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amapi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/index/genam.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/index/indexam.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtcompare.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtinsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtpage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtree.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsearch.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsort.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsplitloc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtxlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/brindesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/clogdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/committsdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/dbasedesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/genericdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gindesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gistdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/hashdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/heapdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/logicalmsgdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/mxactdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/nbtdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/relmapdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/replorigindesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/seqdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/smgrdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/spgdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/standbydesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/tblspcdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xactdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xlogdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgdoinsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spginsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgkdtreeproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgquadtreeproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgtextproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvacuum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvalidate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgxlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/table/table.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableam.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableamapi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/bernoulli.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/system.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/tablesample.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/clog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/commit_ts.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/generic_xlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/multixact.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/parallel.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/rmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/slru.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/subtrans.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/timeline.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/transam.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase_rmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/varsup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xact.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogarchive.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xloginsert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogreader.bc +%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootparse.bc +%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootstrap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/aclchk.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/catalog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/dependency.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/heap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/index.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/indexing.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/namespace.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaccess.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaddress.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/partition.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_aggregate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_collation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_constraint.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_conversion.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_db_role_setting.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_depend.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_enum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_inherits.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_largeobject.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_namespace.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_operator.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_proc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_publication.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_range.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_shdepend.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_subscription.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_type.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/storage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/catalog/toasting.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/aggregatecmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/alter.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/amcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/analyze.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/async.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/cluster.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/collationcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/comment.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/constraint.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/conversioncmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/copy.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/createas.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/dbcommands.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/define.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/discard.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/dropcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/event_trigger.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/explain.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/extension.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/foreigncmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/functioncmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/indexcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/lockcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/matview.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/opclasscmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/operatorcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/policy.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/portalcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/prepare.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/proclang.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/publicationcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/schemacmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/seclabel.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/sequence.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/statscmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/subscriptioncmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablecmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablespace.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/trigger.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/tsearchcmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/typecmds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/user.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/variable.bc +%%LLVM%%lib/postgresql/bitcode/postgres/commands/view.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAmi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execCurrent.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExpr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExprInterp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execGrouping.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execIndexing.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execJunk.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execMain.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execParallel.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execPartition.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execProcnode.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execReplication.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execSRF.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execScan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execTuples.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/execUtils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/functions.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/instrument.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAgg.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAppend.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapAnd.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapHeapscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapIndexscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapOr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCtescan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCustom.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeForeignscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeFunctionscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGather.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGatherMerge.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGroup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHash.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHashjoin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexonlyscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLimit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLockRows.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMaterial.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergeAppend.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergejoin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeModifyTable.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNamedtuplestorescan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNestloop.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeProjectSet.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeRecursiveunion.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeResult.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSamplescan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSeqscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSetOp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSort.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubplan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubqueryscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTableFuncscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeUnique.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeValuesscan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWindowAgg.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWorktablescan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/spi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/tqueue.bc +%%LLVM%%lib/postgresql/bitcode/postgres/executor/tstoreReceiver.bc +%%LLVM%%lib/postgresql/bitcode/postgres/foreign/foreign.bc +%%LLVM%%lib/postgresql/bitcode/postgres/jit/jit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/binaryheap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/bipartite_match.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/bloomfilter.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/dshash.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/hyperloglog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/ilist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/integerset.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/knapsack.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/pairingheap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/rbtree.bc +%%LLVM%%lib/postgresql/bitcode/postgres/lib/stringinfo.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/ifaddr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqcomm.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqformat.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqmq.bc +%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqsignal.bc +%%LLVM%%lib/postgresql/bitcode/postgres/main/main.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/bitmapset.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/copyfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/equalfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/extensible.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/list.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/makefuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodeFuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodes.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/outfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/params.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/print.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/read.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/readfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/tidbitmap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/nodes/value.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_copy.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_cx.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_erx.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_eval.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_main.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_misc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_mutation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox1.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox2.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pmx.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pool.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_px.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_random.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_recombination.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_selection.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/allpaths.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/clausesel.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/costsize.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/equivclass.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/indxpath.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinpath.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinrels.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/pathkeys.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/tidpath.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/analyzejoins.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/createplan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/initsplan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planagg.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planmain.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planner.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/setrefs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/subselect.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepjointree.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepqual.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/preptlist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepunion.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/appendinfo.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/clauses.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/inherit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/joininfo.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/orclauses.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/paramassign.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/pathnode.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/placeholder.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/plancat.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/predtest.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/relnode.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/restrictinfo.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/tlist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/var.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/analyze.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/gram.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_agg.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_clause.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_coerce.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_collate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_cte.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_enr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_expr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_func.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_node.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_oper.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_param.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_relation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_target.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_type.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_utilcmd.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/parser.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/scan.bc +%%LLVM%%lib/postgresql/bitcode/postgres/parser/scansup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partbounds.bc +%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partdesc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partprune.bc +%%LLVM%%lib/postgresql/bitcode/postgres/port/atomics.bc +%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_sema.bc +%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_shmem.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/autovacuum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgworker.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgwriter.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/checkpointer.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/fork_process.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgarch.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgstat.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/postmaster.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/startup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/syslogger.bc +%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/walwriter.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regcomp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regerror.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexec.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexport.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regfree.bc +%%LLVM%%lib/postgresql/bitcode/postgres/regex/regprefix.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/basebackup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/decode.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/launcher.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logical.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logicalfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/message.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/origin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/proto.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/relation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/reorderbuffer.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/snapbuild.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/tablesync.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/worker.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/repl_gram.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/slot.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/slotfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep_gram.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiver.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiverfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/replication/walsender.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteDefine.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteHandler.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteManip.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteRemove.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSupport.bc +%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rowsecurity.bc +%%LLVM%%lib/postgresql/bitcode/postgres/statistics/dependencies.bc +%%LLVM%%lib/postgresql/bitcode/postgres/statistics/extended_stats.bc +%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mcv.bc +%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mvdistinct.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_init.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_table.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/bufmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/freelist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/localbuf.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/buffile.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/copydir.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fd.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/reinit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/sharedfileset.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/freespace.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/fsmpage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/indexfsm.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/barrier.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm_impl.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipci.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/latch.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/pmsignal.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procarray.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procsignal.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_mq.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_toc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmem.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmqueue.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/signalfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinval.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinvaladt.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/standby.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/large_object/inv_api.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/condition_variable.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/deadlock.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lock.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlock.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlocknames.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/predicate.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/proc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/s_lock.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/spin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/bufpage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/checksum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/itemptr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/md.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/storage/sync/sync.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/%%PG_USER%%.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/utility.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_ispell.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_simple.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_synonym.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_thesaurus.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/regis.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/spell.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/to_tsany.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_locale.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_parse.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_typanalyze.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_utils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser_def.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/acl.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/amutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_expanded.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_typanalyze.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_userfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ascii.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/bool.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cash.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/char.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cryptohashes.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/date.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datetime.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/dbsize.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/domains.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/encode.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/enum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandeddatum.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandedrecord.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/float.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/format_type.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/formatting.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/genfile.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_ops.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_spgist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_cidr_ntop.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_net_pton.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int8.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/json.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_gin.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_op.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_util.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_exec.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_gram.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like_support.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/lockfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac8.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/misc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/name.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_gist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_spgist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numeric.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oracle_compat.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/orderedsetaggs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/partitionfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_locale.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_lsn.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_upgrade_support.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pgstatfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pseudotypes.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/quote.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_gist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_spgist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_typanalyze.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regexp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regproc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ri_triggers.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rowtypes.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ruleutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/selfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/timestamp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/trigfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsginidx.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsgistidx.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_cleanup.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_gist.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_op.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_rewrite.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_util.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsrank.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_op.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_parser.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/txid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/uuid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varbit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varchar.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varlena.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/version.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/windowfuncs.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xml.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/attoptcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/catcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/evtcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/inval.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/lsyscache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/partcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/plancache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relfilenodemap.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relmapper.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/spccache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/syscache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/ts_cache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/typcache.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/assert.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/elog.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/dfmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/fmgr.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/funcapi.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgrtab.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/dynahash.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/hashfn.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/pg_crc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/globals.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/miscinit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/postinit.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/conv.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/encnames.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/mbutils.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wchar.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrcmp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrncmp.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/help_config.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_config.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_controldata.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_rusage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/ps_status.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/queryenvironment.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/rls.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/sampling.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/superuser.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/timeout.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/tzparser.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/aset.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/dsa.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/freepage.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/generation.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/mcxt.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/memdebug.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/portalmem.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/logtape.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplestore.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/combocid.bc +%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/snapmgr.bc +%%LLVM%%lib/postgresql/llvmjit.so +%%LLVM%%lib/postgresql/llvmjit_types.bc +lib/libpgcommon.a +%%PORTDOCS%%%%DOCSDIR%%/README-server +%%DATADIR%%/errcodes.txt +%%DATADIR%%/information_schema.sql +%%DATADIR%%/pg_hba.conf.sample +%%DATADIR%%/pg_ident.conf.sample +%%DATADIR%%/postgres.bki +%%DATADIR%%/postgres.description +%%DATADIR%%/postgresql.conf.sample +%%DATADIR%%/sql_features.txt +%%DATADIR%%/system_views.sql +%%DATADIR%%/extension/plpgsql--1.0.sql +%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql +%%DATADIR%%/extension/plpgsql.control +%%DATADIR%%/postgres.shdescription +%%NLS%%share/locale/cs/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/de/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/es/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/fr/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/id/LC_MESSAGES/%%PG_USER%%-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/it/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/ja/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/ko/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/pl/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/%%PG_USER%%-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/ru/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/sv/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/tr/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-12.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-12.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-12.mo +%%DATADIR%%/snowball_create.sql +%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan +%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra +%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa +%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers +%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara +%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera +%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako +%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui +%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul +%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau +%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre +%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville +%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura +%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo +%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca +%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta +%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry +%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar +%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam +%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti +%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala +%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun +%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown +%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone +%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare +%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg +%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba +%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala +%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum +%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali +%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa +%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos +%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville +%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome +%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda +%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi +%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka +%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo +%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo +%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru +%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane +%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu +%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia +%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi +%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena +%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey +%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott +%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou +%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo +%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome +%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu +%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli +%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis +%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek +%%TZDATA%%%%DATADIR%%/timezone/America/Adak +%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage +%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla +%%TZDATA%%%%DATADIR%%/timezone/America/Antigua +%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman +%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia +%%TZDATA%%%%DATADIR%%/timezone/America/Aruba +%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion +%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan +%%TZDATA%%%%DATADIR%%/timezone/America/Atka +%%TZDATA%%%%DATADIR%%/timezone/America/Bahia +%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas +%%TZDATA%%%%DATADIR%%/timezone/America/Barbados +%%TZDATA%%%%DATADIR%%/timezone/America/Belem +%%TZDATA%%%%DATADIR%%/timezone/America/Belize +%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon +%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista +%%TZDATA%%%%DATADIR%%/timezone/America/Bogota +%%TZDATA%%%%DATADIR%%/timezone/America/Boise +%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires +%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay +%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande +%%TZDATA%%%%DATADIR%%/timezone/America/Cancun +%%TZDATA%%%%DATADIR%%/timezone/America/Caracas +%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca +%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne +%%TZDATA%%%%DATADIR%%/timezone/America/Cayman +%%TZDATA%%%%DATADIR%%/timezone/America/Chicago +%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua +%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour +%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba +%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica +%%TZDATA%%%%DATADIR%%/timezone/America/Creston +%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba +%%TZDATA%%%%DATADIR%%/timezone/America/Curacao +%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn +%%TZDATA%%%%DATADIR%%/timezone/America/Dawson +%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek +%%TZDATA%%%%DATADIR%%/timezone/America/Denver +%%TZDATA%%%%DATADIR%%/timezone/America/Detroit +%%TZDATA%%%%DATADIR%%/timezone/America/Dominica +%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton +%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe +%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador +%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada +%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson +%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne +%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza +%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay +%%TZDATA%%%%DATADIR%%/timezone/America/Godthab +%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay +%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk +%%TZDATA%%%%DATADIR%%/timezone/America/Grenada +%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe +%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala +%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil +%%TZDATA%%%%DATADIR%%/timezone/America/Guyana +%%TZDATA%%%%DATADIR%%/timezone/America/Halifax +%%TZDATA%%%%DATADIR%%/timezone/America/Havana +%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes +%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac +%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis +%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik +%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit +%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica +%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy +%%TZDATA%%%%DATADIR%%/timezone/America/Juneau +%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville +%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello +%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN +%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk +%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz +%%TZDATA%%%%DATADIR%%/timezone/America/Lima +%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles +%%TZDATA%%%%DATADIR%%/timezone/America/Louisville +%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes +%%TZDATA%%%%DATADIR%%/timezone/America/Maceio +%%TZDATA%%%%DATADIR%%/timezone/America/Managua +%%TZDATA%%%%DATADIR%%/timezone/America/Manaus +%%TZDATA%%%%DATADIR%%/timezone/America/Marigot +%%TZDATA%%%%DATADIR%%/timezone/America/Martinique +%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros +%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan +%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza +%%TZDATA%%%%DATADIR%%/timezone/America/Menominee +%%TZDATA%%%%DATADIR%%/timezone/America/Merida +%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla +%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City +%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon +%%TZDATA%%%%DATADIR%%/timezone/America/Moncton +%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey +%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo +%%TZDATA%%%%DATADIR%%/timezone/America/Montreal +%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat +%%TZDATA%%%%DATADIR%%/timezone/America/Nassau +%%TZDATA%%%%DATADIR%%/timezone/America/New_York +%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon +%%TZDATA%%%%DATADIR%%/timezone/America/Nome +%%TZDATA%%%%DATADIR%%/timezone/America/Noronha +%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah +%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center +%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem +%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga +%%TZDATA%%%%DATADIR%%/timezone/America/Panama +%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung +%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo +%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix +%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince +%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain +%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre +%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho +%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas +%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River +%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet +%%TZDATA%%%%DATADIR%%/timezone/America/Recife +%%TZDATA%%%%DATADIR%%/timezone/America/Regina +%%TZDATA%%%%DATADIR%%/timezone/America/Resolute +%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco +%%TZDATA%%%%DATADIR%%/timezone/America/Rosario +%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel +%%TZDATA%%%%DATADIR%%/timezone/America/Santarem +%%TZDATA%%%%DATADIR%%/timezone/America/Santiago +%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo +%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo +%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund +%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock +%%TZDATA%%%%DATADIR%%/timezone/America/Sitka +%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy +%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns +%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts +%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia +%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas +%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent +%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current +%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa +%%TZDATA%%%%DATADIR%%/timezone/America/Thule +%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay +%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana +%%TZDATA%%%%DATADIR%%/timezone/America/Toronto +%%TZDATA%%%%DATADIR%%/timezone/America/Tortola +%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver +%%TZDATA%%%%DATADIR%%/timezone/America/Virgin +%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse +%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg +%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat +%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll +%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok +%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen +%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden +%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty +%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman +%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr +%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau +%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad +%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau +%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad +%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain +%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku +%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok +%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul +%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut +%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek +%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei +%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta +%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita +%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan +%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing +%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking +%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo +%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca +%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus +%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka +%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili +%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai +%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe +%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta +%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza +%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin +%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh +%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong +%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd +%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul +%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta +%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura +%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka +%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu +%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu +%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata +%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching +%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait +%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao +%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau +%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan +%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar +%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila +%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat +%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia +%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral +%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh +%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak +%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang +%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar +%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay +%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda +%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon +%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh +%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon +%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin +%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand +%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul +%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai +%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore +%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv +%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu +%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo +%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator +%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi +%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera +%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane +%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok +%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk +%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon +%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg +%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena +%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley +%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT +%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide +%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane +%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill +%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra +%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie +%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin +%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla +%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart +%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI +%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman +%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe +%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne +%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW +%%TZDATA%%%%DATADIR%%/timezone/Australia/North +%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth +%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland +%%TZDATA%%%%DATADIR%%/timezone/Australia/South +%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney +%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania +%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria +%%TZDATA%%%%DATADIR%%/timezone/Australia/West +%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna +%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre +%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha +%%TZDATA%%%%DATADIR%%/timezone/Brazil/East +%%TZDATA%%%%DATADIR%%/timezone/Brazil/West +%%TZDATA%%%%DATADIR%%/timezone/CET +%%TZDATA%%%%DATADIR%%/timezone/CST6CDT +%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic +%%TZDATA%%%%DATADIR%%/timezone/Canada/Central +%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern +%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain +%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland +%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific +%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan +%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon +%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental +%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland +%%TZDATA%%%%DATADIR%%/timezone/Cuba +%%TZDATA%%%%DATADIR%%/timezone/EET +%%TZDATA%%%%DATADIR%%/timezone/EST +%%TZDATA%%%%DATADIR%%/timezone/EST5EDT +%%TZDATA%%%%DATADIR%%/timezone/Egypt +%%TZDATA%%%%DATADIR%%/timezone/Eire +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9 +%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0 +%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich +%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT +%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC +%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal +%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu +%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam +%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra +%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan +%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens +%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast +%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade +%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin +%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava +%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels +%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest +%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest +%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen +%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau +%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen +%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin +%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar +%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey +%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki +%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man +%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul +%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey +%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad +%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev +%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov +%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon +%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana +%%TZDATA%%%%DATADIR%%/timezone/Europe/London +%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg +%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid +%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta +%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn +%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk +%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco +%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow +%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia +%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo +%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris +%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica +%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague +%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga +%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome +%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara +%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino +%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo +%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov +%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol +%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje +%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia +%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm +%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn +%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane +%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol +%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk +%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod +%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz +%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican +%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna +%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius +%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd +%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw +%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb +%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye +%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich +%%TZDATA%%%%DATADIR%%/timezone/Factory +%%TZDATA%%%%DATADIR%%/timezone/GB +%%TZDATA%%%%DATADIR%%/timezone/GB-Eire +%%TZDATA%%%%DATADIR%%/timezone/GMT +%%TZDATA%%%%DATADIR%%/timezone/GMT+0 +%%TZDATA%%%%DATADIR%%/timezone/GMT-0 +%%TZDATA%%%%DATADIR%%/timezone/GMT0 +%%TZDATA%%%%DATADIR%%/timezone/Greenwich +%%TZDATA%%%%DATADIR%%/timezone/HST +%%TZDATA%%%%DATADIR%%/timezone/Hongkong +%%TZDATA%%%%DATADIR%%/timezone/Iceland +%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo +%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos +%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas +%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos +%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro +%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen +%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe +%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives +%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius +%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte +%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion +%%TZDATA%%%%DATADIR%%/timezone/Iran +%%TZDATA%%%%DATADIR%%/timezone/Israel +%%TZDATA%%%%DATADIR%%/timezone/Jamaica +%%TZDATA%%%%DATADIR%%/timezone/Japan +%%TZDATA%%%%DATADIR%%/timezone/Kwajalein +%%TZDATA%%%%DATADIR%%/timezone/Libya +%%TZDATA%%%%DATADIR%%/timezone/MET +%%TZDATA%%%%DATADIR%%/timezone/MST +%%TZDATA%%%%DATADIR%%/timezone/MST7MDT +%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte +%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur +%%TZDATA%%%%DATADIR%%/timezone/Mexico/General +%%TZDATA%%%%DATADIR%%/timezone/NZ +%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT +%%TZDATA%%%%DATADIR%%/timezone/Navajo +%%TZDATA%%%%DATADIR%%/timezone/PRC +%%TZDATA%%%%DATADIR%%/timezone/PST8PDT +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis +%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap +%%TZDATA%%%%DATADIR%%/timezone/Poland +%%TZDATA%%%%DATADIR%%/timezone/Portugal +%%TZDATA%%%%DATADIR%%/timezone/ROC +%%TZDATA%%%%DATADIR%%/timezone/ROK +%%TZDATA%%%%DATADIR%%/timezone/Singapore +%%TZDATA%%%%DATADIR%%/timezone/Turkey +%%TZDATA%%%%DATADIR%%/timezone/UCT +%%TZDATA%%%%DATADIR%%/timezone/US/Alaska +%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian +%%TZDATA%%%%DATADIR%%/timezone/US/Arizona +%%TZDATA%%%%DATADIR%%/timezone/US/Central +%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana +%%TZDATA%%%%DATADIR%%/timezone/US/Eastern +%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii +%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke +%%TZDATA%%%%DATADIR%%/timezone/US/Michigan +%%TZDATA%%%%DATADIR%%/timezone/US/Mountain +%%TZDATA%%%%DATADIR%%/timezone/US/Pacific +%%TZDATA%%%%DATADIR%%/timezone/US/Samoa +%%TZDATA%%%%DATADIR%%/timezone/UTC +%%TZDATA%%%%DATADIR%%/timezone/Universal +%%TZDATA%%%%DATADIR%%/timezone/W-SU +%%TZDATA%%%%DATADIR%%/timezone/WET +%%TZDATA%%%%DATADIR%%/timezone/Zulu +%%TZDATA%%%%DATADIR%%/timezone/posixrules +%%DATADIR%%/timezonesets/Africa.txt +%%DATADIR%%/timezonesets/America.txt +%%DATADIR%%/timezonesets/Antarctica.txt +%%DATADIR%%/timezonesets/Asia.txt +%%DATADIR%%/timezonesets/Atlantic.txt +%%DATADIR%%/timezonesets/Australia +%%DATADIR%%/timezonesets/Australia.txt +%%DATADIR%%/timezonesets/Default +%%DATADIR%%/timezonesets/Etc.txt +%%DATADIR%%/timezonesets/Europe.txt +%%DATADIR%%/timezonesets/India +%%DATADIR%%/timezonesets/Indian.txt +%%DATADIR%%/timezonesets/Pacific.txt +%%DATADIR%%/tsearch_data/danish.stop +%%DATADIR%%/tsearch_data/dutch.stop +%%DATADIR%%/tsearch_data/english.stop +%%DATADIR%%/tsearch_data/finnish.stop +%%DATADIR%%/tsearch_data/french.stop +%%DATADIR%%/tsearch_data/german.stop +%%DATADIR%%/tsearch_data/hungarian.stop +%%DATADIR%%/tsearch_data/hunspell_sample.affix +%%DATADIR%%/tsearch_data/hunspell_sample_long.affix +%%DATADIR%%/tsearch_data/hunspell_sample_long.dict +%%DATADIR%%/tsearch_data/hunspell_sample_num.affix +%%DATADIR%%/tsearch_data/hunspell_sample_num.dict +%%DATADIR%%/tsearch_data/ispell_sample.affix +%%DATADIR%%/tsearch_data/ispell_sample.dict +%%DATADIR%%/tsearch_data/italian.stop +%%DATADIR%%/tsearch_data/norwegian.stop +%%DATADIR%%/tsearch_data/portuguese.stop +%%DATADIR%%/tsearch_data/russian.stop +%%DATADIR%%/tsearch_data/spanish.stop +%%DATADIR%%/tsearch_data/swedish.stop +%%DATADIR%%/tsearch_data/synonym_sample.syn +%%DATADIR%%/tsearch_data/thesaurus_sample.ths +%%DATADIR%%/tsearch_data/turkish.stop +%%DATADIR%%/timezone/Etc/GMT+11 +%%DATADIR%%/timezone/Etc/GMT-11 +%%DATADIR%%/tsearch_data/nepali.stop diff --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile index c586912e709b..05c82100987d 100644 --- a/databases/postgresql94-client/Makefile +++ b/databases/postgresql94-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql94-contrib/Makefile b/databases/postgresql94-contrib/Makefile index ea0969a158d3..566bf85a0d7b 100644 --- a/databases/postgresql94-contrib/Makefile +++ b/databases/postgresql94-contrib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org diff --git a/databases/postgresql94-docs/Makefile b/databases/postgresql94-docs/Makefile index d89a51e96b99..00b98f3b5233 100644 --- a/databases/postgresql94-docs/Makefile +++ b/databases/postgresql94-docs/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER=9.4 -.include "${.CURDIR}/../postgresql96-docs/Makefile" +.include "${.CURDIR}/../postgresql12-docs/Makefile" diff --git a/databases/postgresql94-pgtcl/Makefile b/databases/postgresql94-pgtcl/Makefile index 087c878460fc..c6d3982259a5 100644 --- a/databases/postgresql94-pgtcl/Makefile +++ b/databases/postgresql94-pgtcl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -postgresql94 CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123]-[0-9]* diff --git a/databases/postgresql94-plperl/Makefile b/databases/postgresql94-plperl/Makefile index 7797fc3b1393..6c6c5fbb77f1 100644 --- a/databases/postgresql94-plperl/Makefile +++ b/databases/postgresql94-plperl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 9.4 -.include "${.CURDIR}/../postgresql95-plperl/Makefile" +.include "${.CURDIR}/../postgresql12-plperl/Makefile" diff --git a/databases/postgresql94-plpython/Makefile b/databases/postgresql94-plpython/Makefile index 115dc22608b9..3a5509be8189 100644 --- a/databases/postgresql94-plpython/Makefile +++ b/databases/postgresql94-plpython/Makefile @@ -2,4 +2,4 @@ WANT_PGSQL_VER= 9.4 -.include "${.CURDIR}/../postgresql95-plpython/Makefile" +.include "${.CURDIR}/../postgresql12-plpython/Makefile" diff --git a/databases/postgresql94-pltcl/Makefile b/databases/postgresql94-pltcl/Makefile index c842a75f86e7..3cf3db3ad6c8 100644 --- a/databases/postgresql94-pltcl/Makefile +++ b/databases/postgresql94-pltcl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 9.4 -.include "${.CURDIR}/../postgresql96-pltcl/Makefile" +.include "${.CURDIR}/../postgresql12-pltcl/Makefile" diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile index cbeedaa51c10..6cc72d8baa9c 100644 --- a/databases/postgresql94-server/Makefile +++ b/databases/postgresql94-server/Makefile @@ -1,10 +1,10 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.23 +DISTVERSION?= 9.4.24 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -22,4 +22,4 @@ PG_USER?= pgsql PG_GROUP?= pgsql PG_UID?= 70 -.include "${.CURDIR}/../postgresql11-server/Makefile" +.include "${.CURDIR}/../postgresql12-server/Makefile" diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo index 0c34032d17fb..2ff2a18be4de 100644 --- a/databases/postgresql94-server/distinfo +++ b/databases/postgresql94-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1561409461 -SHA256 (postgresql/postgresql-9.4.23.tar.bz2) = 0d009c08b0c82b12484950bba10ae8bfd6f0c7bafd8f086ab756c483dd231d9b -SIZE (postgresql/postgresql-9.4.23.tar.bz2) = 16848808 +TIMESTAMP = 1565174268 +SHA256 (postgresql/postgresql-9.4.24.tar.bz2) = 52253d67dd46a7463a9d7c5e82bf959931fa4c11ec56293150210fa82a0f9429 +SIZE (postgresql/postgresql-9.4.24.tar.bz2) = 16842941 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 diff --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile index 434668191256..f0f66f5e2a15 100644 --- a/databases/postgresql95-client/Makefile +++ b/databases/postgresql95-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile index 5e80b8e7cec4..760edb6a941d 100644 --- a/databases/postgresql95-contrib/Makefile +++ b/databases/postgresql95-contrib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org diff --git a/databases/postgresql95-docs/Makefile b/databases/postgresql95-docs/Makefile index 059cfb44e24b..0a66511b5a12 100644 --- a/databases/postgresql95-docs/Makefile +++ b/databases/postgresql95-docs/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER=9.5 -.include "${.CURDIR}/../postgresql96-docs/Makefile" +.include "${.CURDIR}/../postgresql12-docs/Makefile" diff --git a/databases/postgresql95-pgtcl/Makefile b/databases/postgresql95-pgtcl/Makefile index 67af2feca181..ff7ebdc78564 100644 --- a/databases/postgresql95-pgtcl/Makefile +++ b/databases/postgresql95-pgtcl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -postgresql95 CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01234]-[0-9]* diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile index 5ef8dcbb3296..832de1fa4940 100644 --- a/databases/postgresql95-plperl/Makefile +++ b/databases/postgresql95-plperl/Makefile @@ -1,27 +1,6 @@ # Created by: Palle Girgensohn # $FreeBSD$ -PORTNAME= postgresql -# Keep the ?=, this port is used as master by the other plperl. -PORTREVISION?= 1 -CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +WANT_PGSQL_VER= 9.5 -MAINTAINER= pgsql@FreeBSD.org -COMMENT= Write SQL functions for PostgreSQL using Perl5 - -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server - -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server - -WANT_PGSQL_VER?=9.5 - -USES+= perl5 readline -CONFIGURE_ARGS= --with-perl - -BUILD_DIRS= src/backend src/pl/plperl -INSTALL_DIRS= src/pl/plperl -SLAVE_ONLY= yes -COMPONENT= -plperl - -.include "${MASTERDIR}/Makefile" +.include "${.CURDIR}/../postgresql12-plperl/Makefile" diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile index 9c9dea2cb055..a5e70e9499d1 100644 --- a/databases/postgresql95-plpython/Makefile +++ b/databases/postgresql95-plpython/Makefile @@ -1,27 +1,5 @@ # $FreeBSD$ -PORTNAME= postgresql -CATEGORIES= databases python -# Keep the ?=, it is used as master by the other plpython ports. -PORTREVISION?= 1 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +WANT_PGSQL_VER= 9.5 -MAINTAINER= pgsql@FreeBSD.org -COMMENT= Module for using Python to write SQL functions - -USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} -WANT_PGSQL= server - -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server - -WANT_PGSQL_VER?= 9.5 -WANT_PYTHON_USE?= python - -CONFIGURE_ARGS= --with-python -COMPONENT= -plpython - -BUILD_DIRS= src/backend src/pl/plpython -INSTALL_DIRS= src/pl/plpython -SLAVE_ONLY= yes - -.include "${MASTERDIR}/Makefile" +.include "${.CURDIR}/../postgresql12-plpython/Makefile" diff --git a/databases/postgresql95-pltcl/Makefile b/databases/postgresql95-pltcl/Makefile index 709efefafab7..e673bb12af62 100644 --- a/databases/postgresql95-pltcl/Makefile +++ b/databases/postgresql95-pltcl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 9.5 -.include "${.CURDIR}/../postgresql96-pltcl/Makefile" +.include "${.CURDIR}/../postgresql12-pltcl/Makefile" diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile index 0cadc1315173..08507d170396 100644 --- a/databases/postgresql95-server/Makefile +++ b/databases/postgresql95-server/Makefile @@ -1,10 +1,10 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.18 +DISTVERSION?= 9.5.19 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -25,4 +25,4 @@ PG_USER?= pgsql PG_GROUP?= pgsql PG_UID?= 70 -.include "${.CURDIR}/../postgresql11-server/Makefile" +.include "${.CURDIR}/../postgresql12-server/Makefile" diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo index 70b1cd6cba26..1cb6ea915ca9 100644 --- a/databases/postgresql95-server/distinfo +++ b/databases/postgresql95-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1561409472 -SHA256 (postgresql/postgresql-9.5.18.tar.bz2) = dfc940487ed5acd5f657d6d02d53a18f9699888d4b0f820071e4564ed2f9f3dd -SIZE (postgresql/postgresql-9.5.18.tar.bz2) = 17570161 +TIMESTAMP = 1565174279 +SHA256 (postgresql/postgresql-9.5.19.tar.bz2) = 960caa26612bca8a3791d1c0bdc5c6d24b3d15841becb617470424edbc5e1bb3 +SIZE (postgresql/postgresql-9.5.19.tar.bz2) = 17571998 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile index 1821aa99f126..2257e41420c9 100644 --- a/databases/postgresql96-client/Makefile +++ b/databases/postgresql96-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile index 2673dcadf645..30313169e20b 100644 --- a/databases/postgresql96-contrib/Makefile +++ b/databases/postgresql96-contrib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile index f2e32ce2877f..fdca4353e8f1 100644 --- a/databases/postgresql96-docs/Makefile +++ b/databases/postgresql96-docs/Makefile @@ -1,46 +1,6 @@ # Created by: Palle Girgensohn # $FreeBSD$ -PORTNAME= postgresql -PORTREVISION= 1 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs +WANT_PGSQL_VER=9.6 -MAINTAINER= pgsql@FreeBSD.org -COMMENT= The PostgreSQL documentation set - -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server -WANT_PGSQL_VER?=9.6 - -DISTV= ${DISTVERSION:R} - -SLAVE_ONLY= YES -COMPONENT= -docs - -PGDOCSREL?= ${DOCSDIR_REL}/release-${PGSQL_VER} -PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} - -sgmldir= ${LOCALBASE}/share/sgml -dbdir= ${sgmldir}/docbook - -BUILD_DEPENDS+= onsgmls:textproc/opensp \ - openjade:textproc/openjade \ - ${sgmldir}/iso8879/catalog:textproc/iso8879 \ - ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ - docbook-sgml>0:textproc/docbook-sgml -CONFIGURE_ARGS= --without-readline -NO_ARCH= yes - -do-build: - ${MAKE_CMD} -C ${WRKSRC} html - -do-install: - @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} - ( cd ${WRKSRC}/doc/src/sgml/html && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) - -post-install: - @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \ - ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST} - -.include "${MASTERDIR}/Makefile" +.include "${.CURDIR}/../postgresql12-docs/Makefile" diff --git a/databases/postgresql96-pgtcl/Makefile b/databases/postgresql96-pgtcl/Makefile index f4c831dc774e..1d2675b9c9d5 100644 --- a/databases/postgresql96-pgtcl/Makefile +++ b/databases/postgresql96-pgtcl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -postgresql96 CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01234]-[0-9]* diff --git a/databases/postgresql96-plperl/Makefile b/databases/postgresql96-plperl/Makefile index 9fa17cce5e84..d1da538538f2 100644 --- a/databases/postgresql96-plperl/Makefile +++ b/databases/postgresql96-plperl/Makefile @@ -3,4 +3,4 @@ WANT_PGSQL_VER= 9.6 -.include "${.CURDIR}/../postgresql95-plperl/Makefile" +.include "${.CURDIR}/../postgresql12-plperl/Makefile" diff --git a/databases/postgresql96-plpython/Makefile b/databases/postgresql96-plpython/Makefile index 0ea4f228f921..fbc92d7cc976 100644 --- a/databases/postgresql96-plpython/Makefile +++ b/databases/postgresql96-plpython/Makefile @@ -2,4 +2,4 @@ WANT_PGSQL_VER= 9.6 -.include "${.CURDIR}/../postgresql95-plpython/Makefile" +.include "${.CURDIR}/../postgresql12-plpython/Makefile" diff --git a/databases/postgresql96-pltcl/Makefile b/databases/postgresql96-pltcl/Makefile index 2870213e69dd..187e9915accf 100644 --- a/databases/postgresql96-pltcl/Makefile +++ b/databases/postgresql96-pltcl/Makefile @@ -1,32 +1,6 @@ # Created by: Palle Girgensohn # $FreeBSD$ -PORTNAME= postgresql -# Keep the ?=, it is used by the other pltcl ports. -PORTREVISION?= 1 -CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +WANT_PGSQL_VER= 9.6 -MAINTAINER= pgsql@FreeBSD.org -COMMENT= Module for using Tcl to write SQL functions - -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server - -WANT_PGSQL_VER?=9.6 - -USES+= tcl pgsql:${WANT_PGSQL_VER} -WANT_PGSQL= server - -CONFIGURE_ARGS= --with-tcl --without-tk \ - --with-tclconfig="${TCL_LIBDIR}" \ - --with-includes="${TCL_INCLUDEDIR}" - -CONFIGURE_ENV+= TCLSH="${TCLSH}" -MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" - -BUILD_DIRS= src/backend src/pl/tcl -INSTALL_DIRS= src/pl/tcl -SLAVE_ONLY= yes -COMPONENT= -pltcl - -.include "${MASTERDIR}/Makefile" +.include "${.CURDIR}/../postgresql12-pltcl/Makefile" diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile index 9198fd9eeb21..0c604a3b39a9 100644 --- a/databases/postgresql96-server/Makefile +++ b/databases/postgresql96-server/Makefile @@ -1,10 +1,10 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.6.14 +DISTVERSION?= 9.6.15 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -19,11 +19,7 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_xlogdump src/bin/pg_upgrade -PG_USER?= postgres -PG_GROUP?= postgres -PG_UID?= 770 - ICU_PATCHFILE= pg-96b4-icu-2016-10-02.diff.gz OPTIONS_DEFAULT+=ICU -.include "${.CURDIR}/../postgresql11-server/Makefile" +.include "${.CURDIR}/../postgresql12-server/Makefile" diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo index f593dd2576cf..bb1b7fb869db 100644 --- a/databases/postgresql96-server/distinfo +++ b/databases/postgresql96-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1561409286 -SHA256 (postgresql/postgresql-9.6.14.tar.bz2) = 3f08c265c9ae814f727461408ab24fdf3d954c4f7ae42d9c97b3c7e03fc31a22 -SIZE (postgresql/postgresql-9.6.14.tar.bz2) = 18787744 +TIMESTAMP = 1565174281 +SHA256 (postgresql/postgresql-9.6.15.tar.bz2) = 3cd9fe9af247167f863030842c1a57f58bdf3e5d50a94997d34a802b6032170a +SIZE (postgresql/postgresql-9.6.15.tar.bz2) = 18799121 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998 -- cgit From 39e8bd31b75a9567a719c7ea0f45e92373610ccd Mon Sep 17 00:00:00 2001 From: girgen Date: Thu, 8 Aug 2019 15:33:54 +0000 Subject: Add postgresql12 to the ports tree --- databases/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/databases/Makefile b/databases/Makefile index 2b10c5802f97..4f2c2017d66d 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -699,6 +699,14 @@ SUBDIR += postgresql11-plpython SUBDIR += postgresql11-pltcl SUBDIR += postgresql11-server + SUBDIR += postgresql12-client + SUBDIR += postgresql12-contrib + SUBDIR += postgresql12-docs + SUBDIR += postgresql12-pgtcl + SUBDIR += postgresql12-plperl + SUBDIR += postgresql12-plpython + SUBDIR += postgresql12-pltcl + SUBDIR += postgresql12-server SUBDIR += postgresql94-client SUBDIR += postgresql94-contrib SUBDIR += postgresql94-docs -- cgit From a7d0017c202adbf3bd0e108521037e2eda59b74b Mon Sep 17 00:00:00 2001 From: jgh Date: Thu, 8 Aug 2019 16:39:11 +0000 Subject: - chase r508388 --- deskutils/menumaker/distinfo | 6 +++--- deskutils/menumaker/pkg-plist | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deskutils/menumaker/distinfo b/deskutils/menumaker/distinfo index dfb27d97d88b..d6af0461b39f 100644 --- a/deskutils/menumaker/distinfo +++ b/deskutils/menumaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501021609 -SHA256 (menumaker-0.99.10.tar.gz) = 7e22db0f0d937d33bb338e03f6eac9aa549b9a790c666e519b13de39de66a4d6 -SIZE (menumaker-0.99.10.tar.gz) = 202580 +TIMESTAMP = 1565281986 +SHA256 (menumaker-0.99.11.tar.gz) = 9d831adbaef2101d8b8d82e48d764c2c1a80a38e97dcf90740eb540e6db3f936 +SIZE (menumaker-0.99.11.tar.gz) = 205196 diff --git a/deskutils/menumaker/pkg-plist b/deskutils/menumaker/pkg-plist index b6213c1f5389..c8eca80be2ce 100644 --- a/deskutils/menumaker/pkg-plist +++ b/deskutils/menumaker/pkg-plist @@ -6,6 +6,7 @@ bin/mmaker %%DATADIR%%/MenuMaker/Deskmenu.py %%DATADIR%%/MenuMaker/FluxBox.py %%DATADIR%%/MenuMaker/IceWM.py +%%DATADIR%%/MenuMaker/JWM.py %%DATADIR%%/MenuMaker/OpenBox3.py %%DATADIR%%/MenuMaker/PekWM.py %%DATADIR%%/MenuMaker/WindowMaker.py -- cgit From cc8aed858641fabc7bbc55fa835e227c96ef75c4 Mon Sep 17 00:00:00 2001 From: jbeich Date: Thu, 8 Aug 2019 16:48:41 +0000 Subject: multimedia/celluloid: update to 0.17 Changes: https://github.com/celluloid-player/celluloid/releases/tag/v0.17 Changes: https://github.com/celluloid-player/celluloid/compare/v0.16...v0.17 Reported by: GitHub (watch releases) --- MOVED | 1 + multimedia/Makefile | 2 +- multimedia/celluloid/Makefile | 24 ++++++++++++++++++++++++ multimedia/celluloid/distinfo | 3 +++ multimedia/celluloid/pkg-descr | 5 +++++ multimedia/celluloid/pkg-plist | 31 +++++++++++++++++++++++++++++++ multimedia/gnome-mpv/Makefile | 25 ------------------------- multimedia/gnome-mpv/distinfo | 3 --- multimedia/gnome-mpv/pkg-descr | 5 ----- multimedia/gnome-mpv/pkg-plist | 29 ----------------------------- 10 files changed, 65 insertions(+), 63 deletions(-) create mode 100644 multimedia/celluloid/Makefile create mode 100644 multimedia/celluloid/distinfo create mode 100644 multimedia/celluloid/pkg-descr create mode 100644 multimedia/celluloid/pkg-plist delete mode 100644 multimedia/gnome-mpv/Makefile delete mode 100644 multimedia/gnome-mpv/distinfo delete mode 100644 multimedia/gnome-mpv/pkg-descr delete mode 100644 multimedia/gnome-mpv/pkg-plist diff --git a/MOVED b/MOVED index 7d8c3fb2ba21..7fae886ad359 100644 --- a/MOVED +++ b/MOVED @@ -12857,3 +12857,4 @@ devel/py-pip-tools2|devel/py-pip-tools|2019-07-31|Has expired: Use devel/py-pip- lang/cint|lang/cling|2019-07-31|Has expired: Abandonware; superseded by lang/cling emulators/pearpc||2019-08-01|Has expired: Abandonware sysutils/bbcp||2019-08-03|Has expired: the port is broken for more than a year +multimedia/gnome-mpv|multimedia/celluloid|2019-08-08|Renamed upstream diff --git a/multimedia/Makefile b/multimedia/Makefile index 20a378646c03..2fc08736713f 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -31,6 +31,7 @@ SUBDIR += camserv SUBDIR += ccextractor SUBDIR += cclive + SUBDIR += celluloid SUBDIR += cheese SUBDIR += chilitags SUBDIR += cinelerra-gg @@ -86,7 +87,6 @@ SUBDIR += gmp-api SUBDIR += gmtk SUBDIR += gnome-mplayer - SUBDIR += gnome-mpv SUBDIR += gnome-subtitles SUBDIR += gnome-twitch SUBDIR += gpac-libgpac diff --git a/multimedia/celluloid/Makefile b/multimedia/celluloid/Makefile new file mode 100644 index 000000000000..887e4644314a --- /dev/null +++ b/multimedia/celluloid/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= celluloid +PORTVERSION= 0.17 +CATEGORIES= multimedia +MASTER_SITES= https://github.com/${PORTNAME}-player/${PORTNAME}/releases/download/v${PORTVERSION}/ + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Simple GTK+ frontend for mpv + +LICENSE= GPLv3+ + +LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ + libmpv.so:multimedia/mpv + +USES= compiler:c11 desktop-file-utils gettext-tools gmake pkgconfig tar:xz +USE_GNOME= cairo gtk30 +GNU_CONFIGURE= yes +GLIB_SCHEMAS= io.github.GnomeMpv.gschema.xml \ + io.github.celluloid_player.Celluloid.gschema.xml +INSTALLS_ICONS= yes +LDFLAGS+= -Wl,--as-needed # gdkpixbuf2 + +.include diff --git a/multimedia/celluloid/distinfo b/multimedia/celluloid/distinfo new file mode 100644 index 000000000000..4d7f876a4053 --- /dev/null +++ b/multimedia/celluloid/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565278213 +SHA256 (celluloid-0.17.tar.xz) = 0016078c02c1c8629a0658bd6eeb02be50d94a670983f53cbdb23f34f4866b28 +SIZE (celluloid-0.17.tar.xz) = 336412 diff --git a/multimedia/celluloid/pkg-descr b/multimedia/celluloid/pkg-descr new file mode 100644 index 000000000000..1f190691f8f4 --- /dev/null +++ b/multimedia/celluloid/pkg-descr @@ -0,0 +1,5 @@ +Celluloid (formerly GNOME MPV) is a simple GTK+ frontend for +mpv. Celluloid interacts with mpv via the client API exported by +libmpv, allowing access to mpv's powerful playback capabilities. + +WWW: https://celluloid-player.github.io/ diff --git a/multimedia/celluloid/pkg-plist b/multimedia/celluloid/pkg-plist new file mode 100644 index 000000000000..38e8d11126b4 --- /dev/null +++ b/multimedia/celluloid/pkg-plist @@ -0,0 +1,31 @@ +bin/celluloid +man/man1/celluloid.1.gz +share/applications/io.github.celluloid_player.Celluloid.desktop +share/dbus-1/services/io.github.celluloid_player.Celluloid.service +share/icons/hicolor/scalable/apps/io.github.celluloid_player.Celluloid.svg +share/icons/hicolor/symbolic/apps/io.github.celluloid_player.Celluloid-symbolic.svg +share/locale/bg/LC_MESSAGES/celluloid.mo +share/locale/ca/LC_MESSAGES/celluloid.mo +share/locale/cs/LC_MESSAGES/celluloid.mo +share/locale/da/LC_MESSAGES/celluloid.mo +share/locale/de_DE/LC_MESSAGES/celluloid.mo +share/locale/eo/LC_MESSAGES/celluloid.mo +share/locale/es/LC_MESSAGES/celluloid.mo +share/locale/fr/LC_MESSAGES/celluloid.mo +share/locale/hr/LC_MESSAGES/celluloid.mo +share/locale/hu/LC_MESSAGES/celluloid.mo +share/locale/it/LC_MESSAGES/celluloid.mo +share/locale/ja/LC_MESSAGES/celluloid.mo +share/locale/nl/LC_MESSAGES/celluloid.mo +share/locale/pl/LC_MESSAGES/celluloid.mo +share/locale/pt_BR/LC_MESSAGES/celluloid.mo +share/locale/pt_PT/LC_MESSAGES/celluloid.mo +share/locale/ro/LC_MESSAGES/celluloid.mo +share/locale/ru/LC_MESSAGES/celluloid.mo +share/locale/sr/LC_MESSAGES/celluloid.mo +share/locale/sr@latin/LC_MESSAGES/celluloid.mo +share/locale/sv/LC_MESSAGES/celluloid.mo +share/locale/tr/LC_MESSAGES/celluloid.mo +share/locale/zh_CN/LC_MESSAGES/celluloid.mo +share/locale/zh_TW/LC_MESSAGES/celluloid.mo +share/metainfo/io.github.celluloid_player.Celluloid.appdata.xml diff --git a/multimedia/gnome-mpv/Makefile b/multimedia/gnome-mpv/Makefile deleted file mode 100644 index 112e7297a910..000000000000 --- a/multimedia/gnome-mpv/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ - -PORTNAME= gnome-mpv -PORTVERSION= 0.16 -PORTREVISION= 1 -CATEGORIES= multimedia -MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/ - -MAINTAINER= jbeich@FreeBSD.org -COMMENT= Simple GTK+ frontend for mpv - -LICENSE= GPLv3+ - -LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ - libmpv.so:multimedia/mpv - -USES= compiler:c11 desktop-file-utils gettext-tools gmake pkgconfig tar:xz -USE_GNOME= cairo gtk30 -GNU_CONFIGURE= yes -GLIB_SCHEMAS= io.github.GnomeMpv.gschema.xml \ - org.gnome-mpv.gschema.xml -INSTALLS_ICONS= yes -LDFLAGS+= -Wl,--as-needed # gdkpixbuf2 - -.include diff --git a/multimedia/gnome-mpv/distinfo b/multimedia/gnome-mpv/distinfo deleted file mode 100644 index 0b05dc2cbcb6..000000000000 --- a/multimedia/gnome-mpv/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1451211838 -SHA256 (gnome-mpv-0.16.tar.xz) = 22cd8a9257ea57449f3120993e668d11e5e3be31444c6e63b8b25ccce0feed4b -SIZE (gnome-mpv-0.16.tar.xz) = 320676 diff --git a/multimedia/gnome-mpv/pkg-descr b/multimedia/gnome-mpv/pkg-descr deleted file mode 100644 index 838b71193348..000000000000 --- a/multimedia/gnome-mpv/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -GNOME MPV is a simple GTK+ frontend for mpv. GNOME MPV interacts with -mpv via the client API exported by libmpv, allowing access to mpv's -powerful playback capabilities. - -WWW: https://gnome-mpv.github.io/ diff --git a/multimedia/gnome-mpv/pkg-plist b/multimedia/gnome-mpv/pkg-plist deleted file mode 100644 index e7c921d7817e..000000000000 --- a/multimedia/gnome-mpv/pkg-plist +++ /dev/null @@ -1,29 +0,0 @@ -bin/gnome-mpv -man/man1/gnome-mpv.1.gz -share/applications/io.github.GnomeMpv.desktop -share/dbus-1/services/io.github.GnomeMpv.service -share/icons/hicolor/scalable/apps/io.github.GnomeMpv.svg -share/icons/hicolor/symbolic/apps/io.github.GnomeMpv-symbolic.svg -share/locale/bg/LC_MESSAGES/gnome-mpv.mo -share/locale/ca/LC_MESSAGES/gnome-mpv.mo -share/locale/cs/LC_MESSAGES/gnome-mpv.mo -share/locale/da/LC_MESSAGES/gnome-mpv.mo -share/locale/de_DE/LC_MESSAGES/gnome-mpv.mo -share/locale/es/LC_MESSAGES/gnome-mpv.mo -share/locale/fr/LC_MESSAGES/gnome-mpv.mo -share/locale/hr/LC_MESSAGES/gnome-mpv.mo -share/locale/hu/LC_MESSAGES/gnome-mpv.mo -share/locale/it/LC_MESSAGES/gnome-mpv.mo -share/locale/ja/LC_MESSAGES/gnome-mpv.mo -share/locale/nl/LC_MESSAGES/gnome-mpv.mo -share/locale/pl/LC_MESSAGES/gnome-mpv.mo -share/locale/pt_BR/LC_MESSAGES/gnome-mpv.mo -share/locale/pt_PT/LC_MESSAGES/gnome-mpv.mo -share/locale/ro/LC_MESSAGES/gnome-mpv.mo -share/locale/ru/LC_MESSAGES/gnome-mpv.mo -share/locale/sr/LC_MESSAGES/gnome-mpv.mo -share/locale/sr@latin/LC_MESSAGES/gnome-mpv.mo -share/locale/sv/LC_MESSAGES/gnome-mpv.mo -share/locale/zh_CN/LC_MESSAGES/gnome-mpv.mo -share/locale/zh_TW/LC_MESSAGES/gnome-mpv.mo -share/metainfo/io.github.GnomeMpv.appdata.xml -- cgit From 6f34df80f8bbec3ff907f8724d1230ca70f88dfb Mon Sep 17 00:00:00 2001 From: jgh Date: Thu, 8 Aug 2019 17:00:58 +0000 Subject: - Make menumaker configure script properly find python. - Change configure to look for python3.5 and python3.6, as well as older versions. - Add LDFLAGS to make it possible for the configure script to find python libraries. Actually use python in Makefile.in. Reviewed by/with: zeising@ --- deskutils/menumaker/Makefile | 5 +++-- deskutils/menumaker/files/patch-Makefile.in | 11 +++++++++-- deskutils/menumaker/files/patch-configure | 11 +++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 deskutils/menumaker/files/patch-configure diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile index ea2a8e4bd269..ca541faff4a2 100644 --- a/deskutils/menumaker/Makefile +++ b/deskutils/menumaker/Makefile @@ -12,11 +12,12 @@ COMMENT= Menu generator for X Window Managers and desktop environments LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake python shebangfix +USES= gmake python + GNU_CONFIGURE= yes NO_ARCH= yes -SHEBANG_FILES= ${WRKSRC}/mmaker +LDFLAGS+= -L${LOCALBASE}/lib INFO= mmaker diff --git a/deskutils/menumaker/files/patch-Makefile.in b/deskutils/menumaker/files/patch-Makefile.in index 425cc3c15096..7414afcd3445 100644 --- a/deskutils/menumaker/files/patch-Makefile.in +++ b/deskutils/menumaker/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-06-23 10:18:34 UTC +--- Makefile.in.orig 2019-07-21 13:18:07 UTC +++ Makefile.in -@@ -835,6 +835,7 @@ uninstall-am: uninstall-dist_binSCRIPTS +@@ -851,12 +851,13 @@ uninstall-am: uninstall-dist_binSCRIPTS \ install-exec-local : @@ -8,3 +8,10 @@ echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker + + install-data-local : +- $(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")' ++ $(PYTHON_BIN) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")' + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/deskutils/menumaker/files/patch-configure b/deskutils/menumaker/files/patch-configure new file mode 100644 index 000000000000..a7ef3a1b9f22 --- /dev/null +++ b/deskutils/menumaker/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2019-08-08 16:26:40 UTC ++++ configure +@@ -3507,7 +3507,7 @@ fi + $as_echo_n "checking for python build information... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } +-for python in python3 python3.4 python3.3 python3.2 python3.1 python3.0 python python2.7; do ++for python in python3 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python python2.7; do + for ac_prog in $python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. -- cgit From 4d1d22fc4e68e7b608d927ad7889597bea401938 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 17:47:43 +0000 Subject: devel/py-typing: Remove the unnecessary python:-3.4 limitation Approved by: portmgr blanket --- devel/py-typing/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-typing/Makefile b/devel/py-typing/Makefile index a878d84f0d94..5e35edb601c7 100644 --- a/devel/py-typing/Makefile +++ b/devel/py-typing/Makefile @@ -12,7 +12,7 @@ COMMENT= Type Hints for Python LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:-3.4 +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -- cgit From 0d751561e8ff37101d3c8df46fd7c033a9fd2918 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 17:53:24 +0000 Subject: New port: science/py-onnx: Open Neural Network eXchange --- science/Makefile | 1 + science/py-onnx/Makefile | 28 ++++++++++++++++++++++++++++ science/py-onnx/distinfo | 3 +++ science/py-onnx/files/patch-setup.py | 20 ++++++++++++++++++++ science/py-onnx/pkg-descr | 14 ++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 science/py-onnx/Makefile create mode 100644 science/py-onnx/distinfo create mode 100644 science/py-onnx/files/patch-setup.py create mode 100644 science/py-onnx/pkg-descr diff --git a/science/Makefile b/science/Makefile index 70b0d50d625e..4e94f0337720 100644 --- a/science/Makefile +++ b/science/Makefile @@ -250,6 +250,7 @@ SUBDIR += py-netCDF4 SUBDIR += py-obspy SUBDIR += py-oddt + SUBDIR += py-onnx SUBDIR += py-openpiv SUBDIR += py-paida SUBDIR += py-paramz diff --git a/science/py-onnx/Makefile b/science/py-onnx/Makefile new file mode 100644 index 000000000000..8d2ebb67ad67 --- /dev/null +++ b/science/py-onnx/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= onnx +DISTVERSION= 1.5.0 +CATEGORIES= science +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Open Neural Network eXchange + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= cmake:devel/cmake \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} +LIB_DEPENDS= libprotobuf.so:devel/protobuf +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils concurrent autoplist + +BINARY_ALIAS= python=${PYTHON_CMD} + +.include diff --git a/science/py-onnx/distinfo b/science/py-onnx/distinfo new file mode 100644 index 000000000000..3e636052643c --- /dev/null +++ b/science/py-onnx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565284463 +SHA256 (onnx-1.5.0.tar.gz) = 1a584a4ef62a6db178c257fffb06a9d8e61b41c0a80bfd8bcd8a253d72c4b0b4 +SIZE (onnx-1.5.0.tar.gz) = 2981047 diff --git a/science/py-onnx/files/patch-setup.py b/science/py-onnx/files/patch-setup.py new file mode 100644 index 000000000000..530d43666ca6 --- /dev/null +++ b/science/py-onnx/files/patch-setup.py @@ -0,0 +1,20 @@ +--- setup.py.orig 2019-08-08 17:17:08 UTC ++++ setup.py +@@ -52,11 +52,12 @@ COVERAGE = bool(os.getenv('COVERAGE')) + # Version + ################################################################################ + +-try: +- git_version = subprocess.check_output(['git', 'rev-parse', 'HEAD'], +- cwd=TOP_DIR).decode('ascii').strip() +-except (OSError, subprocess.CalledProcessError): +- git_version = None ++#try: ++# git_version = subprocess.check_output(['git', 'rev-parse', 'HEAD'], ++# cwd=TOP_DIR).decode('ascii').strip() ++#except (OSError, subprocess.CalledProcessError): ++# git_version = None ++git_version = None + + with open(os.path.join(TOP_DIR, 'VERSION_NUMBER')) as version_file: + VersionInfo = namedtuple('VersionInfo', ['version', 'git_version'])( diff --git a/science/py-onnx/pkg-descr b/science/py-onnx/pkg-descr new file mode 100644 index 000000000000..cb61902666c8 --- /dev/null +++ b/science/py-onnx/pkg-descr @@ -0,0 +1,14 @@ +Open Neural Network Exchange (ONNX) is an open ecosystem that empowers AI +developers to choose the right tools as their project evolves. ONNX provides an +open source format for AI models, both deep learning and traditional ML. It +defines an extensible computation graph model, as well as definitions of +built-in operators and standard data types. Currently we focus on the +capabilities needed for inferencing (scoring). + +ONNX is widely supported and can be found in many frameworks, tools, and +hardware. Enabling interoperability between different frameworks and +streamlining the path from research to production helps increase the speed of +innovation in the AI community. We invite the community to join us and further +evolve ONNX. + +WWW: https://onnx.ai/ -- cgit From 18d11073dd9cb799b67c707bf05c195d6d6dfad9 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 17:58:44 +0000 Subject: devel/nlohmann-json: Update 3.3.0 -> 3.7.0 Maintainer reset due to 3 consecutive timeouts on this port. PR: 233486 Approved by: SlavaMikerov@gmail.com (maintainer's timeout 8+ months) --- devel/nlohmann-json/Makefile | 5 ++--- devel/nlohmann-json/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/devel/nlohmann-json/Makefile b/devel/nlohmann-json/Makefile index ad7c9112681d..936cae0aa640 100644 --- a/devel/nlohmann-json/Makefile +++ b/devel/nlohmann-json/Makefile @@ -3,12 +3,11 @@ PORTNAME= json DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0 -PORTREVISION= 2 +DISTVERSION= 3.7.0 CATEGORIES= devel PKGNAMEPREFIX= nlohmann- -MAINTAINER= SlavaMikerov@gmail.com +MAINTAINER= yuri@FreeBSD.org COMMENT= JSON library for Modern C++ LICENSE= MIT diff --git a/devel/nlohmann-json/distinfo b/devel/nlohmann-json/distinfo index 12a12d0d5aef..f4c484725682 100644 --- a/devel/nlohmann-json/distinfo +++ b/devel/nlohmann-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540694993 -SHA256 (nlohmann-json-v3.3.0_GH0.tar.gz) = 2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801 -SIZE (nlohmann-json-v3.3.0_GH0.tar.gz) = 114604713 +TIMESTAMP = 1565282530 +SHA256 (nlohmann-json-v3.7.0_GH0.tar.gz) = d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760 +SIZE (nlohmann-json-v3.7.0_GH0.tar.gz) = 118868542 -- cgit From 4d8865ea3c897bfe64c71dd373f0e5a3fd1f74d3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Thu, 8 Aug 2019 18:47:05 +0000 Subject: Revert r508396 which incorrectly changes USES=python version range With hat: python --- devel/py-typing/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-typing/Makefile b/devel/py-typing/Makefile index 5e35edb601c7..a878d84f0d94 100644 --- a/devel/py-typing/Makefile +++ b/devel/py-typing/Makefile @@ -12,7 +12,7 @@ COMMENT= Type Hints for Python LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:-3.4 USE_PYTHON= autoplist distutils NO_ARCH= yes -- cgit From 64c325fb0844146724dbb44b7f7b570347483ece Mon Sep 17 00:00:00 2001 From: sunpoet Date: Thu, 8 Aug 2019 19:22:20 +0000 Subject: Fix RUN_DEPENDS: typing is used for Python 3.4 and below - Bump PORTREVISION for dependency change With hat: python --- science/py-onnx/Makefile | 3 ++- science/py-onnx/files/patch-setup.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/science/py-onnx/Makefile b/science/py-onnx/Makefile index 8d2ebb67ad67..acb7d1b82715 100644 --- a/science/py-onnx/Makefile +++ b/science/py-onnx/Makefile @@ -2,6 +2,7 @@ PORTNAME= onnx DISTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +18,7 @@ BUILD_DEPENDS= cmake:devel/cmake \ LIB_DEPENDS= libprotobuf.so:devel/protobuf RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} USES= python diff --git a/science/py-onnx/files/patch-setup.py b/science/py-onnx/files/patch-setup.py index 530d43666ca6..b3eed773cac4 100644 --- a/science/py-onnx/files/patch-setup.py +++ b/science/py-onnx/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2019-08-08 17:17:08 UTC +--- setup.py.orig 2019-04-24 06:21:37 UTC +++ setup.py @@ -52,11 +52,12 @@ COVERAGE = bool(os.getenv('COVERAGE')) # Version @@ -18,3 +18,12 @@ with open(os.path.join(TOP_DIR, 'VERSION_NUMBER')) as version_file: VersionInfo = namedtuple('VersionInfo', ['version', 'git_version'])( +@@ -286,7 +287,7 @@ install_requires.extend([ + 'protobuf', + 'numpy', + 'six', +- 'typing>=3.6.4', ++ 'typing>=3.6.4; python_version < 3.5', + 'typing-extensions>=3.6.2.1', + ]) + -- cgit From 275a37ef830d2d98ca38046271483f8ca431cf23 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 20:07:04 +0000 Subject: New port: science/py-chainer: Deep learning framework --- science/Makefile | 1 + science/py-chainer/Makefile | 26 ++++++++++++++++++++++++++ science/py-chainer/distinfo | 3 +++ science/py-chainer/pkg-descr | 11 +++++++++++ 4 files changed, 41 insertions(+) create mode 100644 science/py-chainer/Makefile create mode 100644 science/py-chainer/distinfo create mode 100644 science/py-chainer/pkg-descr diff --git a/science/Makefile b/science/Makefile index 4e94f0337720..ca17add424cc 100644 --- a/science/Makefile +++ b/science/Makefile @@ -232,6 +232,7 @@ SUBDIR += py-ase SUBDIR += py-avogadrolibs SUBDIR += py-cdo + SUBDIR += py-chainer SUBDIR += py-chempy SUBDIR += py-coards SUBDIR += py-dlib diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile new file mode 100644 index 000000000000..4bae764ef19e --- /dev/null +++ b/science/py-chainer/Makefile @@ -0,0 +1,26 @@ +# $FreeBSD$ + +PORTNAME= chainer +DISTVERSION= 6.2.0 +CATEGORIES= science biology +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Deep learning framework + +LICENSE= MIT + +LIB_DEPENDS= libprotobuf.so:devel/protobuf +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ + ${PY_TYPING} \ + ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils autoplist + +NO_ARCH= yes + +.include diff --git a/science/py-chainer/distinfo b/science/py-chainer/distinfo new file mode 100644 index 000000000000..650faf3f8d16 --- /dev/null +++ b/science/py-chainer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565290777 +SHA256 (chainer-6.2.0.tar.gz) = 59ffacca815ccad80acca218f111ada6d4507a8f69e3ac3f135f489219c4d86f +SIZE (chainer-6.2.0.tar.gz) = 873060 diff --git a/science/py-chainer/pkg-descr b/science/py-chainer/pkg-descr new file mode 100644 index 000000000000..3ce9ee5662f2 --- /dev/null +++ b/science/py-chainer/pkg-descr @@ -0,0 +1,11 @@ +Chainer is a powerful, flexible and intuitive deep learning framework. +* Chainer supports CUDA computation. It only requires a few lines of code to + leverage a GPU. It also runs on multiple GPUs with little effort. +* Chainer supports various network architectures including feed-forward nets, + convnets, recurrent nets and recursive nets. It also supports per-batch + architectures. +* Forward computation can include any control flow statements of Python without + lacking the ability of backpropagation. It makes code intuitive and easy to + debug. + +WWW: https://chainer.org/ -- cgit From 745f9ae5a6a218b7779cca28e377822873c8bf24 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 20:08:09 +0000 Subject: science/py-chainer: Remove the irrelevant category --- science/py-chainer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile index 4bae764ef19e..490416db6e4c 100644 --- a/science/py-chainer/Makefile +++ b/science/py-chainer/Makefile @@ -2,7 +2,7 @@ PORTNAME= chainer DISTVERSION= 6.2.0 -CATEGORIES= science biology +CATEGORIES= science MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -- cgit From 32990155047c8f74d58836314bbf5bf50dee544f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Thu, 8 Aug 2019 20:47:19 +0000 Subject: Fix typo: add missing quotation marks --- science/py-onnx/files/patch-setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/py-onnx/files/patch-setup.py b/science/py-onnx/files/patch-setup.py index b3eed773cac4..6778542b8368 100644 --- a/science/py-onnx/files/patch-setup.py +++ b/science/py-onnx/files/patch-setup.py @@ -23,7 +23,7 @@ 'numpy', 'six', - 'typing>=3.6.4', -+ 'typing>=3.6.4; python_version < 3.5', ++ 'typing>=3.6.4; python_version < "3.5"', 'typing-extensions>=3.6.2.1', ]) -- cgit From e51a841a4d23b6d4383ead406cbf2d8d1ddf6fa7 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 21:04:30 +0000 Subject: sysutils/crate: Update 0.1 -> 0.1.1 Some developments. (jbeich@, I will look into compatibility with other versions once I have time.) --- sysutils/crate/Makefile | 4 ++-- sysutils/crate/distinfo | 6 +++--- sysutils/crate/pkg-descr | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index f4a5c4c79d21..e21922a40716 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= crate -DISTVERSION= 0.1 +DISTVERSION= 0.1.1 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Containerizer for FreeBSD (alpha-software, expect bugs) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= STL feature 'filesystem' isn't available on 11 +xBROKEN_FreeBSD_11= STL feature 'filesystem' isn't available on 11 .if defined(PACKAGE_BUILDING) BROKEN_FreeBSD_12= STL feature 'filesystem' isn't available in 12.0-RELEASE-p7 .endif diff --git a/sysutils/crate/distinfo b/sysutils/crate/distinfo index 41f0c3b18267..6e43a1b42cf3 100644 --- a/sysutils/crate/distinfo +++ b/sysutils/crate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564902749 -SHA256 (yurivict-crate-0.1_GH0.tar.gz) = dad83a6f72c7cdd426b32e3b828f0e47d9793c43951fb738e7dd64f916b816f6 -SIZE (yurivict-crate-0.1_GH0.tar.gz) = 30732 +TIMESTAMP = 1565298013 +SHA256 (yurivict-crate-0.1.1_GH0.tar.gz) = a83ab3a36ed137dca447790dde2b4db50d61bc94ea6990f6ce03c54b30bc929c +SIZE (yurivict-crate-0.1.1_GH0.tar.gz) = 31451 diff --git a/sysutils/crate/pkg-descr b/sysutils/crate/pkg-descr index eeacbabf838d..959e57b92f5c 100644 --- a/sysutils/crate/pkg-descr +++ b/sysutils/crate/pkg-descr @@ -1,8 +1,8 @@ crate is a FreeBSD containerizer utilizing FreeBSD jails. -crate creates application containers based on the description provided by the -user, and then runs containers as a monolithic processes, with all dependencies -included in the container. +crate can create the application container based on the description provided by +the user, and then runs this container any number of times as a monolithic +process, with all dependencies included in the container. Containers can be useful in these scenarios: * You can keep any version of your application, and it will always run later the -- cgit From d12e284fcdb31de60c53773452a9ac5b7edc7f90 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 21:05:43 +0000 Subject: New port: science/py-chainer-chemistry: Library for deep learning in biology and chemistry --- science/Makefile | 1 + science/py-chainer-chemistry/Makefile | 28 ++++++++++++++++++++++++++++ science/py-chainer-chemistry/distinfo | 3 +++ science/py-chainer-chemistry/pkg-descr | 6 ++++++ 4 files changed, 38 insertions(+) create mode 100644 science/py-chainer-chemistry/Makefile create mode 100644 science/py-chainer-chemistry/distinfo create mode 100644 science/py-chainer-chemistry/pkg-descr diff --git a/science/Makefile b/science/Makefile index ca17add424cc..d7d2e8276a0a 100644 --- a/science/Makefile +++ b/science/Makefile @@ -233,6 +233,7 @@ SUBDIR += py-avogadrolibs SUBDIR += py-cdo SUBDIR += py-chainer + SUBDIR += py-chainer-chemistry SUBDIR += py-chempy SUBDIR += py-coards SUBDIR += py-dlib diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile new file mode 100644 index 000000000000..a8687c0814e8 --- /dev/null +++ b/science/py-chainer-chemistry/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= chainer-chemistry +DISTVERSION= 0.5.0 +CATEGORIES= science biology +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Library for deep learning in biology and chemistry + +LICENSE= MIT + +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}chainer>0:science/py-chainer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils autoplist + +NO_ARCH= yes + +.include diff --git a/science/py-chainer-chemistry/distinfo b/science/py-chainer-chemistry/distinfo new file mode 100644 index 000000000000..b73d5a970e0b --- /dev/null +++ b/science/py-chainer-chemistry/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565289694 +SHA256 (chainer-chemistry-0.5.0.tar.gz) = 12a2c19d4846907cdd2e51eeb65ba21d7012e759c7fed3ddb0ee89f2d239a4f5 +SIZE (chainer-chemistry-0.5.0.tar.gz) = 77660 diff --git a/science/py-chainer-chemistry/pkg-descr b/science/py-chainer-chemistry/pkg-descr new file mode 100644 index 000000000000..c951f9ff5c8b --- /dev/null +++ b/science/py-chainer-chemistry/pkg-descr @@ -0,0 +1,6 @@ +Chainer Chemistry is a deep learning framework (based on Chainer) with +applications in Biology and Chemistry. It supports various state-of-the-art +models (especially GCNN - Graph Convolutional Neural Network) for chemical +property prediction. + +WWW: https://github.com/pfnet-research/chainer-chemistry -- cgit From 61f8b35e96e70322a42f4b5fc3ce5b4363aae2c9 Mon Sep 17 00:00:00 2001 From: lwhsu Date: Thu, 8 Aug 2019 21:15:49 +0000 Subject: Add xtoolchain-llvm90, pre seeded toolchain to cross build FreeBSD base Approved by: brooks Sponsored by: The FreeBSD Foundation --- devel/Makefile | 1 + devel/xtoolchain-llvm90/Makefile | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 devel/xtoolchain-llvm90/Makefile diff --git a/devel/Makefile b/devel/Makefile index c4a6a6e15767..3773b6d29831 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -6290,6 +6290,7 @@ SUBDIR += xtoolchain-llvm60 SUBDIR += xtoolchain-llvm70 SUBDIR += xtoolchain-llvm80 + SUBDIR += xtoolchain-llvm90 SUBDIR += xwpe SUBDIR += xxgdb SUBDIR += xxhash diff --git a/devel/xtoolchain-llvm90/Makefile b/devel/xtoolchain-llvm90/Makefile new file mode 100644 index 000000000000..57968617a3ce --- /dev/null +++ b/devel/xtoolchain-llvm90/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +LLVM_SUFFIX=90 + +MASTERDIR= ${.CURDIR}/../xtoolchain-llvm-devel + +.include "${MASTERDIR}/Makefile" -- cgit From 80cc996346ac9521321ed5000a054747942e271b Mon Sep 17 00:00:00 2001 From: asomers Date: Thu, 8 Aug 2019 21:25:42 +0000 Subject: emulators/qemu-utils: fix the build after r508242 revision 508242 updated the master port but didn't update qemu-utils. No PORTREVISION bump because 508242 already bumped PORTVERSION. Reported by: Niels --- emulators/qemu-utils/files/patch-Makefile | 24 ++++++++++++++++++++---- emulators/qemu-utils/pkg-plist | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/emulators/qemu-utils/files/patch-Makefile b/emulators/qemu-utils/files/patch-Makefile index f5f8368c179e..ca87881dba28 100644 --- a/emulators/qemu-utils/files/patch-Makefile +++ b/emulators/qemu-utils/files/patch-Makefile @@ -1,6 +1,21 @@ ---- Makefile.orig 2018-07-26 01:18:43 UTC -+++ Makefile -@@ -806,15 +806,10 @@ ifndef NOPORTDOCS +--- Makefile.orig 2019-08-08 19:18:25.578250000 +0000 ++++ Makefile 2019-08-08 19:20:21.482341000 +0000 +@@ -355,14 +355,10 @@ + ifdef BUILD_DOCS + ifdef NOPORTDOCS + DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 +-DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 + else + DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 +-DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 + DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 + endif +-DOCS+=docs/qemu-block-drivers.7 +-DOCS+=docs/qemu-cpu-models.7 + ifdef CONFIG_VIRTFS + DOCS+=fsdev/virtfs-proxy-helper.1 + endif +@@ -832,16 +828,10 @@ $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" @@ -13,10 +28,11 @@ - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" +- $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" ifneq ($(TOOLS),) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -868,11 +863,6 @@ endif +@@ -895,11 +885,6 @@ ifdef CONFIG_GTK $(MAKE) -C po $@ endif diff --git a/emulators/qemu-utils/pkg-plist b/emulators/qemu-utils/pkg-plist index 0ddc7886c72c..fa481bcfe95d 100644 --- a/emulators/qemu-utils/pkg-plist +++ b/emulators/qemu-utils/pkg-plist @@ -1,3 +1,4 @@ +bin/qemu-edid bin/qemu-img bin/qemu-io bin/qemu-nbd -- cgit From 34555be197b90e9b3624edc14fa45f91f0a7de41 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 8 Aug 2019 21:47:14 +0000 Subject: sysutils/crate: Fix the accidentally changed BROKEN statement. Reported by: adamw --- sysutils/crate/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index e21922a40716..3c875de61e51 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -10,7 +10,7 @@ COMMENT= Containerizer for FreeBSD (alpha-software, expect bugs) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -xBROKEN_FreeBSD_11= STL feature 'filesystem' isn't available on 11 +BROKEN_FreeBSD_11= STL feature 'filesystem' isn't available on 11 .if defined(PACKAGE_BUILDING) BROKEN_FreeBSD_12= STL feature 'filesystem' isn't available in 12.0-RELEASE-p7 .endif -- cgit From 082d47f40f9641f908044aca1892637c5ab7beb3 Mon Sep 17 00:00:00 2001 From: dvl Date: Thu, 8 Aug 2019 22:05:50 +0000 Subject: Upgrade to 0.0.15 * adds PostgreSQL support * add configurable number of DAYS to look back at certs * better error detection and logging of errors --- sysutils/anvil/Makefile | 2 +- sysutils/anvil/distinfo | 6 +++--- sysutils/anvil/files/cert-shifter.conf.sample.in | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sysutils/anvil/Makefile b/sysutils/anvil/Makefile index 896ebb7677a6..06f757370751 100644 --- a/sysutils/anvil/Makefile +++ b/sysutils/anvil/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= anvil -PORTVERSION= 0.0.13 +PORTVERSION= 0.0.15 PORTREVISION= 1 CATEGORIES= sysutils diff --git a/sysutils/anvil/distinfo b/sysutils/anvil/distinfo index e5cfda276ce6..262e04d016e8 100644 --- a/sysutils/anvil/distinfo +++ b/sysutils/anvil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564581702 -SHA256 (dlangille-anvil-0.0.13_GH0.tar.gz) = 8c443a8a1b888aad60c22e1f5a12ee9330c9de5515b0ff2b050448251c192e2b -SIZE (dlangille-anvil-0.0.13_GH0.tar.gz) = 79690 +TIMESTAMP = 1565301813 +SHA256 (dlangille-anvil-0.0.15_GH0.tar.gz) = a1cddad1983a1351e6bfea06db66d2bcc15f671136ce337d1402a017791bf0b3 +SIZE (dlangille-anvil-0.0.15_GH0.tar.gz) = 79891 diff --git a/sysutils/anvil/files/cert-shifter.conf.sample.in b/sysutils/anvil/files/cert-shifter.conf.sample.in index 89cb0ff9f946..71a8f052be9f 100644 --- a/sysutils/anvil/files/cert-shifter.conf.sample.in +++ b/sysutils/anvil/files/cert-shifter.conf.sample.in @@ -4,3 +4,5 @@ CERT_DST_ROOT="/var/db/certs-for-rsync" CERT_DST_CERTS="${CERT_DST_ROOT}/certs" TMP="${CERT_DST_ROOT}/tmp" + +DAYS="1" -- cgit From 5e03b547c04d4e7bed07bbe725f1b25ee486de49 Mon Sep 17 00:00:00 2001 From: kai Date: Thu, 8 Aug 2019 22:38:43 +0000 Subject: math/py-pandas-datareader: Update to 0.7.4 * Pet portlint by making the USES block separate while I'm here. Changelog since 0.7.0: * Restore Python 2.7 compatibility since the 0.7.x branch * Fixed import of pandas.compat dependencies https://github.com/pydata/pandas-datareader/compare/v0.7.0...v0.7.4 PR: 239591 Submitted by: Shane (maintainer) MFH: 2019Q3 --- math/py-pandas-datareader/Makefile | 4 ++-- math/py-pandas-datareader/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/math/py-pandas-datareader/Makefile b/math/py-pandas-datareader/Makefile index b1ca21e65186..7fda82a9106b 100644 --- a/math/py-pandas-datareader/Makefile +++ b/math/py-pandas-datareader/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandas-datareader -DISTVERSION= 0.7.0 -PORTREVISION= 1 +DISTVERSION= 0.7.4 CATEGORIES= math finance python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,6 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist + NO_ARCH= yes do-test: # some testcases are known to fail: https://github.com/pydata/pandas-datareader/issues/500 diff --git a/math/py-pandas-datareader/distinfo b/math/py-pandas-datareader/distinfo index fe894569330d..ca47bbe93db0 100644 --- a/math/py-pandas-datareader/distinfo +++ b/math/py-pandas-datareader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545004215 -SHA256 (pandas-datareader-0.7.0.tar.gz) = 7dee3fe6fa483c8c2ee4f1af91a65b542c5446d75a6fc25c832cad1ffca8ef0b -SIZE (pandas-datareader-0.7.0.tar.gz) = 178612 +TIMESTAMP = 1564721854 +SHA256 (pandas-datareader-0.7.4.tar.gz) = 2942644ac14386b08661b50581790d2727d11fd67301f225da8b2f92a634fadf +SIZE (pandas-datareader-0.7.4.tar.gz) = 178914 -- cgit From 178d680406d3a627d79ffe0d688468120026545f Mon Sep 17 00:00:00 2001 From: kai Date: Thu, 8 Aug 2019 22:45:35 +0000 Subject: devel/py-flaky: Update to 3.6.1 Changelog: * Reraise "KeyboardInterrupt" when running tests under pytest. --- devel/py-flaky/Makefile | 2 +- devel/py-flaky/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-flaky/Makefile b/devel/py-flaky/Makefile index 91d3b7839f2d..fd7d91a9b62f 100644 --- a/devel/py-flaky/Makefile +++ b/devel/py-flaky/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= flaky -DISTVERSION= 3.6.0 +DISTVERSION= 3.6.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-flaky/distinfo b/devel/py-flaky/distinfo index 8c7163e1aad3..c27cf0a8bdc8 100644 --- a/devel/py-flaky/distinfo +++ b/devel/py-flaky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563397978 -SHA256 (flaky-3.6.0.tar.gz) = c24e321b3b4b4a2d323b646acff6738e7601849832f4280864d69f00a6a9869d -SIZE (flaky-3.6.0.tar.gz) = 29523 +TIMESTAMP = 1565299054 +SHA256 (flaky-3.6.1.tar.gz) = 8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698 +SIZE (flaky-3.6.1.tar.gz) = 29501 -- cgit From 1e6848acaa31aeaef1a541a14b384b0123b50754 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:27:36 +0000 Subject: audio/gsequencer: Update 2.2.33 -> 2.2.35 Reported by: portscout --- audio/gsequencer/Makefile | 2 +- audio/gsequencer/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/gsequencer/Makefile b/audio/gsequencer/Makefile index 914ef3fa67e3..fab05e09d397 100644 --- a/audio/gsequencer/Makefile +++ b/audio/gsequencer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gsequencer -DISTVERSION= 2.2.33 +DISTVERSION= 2.2.35 CATEGORIES= audio MASTER_SITES= SAVANNAH/gsequencer/${DISTVERSION:R}.x diff --git a/audio/gsequencer/distinfo b/audio/gsequencer/distinfo index d18ddc5252b2..5522abe286d0 100644 --- a/audio/gsequencer/distinfo +++ b/audio/gsequencer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564904442 -SHA256 (gsequencer-2.2.33.tar.gz) = e9e6fb5d71dcbadea4050f5e23d23a772062628793a817a022e8041a267fde4f -SIZE (gsequencer-2.2.33.tar.gz) = 5244802 +TIMESTAMP = 1565330643 +SHA256 (gsequencer-2.2.35.tar.gz) = a2838defbcf7940b4100781cf4236959ef8dbf0a16afcbe3882def1c7a4a6fbe +SIZE (gsequencer-2.2.35.tar.gz) = 5243649 -- cgit From e973fe05ce8efedee7cdf5daf7d8e39ae9608a33 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:33:12 +0000 Subject: devel/py-pydantic: Update 0.31 -> 0.32 Reported by: portscout --- devel/py-pydantic/Makefile | 3 +-- devel/py-pydantic/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/py-pydantic/Makefile b/devel/py-pydantic/Makefile index 65d885e4128d..4f65227be182 100644 --- a/devel/py-pydantic/Makefile +++ b/devel/py-pydantic/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pydantic -DISTVERSION= 0.31 -PORTREVISION= 1 +DISTVERSION= 0.32 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pydantic/distinfo b/devel/py-pydantic/distinfo index 774dfff556be..2359668ce46b 100644 --- a/devel/py-pydantic/distinfo +++ b/devel/py-pydantic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564554230 -SHA256 (pydantic-0.31.tar.gz) = 6d9448b92dc1ab15918c00ee0915eb50b950f671a92fc25a018e667f61613d75 -SIZE (pydantic-0.31.tar.gz) = 68853 +TIMESTAMP = 1565332106 +SHA256 (pydantic-0.32.tar.gz) = 09171f1eb53c702e5245dd668458149ac95b91722d1d8dcc89d9839aab87bdc8 +SIZE (pydantic-0.32.tar.gz) = 69483 -- cgit From e3ed14a15cb32416de9808ff468e7322dd08cedc Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:35:34 +0000 Subject: math/py-uncertainties: Update 3.1.1 -> 3.1.2 Reported by: portscout --- math/py-uncertainties/Makefile | 2 +- math/py-uncertainties/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/math/py-uncertainties/Makefile b/math/py-uncertainties/Makefile index 766edcad4048..86f015420b19 100644 --- a/math/py-uncertainties/Makefile +++ b/math/py-uncertainties/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= uncertainties -DISTVERSION= 3.1.1 +DISTVERSION= 3.1.2 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-uncertainties/distinfo b/math/py-uncertainties/distinfo index f8440389f03d..25ee8c78172c 100644 --- a/math/py-uncertainties/distinfo +++ b/math/py-uncertainties/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564209920 -SHA256 (uncertainties-3.1.1.tar.gz) = 18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448 -SIZE (uncertainties-3.1.1.tar.gz) = 232231 +TIMESTAMP = 1565332426 +SHA256 (uncertainties-3.1.2.tar.gz) = ba07c17a8a78cb58a47cd373079c7ea459f8b26cd474e29163b6ba0d72856a1e +SIZE (uncertainties-3.1.2.tar.gz) = 232577 -- cgit From b320a3c794edb1ca9552142f8b2399a7e3b8c668 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:42:26 +0000 Subject: science/jmol: Update 14.29.49 -> 14.29.50 Reported by: portscout --- science/jmol/Makefile | 2 +- science/jmol/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/science/jmol/Makefile b/science/jmol/Makefile index 5572562e25d5..6747e0f58901 100644 --- a/science/jmol/Makefile +++ b/science/jmol/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Jmol -DISTVERSION= 14.29.49 +DISTVERSION= 14.29.50 CATEGORIES= science java MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/Version%20${DISTVERSION:R}/${PORTNAME}%20${DISTVERSION}/:src \ http://${PORTNAME:tl}.svn.sourceforge.net/viewvc/${PORTNAME:tl}/trunk/${PORTNAME}/selfSignedCertificate/:cert diff --git a/science/jmol/distinfo b/science/jmol/distinfo index a0d2f9eb09e4..e6e3948237f1 100644 --- a/science/jmol/distinfo +++ b/science/jmol/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1564727158 -SHA256 (Jmol-14.29.49-full.tar.gz) = 448b1b6351b75d21ae0e5860b4c44784b89a417d22d3ae59d235e42c0366594e -SIZE (Jmol-14.29.49-full.tar.gz) = 132475480 +TIMESTAMP = 1565332575 +SHA256 (Jmol-14.29.50-full.tar.gz) = fc408314e083e42913a991b48ca444da5ee94555357d1a6ccbda4ba38ddca7f4 +SIZE (Jmol-14.29.50-full.tar.gz) = 132499948 SHA256 (selfSignedCertificate.cer) = 0fa14fd5f21593a328ba4439ac17b3b507969d71a2734e392239b83ae8ec2920 SIZE (selfSignedCertificate.cer) = 735 SHA256 (selfSignedCertificate.store) = 81b69722530d94dc599ce79382a3386cce518baa7ab79fbb530d13483b51bed5 -- cgit From 83a04e4b5672441c597c0afaef8eb66de285e630 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:45:34 +0000 Subject: devel/emscripten: Update 1.38.40 -> 1.38.41 Reported by: portscout --- devel/emscripten/Makefile | 2 +- devel/emscripten/distinfo | 6 +++--- devel/emscripten/pkg-plist | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/devel/emscripten/Makefile b/devel/emscripten/Makefile index 89cf5139c646..960a2a3d1974 100644 --- a/devel/emscripten/Makefile +++ b/devel/emscripten/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= emscripten -DISTVERSION= 1.38.40 +DISTVERSION= 1.38.41 CATEGORIES= devel www MAINTAINER= yuri@FreeBSD.org diff --git a/devel/emscripten/distinfo b/devel/emscripten/distinfo index d3078319113c..f44084a5cbff 100644 --- a/devel/emscripten/distinfo +++ b/devel/emscripten/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564207604 -SHA256 (emscripten-core-emscripten-1.38.40_GH0.tar.gz) = 0b72324ff3e3360f64e0af93ccb062af1d3b5f0976abb9e9b35b044b78c73c8f -SIZE (emscripten-core-emscripten-1.38.40_GH0.tar.gz) = 42492542 +TIMESTAMP = 1565332990 +SHA256 (emscripten-core-emscripten-1.38.41_GH0.tar.gz) = 9e87e82799b7a26146333764c986b54274a2b75984bbb7112d9a08f0a1836a63 +SIZE (emscripten-core-emscripten-1.38.41_GH0.tar.gz) = 42513270 diff --git a/devel/emscripten/pkg-plist b/devel/emscripten/pkg-plist index b94f6d31b8a3..7b456573b6ee 100644 --- a/devel/emscripten/pkg-plist +++ b/devel/emscripten/pkg-plist @@ -204,6 +204,7 @@ lib/emscripten/src/library_pthread_stub.js lib/emscripten/src/library_sdl.js lib/emscripten/src/library_signals.js lib/emscripten/src/library_sockfs.js +lib/emscripten/src/library_stack_trace.js lib/emscripten/src/library_strtok_r.c lib/emscripten/src/library_syscall.js lib/emscripten/src/library_trace.js @@ -229,11 +230,11 @@ lib/emscripten/src/preamble_sharedlib.js lib/emscripten/src/proxyClient.js lib/emscripten/src/proxyWorker.js lib/emscripten/src/runtime.js +lib/emscripten/src/runtime_assertions.js lib/emscripten/src/runtime_math.js lib/emscripten/src/runtime_sab_polyfill.js lib/emscripten/src/runtime_safe_heap.js lib/emscripten/src/runtime_stack_check.js -lib/emscripten/src/runtime_stack_trace.js lib/emscripten/src/runtime_strings.js lib/emscripten/src/settings.js lib/emscripten/src/shell.html @@ -3489,6 +3490,7 @@ lib/emscripten/tools/optimizer/simple_ast.h lib/emscripten/tools/optimizer/snprintf.h lib/emscripten/tools/ports/__init__.py lib/emscripten/tools/ports/binaryen.py +lib/emscripten/tools/ports/boost_headers.py lib/emscripten/tools/ports/bullet.py lib/emscripten/tools/ports/bzip2.py lib/emscripten/tools/ports/cocos2d.py -- cgit From 3ec10d25bce4d5053eba12452c195182b1f590bd Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 06:58:08 +0000 Subject: devel/buildstream: Update 1.2.7 -> 1.2.8 Reported by: portscout --- devel/buildstream/Makefile | 3 ++- devel/buildstream/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/buildstream/Makefile b/devel/buildstream/Makefile index 4bf67cdadbf5..5f5a1c927884 100644 --- a/devel/buildstream/Makefile +++ b/devel/buildstream/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= BuildStream -DISTVERSION= 1.2.7 +DISTVERSION= 1.2.8 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,6 +18,7 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}grpcio>=1.18.0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pluginbase>=0.7:devel/py-pluginbase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.1:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.4.8:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.51:devel/py-ruamel.yaml@${PY_FLAVOR} \ diff --git a/devel/buildstream/distinfo b/devel/buildstream/distinfo index a059c8f27741..0003dc046041 100644 --- a/devel/buildstream/distinfo +++ b/devel/buildstream/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563323108 -SHA256 (BuildStream-1.2.7.tar.gz) = 338c0179b7fc0a97b9a3234f808971ba228d3a3f71db952cb335608de51910d7 -SIZE (BuildStream-1.2.7.tar.gz) = 470738 +TIMESTAMP = 1565333157 +SHA256 (BuildStream-1.2.8.tar.gz) = 98c613eddee9afbbe0604648d13bb01a2e61dca53c969bebda33912a02d3f576 +SIZE (BuildStream-1.2.8.tar.gz) = 471029 -- cgit From d116820808a7ccfd49d160d34e99b175e2c4da9a Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 07:01:15 +0000 Subject: net/wpa_supplicant_gui: Update 2.8 -> 2.9 Reported by: portscout --- net/wpa_supplicant_gui/Makefile | 2 +- net/wpa_supplicant_gui/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/wpa_supplicant_gui/Makefile b/net/wpa_supplicant_gui/Makefile index 8c62d2f505f8..2e27418d800f 100644 --- a/net/wpa_supplicant_gui/Makefile +++ b/net/wpa_supplicant_gui/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wpa_supplicant_gui -DISTVERSION= 2.8 +DISTVERSION= 2.9 CATEGORIES= net MASTER_SITES= http://w1.fi/releases/ \ http://partmedia.users.sourceforge.net/dist/:icons \ diff --git a/net/wpa_supplicant_gui/distinfo b/net/wpa_supplicant_gui/distinfo index 8b5f9b217eff..848e1d6b1ad9 100644 --- a/net/wpa_supplicant_gui/distinfo +++ b/net/wpa_supplicant_gui/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1555914470 -SHA256 (wpa_supplicant-2.8.tar.gz) = a689336a12a99151b9de5e25bfccadb88438f4f4438eb8db331cd94346fd3d96 -SIZE (wpa_supplicant-2.8.tar.gz) = 3155904 +TIMESTAMP = 1565333921 +SHA256 (wpa_supplicant-2.9.tar.gz) = fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 +SIZE (wpa_supplicant-2.9.tar.gz) = 3231785 SHA256 (wpa-gui-icons.tar.gz) = c0d2adb4d8d9f58c015e4862a5ab50c7a562b6bb641e1bb6a0cc841249573b42 SIZE (wpa-gui-icons.tar.gz) = 3797 -- cgit From 190662ef06e566d471bd15d30c88c7e38daf392e Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 07:15:26 +0000 Subject: x11-toolkits/redkite: Update 0.6-4 -> 0.6.1 Reported by: portscout --- x11-toolkits/redkite/Makefile | 4 +--- x11-toolkits/redkite/distinfo | 6 +++--- x11-toolkits/redkite/files/patch-CMakeLists.txt | 9 --------- x11-toolkits/redkite/pkg-plist | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/x11-toolkits/redkite/Makefile b/x11-toolkits/redkite/Makefile index 279f1630b2fb..fe15a49cc650 100644 --- a/x11-toolkits/redkite/Makefile +++ b/x11-toolkits/redkite/Makefile @@ -2,8 +2,7 @@ PORTNAME= redkite DISTVERSIONPREFIX= v -DISTVERSION= v0.6-4 -DISTVERSIONSUFFIX= -gad49c91 +DISTVERSION= 0.6.1 CATEGORIES= x11-toolkits MAINTAINER= yuri@FreeBSD.org @@ -16,7 +15,6 @@ USES= cmake compiler:c++14-lang gnome localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= quamplex USE_GNOME= cairo -USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib CMAKE_OFF= ENABLE_EXAMPLES diff --git a/x11-toolkits/redkite/distinfo b/x11-toolkits/redkite/distinfo index 8c041d39338e..52fb5a5f026e 100644 --- a/x11-toolkits/redkite/distinfo +++ b/x11-toolkits/redkite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565141035 -SHA256 (quamplex-redkite-vv0.6-4-gad49c91_GH0.tar.gz) = eedc7a3bd25038b835e4220c2dae325aefd9ad6bb028d3416d9d5bc717ddfaa2 -SIZE (quamplex-redkite-vv0.6-4-gad49c91_GH0.tar.gz) = 122164 +TIMESTAMP = 1565334121 +SHA256 (quamplex-redkite-v0.6.1_GH0.tar.gz) = 8800b90b8f1203c8b30d2493e8c84f55c41c76faaad9f74f715c3c26a38baae6 +SIZE (quamplex-redkite-v0.6.1_GH0.tar.gz) = 122142 diff --git a/x11-toolkits/redkite/files/patch-CMakeLists.txt b/x11-toolkits/redkite/files/patch-CMakeLists.txt index 5e725baec9f6..8d9b7ec1c321 100644 --- a/x11-toolkits/redkite/files/patch-CMakeLists.txt +++ b/x11-toolkits/redkite/files/patch-CMakeLists.txt @@ -9,12 +9,3 @@ else() message(FATAL_ERROR "Redkite not implemented yet for ${CMAKE_SYSTEM_NAME}") endif() -@@ -174,7 +176,7 @@ else() # defualt GNU/Linux - include_directories(${RK_INCLUDE_PATH}/impl/platforms/xwin) - endif() - --add_library(redkite STATIC -+add_library(redkite SHARED - ${RK_HEADERS} - ${RK_HEADERS_IMPL} - ${RK_HEADERS_PLATFORM} diff --git a/x11-toolkits/redkite/pkg-plist b/x11-toolkits/redkite/pkg-plist index 1ef534236468..69f39ea06037 100644 --- a/x11-toolkits/redkite/pkg-plist +++ b/x11-toolkits/redkite/pkg-plist @@ -20,4 +20,4 @@ include/redkite/RkRect.h include/redkite/RkSize.h include/redkite/RkTimer.h include/redkite/RkWidget.h -lib/libredkite.so +lib/libredkite.a -- cgit From edb5aa14bdf3c6ac7a658da5347f5576fc3abf13 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 07:22:48 +0000 Subject: biology/checkm: Update 1.0.13 -> 1.0.16 Reported by: portscout --- biology/checkm/Makefile | 3 +-- biology/checkm/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/biology/checkm/Makefile b/biology/checkm/Makefile index b752cdb3c53f..1823cddb1264 100644 --- a/biology/checkm/Makefile +++ b/biology/checkm/Makefile @@ -2,8 +2,7 @@ PORTNAME= CheckM DISTVERSIONPREFIX= v -DISTVERSION= 1.0.13 -PORTREVISION= 2 +DISTVERSION= 1.0.16 CATEGORIES= biology python MAINTAINER= yuri@FreeBSD.org diff --git a/biology/checkm/distinfo b/biology/checkm/distinfo index 1378c5ef3640..275f6a83c0c8 100644 --- a/biology/checkm/distinfo +++ b/biology/checkm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549752955 -SHA256 (Ecogenomics-CheckM-v1.0.13_GH0.tar.gz) = 7fe2e86892bcead16f1dda4201ccd8f6371f491be8ecf9ba31bde24157d5fa36 -SIZE (Ecogenomics-CheckM-v1.0.13_GH0.tar.gz) = 211472 +TIMESTAMP = 1565335007 +SHA256 (Ecogenomics-CheckM-v1.0.16_GH0.tar.gz) = f884e105b145030bbaf15406c528f1bd1464fb4c303a82e327c4b42b21790ce8 +SIZE (Ecogenomics-CheckM-v1.0.16_GH0.tar.gz) = 211994 -- cgit From 0dca21ad6fef384aae5e73a37ea0a52d02a4e532 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 9 Aug 2019 07:40:55 +0000 Subject: math/wxmaxima: Update to 19.07.0 Changelog: * Many improvements and bugfixes in the LaTeX and HTML export function * Many updated translations * Resolved a freeze on autocompletion * A sidebar that shows the contents of variables * Simplified the recalculation logic in order to squash the remaining bugs * Simplified the sync between input and output cells https://github.com/wxMaxima-developers/wxmaxima/releases/tag/Version-19.07.0 PR: 239689 Submitted by: Lorenzo Salvadore (maintainer) MFH: 2019Q3 --- math/wxmaxima/Makefile | 2 +- math/wxmaxima/distinfo | 6 +++--- math/wxmaxima/pkg-plist | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile index c03737fa9d98..75ad26a0c940 100644 --- a/math/wxmaxima/Makefile +++ b/math/wxmaxima/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wxmaxima -PORTVERSION= 19.05.7 +PORTVERSION= 19.07.0 DISTVERSIONPREFIX= Version- CATEGORIES= math diff --git a/math/wxmaxima/distinfo b/math/wxmaxima/distinfo index e9c7b0e5a39a..98f0948752c3 100644 --- a/math/wxmaxima/distinfo +++ b/math/wxmaxima/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559207455 -SHA256 (wxMaxima-Developers-wxmaxima-Version-19.05.7_GH0.tar.gz) = 06da51b6032dd5941b6ef09f8d7705f7c0a14b8dc7d0065f571369df9c339b7a -SIZE (wxMaxima-Developers-wxmaxima-Version-19.05.7_GH0.tar.gz) = 13832202 +TIMESTAMP = 1562322809 +SHA256 (wxMaxima-Developers-wxmaxima-Version-19.07.0_GH0.tar.gz) = 16237f22cf76ecb9159e536bbb121e89ac5ad043843a5f32aaac74f0b409c658 +SIZE (wxMaxima-Developers-wxmaxima-Version-19.07.0_GH0.tar.gz) = 15607972 diff --git a/math/wxmaxima/pkg-plist b/math/wxmaxima/pkg-plist index ae435c33c666..dfec15900369 100644 --- a/math/wxmaxima/pkg-plist +++ b/math/wxmaxima/pkg-plist @@ -57,9 +57,16 @@ share/wxMaxima/COPYING share/wxMaxima/README share/wxMaxima/README.md share/wxMaxima/a.png +share/wxMaxima/all-celltypes.wxmx share/wxMaxima/b.png share/wxMaxima/c.png share/wxMaxima/d.png +share/wxMaxima/foreign-characters.wxmx share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.png share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.svg +share/wxMaxima/misc-problematic-things.wxmx +share/wxMaxima/other-features.wxmx +share/wxMaxima/testbench_all_celltypes.wxmx +share/wxMaxima/testbench_automatic.wxmx share/wxMaxima/testbench_simple.wxmx +share/wxMaxima/textcells.wxmx -- cgit From f7be675f20a65fef63ef2a130087d61a7b25839a Mon Sep 17 00:00:00 2001 From: joneum Date: Fri, 9 Aug 2019 07:47:57 +0000 Subject: Update to 1.2.2 Sponsored by: Netzkommune GmbH --- www/mod_webkit/Makefile | 4 ++-- www/mod_webkit/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile index a3c4d5c98db2..97b4a2ecf0e9 100644 --- a/www/mod_webkit/Makefile +++ b/www/mod_webkit/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_webkit -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= www MAINTAINER= apache@FreeBSD.org @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= Cito GH_PROJECT= w4py -USES= apache:2.2+ +USES= apache:2.4+ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_EXTRAS= marshal.c diff --git a/www/mod_webkit/distinfo b/www/mod_webkit/distinfo index 0926558c3c81..e55dcb467056 100644 --- a/www/mod_webkit/distinfo +++ b/www/mod_webkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482321593 -SHA256 (Cito-w4py-1.2.1_GH0.tar.gz) = c88b39fbc0fc31148670f8ffa75ee6337483de26134093d9169a68f158f08d11 -SIZE (Cito-w4py-1.2.1_GH0.tar.gz) = 972967 +TIMESTAMP = 1565167921 +SHA256 (Cito-w4py-1.2.2_GH0.tar.gz) = ac9537f1b43ecc7fe5f0a76c80950b3c550827762aae344621ad6b42febe0254 +SIZE (Cito-w4py-1.2.2_GH0.tar.gz) = 974430 -- cgit From 662765e341e00f08cc4079a98193b8873da6c12e Mon Sep 17 00:00:00 2001 From: riggs Date: Fri, 9 Aug 2019 07:48:30 +0000 Subject: Fix build with boost 1.71 Details: - Backport upstream change to resolve namespace lookup issue with mkvtoolnix's split function and upcoming boost release, see https://gitlab.com/mbunkus/mkvtoolnix/issues/2599 PR: 239196 Reported by: jbeich --- .../mkvtoolnix/files/patch-src_common_strings_editing.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h diff --git a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h new file mode 100644 index 000000000000..46f2d2be90ff --- /dev/null +++ b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h @@ -0,0 +1,11 @@ +--- src/common/strings/editing.h.orig 2019-06-22 10:06:04 UTC ++++ src/common/strings/editing.h +@@ -29,7 +29,7 @@ inline std::vector + split(std::string const &text, + std::string const &pattern = ",", + size_t max = 0) { +- return split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max); ++ return ::split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max); + } + + void strip(std::string &s, bool newlines = false); -- cgit From 297e350916b3eb0ca75a89c14a51c6114a7c2f08 Mon Sep 17 00:00:00 2001 From: jbeich Date: Fri, 9 Aug 2019 07:51:31 +0000 Subject: x11-wm/sway: update to 1.2.r1 Changes: https://github.com/swaywm/sway/releases/tag/1.2-rc1 Reported by: GitHub (watch releases) --- x11-wm/sway/Makefile | 3 +-- x11-wm/sway/distinfo | 6 +++--- x11-wm/sway/pkg-plist | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 0c4b57216bbf..4f2b63b36654 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sway -DISTVERSION= 1.1.1 -PORTREVISION= 1 +DISTVERSION= 1.2-rc1 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 37aa39a1f97d..854ff01d29bb 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559570088 -SHA256 (swaywm-sway-1.1.1_GH0.tar.gz) = 740bf97556c54da83937a255113d715aaa05e05b44d61fbe85e01b53ff1f9922 -SIZE (swaywm-sway-1.1.1_GH0.tar.gz) = 5480615 +TIMESTAMP = 1565312384 +SHA256 (swaywm-sway-1.2-rc1_GH0.tar.gz) = b5099a648a076f8bba0f67afdf6b040f927b5a9f2c7abc68ed37541f73702727 +SIZE (swaywm-sway-1.2-rc1_GH0.tar.gz) = 5491894 diff --git a/x11-wm/sway/pkg-plist b/x11-wm/sway/pkg-plist index fde3ea209f57..5e3c84d4f27e 100644 --- a/x11-wm/sway/pkg-plist +++ b/x11-wm/sway/pkg-plist @@ -13,6 +13,7 @@ bin/swaynag %%MANPAGES%%man/man5/sway.5.gz %%MANPAGES%%man/man5/swaynag.5.gz %%MANPAGES%%man/man7/sway-ipc.7.gz +%%MANPAGES%%man/man7/swaybar-protocol.7.gz share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640.png share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640_Portrait.png share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png -- cgit From d8f6178bf9435b372e3938689e638bb1f5de7458 Mon Sep 17 00:00:00 2001 From: gahr Date: Fri, 9 Aug 2019 08:00:52 +0000 Subject: devel/catch: update to 2.9.2 Release notes: https://github.com/catchorg/Catch2/releases/tag/v2.9.2 --- devel/catch/Makefile | 4 ++-- devel/catch/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/catch/Makefile b/devel/catch/Makefile index d75106c63826..b9785d3d7056 100644 --- a/devel/catch/Makefile +++ b/devel/catch/Makefile @@ -3,8 +3,8 @@ PORTNAME= catch DISTVERSIONPREFIX= v -DISTVERSION= 2.9.1 -PORTREVISION= 1 +DISTVERSION= 2.9.2 +PORTREVISION= 0 CATEGORIES= devel MAINTAINER= gahr@FreeBSD.org diff --git a/devel/catch/distinfo b/devel/catch/distinfo index e31e59454a08..30773a5bf18c 100644 --- a/devel/catch/distinfo +++ b/devel/catch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560847117 -SHA256 (catchorg-Catch2-v2.9.1_GH0.tar.gz) = 0b36488aca6265e7be14da2c2d0c748b4ddb9c70a1ea4da75736699c629f14ac -SIZE (catchorg-Catch2-v2.9.1_GH0.tar.gz) = 626539 +TIMESTAMP = 1565335502 +SHA256 (catchorg-Catch2-v2.9.2_GH0.tar.gz) = 54bea6d80a388a80f895cd0e2343fca72b0d9093a776af40904aefce49c13bda +SIZE (catchorg-Catch2-v2.9.2_GH0.tar.gz) = 634059 -- cgit From 7e2b0180b8485cbe632608f2a131b30ac56b8b73 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 9 Aug 2019 08:04:32 +0000 Subject: net/freeswitch: Update to 1.8.7 Changelog since the 1.8.5 release: * Fixes around +100 bugs * The link to the release notes was omitted as it's not very URL friendly. It can be obtained via the URL field within the PR listed below. PR: 239676 Submitted by: emss@free.fre (based on) --- net/freeswitch/Makefile | 3 +-- net/freeswitch/distinfo | 6 +++--- net/freeswitch/files/extrapatch-modules.conf | 9 +++++---- net/freeswitch/pkg-plist | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index e756ec7fb4ea..84b958c29c5c 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= freeswitch -PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTVERSION= 1.8.7 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds diff --git a/net/freeswitch/distinfo b/net/freeswitch/distinfo index a2ebac4714fb..2de5fa0b0bd8 100644 --- a/net/freeswitch/distinfo +++ b/net/freeswitch/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1552339873 -SHA256 (freeswitch-1.8.5.tar.xz) = 503a551be5d6df06162ea9d98a952b6fb524852ce2352fe3ca3a36a76995b046 -SIZE (freeswitch-1.8.5.tar.xz) = 28816680 +TIMESTAMP = 1565103430 +SHA256 (freeswitch-1.8.7.tar.xz) = 7d3cee32713db5f65e3d4703c6420038872d8f6efab8be4d58fbf66ffa993008 +SIZE (freeswitch-1.8.7.tar.xz) = 28883512 SHA256 (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592 SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2 diff --git a/net/freeswitch/files/extrapatch-modules.conf b/net/freeswitch/files/extrapatch-modules.conf index 7a4abbd9b26c..61431067f143 100644 --- a/net/freeswitch/files/extrapatch-modules.conf +++ b/net/freeswitch/files/extrapatch-modules.conf @@ -1,6 +1,6 @@ ---- modules.conf.orig 2019-01-25 00:17:59 UTC +--- modules.conf.orig 2019-07-02 21:01:14 UTC +++ modules.conf -@@ -1,166 +1,166 @@ +@@ -1,167 +1,167 @@ -#applications/mod_abstraction -#applications/mod_av -#applications/mod_avmd @@ -66,9 +66,9 @@ #applications/mod_rad_auth -#applications/mod_redis -#applications/mod_rss - applications/mod_signalwire +applications/mod_redis +applications/mod_rss + applications/mod_signalwire applications/mod_sms #applications/mod_sms_flowroute -#applications/mod_snapshot @@ -191,8 +191,9 @@ +formats/mod_ssml formats/mod_tone_stream -#formats/mod_vlc --#languages/mod_basic +formats/mod_vlc + #formats/mod_opusfile +-#languages/mod_basic +languages/mod_basic #languages/mod_java languages/mod_lua diff --git a/net/freeswitch/pkg-plist b/net/freeswitch/pkg-plist index 175f5aa4bddc..bb1e51aa801c 100644 --- a/net/freeswitch/pkg-plist +++ b/net/freeswitch/pkg-plist @@ -4,6 +4,7 @@ bin/fs_encode bin/fs_ivrd bin/fsxs bin/gentls_cert +bin/switch_console bin/switch_core bin/switch_event bin/switch_hash -- cgit From 4a54bd0bc7cae8c4f284601e75d055f639439f1a Mon Sep 17 00:00:00 2001 From: tobik Date: Fri, 9 Aug 2019 08:22:57 +0000 Subject: ports-mgmt/portfmt: Update to latest commit Changes: https://github.com/t6/portfmt/commits/32c8480f842d996e8f31c01bad0e908690714a75 --- ports-mgmt/portfmt/Makefile | 4 ++-- ports-mgmt/portfmt/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/portfmt/Makefile b/ports-mgmt/portfmt/Makefile index a844e0715c29..9c559f8adb45 100644 --- a/ports-mgmt/portfmt/Makefile +++ b/ports-mgmt/portfmt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= portfmt -PORTVERSION= g20190801 +PORTVERSION= g20190809 CATEGORIES= ports-mgmt MAINTAINER= tobik@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= t6 -GH_TAGNAME= b8d3a2ad5ba70b9b976f44df2274029b6ff7906d +GH_TAGNAME= 32c8480f842d996e8f31c01bad0e908690714a75 USE_LDCONFIG= yes HAS_CONFIGURE= yes diff --git a/ports-mgmt/portfmt/distinfo b/ports-mgmt/portfmt/distinfo index 68ef5bbf91e4..94f53add7815 100644 --- a/ports-mgmt/portfmt/distinfo +++ b/ports-mgmt/portfmt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564689960 -SHA256 (t6-portfmt-g20190801-b8d3a2ad5ba70b9b976f44df2274029b6ff7906d_GH0.tar.gz) = 811791a2941ebd4ea2eee8d8e5ed2ce2030841463f833ea76a1dccfb3d9aa1e7 -SIZE (t6-portfmt-g20190801-b8d3a2ad5ba70b9b976f44df2274029b6ff7906d_GH0.tar.gz) = 73061 +TIMESTAMP = 1565338872 +SHA256 (t6-portfmt-g20190809-32c8480f842d996e8f31c01bad0e908690714a75_GH0.tar.gz) = 96e5a9e670c349dcdf906c4c960a7fb85e88aea00084a7081f3bb3fc2ca368c8 +SIZE (t6-portfmt-g20190809-32c8480f842d996e8f31c01bad0e908690714a75_GH0.tar.gz) = 73571 -- cgit From 7b30eeab070b6a27345b704845b7141c6b124747 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 9 Aug 2019 09:01:37 +0000 Subject: www/cliqz: Update to 1.28.1 Changelog: * DB-2234: Add tab privacy check | fixed loadContext error * DB-2241: Text ellipsis in Refresh dialog * DB-2243: Disabled "about:welcome" page * DB-2244: Fixing bookmark issue and removing bookmark recommendation served from activity stream https://github.com/cliqz-oss/browser-f/compare/1.28.0...1.28.1 PR: 239706 Submitted by: Santhosh Raju (maintainer) --- www/cliqz/Makefile | 4 ++-- www/cliqz/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index fb7ec56f5bff..f5840f0b66fb 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.28.0 +DISTVERSION= 1.28.1 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz @@ -72,7 +72,7 @@ SHEBANG_FILES= magic_build_and_package.sh CLIQZ_CHANNEL= release # If the DISTVERSION is updated, make sure to update the last build id from # fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid -CLIQZ_LAST_BUILD_ID= 20190726184423 +CLIQZ_LAST_BUILD_ID= 20190802181254 CLIQZ_ICON= ${PORTNAME}.png CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo index 6c3073481c10..d1b13b493afe 100644 --- a/www/cliqz/distinfo +++ b/www/cliqz/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1564511104 +TIMESTAMP = 1565224721 SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 SIZE (adult-domains.bin) = 528392 -SHA256 (cliqz@cliqz.com.xpi) = ed820af4f00b0ae7a3eb3792aa98b4842f44ea2ce5583dd6cd6171aac5667234 -SIZE (cliqz@cliqz.com.xpi) = 6035731 +SHA256 (cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c +SIZE (cliqz@cliqz.com.xpi) = 7795084 SHA256 (https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b SIZE (https-everywhere@cliqz.com.xpi) = 1765469 SHA256 (gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76 SIZE (gdprtool@cliqz.com.xpi) = 222806 -SHA256 (cliqz-oss-browser-f-1.28.0_GH0.tar.gz) = 329115f50936654d31c83592c3f5808854109fa2a425bd3efb2c57647022c43b -SIZE (cliqz-oss-browser-f-1.28.0_GH0.tar.gz) = 496805258 +SHA256 (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 4d6d0dbf87d30e760b66e6e891ab80ff5e9863168ce9641cebfe4b114fe38e10 +SIZE (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 496805470 -- cgit From c8ed0d9520da732da36a66ac549d56f7559d55e1 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Fri, 9 Aug 2019 09:02:29 +0000 Subject: - Fix LICENSE - Add LICENSE_FILE - Simplify docs installation - Respect CFLAGS - Update WWW --- misc/digitemp/Makefile | 23 +++++++++-------------- misc/digitemp/files/patch-Makefile | 13 +++++++++++++ misc/digitemp/pkg-descr | 2 +- 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 misc/digitemp/files/patch-Makefile diff --git a/misc/digitemp/Makefile b/misc/digitemp/Makefile index 634d355e7044..0687aeb4f256 100644 --- a/misc/digitemp/Makefile +++ b/misc/digitemp/Makefile @@ -9,26 +9,26 @@ MASTER_SITES= http://www.digitemp.com/software/linux/ MAINTAINER= ports@FreeBSD.org COMMENT= Dallas Semiconductor 1-wire device reading console application -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake -MAKE_ARGS+= CC="${CC}" PLIST_FILES= bin/digitemp_DS9097 bin/digitemp_DS9097U \ etc/digitemp.conf.sample \ man/man1/digitemp.1.gz -DOCFILES= ChangeLog COPYRIGHT CREDITS FAQ README TODO \ - dthowto.txt DS9097_Schematic.gif -DOCDIRS= perl python rrdb -PORTDOCS= ${DOCFILES} ${DOCDIRS} +DOCS= ChangeLog CREDITS FAQ README TODO \ + dthowto.txt DS9097_Schematic.gif \ + perl python/gui python/mysql rrdb +PORTDOCS= * ALL_TARGET= ds9097 ds9097u OPTIONS_DEFINE= DOCS pre-install: - ${REINPLACE_CMD} -e "s/dev\/ttyS/dev\/cuau/g" ${WRKSRC}/${PORTNAME}.1 + @${REINPLACE_CMD} -e "s/dev\/ttyS/dev\/cuau/g" ${WRKSRC}/${PORTNAME}.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/digitemp_DS9097 ${STAGEDIR}${PREFIX}/bin @@ -39,12 +39,7 @@ do-install: @${ECHO_MSG} "Sample config installed at ${PREFIX}/etc/digitemp.conf.sample" @${ECHO_MSG} "" -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.for dir in perl python/gui python/mysql rrdb - @${MKDIR} ${STAGEDIR}${DOCSDIR}/${dir} - ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${STAGEDIR}${DOCSDIR}/${dir} \; -.endfor +do-install-DOCS-on: + @cd ${WRKSRC} && ${COPYTREE_SHARE} "${DOCS}" ${STAGEDIR}${DOCSDIR} .include diff --git a/misc/digitemp/files/patch-Makefile b/misc/digitemp/files/patch-Makefile new file mode 100644 index 000000000000..3dc76b264ff8 --- /dev/null +++ b/misc/digitemp/files/patch-Makefile @@ -0,0 +1,13 @@ +--- Makefile.orig 2008-08-28 21:37:00 UTC ++++ Makefile +@@ -11,8 +11,8 @@ + + VERSION = 3.6.0 + +-CC = gcc +-CFLAGS = -I./src -I./userial -O2 -Wall # -g ++CC? = gcc ++CFLAGS += -I./src -I./userial + + OBJS = src/digitemp.o src/device_name.o src/ds2438.o + HDRS = src/digitemp.h src/device_name.h diff --git a/misc/digitemp/pkg-descr b/misc/digitemp/pkg-descr index b0757e57da6b..ab275746043d 100644 --- a/misc/digitemp/pkg-descr +++ b/misc/digitemp/pkg-descr @@ -6,4 +6,4 @@ following 1-wire temperature sensors: DS18S20 (and DS1820), DS18B20, DS1822, the DS2438 Smart Battery Monitor, DS2422 and DS2423 Counters, DS2409 MicroLAN Coupler (used in 1-wire hubs) and the AAG TAI-8540 humidity sensor. -WWW: http://www.digitemp.com/software.shtml +WWW: https://www.digitemp.com/software.shtml -- cgit From e9169f8d9d836658d9de078acb66844bc83940c1 Mon Sep 17 00:00:00 2001 From: vsevolod Date: Fri, 9 Aug 2019 09:22:47 +0000 Subject: - Add missing uses [1] - Drop maintainership PR: 239728 [1] Submitted by: Walter Schwarzenfeld [1] Reported by: Robert Cina --- cad/tkgate/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index be698447ff73..a8f5c1f458fd 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -5,14 +5,14 @@ PORTVERSION= 2.1 CATEGORIES= cad MASTER_SITES= http://cdn.bitbucket.org/starling13/tkgate/downloads/ -MAINTAINER= vsevolod@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Event driven digital circuit simulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES+= iconv:translit tk:build,run autoreconf +USES+= iconv:translit tk:build,run autoreconf libtool pkgconfig USE_GNOME= pango OPTIONS_DEFINE= DOCS -- cgit From 5968e499b4dac17936153f84e348dbf4bc64213f Mon Sep 17 00:00:00 2001 From: arrowd Date: Fri, 9 Aug 2019 09:41:53 +0000 Subject: devel/stack: Update to 2.1.3.1. Add RUN_DEPENDS on gmake and perl, as these are required when Stack installs GHC. --- devel/stack/Makefile | 219 ++++++++++++++++++++++++++++++++++++++------------- devel/stack/distinfo | 190 ++++++++++++++++++++++++++++---------------- 2 files changed, 284 insertions(+), 125 deletions(-) diff --git a/devel/stack/Makefile b/devel/stack/Makefile index 0d5022726739..f7464d472f1f 100644 --- a/devel/stack/Makefile +++ b/devel/stack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stack -PORTVERSION= 2.1.1.1 +PORTVERSION= 2.1.3.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,63 +11,170 @@ COMMENT= Cross-platform program for developing Haskell programs LICENSE= BSD3CLAUSE BUILD_DEPENDS= happy:devel/hs-happy -RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss +RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \ + gmake:devel/gmake -USES= cabal +USES= cabal gmake perl5 -USE_CABAL= Glob-0.10.0_1 StateVar-1.2 aeson-1.4.3.0 aeson-compat-0.3.9 \ - annotated-wl-pprint-0.7.0 ansi-terminal-0.9.1 ansi-wl-pprint-0.6.9 \ - asn1-encoding-0.9.5 asn1-parse-0.9.4 asn1-types-0.3.2 async-2.2.2 \ - attoparsec-0.13.2.2 attoparsec-iso8601-1.0.1.0 auto-update-0.1.4.1 \ - base-compat-0.10.5 base-orphans-0.8.1 base-prelude-1.3 \ - base16-bytestring-0.1.1.6 base64-bytestring-1.0.0.2 \ - basement-0.0.10 bifunctors-5.5.4 bitarray-0.0.1.1 \ - blaze-builder-0.4.1.0 blaze-html-0.9.1.1 blaze-markup-0.8.2.2 \ - cabal-doctest-1.0.6_2 case-insensitive-1.2.1.0 cereal-0.5.8.1 \ - clock-0.8 cmdargs-0.10.20 colour-2.3.5 comonad-5.0.5 conduit-1.3.1.1 \ - conduit-combinators-1.3.0 conduit-extra-1.3.2 connection-0.3.0 \ - contravariant-1.5.2 cookie-0.4.4 cryptohash-sha256-0.11.101.0_2 \ - cryptonite-0.25 cryptonite-conduit-0.2.2 \ - data-default-class-0.1.2.0 digest-0.0.1.2 distributive-0.6 \ - dlist-0.8.0.6 easy-file-0.2.2 echo-0.1.3_1 ed25519-0.0.5.0_2 \ - either-5.0.1.1 exceptions-0.10.2 extra-1.6.17 fast-logger-2.4.16 \ - file-embed-0.0.11 filelock-0.1.1.3 fsnotify-0.3.0.1 \ - generic-deriving-1.12.4 githash-0.1.3.1 hackage-security-0.5.3.0_4 \ - hashable-1.2.7.0_1 hi-file-parser-0.1.0.0 hourglass-0.2.12 \ - hpack-0.31.2 hsc2hs-0.68.4 http-api-data-0.4.1 http-client-0.6.4 \ - http-client-tls-0.3.5.3 http-conduit-2.3.7.1 \ - http-download-0.1.0.0 http-types-0.12.3 infer-license-0.2.0 \ - integer-logarithms-1.0.3 libyaml-0.1.1.0 lifted-base-0.2.3.12 \ - megaparsec-7.0.5 memory-0.14.18 microlens-0.4.10 \ - microlens-th-0.4.2.3_1 mime-types-0.1.0.9 mintty-0.1.2 \ - monad-control-1.0.2.3 monad-logger-0.3.30 monad-loops-0.4.3 \ - mono-traversable-1.0.11.0 mustache-2.3.0 \ - neat-interpolation-0.3.2.4 network-2.8.0.1 network-uri-2.6.1.0_1 \ - old-locale-1.0.0.7_2 old-time-1.1.0.3_2 open-browser-0.2.1.0 \ - optparse-applicative-0.14.3.0 optparse-simple-0.1.1.2 \ - pantry-tmp-0.1.0.0 parser-combinators-1.1.0 path-0.6.1_1 \ - path-io-1.4.2 path-pieces-0.2.1 pem-0.2.4 persistent-2.9.2 \ - persistent-sqlite-2.9.3 persistent-template-2.6.0 \ - primitive-0.6.4.0_1 profunctors-5.4 project-template-0.2.0.1 \ - random-1.1 regex-applicative-0.3.3 \ - regex-applicative-text-0.1.0.1_3 resource-pool-0.2.3.2 \ - resourcet-1.2.2 retry-0.8.0.1 rio-0.1.9.2 rio-orphans-0.1.1.0 \ - rio-prettyprint-0.1.0.0 safe-0.3.17 safe-exceptions-0.1.7.0_4 \ - scientific-0.3.6.2 semigroupoids-5.3.2 semigroups-0.18.5 \ - silently-1.2.5 socks-0.6.0 split-0.2.3.3_1 stm-chans-3.0.0.4_1 \ - streaming-commons-0.2.1.1 syb-0.7 tagged-0.8.6 tar-0.5.1.0_1 \ - tar-conduit-0.3.2 temporary-1.3 terminal-size-0.3.2.1 \ - text-metrics-0.3.0_4 th-abstraction-0.3.1.0 th-expand-syns-0.4.4.0_1 \ - th-lift-0.8.0.1 th-lift-instances-0.1.13 th-orphans-0.13.7 \ - th-reify-many-0.1.9 th-utilities-0.2.3.0 time-compat-1.9.2.2 \ - time-locale-compat-0.1.1.5 tls-1.4.1 transformers-base-0.4.5.2 \ - transformers-compat-0.6.5 typed-process-0.2.4.1 \ - unicode-transforms-0.3.6 unix-compat-0.5.1 unix-time-0.4.6 \ - unliftio-0.2.11 unliftio-core-0.1.2.0_1 \ - unordered-containers-0.2.10.0 uuid-types-1.0.3 vector-0.12.0.3 \ - vector-algorithms-0.8.0.1 void-0.7.3 x509-1.7.5 x509-store-1.6.7 \ - x509-system-1.6.6 x509-validation-1.6.11 yaml-0.11.0.0 \ - zip-archive-0.4.1 zlib-0.6.2 +USE_PERL5= run + +USE_CABAL= Glob-0.10.0_1 \ + StateVar-1.2 \ + aeson-1.4.4.0 \ + annotated-wl-pprint-0.7.0_1 \ + ansi-terminal-0.9.1 \ + ansi-wl-pprint-0.6.9 \ + asn1-encoding-0.9.5 \ + asn1-parse-0.9.4 \ + asn1-types-0.3.3 \ + async-2.2.2 \ + attoparsec-0.13.2.2_3 \ + attoparsec-iso8601-1.0.1.0 \ + auto-update-0.1.6 \ + base-compat-0.10.5 \ + base-orphans-0.8.1 \ + base-prelude-1.3 \ + base16-bytestring-0.1.1.6 \ + base64-bytestring-1.0.0.2 \ + basement-0.0.11 \ + bifunctors-5.5.4_1 \ + bitarray-0.0.1.1_1 \ + blaze-builder-0.4.1.0 \ + blaze-html-0.9.1.1 \ + blaze-markup-0.8.2.2_1 \ + cabal-doctest-1.0.6_2 \ + case-insensitive-1.2.1.0 \ + cereal-0.5.8.1 \ + clock-0.8 \ + cmdargs-0.10.20 \ + colour-2.3.5 \ + comonad-5.0.5 \ + conduit-1.3.1.1 \ + conduit-combinators-1.3.0 \ + conduit-extra-1.3.4 \ + connection-0.3.0_1 \ + contravariant-1.5.2 \ + cookie-0.4.4 \ + cryptohash-sha256-0.11.101.0_2 \ + cryptonite-0.26 \ + cryptonite-conduit-0.2.2_1 \ + data-default-class-0.1.2.0 \ + digest-0.0.1.2 \ + distributive-0.6 \ + dlist-0.8.0.7 \ + easy-file-0.2.2 \ + echo-0.1.3_1 \ + ed25519-0.0.5.0_2 \ + either-5.0.1.1 \ + exceptions-0.10.2 \ + extra-1.6.17 \ + fast-logger-2.4.16 \ + file-embed-0.0.11 \ + filelock-0.1.1.3 \ + fsnotify-0.3.0.1_1 \ + generic-deriving-1.12.4_1 \ + githash-0.1.3.1 \ + hackage-security-0.5.3.0_6 \ + hashable-1.2.7.0_1 \ + hi-file-parser-0.1.0.0_2 \ + hourglass-0.2.12 \ + hpack-0.31.2 \ + hsc2hs-0.68.4 \ + http-api-data-0.4.1 \ + http-client-0.6.4 \ + http-client-tls-0.3.5.3_1 \ + http-conduit-2.3.7.1_1 \ + http-download-0.1.0.0_4 \ + http-types-0.12.3 \ + infer-license-0.2.0 \ + integer-logarithms-1.0.3_1 \ + libyaml-0.1.1.0 \ + lifted-base-0.2.3.12 \ + megaparsec-7.0.5 \ + memory-0.14.18_1 \ + microlens-0.4.11.2 \ + microlens-th-0.4.3.2 \ + mime-types-0.1.0.9 \ + mintty-0.1.2 \ + monad-control-1.0.2.3 \ + monad-logger-0.3.30 \ + monad-loops-0.4.3 \ + mono-traversable-1.0.11.0 \ + mustache-2.3.0 \ + neat-interpolation-0.3.2.4 \ + network-3.1.0.1 \ + network-uri-2.6.1.0_1 \ + old-locale-1.0.0.7_2 \ + old-time-1.1.0.3_2 \ + open-browser-0.2.1.0 \ + optparse-applicative-0.15.0.0 \ + optparse-simple-0.1.1.2 \ + pantry-0.1.1.1 \ + parser-combinators-1.2.0 \ + path-0.6.1_1 \ + path-io-1.4.2 \ + path-pieces-0.2.1_1 \ + pem-0.2.4 \ + persistent-2.10.1 \ + persistent-sqlite-2.10.4 \ + persistent-template-2.7.2 \ + primitive-0.7.0.0 \ + profunctors-5.4 \ + project-template-0.2.0.1_1 \ + random-1.1_1 \ + regex-applicative-0.3.3 \ + regex-applicative-text-0.1.0.1_3 \ + resource-pool-0.2.3.2 \ + resourcet-1.2.2 \ + retry-0.8.0.1 \ + rio-0.1.11.0 \ + rio-orphans-0.1.1.0 \ + rio-prettyprint-0.1.0.0_2 \ + safe-0.3.17 \ + safe-exceptions-0.1.7.0_4 \ + scientific-0.3.6.2 \ + semigroupoids-5.3.2_1 \ + semigroups-0.19 \ + silently-1.2.5.1 \ + socks-0.6.0 \ + split-0.2.3.3_1 \ + stm-chans-3.0.0.4_1 \ + streaming-commons-0.2.1.1 \ + syb-0.7.1 \ + tagged-0.8.6_1 \ + tar-0.5.1.0_1 \ + tar-conduit-0.3.2 \ + temporary-1.3 \ + terminal-size-0.3.2.1 \ + text-metrics-0.3.0_4 \ + th-abstraction-0.3.1.0 \ + th-expand-syns-0.4.4.0_1 \ + th-lift-0.8.0.1 \ + th-lift-instances-0.1.13 \ + th-orphans-0.13.7_1 \ + th-reify-many-0.1.9 \ + th-utilities-0.2.3.0 \ + time-compat-1.9.2.2_1 \ + tls-1.5.1 \ + transformers-base-0.4.5.2 \ + transformers-compat-0.6.5 \ + typed-process-0.2.6.0 \ + unicode-transforms-0.3.6 \ + unix-compat-0.5.1_1 \ + unix-time-0.4.7 \ + unliftio-0.2.12 \ + unliftio-core-0.1.2.0_2 \ + unordered-containers-0.2.10.0_1 \ + uuid-types-1.0.3_2 \ + vector-0.12.0.3_2 \ + vector-algorithms-0.8.0.1_2 \ + x509-1.7.5_1 \ + x509-store-1.6.7_1 \ + x509-system-1.6.6 \ + x509-validation-1.6.11 \ + yaml-0.11.1.0 \ + zip-archive-0.4.1_1 \ + zlib-0.6.2 #PLIST_FILES= etc/bash_completion.d/_stack.bash \ # share/zsh/site-functions/_stack diff --git a/devel/stack/distinfo b/devel/stack/distinfo index 00aca7b50a36..a66b7b9145ab 100644 --- a/devel/stack/distinfo +++ b/devel/stack/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1560535992 -SHA256 (cabal/stack-2.1.1.1.tar.gz) = 4286a7f6f2e972598b847d751cdb650c4d06c36192723b2f5d96e4cd26041ee3 -SIZE (cabal/stack-2.1.1.1.tar.gz) = 566543 +TIMESTAMP = 1565336799 +SHA256 (cabal/stack-2.1.3.1.tar.gz) = f983369a22a3e3af9ae09770cf34e4ba439cc7f5ef5a0e87f4db11c1ec5356e0 +SIZE (cabal/stack-2.1.3.1.tar.gz) = 571097 SHA256 (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 SIZE (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 29500 SHA256 (cabal/Glob-0.10.0/revision/1.cabal) = bbccaf21bff9071dcf369f55cc1a07250bdc84c432bdf4277ed53e5e2327cd7d SIZE (cabal/Glob-0.10.0/revision/1.cabal) = 2947 SHA256 (cabal/StateVar-1.2/StateVar-1.2.tar.gz) = afc036021fcd38f15fcc4af392a3e57017d5ddcc926e99391dbfc8c4e6375f8b SIZE (cabal/StateVar-1.2/StateVar-1.2.tar.gz) = 4770 -SHA256 (cabal/aeson-1.4.3.0/aeson-1.4.3.0.tar.gz) = 6564ac0fb429cd4bcafc706fa4b905dab94f57f765ebd96a65c9ba4b9e520c19 -SIZE (cabal/aeson-1.4.3.0/aeson-1.4.3.0.tar.gz) = 272210 -SHA256 (cabal/aeson-compat-0.3.9/aeson-compat-0.3.9.tar.gz) = e043941ba761c13a3854fc087521b864b56b2df874154e42aedb67b2a77f23c8 -SIZE (cabal/aeson-compat-0.3.9/aeson-compat-0.3.9.tar.gz) = 7441 +SHA256 (cabal/aeson-1.4.4.0/aeson-1.4.4.0.tar.gz) = 17c67cdaca651e18f310b21b2b12bac6bcec5188c3ac0e4b64cc60c94d7e4d2e +SIZE (cabal/aeson-1.4.4.0/aeson-1.4.4.0.tar.gz) = 279980 SHA256 (cabal/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz) = 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18 SIZE (cabal/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz) = 10338 +SHA256 (cabal/annotated-wl-pprint-0.7.0/revision/1.cabal) = 5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d +SIZE (cabal/annotated-wl-pprint-0.7.0/revision/1.cabal) = 1142 SHA256 (cabal/ansi-terminal-0.9.1/ansi-terminal-0.9.1.tar.gz) = 74088e80b33ba680f7c46137d25bfcca6fa8795bc2d097e4e0435b3c41a320fb SIZE (cabal/ansi-terminal-0.9.1/ansi-terminal-0.9.1.tar.gz) = 34756 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac @@ -21,16 +21,18 @@ SHA256 (cabal/asn1-encoding-0.9.5/asn1-encoding-0.9.5.tar.gz) = 1e863bfd363f6c37 SIZE (cabal/asn1-encoding-0.9.5/asn1-encoding-0.9.5.tar.gz) = 16114 SHA256 (cabal/asn1-parse-0.9.4/asn1-parse-0.9.4.tar.gz) = c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708 SIZE (cabal/asn1-parse-0.9.4/asn1-parse-0.9.4.tar.gz) = 2860 -SHA256 (cabal/asn1-types-0.3.2/asn1-types-0.3.2.tar.gz) = 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217 -SIZE (cabal/asn1-types-0.3.2/asn1-types-0.3.2.tar.gz) = 6424 +SHA256 (cabal/asn1-types-0.3.3/asn1-types-0.3.3.tar.gz) = 57ebc2371bdb607294b5ca18f44ced121ab528ee304905db1524cb441b535498 +SIZE (cabal/asn1-types-0.3.3/asn1-types-0.3.3.tar.gz) = 6478 SHA256 (cabal/async-2.2.2/async-2.2.2.tar.gz) = 4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff SIZE (cabal/async-2.2.2/async-2.2.2.tar.gz) = 12927 SHA256 (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848 SIZE (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = 159729 +SHA256 (cabal/attoparsec-0.13.2.2/revision/3.cabal) = 51ca172466aa77a7b5802e676577926f0d4991cebeece0a848b7753390da39ae +SIZE (cabal/attoparsec-0.13.2.2/revision/3.cabal) = 5796 SHA256 (cabal/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601-1.0.1.0.tar.gz) = 499ffbd2d39e79cc4fda5ad0129dbf94fdb72a84aa932dfe2a5f5c5c02074142 SIZE (cabal/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601-1.0.1.0.tar.gz) = 4317 -SHA256 (cabal/auto-update-0.1.4.1/auto-update-0.1.4.1.tar.gz) = 35ff4b15ecf505f1cf3eb78f83deaa89879d92d40335b6580b2383c622efcfc9 -SIZE (cabal/auto-update-0.1.4.1/auto-update-0.1.4.1.tar.gz) = 8703 +SHA256 (cabal/auto-update-0.1.6/auto-update-0.1.6.tar.gz) = f4e023dc8713c387ecf20d851247597fd012cabea3872310b35e911105eb66c4 +SIZE (cabal/auto-update-0.1.6/auto-update-0.1.6.tar.gz) = 10929 SHA256 (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 990aea21568956d44ab018c5dbfbaea014b9a0d5295d29ca7550149419a6fb41 SIZE (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 33158 SHA256 (cabal/base-orphans-0.8.1/base-orphans-0.8.1.tar.gz) = 442bd63aed102e753b2fed15df8ae19f35ee07af26590da63837c523b64a99db @@ -41,18 +43,24 @@ SHA256 (cabal/base16-bytestring-0.1.1.6/base16-bytestring-0.1.1.6.tar.gz) = 5afe SIZE (cabal/base16-bytestring-0.1.1.6/base16-bytestring-0.1.1.6.tar.gz) = 3694 SHA256 (cabal/base64-bytestring-1.0.0.2/base64-bytestring-1.0.0.2.tar.gz) = 193654ed9bd9e7f20163c9b70bab32d33010be50a5e1e8e2258229faf32a608c SIZE (cabal/base64-bytestring-1.0.0.2/base64-bytestring-1.0.0.2.tar.gz) = 9830 -SHA256 (cabal/basement-0.0.10/basement-0.0.10.tar.gz) = e3471b037187da02814fa710c4d59a804c5446a3617122aca63f32d4f8c4f505 -SIZE (cabal/basement-0.0.10/basement-0.0.10.tar.gz) = 133928 +SHA256 (cabal/basement-0.0.11/basement-0.0.11.tar.gz) = 67582b3475a5547925399f719df21f8bbbd0ca4d4db27795c22a474f8ee6346b +SIZE (cabal/basement-0.0.11/basement-0.0.11.tar.gz) = 134032 SHA256 (cabal/bifunctors-5.5.4/bifunctors-5.5.4.tar.gz) = 29d62cf43fcef94534a585623357ab6d89a940db8d3931cb092485c6c3b19b8c SIZE (cabal/bifunctors-5.5.4/bifunctors-5.5.4.tar.gz) = 40510 +SHA256 (cabal/bifunctors-5.5.4/revision/1.cabal) = 7240cda20b6b51e18d679691fab27784a56fc075cf71927070850f2960171017 +SIZE (cabal/bifunctors-5.5.4/revision/1.cabal) = 3313 SHA256 (cabal/bitarray-0.0.1.1/bitarray-0.0.1.1.tar.gz) = b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802 SIZE (cabal/bitarray-0.0.1.1/bitarray-0.0.1.1.tar.gz) = 3701 +SHA256 (cabal/bitarray-0.0.1.1/revision/1.cabal) = 857cf98f81ab2785f7f8540c293b886c220b68974198f80799583a95b648d381 +SIZE (cabal/bitarray-0.0.1.1/revision/1.cabal) = 991 SHA256 (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814 SIZE (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 61365 SHA256 (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = ea0e944298dbbd692b41af4f15dbd1a1574aec7b8f91f38391d25106b143bb1b SIZE (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = 81502 SHA256 (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = c6f0cf8fd707ba8c0b700e0c5ad6a1212c8b57d46a9cbdfb904d8bf585ad82e1 SIZE (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = 14458 +SHA256 (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = fda3582c37167b7b26a3e973f8501e0889041de01416add83c592cf03bbb7a47 +SIZE (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = 2231 SHA256 (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = decaaa5a73eaabaf3c4f8c644bd7f6e3f428b6244e935c0cf105f75f9b24ed2d SIZE (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = 10007 SHA256 (cabal/cabal-doctest-1.0.6/revision/2.cabal) = c0b4a5b1ff38d2867e7003b4be59f3bd7e8e204ab8c988d96d3a77472ae671cd @@ -73,10 +81,12 @@ SHA256 (cabal/conduit-1.3.1.1/conduit-1.3.1.1.tar.gz) = 84dfafc92e9553c7bae4b4fe SIZE (cabal/conduit-1.3.1.1/conduit-1.3.1.1.tar.gz) = 87547 SHA256 (cabal/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3 SIZE (cabal/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz) = 2204 -SHA256 (cabal/conduit-extra-1.3.2/conduit-extra-1.3.2.tar.gz) = b148a31bd065bdc5e3d94cb38227213fd88227bd21ec3c1dcec1ccd9740b46bb -SIZE (cabal/conduit-extra-1.3.2/conduit-extra-1.3.2.tar.gz) = 32935 +SHA256 (cabal/conduit-extra-1.3.4/conduit-extra-1.3.4.tar.gz) = b17381c259305eaa1752cbaedf2319757efc1b975633d73d5ab7c89d461b05b5 +SIZE (cabal/conduit-extra-1.3.4/conduit-extra-1.3.4.tar.gz) = 33170 SHA256 (cabal/connection-0.3.0/connection-0.3.0.tar.gz) = 6470d69a4f9a0bd374183a30d2089a96d38ad31438ef081b62287f74b55fa3b8 SIZE (cabal/connection-0.3.0/connection-0.3.0.tar.gz) = 8954 +SHA256 (cabal/connection-0.3.0/revision/1.cabal) = 139db21f619e93ab3e45df5c321c6093d3a14bdc584db82d8166336d5510a432 +SIZE (cabal/connection-0.3.0/revision/1.cabal) = 1508 SHA256 (cabal/contravariant-1.5.2/contravariant-1.5.2.tar.gz) = c4262c24e3dcc2ba8ca221ed52a6390818a715301e4f13135d8d732e0c7dc60c SIZE (cabal/contravariant-1.5.2/contravariant-1.5.2.tar.gz) = 16006 SHA256 (cabal/cookie-0.4.4/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3 @@ -85,18 +95,20 @@ SHA256 (cabal/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz) SIZE (cabal/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz) = 14996 SHA256 (cabal/cryptohash-sha256-0.11.101.0/revision/2.cabal) = 2790b29264ebf63dac368dd05ec931254e5c70b0ccbc87d0969903533b32b054 SIZE (cabal/cryptohash-sha256-0.11.101.0/revision/2.cabal) = 5417 -SHA256 (cabal/cryptonite-0.25/cryptonite-0.25.tar.gz) = 89be1a18af8730a7bfe4d718d7d5f6ce858e9df93a411566d15bf992db5a3c8c -SIZE (cabal/cryptonite-0.25/cryptonite-0.25.tar.gz) = 552967 +SHA256 (cabal/cryptonite-0.26/cryptonite-0.26.tar.gz) = c47390df555295fdb1fb8161c190e208f43b8d334b2da3e96f0c64b7fe07aedd +SIZE (cabal/cryptonite-0.26/cryptonite-0.26.tar.gz) = 581153 SHA256 (cabal/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz) = 705d69ab3f79b7b8810c7b9e7da81a1c6686b6a4323b1e78150576a25a658dae SIZE (cabal/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz) = 5405 +SHA256 (cabal/cryptonite-conduit-0.2.2/revision/1.cabal) = bfbae677a44f3a5cf3bf7f36271682979a402825f3d1e8767cfd62f2ddb702c2 +SIZE (cabal/cryptonite-conduit-0.2.2/revision/1.cabal) = 1984 SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56 SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522 SHA256 (cabal/digest-0.0.1.2/digest-0.0.1.2.tar.gz) = 641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11 SIZE (cabal/digest-0.0.1.2/digest-0.0.1.2.tar.gz) = 3790 SHA256 (cabal/distributive-0.6/distributive-0.6.tar.gz) = a4af1341a63a430dc569dd1e59631f127c40ebdd353a945a74d18682f6bdc1d4 SIZE (cabal/distributive-0.6/distributive-0.6.tar.gz) = 10904 -SHA256 (cabal/dlist-0.8.0.6/dlist-0.8.0.6.tar.gz) = 780b4ac91d6e88e77ebf1629568bddd45959b8e0cd295b17c7d55d835c03c73f -SIZE (cabal/dlist-0.8.0.6/dlist-0.8.0.6.tar.gz) = 9057 +SHA256 (cabal/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz) = a3c06a200f9756329b09d415e7733b7204dda76ce07783e6457d0ab9ffbcba2c +SIZE (cabal/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz) = 9228 SHA256 (cabal/easy-file-0.2.2/easy-file-0.2.2.tar.gz) = 52f52e72ba48d60935932401c233a72bf45c582871238aecc5a18021ce67b47e SIZE (cabal/easy-file-0.2.2/easy-file-0.2.2.tar.gz) = 12667 SHA256 (cabal/echo-0.1.3/echo-0.1.3.tar.gz) = 704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef @@ -121,20 +133,26 @@ SHA256 (cabal/filelock-0.1.1.3/filelock-0.1.1.3.tar.gz) = 253e4923916e5da24800d9 SIZE (cabal/filelock-0.1.1.3/filelock-0.1.1.3.tar.gz) = 7187 SHA256 (cabal/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz) = ded2165f72a2b4971f941cb83ef7f58b200e3e04159be78da55ba6c5d35f6da5 SIZE (cabal/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz) = 20638 +SHA256 (cabal/fsnotify-0.3.0.1/revision/1.cabal) = 58bb530d7acf93eb4ed69473e32a1485581815f04f69dfc8a278523781ba49dd +SIZE (cabal/fsnotify-0.3.0.1/revision/1.cabal) = 2988 SHA256 (cabal/generic-deriving-1.12.4/generic-deriving-1.12.4.tar.gz) = 4401c13d38938338fb152bbc1049c5e1f880199afc2015421d5496811b4eaf6d SIZE (cabal/generic-deriving-1.12.4/generic-deriving-1.12.4.tar.gz) = 67688 +SHA256 (cabal/generic-deriving-1.12.4/revision/1.cabal) = f2f9609b5caacb5ff049859e4cd9c459658eaafcbebc6d564442127e1139e09b +SIZE (cabal/generic-deriving-1.12.4/revision/1.cabal) = 4146 SHA256 (cabal/githash-0.1.3.1/githash-0.1.3.1.tar.gz) = ea58689a525e4953aaf91415d9a70b593fae88c7858e37f761bc836ce1fafc6e SIZE (cabal/githash-0.1.3.1/githash-0.1.3.1.tar.gz) = 6119 SHA256 (cabal/hackage-security-0.5.3.0/hackage-security-0.5.3.0.tar.gz) = db986e17e9265aa9e40901690815b890b97d53159eb24d0a6cafaa7c18577c21 SIZE (cabal/hackage-security-0.5.3.0/hackage-security-0.5.3.0.tar.gz) = 87119 -SHA256 (cabal/hackage-security-0.5.3.0/revision/4.cabal) = b70efd47441e90622cf875ed2159f900b249f738f9e554027e392083e73673d6 -SIZE (cabal/hackage-security-0.5.3.0/revision/4.cabal) = 11351 +SHA256 (cabal/hackage-security-0.5.3.0/revision/6.cabal) = 5e9544320a8f9d535bb197dae6e3abaea9b69a5cdd7d7fc443bfcd4dffb442f7 +SIZE (cabal/hackage-security-0.5.3.0/revision/6.cabal) = 11371 SHA256 (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf SIZE (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = 30182 SHA256 (cabal/hashable-1.2.7.0/revision/1.cabal) = 03b6836ca9cd3ad0e5a2f3cce989b001dd0e05f306a873db3196037adb30e0a4 SIZE (cabal/hashable-1.2.7.0/revision/1.cabal) = 5215 SHA256 (cabal/hi-file-parser-0.1.0.0/hi-file-parser-0.1.0.0.tar.gz) = 54ac6750d5e4ef93c64b255f672261ae4c80ef11f20d92c382736e09be11fa25 SIZE (cabal/hi-file-parser-0.1.0.0/hi-file-parser-0.1.0.0.tar.gz) = 9344 +SHA256 (cabal/hi-file-parser-0.1.0.0/revision/2.cabal) = 3fc95852035c8e0fa6d5f9d22e5108067c8f4816ac84675bddc971b20144a9ae +SIZE (cabal/hi-file-parser-0.1.0.0/revision/2.cabal) = 2317 SHA256 (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a SIZE (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 25797 SHA256 (cabal/hpack-0.31.2/hpack-0.31.2.tar.gz) = 6f00834e99463f022fe9346b9c2cdb1054a6d89e9d6b70a4869c2b5a50304dd0 @@ -147,16 +165,24 @@ SHA256 (cabal/http-client-0.6.4/http-client-0.6.4.tar.gz) = 369278ec3d0d89bfdd8b SIZE (cabal/http-client-0.6.4/http-client-0.6.4.tar.gz) = 89810 SHA256 (cabal/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz) = 471abf8f29a909f40b21eab26a410c0e120ae12ce337512a61dae9f52ebb4362 SIZE (cabal/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz) = 7679 +SHA256 (cabal/http-client-tls-0.3.5.3/revision/1.cabal) = c97c3d88e6318a3056e42e2cd0913d5c4bff381f83341bb6ff06865fd12c8b52 +SIZE (cabal/http-client-tls-0.3.5.3/revision/1.cabal) = 2066 SHA256 (cabal/http-conduit-2.3.7.1/http-conduit-2.3.7.1.tar.gz) = 69402334eb11eb5880ca8de522b4de7bd9e871bb8a33e7322b56051a375fd2f6 SIZE (cabal/http-conduit-2.3.7.1/http-conduit-2.3.7.1.tar.gz) = 28191 +SHA256 (cabal/http-conduit-2.3.7.1/revision/1.cabal) = 45fa0403c59eab3237b407a86451976d948639a77db4d8ff24f5dd7e6d57b456 +SIZE (cabal/http-conduit-2.3.7.1/revision/1.cabal) = 2968 SHA256 (cabal/http-download-0.1.0.0/http-download-0.1.0.0.tar.gz) = cb63a97d652a1bf3e28a65d2b1c61110e3810ca0451b309e22e368ca0c3d3772 SIZE (cabal/http-download-0.1.0.0/http-download-0.1.0.0.tar.gz) = 8094 +SHA256 (cabal/http-download-0.1.0.0/revision/4.cabal) = b02d76d28364b74fb90d3ec3c46fd81f9d77bcf71fa40c1d341a7251a0fc40e8 +SIZE (cabal/http-download-0.1.0.0/revision/4.cabal) = 2023 SHA256 (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 4e8a4a66477459fa436a331c75e46857ec8026283df984d54f90576cd3024016 SIZE (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 13547 SHA256 (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 12e6fe616575159c03cf6fd4a4f30021ecf264a529ab4e4edd6e96e296a98e72 SIZE (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 48173 SHA256 (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 5ae262018698af35bb74916fad170d96d3eb44669c72ed36db9a19a3392cec16 SIZE (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 8840 +SHA256 (cabal/integer-logarithms-1.0.3/revision/1.cabal) = 280ade63c067aaff7259049b033aa7c51e9e993cdaa6e6c601560a92e530dffc +SIZE (cabal/integer-logarithms-1.0.3/revision/1.cabal) = 2805 SHA256 (cabal/libyaml-0.1.1.0/libyaml-0.1.1.0.tar.gz) = 6a034047f45c2f5d3acb8a5b0852075bd4b4f7d6a222a992f45afac152b55f5f SIZE (cabal/libyaml-0.1.1.0/libyaml-0.1.1.0.tar.gz) = 63160 SHA256 (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = c134a95f56750aae806e38957bb03c59627cda16034af9e00a02b699474317c5 @@ -165,12 +191,12 @@ SHA256 (cabal/megaparsec-7.0.5/megaparsec-7.0.5.tar.gz) = f2dc2ea9da25f726c06500 SIZE (cabal/megaparsec-7.0.5/megaparsec-7.0.5.tar.gz) = 58896 SHA256 (cabal/memory-0.14.18/memory-0.14.18.tar.gz) = f5458d170a291788ac8da896bb44b0cc84021c99dd596c52adf2f7a7f6c03507 SIZE (cabal/memory-0.14.18/memory-0.14.18.tar.gz) = 42266 -SHA256 (cabal/microlens-0.4.10/microlens-0.4.10.tar.gz) = 9c55a89d1c91fddcafca4bb1fa99a3ef29223436d75191fb29385de2bd3f47ec -SIZE (cabal/microlens-0.4.10/microlens-0.4.10.tar.gz) = 25561 -SHA256 (cabal/microlens-th-0.4.2.3/microlens-th-0.4.2.3.tar.gz) = 321018c6c0aad3f68eb26f6c7e7a518db43039e3f8f19c4634ceb4c7f8051c8f -SIZE (cabal/microlens-th-0.4.2.3/microlens-th-0.4.2.3.tar.gz) = 20960 -SHA256 (cabal/microlens-th-0.4.2.3/revision/1.cabal) = c606d0c0ad33250d9840a2c533b53151e2f4bc14b5ad80fad5f9411cd6b1f198 -SIZE (cabal/microlens-th-0.4.2.3/revision/1.cabal) = 2163 +SHA256 (cabal/memory-0.14.18/revision/1.cabal) = f55301417e1c5a43b055d1f0d3e88abe895d15a3e9d49889af634fb4b7028d40 +SIZE (cabal/memory-0.14.18/revision/1.cabal) = 5087 +SHA256 (cabal/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz) = 4e484d4a73c7c5176ccfdacc29aec7399352cac1c7e8924d5123857cf36ddffc +SIZE (cabal/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz) = 26549 +SHA256 (cabal/microlens-th-0.4.3.2/microlens-th-0.4.3.2.tar.gz) = 9d900d03e7f704208031b310584ec3e4796fe1133e46205418826847723ce273 +SIZE (cabal/microlens-th-0.4.3.2/microlens-th-0.4.3.2.tar.gz) = 20987 SHA256 (cabal/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz) = 0a32435169ef4ba59f4a4b8addfd0c04479410854d1b8d69a1e38fb389ba71d2 SIZE (cabal/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz) = 11384 SHA256 (cabal/mintty-0.1.2/mintty-0.1.2.tar.gz) = 7c8af77bcde4e9b54692e3761f41adf35a50664974ba77f2ba65ea2af9f950da @@ -187,8 +213,8 @@ SHA256 (cabal/mustache-2.3.0/mustache-2.3.0.tar.gz) = 018863e578e971e393edc65dd7 SIZE (cabal/mustache-2.3.0/mustache-2.3.0.tar.gz) = 19986 SHA256 (cabal/neat-interpolation-0.3.2.4/neat-interpolation-0.3.2.4.tar.gz) = de7370d938ffd8c7b52d732f4f088387ed8216cf9767d818e99b7ec827931752 SIZE (cabal/neat-interpolation-0.3.2.4/neat-interpolation-0.3.2.4.tar.gz) = 4463 -SHA256 (cabal/network-2.8.0.1/network-2.8.0.1.tar.gz) = 61f55dbfed0f0af721a8ea36079e9309fcc5a1be20783b44ae500d9e4399a846 -SIZE (cabal/network-2.8.0.1/network-2.8.0.1.tar.gz) = 125767 +SHA256 (cabal/network-3.1.0.1/network-3.1.0.1.tar.gz) = 5af256c71245deacf656775525a98875a0f5a3e5625b3be5992ed17b9a2a9d64 +SIZE (cabal/network-3.1.0.1/network-3.1.0.1.tar.gz) = 115900 SHA256 (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0 SIZE (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 27262 SHA256 (cabal/network-uri-2.6.1.0/revision/1.cabal) = 62cc45c66023e37ef921d5fb546aca56a9c786615e05925fb193a70bf0913690 @@ -203,14 +229,14 @@ SHA256 (cabal/old-time-1.1.0.3/revision/2.cabal) = c91fbb3ee73d20ccd015842b30f1f SIZE (cabal/old-time-1.1.0.3/revision/2.cabal) = 1328 SHA256 (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66 SIZE (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 2629 -SHA256 (cabal/optparse-applicative-0.14.3.0/optparse-applicative-0.14.3.0.tar.gz) = 72476302fe555a508917b2d7d6121c7b58ea5434cdc08aeb5d4b652e8f0e7663 -SIZE (cabal/optparse-applicative-0.14.3.0/optparse-applicative-0.14.3.0.tar.gz) = 53480 +SHA256 (cabal/optparse-applicative-0.15.0.0/optparse-applicative-0.15.0.0.tar.gz) = af4bad699464b071a7e9d636fecf3982ae76fc5f69e48bec30405ca6cfce2008 +SIZE (cabal/optparse-applicative-0.15.0.0/optparse-applicative-0.15.0.0.tar.gz) = 55650 SHA256 (cabal/optparse-simple-0.1.1.2/optparse-simple-0.1.1.2.tar.gz) = 02716473cc57ff1212c5174cc213f5b1bb744e680c222a4ae97e0b12f38400e4 SIZE (cabal/optparse-simple-0.1.1.2/optparse-simple-0.1.1.2.tar.gz) = 5067 -SHA256 (cabal/pantry-tmp-0.1.0.0/pantry-tmp-0.1.0.0.tar.gz) = d6560dd5d037976d79b920c2d77f67fdda33aca1101626549fbf9b350b5362a1 -SIZE (cabal/pantry-tmp-0.1.0.0/pantry-tmp-0.1.0.0.tar.gz) = 82912 -SHA256 (cabal/parser-combinators-1.1.0/parser-combinators-1.1.0.tar.gz) = ac7642972b18a47c575d2bcd0b2f6c34f33ca2ed3adb28034420d09ced823e91 -SIZE (cabal/parser-combinators-1.1.0/parser-combinators-1.1.0.tar.gz) = 10696 +SHA256 (cabal/pantry-0.1.1.1/pantry-0.1.1.1.tar.gz) = cf53877dd0b0222a608e8f7534ac40c55ce381bdeb9c2a3108dbbeaba0165720 +SIZE (cabal/pantry-0.1.1.1/pantry-0.1.1.1.tar.gz) = 84571 +SHA256 (cabal/parser-combinators-1.2.0/parser-combinators-1.2.0.tar.gz) = ea5e158548fc06602483fdec3b4cbb076a6118ec2835454cfb18bed835796ea2 +SIZE (cabal/parser-combinators-1.2.0/parser-combinators-1.2.0.tar.gz) = 10898 SHA256 (cabal/path-0.6.1/path-0.6.1.tar.gz) = 4b8bd85a13395b4240c639b9cf804371854d5dac69158f661068bd3089a25e59 SIZE (cabal/path-0.6.1/path-0.6.1.tar.gz) = 19167 SHA256 (cabal/path-0.6.1/revision/1.cabal) = c3100b035e41a3a623ce09905e1d0ca7fb5b5e61f76d5e20812321253aff6115 @@ -219,24 +245,28 @@ SHA256 (cabal/path-io-1.4.2/path-io-1.4.2.tar.gz) = 23c7f203347bc20e5649476e9b5d SIZE (cabal/path-io-1.4.2/path-io-1.4.2.tar.gz) = 19223 SHA256 (cabal/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz) = 080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f SIZE (cabal/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz) = 3529 +SHA256 (cabal/path-pieces-0.2.1/revision/1.cabal) = c713a8d04b3e6b89f1116c1d5fe434305031e17a9f0ad30a457a8402e1d5fc5c +SIZE (cabal/path-pieces-0.2.1/revision/1.cabal) = 1233 SHA256 (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 770c4c1b9cd24b3db7f511f8a48404a0d098999e28573c3743a8a296bb96f8d4 SIZE (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 4717 -SHA256 (cabal/persistent-2.9.2/persistent-2.9.2.tar.gz) = 497e5d2c96aaa370f147ece995a798d1ea217e35996f908d42681f41ec1c4af3 -SIZE (cabal/persistent-2.9.2/persistent-2.9.2.tar.gz) = 61772 -SHA256 (cabal/persistent-sqlite-2.9.3/persistent-sqlite-2.9.3.tar.gz) = 985b9f7323e88f784ff93dd6f5bc65cb0183435dea052a5d238dec1e11b28b8f -SIZE (cabal/persistent-sqlite-2.9.3/persistent-sqlite-2.9.3.tar.gz) = 2169817 -SHA256 (cabal/persistent-template-2.6.0/persistent-template-2.6.0.tar.gz) = 5bfa8cbe7c25bdef33cc6d6ece1673f847c2a56860f57c69d8d2d0ecacf82173 -SIZE (cabal/persistent-template-2.6.0/persistent-template-2.6.0.tar.gz) = 21186 -SHA256 (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 4cbeaf7924dd79221f327ea101a29bf35c4976dc3319df157ff46ea68e6a0c64 -SIZE (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 45937 -SHA256 (cabal/primitive-0.6.4.0/revision/1.cabal) = 5b6a2c3cc70a35aabd4565fcb9bb1dd78fe2814a36e62428a9a1aae8c32441a1 -SIZE (cabal/primitive-0.6.4.0/revision/1.cabal) = 2079 +SHA256 (cabal/persistent-2.10.1/persistent-2.10.1.tar.gz) = 6fe95cb982966ff63618940b5fbeffe9c5614bc8b810b71914a17adfef5193f3 +SIZE (cabal/persistent-2.10.1/persistent-2.10.1.tar.gz) = 63275 +SHA256 (cabal/persistent-sqlite-2.10.4/persistent-sqlite-2.10.4.tar.gz) = e96407747067fa942d4a9de359d627cc75642b52ba707f3c63103f018f188b74 +SIZE (cabal/persistent-sqlite-2.10.4/persistent-sqlite-2.10.4.tar.gz) = 2174151 +SHA256 (cabal/persistent-template-2.7.2/persistent-template-2.7.2.tar.gz) = 2896c4221b969e7709e6722192c1164941a5c0798ec9415728fea12397eed711 +SIZE (cabal/persistent-template-2.7.2/persistent-template-2.7.2.tar.gz) = 24024 +SHA256 (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 786a44fea328caf704b762ebc887e9e8476c4378fdf3a06c94e86ef1878d1576 +SIZE (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 66014 SHA256 (cabal/profunctors-5.4/profunctors-5.4.tar.gz) = 10ba750039cf29aa985aa6b39c1b055d28f02ae0ffc6923f8da8e5d1768bb0ac SIZE (cabal/profunctors-5.4/profunctors-5.4.tar.gz) = 29259 SHA256 (cabal/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz) = eb52496fa7448f5fed445525c05327b31a45282fc1d0a772c7022a9809e7c9dc SIZE (cabal/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz) = 8321 +SHA256 (cabal/project-template-0.2.0.1/revision/1.cabal) = 0acc217b4005ca3b24e0ba23475b6db80e3968c314dcfff67a205b802dd60353 +SIZE (cabal/project-template-0.2.0.1/revision/1.cabal) = 1956 SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a SIZE (cabal/random-1.1/random-1.1.tar.gz) = 10870 +SHA256 (cabal/random-1.1/revision/1.cabal) = 7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df +SIZE (cabal/random-1.1/revision/1.cabal) = 1777 SHA256 (cabal/regex-applicative-0.3.3/regex-applicative-0.3.3.tar.gz) = 6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6 SIZE (cabal/regex-applicative-0.3.3/regex-applicative-0.3.3.tar.gz) = 13834 SHA256 (cabal/regex-applicative-text-0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz) = b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9 @@ -249,12 +279,14 @@ SHA256 (cabal/resourcet-1.2.2/resourcet-1.2.2.tar.gz) = 1323425aba3827479eb3588e SIZE (cabal/resourcet-1.2.2/resourcet-1.2.2.tar.gz) = 16541 SHA256 (cabal/retry-0.8.0.1/retry-0.8.0.1.tar.gz) = 9d4137e69212fea9e77ef1fa6540e6763ba3a432d9403dd17e2665b0657ec374 SIZE (cabal/retry-0.8.0.1/retry-0.8.0.1.tar.gz) = 13917 -SHA256 (cabal/rio-0.1.9.2/rio-0.1.9.2.tar.gz) = 4cd9b09f1d2f9b88d2cf5a44da81a7ae4e4f7651636fd70fe40b24d2d2275191 -SIZE (cabal/rio-0.1.9.2/rio-0.1.9.2.tar.gz) = 56914 +SHA256 (cabal/rio-0.1.11.0/rio-0.1.11.0.tar.gz) = 944896a2c1f6b951bb859d75d498689eb614fb7235a0f073609833eb42fee39e +SIZE (cabal/rio-0.1.11.0/rio-0.1.11.0.tar.gz) = 53528 SHA256 (cabal/rio-orphans-0.1.1.0/rio-orphans-0.1.1.0.tar.gz) = 7e8d2c6df6e7afdbca5b344c6e57c754e2d6b9c0cfb4f00e1df88dad1bd48b4e SIZE (cabal/rio-orphans-0.1.1.0/rio-orphans-0.1.1.0.tar.gz) = 3098 SHA256 (cabal/rio-prettyprint-0.1.0.0/rio-prettyprint-0.1.0.0.tar.gz) = 15e4ddc5268f033cfad89ddd023d4157c7dc5784004aa40d232581380e6b1459 SIZE (cabal/rio-prettyprint-0.1.0.0/rio-prettyprint-0.1.0.0.tar.gz) = 11154 +SHA256 (cabal/rio-prettyprint-0.1.0.0/revision/2.cabal) = 764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3 +SIZE (cabal/rio-prettyprint-0.1.0.0/revision/2.cabal) = 1359 SHA256 (cabal/safe-0.3.17/safe-0.3.17.tar.gz) = 79c5c41e7151906969133ea21af9f7e8d25c18315886e23d0bdf6faa8b537e5c SIZE (cabal/safe-0.3.17/safe-0.3.17.tar.gz) = 10524 SHA256 (cabal/safe-exceptions-0.1.7.0/safe-exceptions-0.1.7.0.tar.gz) = 18cddc587b52b6faa0287fb6ad6c964d1562571ea2c8ff57a194dd54b5fba069 @@ -265,10 +297,12 @@ SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8 SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510 SHA256 (cabal/semigroupoids-5.3.2/semigroupoids-5.3.2.tar.gz) = 61a8213df437ee96a20b1c6dec8b5c573e4e0f338eb2061739a67f471d6b9d05 SIZE (cabal/semigroupoids-5.3.2/semigroupoids-5.3.2.tar.gz) = 25649 -SHA256 (cabal/semigroups-0.18.5/semigroups-0.18.5.tar.gz) = ab2a96af6e81e31b909c37ba65f436f1493dbf387cfe0de10b6586270c4ce29d -SIZE (cabal/semigroups-0.18.5/semigroups-0.18.5.tar.gz) = 20162 -SHA256 (cabal/silently-1.2.5/silently-1.2.5.tar.gz) = cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839 -SIZE (cabal/silently-1.2.5/silently-1.2.5.tar.gz) = 3364 +SHA256 (cabal/semigroupoids-5.3.2/revision/1.cabal) = c690b223a2dd5342db29c2a905bf00ca1a95731b1704a4bd053cb0bd42bc08e5 +SIZE (cabal/semigroupoids-5.3.2/revision/1.cabal) = 7567 +SHA256 (cabal/semigroups-0.19/semigroups-0.19.tar.gz) = 399d033b02853094a11a1d78e9ab05140f00af4b56fede405c66032f466b2cba +SIZE (cabal/semigroups-0.19/semigroups-0.19.tar.gz) = 20644 +SHA256 (cabal/silently-1.2.5.1/silently-1.2.5.1.tar.gz) = 7fc9baf6f47ffc082e7e05c9dade1451bdee06a0c4e2d882e8e0b692f50bfad1 +SIZE (cabal/silently-1.2.5.1/silently-1.2.5.1.tar.gz) = 3358 SHA256 (cabal/socks-0.6.0/socks-0.6.0.tar.gz) = 9762fa87aeda7cf98290cb66af91c4ed5bf258b3548b189e9188d0c29f707381 SIZE (cabal/socks-0.6.0/socks-0.6.0.tar.gz) = 9725 SHA256 (cabal/split-0.2.3.3/split-0.2.3.3.tar.gz) = 1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413 @@ -281,10 +315,12 @@ SHA256 (cabal/stm-chans-3.0.0.4/revision/1.cabal) = e2eef3cea5251628f7b2ad22c24a SIZE (cabal/stm-chans-3.0.0.4/revision/1.cabal) = 2088 SHA256 (cabal/streaming-commons-0.2.1.1/streaming-commons-0.2.1.1.tar.gz) = a2e8932774abb3e1500bd9884939f39563e426f0fbd3e88b875e6939f9e8bed2 SIZE (cabal/streaming-commons-0.2.1.1/streaming-commons-0.2.1.1.tar.gz) = 86688 -SHA256 (cabal/syb-0.7/syb-0.7.tar.gz) = b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5 -SIZE (cabal/syb-0.7/syb-0.7.tar.gz) = 39566 +SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700 +SIZE (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = 39594 SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759 +SHA256 (cabal/tagged-0.8.6/revision/1.cabal) = 7093ee39c9779beeacffa4b0035a0e8a25da16afcd1c1a876930207fb8e31d1c +SIZE (cabal/tagged-0.8.6/revision/1.cabal) = 2606 SHA256 (cabal/tar-0.5.1.0/tar-0.5.1.0.tar.gz) = c89d697b6472b739db50e61201251fcaf8a8f5b595b1d9a488d395d7d5ce4b68 SIZE (cabal/tar-0.5.1.0/tar-0.5.1.0.tar.gz) = 39271 SHA256 (cabal/tar-0.5.1.0/revision/1.cabal) = 9d18d14f4121a9f13806b06efe1c5bbf967cfa3a4006f3c056c23156355fcdd3 @@ -311,55 +347,71 @@ SHA256 (cabal/th-lift-instances-0.1.13/th-lift-instances-0.1.13.tar.gz) = 4ecf55 SIZE (cabal/th-lift-instances-0.1.13/th-lift-instances-0.1.13.tar.gz) = 5720 SHA256 (cabal/th-orphans-0.13.7/th-orphans-0.13.7.tar.gz) = fe6de44ff0d3279155ad5e0d39bb05efbabdf3335728c3993000624b40cd1d63 SIZE (cabal/th-orphans-0.13.7/th-orphans-0.13.7.tar.gz) = 7839 +SHA256 (cabal/th-orphans-0.13.7/revision/1.cabal) = 030848f9fcaafa04937e9d51dcc168e2625df38d8e334ce65ad83e0e6fcdc2bd +SIZE (cabal/th-orphans-0.13.7/revision/1.cabal) = 2579 SHA256 (cabal/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz) = f889dd029d5ab191ace99fe595f363c60314d536e61c8c58f6167f1a9d29ae43 SIZE (cabal/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz) = 5693 SHA256 (cabal/th-utilities-0.2.3.0/th-utilities-0.2.3.0.tar.gz) = a4937587ea7364be3804d10e63753b85d167560bd666a43e05f6eb330392842e SIZE (cabal/th-utilities-0.2.3.0/th-utilities-0.2.3.0.tar.gz) = 15577 SHA256 (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = a268613385d359274edf48fb2dad4af29874f58486b2d5625e3b95a371066a17 SIZE (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = 49652 -SHA256 (cabal/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz) = 07ff1566de7d851423a843b2de385442319348c621d4f779b3d365ce91ac502c -SIZE (cabal/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz) = 1956 -SHA256 (cabal/tls-1.4.1/tls-1.4.1.tar.gz) = bbead1afc0b808bd5cff7bddaeae84ade37f18bbe72bd78d45a2fa4ac41908f8 -SIZE (cabal/tls-1.4.1/tls-1.4.1.tar.gz) = 92647 +SHA256 (cabal/time-compat-1.9.2.2/revision/1.cabal) = 9998dc1b77b5067572ab708e94750f1061152f342e92ad1aba38aae63581174d +SIZE (cabal/time-compat-1.9.2.2/revision/1.cabal) = 4209 +SHA256 (cabal/tls-1.5.1/tls-1.5.1.tar.gz) = d18ff12e8db63d3b9e041106383915a4b50a47f29c8cdba48810dd4812c145bb +SIZE (cabal/tls-1.5.1/tls-1.5.1.tar.gz) = 141300 SHA256 (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = d0c80c63fdce6a077dd8eda4f1ff289b85578703a3f1272e141d400fe23245e8 SIZE (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = 2849 SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b SIZE (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = 40421 -SHA256 (cabal/typed-process-0.2.4.1/typed-process-0.2.4.1.tar.gz) = 358331688984f0dafd862cf05a2c8c4df767ad517938ad02e65ee4b6757e752a -SIZE (cabal/typed-process-0.2.4.1/typed-process-0.2.4.1.tar.gz) = 15622 +SHA256 (cabal/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz) = 31a2a81f33463fedc33cc519ad5b9679787e648fe2ec7efcdebd7d54bdbbc2b1 +SIZE (cabal/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz) = 17363 SHA256 (cabal/unicode-transforms-0.3.6/unicode-transforms-0.3.6.tar.gz) = 8326d001c463893a81fcfb431e3cc50c652fab041e9a37e284c445adfd667aaa SIZE (cabal/unicode-transforms-0.3.6/unicode-transforms-0.3.6.tar.gz) = 722543 SHA256 (cabal/unix-compat-0.5.1/unix-compat-0.5.1.tar.gz) = a39d0c79dd906763770b80ba5b6c5cb710e954f894350e9917de0d73f3a19c52 SIZE (cabal/unix-compat-0.5.1/unix-compat-0.5.1.tar.gz) = 13218 -SHA256 (cabal/unix-time-0.4.6/unix-time-0.4.6.tar.gz) = 04276a957af28cead1facea82fe85524d2bafd3e2fe5c1bdf3103f3cda925d32 -SIZE (cabal/unix-time-0.4.6/unix-time-0.4.6.tar.gz) = 52167 -SHA256 (cabal/unliftio-0.2.11/unliftio-0.2.11.tar.gz) = e21c3eef1ea63b360cdcc569c4b46fbffa3049e0a714007b0a3aaf5b080288ad -SIZE (cabal/unliftio-0.2.11/unliftio-0.2.11.tar.gz) = 42268 +SHA256 (cabal/unix-compat-0.5.1/revision/1.cabal) = 2df31ac1a2f5330524972c0eaa74955cc4dc42749e15019c1d1b5a71fc988a30 +SIZE (cabal/unix-compat-0.5.1/revision/1.cabal) = 2040 +SHA256 (cabal/unix-time-0.4.7/unix-time-0.4.7.tar.gz) = 19233f8badf921d444c6165689253d877cfed58ce08f28cad312558a9280de09 +SIZE (cabal/unix-time-0.4.7/unix-time-0.4.7.tar.gz) = 52235 +SHA256 (cabal/unliftio-0.2.12/unliftio-0.2.12.tar.gz) = 8fa9f4d4cc078fd7c76914652070d06a646f83d34e51547fede4fdd7f30ffe09 +SIZE (cabal/unliftio-0.2.12/unliftio-0.2.12.tar.gz) = 53746 SHA256 (cabal/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz) = 24c38b3d610ca2642ed496d1de3d7b6b398ce0410aa0a15f3c7ce636ba8f7a78 SIZE (cabal/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz) = 3631 -SHA256 (cabal/unliftio-core-0.1.2.0/revision/1.cabal) = 49d43dc863d14d89d91a676a968cea8d9f0030ad6ac95768747a44d0d273dd68 -SIZE (cabal/unliftio-core-0.1.2.0/revision/1.cabal) = 1081 +SHA256 (cabal/unliftio-core-0.1.2.0/revision/2.cabal) = 7f9b48adef8e36da0202e6e70a733a5e210263ed4177c93e47a4b3f89694194b +SIZE (cabal/unliftio-core-0.1.2.0/revision/2.cabal) = 1081 SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573 SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733 +SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 +SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199 SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999 +SHA256 (cabal/uuid-types-1.0.3/revision/2.cabal) = 2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2 +SIZE (cabal/uuid-types-1.0.3/revision/2.cabal) = 2473 SHA256 (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = b8a2bfbf9d22d34a28cde9b9e92bfb054e46797754154dd5883295c38936e5a8 SIZE (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = 124899 +SHA256 (cabal/vector-0.12.0.3/revision/2.cabal) = 1422b0bcf4e7675116ca8d9f473bf239850c58c4518a56010e3bfebeac345ace +SIZE (cabal/vector-0.12.0.3/revision/2.cabal) = 7171 SHA256 (cabal/vector-algorithms-0.8.0.1/vector-algorithms-0.8.0.1.tar.gz) = 15bcde786dcf03861946885e030d3dbe3b683e1a6fc12d7317e115084f4637fe SIZE (cabal/vector-algorithms-0.8.0.1/vector-algorithms-0.8.0.1.tar.gz) = 26071 -SHA256 (cabal/void-0.7.3/void-0.7.3.tar.gz) = 53af758ddc37dc63981671e503438d02c6f64a2d8744e9bec557a894431f7317 -SIZE (cabal/void-0.7.3/void-0.7.3.tar.gz) = 6741 +SHA256 (cabal/vector-algorithms-0.8.0.1/revision/2.cabal) = 8496dd4b5e79c37c064e69ce20c5bb31048dfb4b59ce43de6a01b5d0fa384457 +SIZE (cabal/vector-algorithms-0.8.0.1/revision/2.cabal) = 3616 SHA256 (cabal/x509-1.7.5/x509-1.7.5.tar.gz) = b1b0fcbb4aa0d749ed2b54710c2ebd6d900cb932108ad14f97640cf4ca60c7c8 SIZE (cabal/x509-1.7.5/x509-1.7.5.tar.gz) = 21457 +SHA256 (cabal/x509-1.7.5/revision/1.cabal) = 01185a9a17bee4e89287d9e32bfaa673133cf2b09a39759627bed1f72ea528fd +SIZE (cabal/x509-1.7.5/revision/1.cabal) = 2305 SHA256 (cabal/x509-store-1.6.7/x509-store-1.6.7.tar.gz) = 9786356c8bfdf631ea018c3244d0854c6db2cb24e583891ea553961443f61ef9 SIZE (cabal/x509-store-1.6.7/x509-store-1.6.7.tar.gz) = 12689 +SHA256 (cabal/x509-store-1.6.7/revision/1.cabal) = a707b2f4ba3c02ebacd7ecd19e9f0c0b211b58270329c2c775a2c1df26820212 +SIZE (cabal/x509-store-1.6.7/revision/1.cabal) = 1781 SHA256 (cabal/x509-system-1.6.6/x509-system-1.6.6.tar.gz) = 40dcdaae3ec67f38c08d96d4365b901eb8ac0c590bd7972eb429d37d58aa4419 SIZE (cabal/x509-system-1.6.6/x509-system-1.6.6.tar.gz) = 3419 SHA256 (cabal/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz) = f94321cbcc4a534adf5889ae6950f3673e38b62b89b6970b477f502ce987d19b SIZE (cabal/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz) = 19752 -SHA256 (cabal/yaml-0.11.0.0/yaml-0.11.0.0.tar.gz) = e66466cd29a4d256c3dd4dd4ab366033dbc5fa1fb67fdc6f7ac7aa3f161527bf -SIZE (cabal/yaml-0.11.0.0/yaml-0.11.0.0.tar.gz) = 26529 +SHA256 (cabal/yaml-0.11.1.0/yaml-0.11.1.0.tar.gz) = 09371f87b0ff92c3daadd41b25955428a572f064198c0f18b28608358524a6cd +SIZE (cabal/yaml-0.11.1.0/yaml-0.11.1.0.tar.gz) = 27755 SHA256 (cabal/zip-archive-0.4.1/zip-archive-0.4.1.tar.gz) = c5d5c9976241dcc25b0d8753dc526bb1bfef60f30dee38c53a7ae56e6be9b1b1 SIZE (cabal/zip-archive-0.4.1/zip-archive-0.4.1.tar.gz) = 20967 +SHA256 (cabal/zip-archive-0.4.1/revision/1.cabal) = 51774bdc747d20b8f23172315f9c3fdd6c11de01607e98e9890eb87fb49566d7 +SIZE (cabal/zip-archive-0.4.1/revision/1.cabal) = 4055 SHA256 (cabal/zlib-0.6.2/zlib-0.6.2.tar.gz) = 0dcc7d925769bdbeb323f83b66884101084167501f11d74d21eb9bc515707fed SIZE (cabal/zlib-0.6.2/zlib-0.6.2.tar.gz) = 142677 -- cgit From d0b02e3cf7ff975d33039e554638dbcfb31cda33 Mon Sep 17 00:00:00 2001 From: linimon Date: Fri, 9 Aug 2019 09:56:31 +0000 Subject: Escape hashtag character in COMMENT. --- devel/include-what-you-use/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index 3cd23e0f0a99..0b490cd0fc1e 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= devel MAINTAINER= koobs@FreeBSD.org -COMMENT= Tool for use with clang to analyze #includes in C and C++ source files +COMMENT= Tool for use with clang to analyze \#includes in C and C++ source files LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -- cgit From bd023ad6b6591a3090e3fee14fae0c1b3ef38191 Mon Sep 17 00:00:00 2001 From: riggs Date: Fri, 9 Aug 2019 10:22:43 +0000 Subject: Update to upstream version 19.11.5.28 PR: 238822 Submitted by: proler@gmail.com (maintainer) --- databases/clickhouse/Makefile | 7 +- databases/clickhouse/distinfo | 6 +- databases/clickhouse/pkg-plist | 381 ++++++++++++++++++++++++++++++++++------- 3 files changed, 330 insertions(+), 64 deletions(-) diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index f6983484579a..31f2d6d60ca5 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= clickhouse -PORTVERSION= 19.5.3.8 +PORTVERSION= 19.11.5.28 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 4 CATEGORIES= databases MAINTAINER= proler@gmail.com @@ -19,6 +18,7 @@ ONLY_FOR_ARCHS_REASON= "Only supported on amd64" BUILD_DEPENDS= bash:shells/bash \ sparsehash>=0:devel/sparsehash \ cctz>=0:devel/cctz \ + rapidjson>=0:devel/rapidjson \ double-conversion>=0:devel/double-conversion LIB_DEPENDS= libtcmalloc.so:devel/google-perftools \ libodbc.so:databases/unixODBC \ @@ -59,13 +59,14 @@ SHEBANG_FILES= dbms/tests/performance/create_benchmark_page.py \ CMAKE_ARGS= -DUNBUNDLED=1 \ -DUSE_STATIC_LIBRARIES=0 \ + -DENABLE_EMBEDDED_COMPILER=0 \ -DNO_WERROR=1 USERS= clickhouse GROUPS= clickhouse # The version stamp of libclickhouse.so doesn't always match ${PORTVERSION} -SOVERSION= 19.5.3.1 +SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} OPTIONS_DEFINE= TEST diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo index ee53e0e30a59..0aece3c1424c 100644 --- a/databases/clickhouse/distinfo +++ b/databases/clickhouse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555623312 -SHA256 (yandex-ClickHouse-v19.5.3.8-stable_GH0.tar.gz) = 530906ef4bda8064afa830cc1118998eb4ba7ab9b1d7e10a169707755670866d -SIZE (yandex-ClickHouse-v19.5.3.8-stable_GH0.tar.gz) = 7927651 +TIMESTAMP = 1565027451 +SHA256 (yandex-ClickHouse-v19.11.5.28-stable_GH0.tar.gz) = 723b0e1a1158bfe8b108b58cafe3a74ad91131fec07c59b2f5a9170311a8fa02 +SIZE (yandex-ClickHouse-v19.11.5.28-stable_GH0.tar.gz) = 8114857 diff --git a/databases/clickhouse/pkg-plist b/databases/clickhouse/pkg-plist index 68f8bcb73e55..8f66cc4c74d4 100644 --- a/databases/clickhouse/pkg-plist +++ b/databases/clickhouse/pkg-plist @@ -23,61 +23,93 @@ bin/clickhouse-zookeeper-cli %%ETCDIR%%-server/server-test.xml @sample %%ETCDIR%%-server/users.xml.sample lib/libclickhouse.so -lib/libclickhouse.so.19.5 +lib/libclickhouse.so.19.11 lib/libclickhouse.so.%%SOVERSION%% -%%DATADIR%%-test/performance/array/array_element.xml -%%DATADIR%%-test/performance/array/array_join.xml -%%DATADIR%%-test/performance/array/complex_array_creation.xml -%%DATADIR%%-test/performance/base64/base64.xml -%%DATADIR%%-test/performance/base64/base64_hits.xml -%%DATADIR%%-test/performance/columns_hashing/columns_hashing.xml +%%DATADIR%%-test/config/decimals_dictionary.xml +%%DATADIR%%-test/config/ints_dictionary.xml +%%DATADIR%%-test/config/listen.xml +%%DATADIR%%-test/config/log_queries.xml +%%DATADIR%%-test/config/part_log.xml +%%DATADIR%%-test/config/query_masking_rules.xml +%%DATADIR%%-test/config/readonly.xml +%%DATADIR%%-test/config/strings_dictionary.xml +%%DATADIR%%-test/config/text_log.xml +%%DATADIR%%-test/config/zookeeper.xml +%%DATADIR%%-test/performance/IPv4.xml +%%DATADIR%%-test/performance/IPv6.xml +%%DATADIR%%-test/performance/README.md +%%DATADIR%%-test/performance/agg_functions_min_max_any.xml +%%DATADIR%%-test/performance/array_element.xml +%%DATADIR%%-test/performance/array_join.xml +%%DATADIR%%-test/performance/base64.xml +%%DATADIR%%-test/performance/base64_hits.xml +%%DATADIR%%-test/performance/basename.xml +%%DATADIR%%-test/performance/bounding_ratio.xml +%%DATADIR%%-test/performance/cidr.xml +%%DATADIR%%-test/performance/codec_double_delta.xml +%%DATADIR%%-test/performance/codec_gorilla.xml +%%DATADIR%%-test/performance/column_column_comparison.xml +%%DATADIR%%-test/performance/columns_hashing.xml +%%DATADIR%%-test/performance/complex_array_creation.xml +%%DATADIR%%-test/performance/concat_hits.xml +%%DATADIR%%-test/performance/conditional.xml +%%DATADIR%%-test/performance/consistent_hashes.xml +%%DATADIR%%-test/performance/constant_column_comparison.xml +%%DATADIR%%-test/performance/constant_column_search.xml +%%DATADIR%%-test/performance/cpu_synthetic.xml %%DATADIR%%-test/performance/create_benchmark_page.py -%%DATADIR%%-test/performance/date_parsing/date_parsing.xml -%%DATADIR%%-test/performance/date_time/conditional.xml -%%DATADIR%%-test/performance/date_time/date_time.xml -%%DATADIR%%-test/performance/date_time/format_date_time.xml -%%DATADIR%%-test/performance/entropy/entropy.xml -%%DATADIR%%-test/performance/float_parsing/float_parsing.xml -%%DATADIR%%-test/performance/functions_coding/functions_coding.xml -%%DATADIR%%-test/performance/functions_hashing/consistent_hashes.xml -%%DATADIR%%-test/performance/functions_hashing/cryptographic_hashes.xml -%%DATADIR%%-test/performance/functions_hashing/general_purpose_hashes.xml -%%DATADIR%%-test/performance/functions_json/visit_param_extract_raw.xml -%%DATADIR%%-test/performance/gather/concat_hits.xml -%%DATADIR%%-test/performance/gather/if_array_num.xml -%%DATADIR%%-test/performance/gather/if_array_string.xml -%%DATADIR%%-test/performance/gather/if_string_const.xml -%%DATADIR%%-test/performance/gather/if_string_hits.xml -%%DATADIR%%-test/performance/gather/slices_hits.xml -%%DATADIR%%-test/performance/int_parsing/int_parsing.xml -%%DATADIR%%-test/performance/ipv4_ipv6/IPv4.xml -%%DATADIR%%-test/performance/ipv4_ipv6/IPv6.xml -%%DATADIR%%-test/performance/jit_query_compilation/small_requests.xml -%%DATADIR%%-test/performance/leftpad/leftpad.xml -%%DATADIR%%-test/performance/merge_tree_with_aio/read_hits_with_aio.xml -%%DATADIR%%-test/performance/no_data/bounding_ratio.xml -%%DATADIR%%-test/performance/no_data/system_numbers.xml -%%DATADIR%%-test/performance/nyc_taxi/nyc_taxi.xml -%%DATADIR%%-test/performance/right/right.xml -%%DATADIR%%-test/performance/roundDown/roundDown.xml -%%DATADIR%%-test/performance/set/set.xml -%%DATADIR%%-test/performance/set/set_hits.xml -%%DATADIR%%-test/performance/string_comparisions/column_column_comparison.xml -%%DATADIR%%-test/performance/string_comparisions/constant_column_comparison.xml -%%DATADIR%%-test/performance/string_comparisions/fixed_string16.xml -%%DATADIR%%-test/performance/string_comparisions/order_by_single_column.xml -%%DATADIR%%-test/performance/string_search/constant_column_comparison.xml -%%DATADIR%%-test/performance/string_search/ngram_distance.xml -%%DATADIR%%-test/performance/string_sort/string_sort.xml -%%DATADIR%%-test/performance/test_hits/first_significant_subdomain.xml -%%DATADIR%%-test/performance/test_hits/test_hits.xml -%%DATADIR%%-test/performance/test_hits/test_hits_agg_functions_min_max_any.xml -%%DATADIR%%-test/performance/trim/trim_numbers.xml -%%DATADIR%%-test/performance/trim/trim_urls.xml -%%DATADIR%%-test/performance/trim/trim_whitespace.xml -%%DATADIR%%-test/performance/uniq/uniq.xml -%%DATADIR%%-test/performance/url/url_hits.xml -%%DATADIR%%-test/performance/website/url_hits.xml +%%DATADIR%%-test/performance/cryptographic_hashes.xml +%%DATADIR%%-test/performance/date_parsing.xml +%%DATADIR%%-test/performance/date_time.xml +%%DATADIR%%-test/performance/entropy.xml +%%DATADIR%%-test/performance/first_significant_subdomain.xml +%%DATADIR%%-test/performance/fixed_string16.xml +%%DATADIR%%-test/performance/float_parsing.xml +%%DATADIR%%-test/performance/format_date_time.xml +%%DATADIR%%-test/performance/functions_coding.xml +%%DATADIR%%-test/performance/functions_geo.xml +%%DATADIR%%-test/performance/general_purpose_hashes.xml +%%DATADIR%%-test/performance/group_array_moving_sum.xml +%%DATADIR%%-test/performance/h3.xml +%%DATADIR%%-test/performance/if_array_num.xml +%%DATADIR%%-test/performance/if_array_string.xml +%%DATADIR%%-test/performance/if_string_const.xml +%%DATADIR%%-test/performance/if_string_hits.xml +%%DATADIR%%-test/performance/int_parsing.xml +%%DATADIR%%-test/performance/jit_large_requests.xml +%%DATADIR%%-test/performance/jit_small_requests.xml +%%DATADIR%%-test/performance/joins_in_memory.xml +%%DATADIR%%-test/performance/json_extract_rapidjson.xml +%%DATADIR%%-test/performance/json_extract_simdjson.xml +%%DATADIR%%-test/performance/leftpad.xml +%%DATADIR%%-test/performance/linear_regression.xml +%%DATADIR%%-test/performance/merge_table_streams.xml +%%DATADIR%%-test/performance/merge_tree_many_partitions.xml +%%DATADIR%%-test/performance/merge_tree_many_partitions_2.xml +%%DATADIR%%-test/performance/merge_tree_simple_select.xml +%%DATADIR%%-test/performance/ngram_distance.xml +%%DATADIR%%-test/performance/number_formatting_formats.xml +%%DATADIR%%-test/performance/nyc_taxi.xml +%%DATADIR%%-test/performance/order_by_single_column.xml +%%DATADIR%%-test/performance/parse_engine_file.xml +%%DATADIR%%-test/performance/read_hits_with_aio.xml +%%DATADIR%%-test/performance/right.xml +%%DATADIR%%-test/performance/roundDown.xml +%%DATADIR%%-test/performance/select_format.xml +%%DATADIR%%-test/performance/set.xml +%%DATADIR%%-test/performance/set_hits.xml +%%DATADIR%%-test/performance/simple_join_query.xml +%%DATADIR%%-test/performance/slices_hits.xml +%%DATADIR%%-test/performance/sort.xml +%%DATADIR%%-test/performance/string_sort.xml +%%DATADIR%%-test/performance/system_numbers.xml +%%DATADIR%%-test/performance/trim_numbers.xml +%%DATADIR%%-test/performance/trim_urls.xml +%%DATADIR%%-test/performance/trim_whitespace.xml +%%DATADIR%%-test/performance/uniq.xml +%%DATADIR%%-test/performance/url_hits.xml +%%DATADIR%%-test/performance/visit_param_extract_raw.xml +%%DATADIR%%-test/performance/website.xml %%DATADIR%%-test/queries/0_stateless/00001_select_1.reference %%DATADIR%%-test/queries/0_stateless/00001_select_1.sql %%DATADIR%%-test/queries/0_stateless/00002_system_numbers.reference @@ -136,8 +168,6 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.sql %%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.reference %%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql -%%DATADIR%%-test/queries/0_stateless/00028_shard_big_non_agg_aj_distributed.reference -%%DATADIR%%-test/queries/0_stateless/00028_shard_big_non_agg_aj_distributed.sql %%DATADIR%%-test/queries/0_stateless/00030_alter_table.reference %%DATADIR%%-test/queries/0_stateless/00030_alter_table.sql %%DATADIR%%-test/queries/0_stateless/00031_parser_number.reference @@ -1394,6 +1424,10 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.sql %%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.reference %%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.sql +%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.reference +%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.sql +%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.reference +%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.sql %%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.reference %%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.sql %%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.reference @@ -1527,7 +1561,7 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.reference %%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.sql %%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference -%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh %%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.reference %%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.sql %%DATADIR%%-test/queries/0_stateless/00628_in_lambda_on_merge_table_bug.reference @@ -1736,6 +1770,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00700_decimal_null.sql %%DATADIR%%-test/queries/0_stateless/00700_decimal_round.reference %%DATADIR%%-test/queries/0_stateless/00700_decimal_round.sql +%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.reference +%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.sql %%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.reference %%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.sql %%DATADIR%%-test/queries/0_stateless/00701_join_default_strictness.reference @@ -1961,6 +1997,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables.sql %%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.reference %%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.sql +%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.reference +%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.sql %%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.reference %%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.sql %%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference @@ -2180,8 +2218,40 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00852_any_join_nulls.sql %%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.reference %%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.sql +%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.reference +%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.sql +%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.reference +%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.sql +%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.reference +%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.sql %%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.reference %%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.sql +%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.reference +%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.sql +%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.reference +%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.sql +%%DATADIR%%-test/queries/0_stateless/00860_unknown_identifier_bug.reference +%%DATADIR%%-test/queries/0_stateless/00860_unknown_identifier_bug.sql +%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.reference +%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.sql +%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.reference +%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.sql +%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.reference +%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.sql +%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.reference +%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.sql +%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.reference +%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.sql +%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.reference +%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.sql +%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.reference +%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.sql +%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.reference +%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.sql +%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.reference +%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.sql +%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.reference +%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.sql %%DATADIR%%-test/queries/0_stateless/00897_flatten.reference %%DATADIR%%-test/queries/0_stateless/00897_flatten.sql %%DATADIR%%-test/queries/0_stateless/00898_parsing_bad_diagnostic_message.reference @@ -2235,6 +2305,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00909_kill_not_initialized_query.sh %%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.reference %%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.sql +%%DATADIR%%-test/queries/0_stateless/00910_aggregation_timeseriesgroupsum.reference +%%DATADIR%%-test/queries/0_stateless/00910_aggregation_timeseriesgroupsum.sql %%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.reference %%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.sql %%DATADIR%%-test/queries/0_stateless/00910_client_window_size_detection.reference @@ -2257,6 +2329,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00914_join_bgranvea.sql %%DATADIR%%-test/queries/0_stateless/00914_replicate.reference %%DATADIR%%-test/queries/0_stateless/00914_replicate.sql +%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.reference +%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.sql %%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.reference %%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.sql %%DATADIR%%-test/queries/0_stateless/00916_add_materialized_column_after.reference @@ -2265,10 +2339,14 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00916_create_or_replace_view.sql %%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.reference %%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.sql +%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.reference +%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.sql %%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.reference %%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.sql %%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.reference %%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.sql +%%DATADIR%%-test/queries/0_stateless/00918_json_functions.reference +%%DATADIR%%-test/queries/0_stateless/00918_json_functions.sql %%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.reference %%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.sql %%DATADIR%%-test/queries/0_stateless/00919_sum_aggregate_states_constants.reference @@ -2277,12 +2355,26 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00920_multiply_aggregate_states_constants.sql %%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference %%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.reference +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.sql +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql +%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.reference +%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.sql %%DATADIR%%-test/queries/0_stateless/00926_multimatch.reference %%DATADIR%%-test/queries/0_stateless/00926_multimatch.sql -%%DATADIR%%-test/queries/0_stateless/00927_asof_join_big.reference -%%DATADIR%%-test/queries/0_stateless/00927_asof_join_big.sql +%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql %%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.reference %%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.sql +%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.reference +%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.sql %%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.reference %%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.sql %%DATADIR%%-test/queries/0_stateless/00927_asof_join_other_types.reference @@ -2305,12 +2397,174 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_nullable_aggregate_function_type.sql %%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.reference %%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.sql +%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_set_index_in_key_condition.reference +%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_set_index_in_key_condition.sql %%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.reference %%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.sql +%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.reference +%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.sql +%%DATADIR%%-test/queries/0_stateless/00933_alter_ttl.reference +%%DATADIR%%-test/queries/0_stateless/00933_alter_ttl.sql +%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.reference +%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.sql %%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference %%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh +%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper.reference +%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.reference +%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.sql +%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.reference +%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.sql +%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.reference +%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.sql %%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.reference %%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.sql +%%DATADIR%%-test/queries/0_stateless/00936_crc32_function.reference +%%DATADIR%%-test/queries/0_stateless/00936_crc32_function.sql +%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.reference +%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.sql +%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.reference +%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.sql +%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.reference +%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.sh +%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.reference +%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.sh +%%DATADIR%%-test/queries/0_stateless/00938_basename.reference +%%DATADIR%%-test/queries/0_stateless/00938_basename.sql +%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.reference +%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.sql +%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault.reference +%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault.sh +%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.reference +%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.sql +%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.reference +%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.sql +%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.reference +%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.sql +%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.reference +%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.sql +%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.reference +%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.sql +%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.reference +%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.sh +%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.reference +%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.sh +%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.reference +%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.sql +%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.reference +%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.sql +%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.sh +%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.reference +%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.sql +%%DATADIR%%-test/queries/0_stateless/00944_ml_test.reference +%%DATADIR%%-test/queries/0_stateless/00944_ml_test.sql +%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.reference +%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.sql +%%DATADIR%%-test/queries/0_stateless/00945_ml_test.reference +%%DATADIR%%-test/queries/0_stateless/00945_ml_test.sql +%%DATADIR%%-test/queries/0_stateless/00946_ml_test.reference +%%DATADIR%%-test/queries/0_stateless/00946_ml_test.sql +%%DATADIR%%-test/queries/0_stateless/00947_ml_test.reference +%%DATADIR%%-test/queries/0_stateless/00947_ml_test.sql +%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.reference +%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.sh +%%DATADIR%%-test/queries/0_stateless/00948_to_valid_utf8.reference +%%DATADIR%%-test/queries/0_stateless/00948_to_valid_utf8.sql +%%DATADIR%%-test/queries/0_stateless/00949_format.reference +%%DATADIR%%-test/queries/0_stateless/00949_format.sql +%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.reference +%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.sql +%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.reference +%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.sql +%%DATADIR%%-test/queries/0_stateless/00950_dict_get.reference +%%DATADIR%%-test/queries/0_stateless/00950_dict_get.sql +%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.reference +%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.sql +%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.reference +%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.sql +%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.reference +%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.sql +%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.reference +%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql +%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.reference +%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.sql +%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.reference +%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.sh +%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.reference +%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.sql +%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.reference +%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh +%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.reference +%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.sh +%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.reference +%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.sql +%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.reference +%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.sh +%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.reference +%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.sql +%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.reference +%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.sh +%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.reference +%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.sh +%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.reference +%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.sql +%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.reference +%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.sql +%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.reference +%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.sql +%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.reference +%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.sh +%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.reference +%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.sh +%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.reference +%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.sh +%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.reference +%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.sql +%%DATADIR%%-test/queries/0_stateless/00961_check_table.reference +%%DATADIR%%-test/queries/0_stateless/00961_check_table.sql +%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference +%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql +%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.reference +%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.sql +%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.reference +%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.sql +%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.reference +%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.sql +%%DATADIR%%-test/queries/0_stateless/00963_achimbab.reference +%%DATADIR%%-test/queries/0_stateless/00963_achimbab.sql +%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.reference +%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.sql +%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.reference +%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.sql +%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.reference +%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.sql +%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.reference +%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.sql +%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.reference +%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.sql +%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.reference +%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.sql +%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.reference +%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql +%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.reference +%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.sh +%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.reference +%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.sql +%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.reference +%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.sql +%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.reference +%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.sql +%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.reference +%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.sql +%%DATADIR%%-test/queries/0_stateless/00975_json_hang.reference +%%DATADIR%%-test/queries/0_stateless/00975_json_hang.sql +%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.reference +%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql +%%DATADIR%%-test/queries/0_stateless/00977_int_div.reference +%%DATADIR%%-test/queries/0_stateless/00977_int_div.sql +%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.reference +%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.sql %%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet %%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns %%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.parquet @@ -2548,13 +2802,24 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.sql %%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.reference %%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.sql +%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.reference +%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.sql +%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.reference +%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.sql +%%DATADIR%%-test/queries/__init__.py %%DATADIR%%-test/queries/bugs/00597_push_down_predicate.sql +%%DATADIR%%-test/queries/bugs/00938_client_suggestions.sh +%%DATADIR%%-test/queries/bugs/default_prewhere.sql +%%DATADIR%%-test/queries/bugs/low_cardinality_remove.sql %%DATADIR%%-test/queries/bugs/missing_scalar_subquery_removal.sql %%DATADIR%%-test/queries/bugs/position_case_insensitive_utf8.sql %%DATADIR%%-test/queries/bugs/prewhere_with_alias.sql %%DATADIR%%-test/queries/bugs/remote_scalar_subquery.sql %%DATADIR%%-test/queries/bugs/totals_rollup_having_block_header.sql %%DATADIR%%-test/queries/bugs/view_bad_types.sql +%%DATADIR%%-test/queries/conftest.py +%%DATADIR%%-test/queries/query_test.py +%%DATADIR%%-test/queries/server.py %%DATADIR%%-test/queries/shell_config.sh @dir %%DATADIR%%/headers/%%SOVERSION%% @dir(clickhouse,,) /var/db/clickhouse -- cgit From 59fe80857b5538e29324992eab66b86451cdb389 Mon Sep 17 00:00:00 2001 From: mizhka Date: Fri, 9 Aug 2019 10:32:54 +0000 Subject: [new port] add lang/kotlin Kotlin is cross-platform language designed to interoperate with Java. It's sponsored by JetBrains and Google, officially supported by Google for mobile development on Android. Since May, 2019, it's preferred language for Android app developer according to Google. Here is source link of port: https://github.com/lwhsu/freebsd-ports-kotlin Reviewed by: lwhsu Approved by: lwhsu --- lang/kotlin/Makefile | 44 +++++++++++++++++++++++++++++++++++ lang/kotlin/distinfo | 3 +++ lang/kotlin/pkg-descr | 3 +++ lang/kotlin/pkg-plist | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 lang/kotlin/Makefile create mode 100644 lang/kotlin/distinfo create mode 100644 lang/kotlin/pkg-descr create mode 100644 lang/kotlin/pkg-plist diff --git a/lang/kotlin/Makefile b/lang/kotlin/Makefile new file mode 100644 index 000000000000..3e6054a45a8f --- /dev/null +++ b/lang/kotlin/Makefile @@ -0,0 +1,44 @@ +# $FreeBSD$ + +PORTNAME= kotlin +PORTVERSION= 1.3.41 +CATEGORIES= lang +MASTER_SITES= https://github.com/JetBrains/kotlin/releases/download/v${PORTVERSION}/ +DISTNAME= kotlin-compiler-${PORTVERSION} + +MAINTAINER= mizhka@FreeBSD.org +COMMENT= Kotlin Programming Language + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/license/LICENSE.txt + +RUN_DEPENDS= bash:shells/bash + +USES= zip + +WRKSRC= ${WRKDIR}/kotlinc + +USE_JAVA= yes +NO_BUILD= yes + +KOTLIN_BIN= kapt \ + kotlin \ + kotlin-dce-js \ + kotlinc \ + kotlinc-js \ + kotlinc-jvm + +post-extract: + ${RM} ${WRKSRC}/bin/*.bat + +do-install: + ${MKDIR} ${STAGEDIR}${DATADIR}/lib + ${MKDIR} ${STAGEDIR}${DATADIR}/bin + cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin + cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib +.for f in ${KOTLIN_BIN} + ${LN} -sf ${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} +.endfor + ${INSTALL_DATA} ${WRKSRC}/build.txt ${STAGEDIR}${DATADIR} + +.include diff --git a/lang/kotlin/distinfo b/lang/kotlin/distinfo new file mode 100644 index 000000000000..a14eeca3f636 --- /dev/null +++ b/lang/kotlin/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565023088 +SHA256 (kotlin-compiler-1.3.41.zip) = c44ab6866895606e408b60934ebe45d4befcbc33ea0e4ea73c4b3b89ad770132 +SIZE (kotlin-compiler-1.3.41.zip) = 45655109 diff --git a/lang/kotlin/pkg-descr b/lang/kotlin/pkg-descr new file mode 100644 index 000000000000..0e3c6ad87221 --- /dev/null +++ b/lang/kotlin/pkg-descr @@ -0,0 +1,3 @@ +Kotlin Programming Language + +WWW: https://kotlinlang.org/ diff --git a/lang/kotlin/pkg-plist b/lang/kotlin/pkg-plist new file mode 100644 index 000000000000..91ff503d5139 --- /dev/null +++ b/lang/kotlin/pkg-plist @@ -0,0 +1,63 @@ +bin/kapt +bin/kotlin +bin/kotlin-dce-js +bin/kotlinc +bin/kotlinc-js +bin/kotlinc-jvm +%%DATADIR%%/bin/kapt +%%DATADIR%%/bin/kotlin +%%DATADIR%%/bin/kotlin-dce-js +%%DATADIR%%/bin/kotlinc +%%DATADIR%%/bin/kotlinc-js +%%DATADIR%%/bin/kotlinc-jvm +%%DATADIR%%/build.txt +%%DATADIR%%/lib/allopen-compiler-plugin.jar +%%DATADIR%%/lib/android-extensions-compiler.jar +%%DATADIR%%/lib/android-extensions-runtime.jar +%%DATADIR%%/lib/annotations-13.0.jar +%%DATADIR%%/lib/jvm-abi-gen.jar +%%DATADIR%%/lib/kotlin-annotation-processing-cli.jar +%%DATADIR%%/lib/kotlin-annotation-processing-runtime.jar +%%DATADIR%%/lib/kotlin-annotation-processing.jar +%%DATADIR%%/lib/kotlin-annotations-android.jar +%%DATADIR%%/lib/kotlin-annotations-jvm-sources.jar +%%DATADIR%%/lib/kotlin-annotations-jvm.jar +%%DATADIR%%/lib/kotlin-ant.jar +%%DATADIR%%/lib/kotlin-compiler.jar +%%DATADIR%%/lib/kotlin-daemon-client.jar +%%DATADIR%%/lib/kotlin-imports-dumper-compiler-plugin.jar +%%DATADIR%%/lib/kotlin-main-kts.jar +%%DATADIR%%/lib/kotlin-preloader.jar +%%DATADIR%%/lib/kotlin-reflect-sources.jar +%%DATADIR%%/lib/kotlin-reflect.jar +%%DATADIR%%/lib/kotlin-runner.jar +%%DATADIR%%/lib/kotlin-script-runtime-sources.jar +%%DATADIR%%/lib/kotlin-script-runtime.jar +%%DATADIR%%/lib/kotlin-scripting-common.jar +%%DATADIR%%/lib/kotlin-scripting-compiler-impl.jar +%%DATADIR%%/lib/kotlin-scripting-compiler.jar +%%DATADIR%%/lib/kotlin-scripting-jvm.jar +%%DATADIR%%/lib/kotlin-source-sections-compiler-plugin.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk7-sources.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk7.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk8-sources.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk8.jar +%%DATADIR%%/lib/kotlin-stdlib-js-sources.jar +%%DATADIR%%/lib/kotlin-stdlib-js.jar +%%DATADIR%%/lib/kotlin-stdlib-sources.jar +%%DATADIR%%/lib/kotlin-stdlib.jar +%%DATADIR%%/lib/kotlin-test-js-sources.jar +%%DATADIR%%/lib/kotlin-test-js.jar +%%DATADIR%%/lib/kotlin-test-junit-sources.jar +%%DATADIR%%/lib/kotlin-test-junit.jar +%%DATADIR%%/lib/kotlin-test-junit5-sources.jar +%%DATADIR%%/lib/kotlin-test-junit5.jar +%%DATADIR%%/lib/kotlin-test-sources.jar +%%DATADIR%%/lib/kotlin-test-testng-sources.jar +%%DATADIR%%/lib/kotlin-test-testng.jar +%%DATADIR%%/lib/kotlin-test.jar +%%DATADIR%%/lib/kotlinx-serialization-compiler-plugin.jar +%%DATADIR%%/lib/mutability-annotations-compat.jar +%%DATADIR%%/lib/noarg-compiler-plugin.jar +%%DATADIR%%/lib/sam-with-receiver-compiler-plugin.jar +%%DATADIR%%/lib/trove4j.jar -- cgit From 0536fe5c91d4f687fac8a1aeeabad9f34e53de0c Mon Sep 17 00:00:00 2001 From: demon Date: Fri, 9 Aug 2019 11:10:31 +0000 Subject: Update to version 1.9.10. --- net/haproxy19/Makefile | 3 +-- net/haproxy19/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile index c1d9e3081609..533ebfe89f84 100644 --- a/net/haproxy19/Makefile +++ b/net/haproxy19/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.9.9 -PORTREVISION= 1 +DISTVERSION= 1.9.10 CATEGORIES= net www PKGNAMESUFFIX= 19 MASTER_SITES= http://www.haproxy.org/download/1.9/src/ diff --git a/net/haproxy19/distinfo b/net/haproxy19/distinfo index 24f13b212fb3..f7e4b963f5b4 100644 --- a/net/haproxy19/distinfo +++ b/net/haproxy19/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563894130 -SHA256 (haproxy-1.9.9.tar.gz) = a51fd2b21119c35fc892c1d021009feda4b63ccbde2f8fea80ffe5f314b7e7b0 -SIZE (haproxy-1.9.9.tar.gz) = 2383704 +TIMESTAMP = 1565348965 +SHA256 (haproxy-1.9.10.tar.gz) = 8ec2d53fe279563a3ea08f472ed3495468c21a6477415601af9f682e7f9e563a +SIZE (haproxy-1.9.10.tar.gz) = 2386066 -- cgit From 0927e8ab89302b60c4dca000a09f8e97a81f2a99 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Fri, 9 Aug 2019 11:36:04 +0000 Subject: games/minetest: fix build with GCC-based architectures New GCC is needed: Insufficient gcc version, found 4.2.1. Version 4.9 or higher is required. Approved by: mentors (implicit approval) --- games/minetest/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/minetest/Makefile b/games/minetest/Makefile index d52d5ef60b23..aca2c52bef78 100644 --- a/games/minetest/Makefile +++ b/games/minetest/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ USE_GITHUB= yes GH_ACCOUNT= minetest -USES= cmake iconv:wchar_t +USES= cmake compiler:c11 iconv:wchar_t LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" -- cgit From 330e95d1f3d33844fb37ba9063b4a4ecaf03f926 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:45:35 +0000 Subject: Update to 0.4.2.6 Changes: https://github.com/KimiNewt/pyshark/releases https://github.com/KimiNewt/pyshark/commits/master --- net/py-pyshark/Makefile | 2 +- net/py-pyshark/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index 8dce13d3ac70..4e860fe5395d 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyshark -PORTVERSION= 0.4.2.5 +PORTVERSION= 0.4.2.6 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyshark/distinfo b/net/py-pyshark/distinfo index 9c2fc282ef15..863a578a7de0 100644 --- a/net/py-pyshark/distinfo +++ b/net/py-pyshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565190845 -SHA256 (pyshark-0.4.2.5.tar.gz) = 5fc70614323893788d61667235d01a03688c2e87393998963bd390dd1a4a05a5 -SIZE (pyshark-0.4.2.5.tar.gz) = 19848 +TIMESTAMP = 1565282900 +SHA256 (pyshark-0.4.2.6.tar.gz) = 7a81f1df8536d5f3cabf3db83b3ee7b5e4afbc2ca686e4caf5b36e0e218b6dc6 +SIZE (pyshark-0.4.2.6.tar.gz) = 19917 -- cgit From 870150647c74c1acd38edd6482ce35687ef5e63c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:45:40 +0000 Subject: Update to 1.18.0 Changes: https://github.com/googleapis/google-cloud-python/releases https://github.com/googleapis/google-cloud-python/blob/master/storage/CHANGELOG.md --- www/py-google-cloud-storage/Makefile | 2 +- www/py-google-cloud-storage/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/py-google-cloud-storage/Makefile b/www/py-google-cloud-storage/Makefile index b8a1e23d96b1..e5de45d77241 100644 --- a/www/py-google-cloud-storage/Makefile +++ b/www/py-google-cloud-storage/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= google-cloud-storage -PORTVERSION= 1.17.0 +PORTVERSION= 1.18.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-google-cloud-storage/distinfo b/www/py-google-cloud-storage/distinfo index cc3a40470c1a..3d38863ee3d9 100644 --- a/www/py-google-cloud-storage/distinfo +++ b/www/py-google-cloud-storage/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564157949 -SHA256 (google-cloud-storage-1.17.0.tar.gz) = 4e24989b69e37086bd8c219d5502b13540ee9650ab9ea52cd909ad819ea51542 -SIZE (google-cloud-storage-1.17.0.tar.gz) = 5390370 +TIMESTAMP = 1565282908 +SHA256 (google-cloud-storage-1.18.0.tar.gz) = 9fb3dc68948f4c893c2b16f5a3db3daea2d2f3b8e9d5c2d505fe1523758009b6 +SIZE (google-cloud-storage-1.18.0.tar.gz) = 5396019 -- cgit From d224eb4417ef3c75cb3c60aa7d0768d675be207d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:45:46 +0000 Subject: Update to 2.11.328 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 7f1ada56bb51..62ac35674e63 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.327 +DISTVERSION= 2.11.328 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 2e7f93ad2989..7b65a7fcd09f 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565190853 -SHA256 (rubygem/aws-sdk-2.11.327.gem) = e494cb12164356b6246a395b30157d844a10c20b39ae3143fd3903e1f554b08d -SIZE (rubygem/aws-sdk-2.11.327.gem) = 4608 +TIMESTAMP = 1565282910 +SHA256 (rubygem/aws-sdk-2.11.328.gem) = 72d027944c1fedca6f5b3bd3777547925a4562495e0666659ff49a6a13bd6fdc +SIZE (rubygem/aws-sdk-2.11.328.gem) = 4608 -- cgit From d20e8c02da1893188b4a3a859be48d6667429e6f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:45:51 +0000 Subject: Update to 2.11.328 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 8a7a33028a7d..c1b641bdfe6d 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.327 +DISTVERSION= 2.11.328 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 7475a0bfe4c6..c908bc3b5af7 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565190860 -SHA256 (rubygem/aws-sdk-core-2.11.327.gem) = e39ab1b80574305d238e06fd7a31e2f1971b221af1fbad903850467d7775451c -SIZE (rubygem/aws-sdk-core-2.11.327.gem) = 1631232 +TIMESTAMP = 1565282913 +SHA256 (rubygem/aws-sdk-core-2.11.328.gem) = c68a1a3315e3e6991436871551c4736592d7305619e73bf061e81431592920fe +SIZE (rubygem/aws-sdk-core-2.11.328.gem) = 1631232 -- cgit From 119caa8b661b65acb5e5c39ffb9fb0eadd27e13e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:45:56 +0000 Subject: Update to 2.11.328 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index d18272677fe3..caa67cf9ea90 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.327 +DISTVERSION= 2.11.328 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index adce9a867528..00f5eb871651 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565190862 -SHA256 (rubygem/aws-sdk-resources-2.11.327.gem) = 90d0b757fe9beab587067a0784996c56e49ed430eaa1fd961bdcb9329d8fe0e8 -SIZE (rubygem/aws-sdk-resources-2.11.327.gem) = 48640 +TIMESTAMP = 1565282914 +SHA256 (rubygem/aws-sdk-resources-2.11.328.gem) = 294e098ab333bb85657a79f1d1e8d131a0cb085cea7382e74b197dbbf5eb6b21 +SIZE (rubygem/aws-sdk-resources-2.11.328.gem) = 48640 -- cgit From 7bd6e74bbd8c0afb1107fbd8199fbb78a261ead7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:46:01 +0000 Subject: Update to 1.8.0 Changes: https://github.com/cucumber/cucumber-rails/releases --- devel/rubygem-cucumber-rails/Makefile | 6 +++--- devel/rubygem-cucumber-rails/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-cucumber-rails/Makefile b/devel/rubygem-cucumber-rails/Makefile index bc8bd746ea9b..489326f344cc 100644 --- a/devel/rubygem-cucumber-rails/Makefile +++ b/devel/rubygem-cucumber-rails/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cucumber-rails -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,9 +12,9 @@ COMMENT= Cucumber generator and runtime for Rails LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-capybara>=2.3.0<4:devel/rubygem-capybara \ +RUN_DEPENDS= rubygem-capybara>=2.12<4:devel/rubygem-capybara \ rubygem-cucumber>=3.0.2<4:devel/rubygem-cucumber \ - rubygem-mime-types>=1.17<4:misc/rubygem-mime-types \ + rubygem-mime-types>=2.0<4:misc/rubygem-mime-types \ rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri \ rubygem-railties5>=4.2:www/rubygem-railties5 diff --git a/devel/rubygem-cucumber-rails/distinfo b/devel/rubygem-cucumber-rails/distinfo index ee1288663f50..2a82d098f05f 100644 --- a/devel/rubygem-cucumber-rails/distinfo +++ b/devel/rubygem-cucumber-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564236359 -SHA256 (rubygem/cucumber-rails-1.7.0.gem) = 42acf7cea68603586b10c960741a9826ff78818854eb17890584defade3a0bc3 -SIZE (rubygem/cucumber-rails-1.7.0.gem) = 411648 +TIMESTAMP = 1565282917 +SHA256 (rubygem/cucumber-rails-1.8.0.gem) = da72011658cb88baf3aa9a7c532e90484fda91f640990b4ea8918c1a914e6e68 +SIZE (rubygem/cucumber-rails-1.8.0.gem) = 43008 -- cgit From 0aab0b413e6371cd105e048bf032b47b94213f65 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:46:06 +0000 Subject: Update to 3.1.0 Changes: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md https://github.com/tinfoil/devise-two-factor/commits/master --- security/rubygem-devise-two-factor/Makefile | 3 +-- security/rubygem-devise-two-factor/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/security/rubygem-devise-two-factor/Makefile b/security/rubygem-devise-two-factor/Makefile index 42fa3040cfe4..3af6088a7538 100644 --- a/security/rubygem-devise-two-factor/Makefile +++ b/security/rubygem-devise-two-factor/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= devise-two-factor -PORTVERSION= 3.0.3 -PORTREVISION= 1 +PORTVERSION= 3.1.0 CATEGORIES= security rubygems MASTER_SITES= RG diff --git a/security/rubygem-devise-two-factor/distinfo b/security/rubygem-devise-two-factor/distinfo index 383d7bd69ae3..fda54b9aae6f 100644 --- a/security/rubygem-devise-two-factor/distinfo +++ b/security/rubygem-devise-two-factor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523619786 -SHA256 (rubygem/devise-two-factor-3.0.3.gem) = ac5213fa12164e65ed656b61d2406bed88e8378368f7e11e2d4040167cd1c1ac -SIZE (rubygem/devise-two-factor-3.0.3.gem) = 28672 +TIMESTAMP = 1565282920 +SHA256 (rubygem/devise-two-factor-3.1.0.gem) = c4ae641aef51339b10e8f2e0ee56c6abbaa81caa9d653926c1b4fb9ce13df33f +SIZE (rubygem/devise-two-factor-3.1.0.gem) = 29184 -- cgit From c5a6c4d0b1633d0084a3180a405191ec9eae351d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 11:46:11 +0000 Subject: Update comment: add pgsql 12 --- Mk/bsd.default-versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8af1834051a4..7546d624548f 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -80,7 +80,7 @@ _PERL5_FROM_BIN!= ${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;' _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif -# Possible values: 9.4, 9.5, 9.6, 10, 11 +# Possible values: 9.4, 9.5, 9.6, 10, 11, 12 PGSQL_DEFAULT?= 9.5 # Possible values: 7.1, 7.2, 7.3 PHP_DEFAULT?= 7.2 -- cgit From 491cbe2871f89e97e5baefec637b921813d3e3f6 Mon Sep 17 00:00:00 2001 From: matthew Date: Fri, 9 Aug 2019 12:13:05 +0000 Subject: Update to 3.9.1 ChangeLog: https://github.com/protocolbuffers/protobuf/blob/v3.9.1/CHANGES.txt (Although the changelog doesn't seem to have been updated since version 3.9.0, which does rather limit its utility.) --- devel/protobuf-java/Makefile | 2 +- devel/protobuf-java/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/protobuf-java/Makefile b/devel/protobuf-java/Makefile index 3fd6a60f88b7..82b12642197f 100644 --- a/devel/protobuf-java/Makefile +++ b/devel/protobuf-java/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= protobuf-java -DISTVERSION= 3.9.0 +DISTVERSION= 3.9.1 CATEGORIES= devel java MASTER_SITES= http://central.maven.org/maven2/com/google/protobuf/protobuf-java/${DISTVERSION}/ EXTRACT_SUFX= .jar diff --git a/devel/protobuf-java/distinfo b/devel/protobuf-java/distinfo index e2d430b13e4b..2e5722dba9f7 100644 --- a/devel/protobuf-java/distinfo +++ b/devel/protobuf-java/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562911555 -SHA256 (protobuf-java-3.9.0.jar) = 6c96d85eac237fea84d9d5e7413c85b62f2df0b9f7b17b0168bd1e28b09ff0e8 -SIZE (protobuf-java-3.9.0.jar) = 1635813 +TIMESTAMP = 1565286029 +SHA256 (protobuf-java-3.9.1.jar) = 5a1e5c225791eccd3d67a598922e637406190c90155fb97f38e4eab29719324d +SIZE (protobuf-java-3.9.1.jar) = 1635825 -- cgit From c0b9bc6fe93d0958755967fa7a825eaa78753ee7 Mon Sep 17 00:00:00 2001 From: linimon Date: Fri, 9 Aug 2019 12:47:54 +0000 Subject: Appease portlint. I have a tier-2-related patch in progress, and having portlint less noisy will help me with testing. Approved by: "just fix it" --- math/vtk6/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index bf4c2bd08f5e..776dc2c87026 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -24,9 +24,9 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ # * VTK Groups CONFLICTS= vtk5 vtk8 +USES= alias cmake jpeg localbase USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt sm ice x11 xext -USES= alias cmake jpeg localbase CXXFLAGS_powerpc64= -mminimal-toc VTK_SHORT_VER= ${PORTVERSION:R} -- cgit From b88013440dcf5511a15f15848aef2f81ceb2d570 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 9 Aug 2019 12:54:26 +0000 Subject: Fix bulk -a with BUILD_ALL_PYTHON_FLAVORS. devel/py-typing-extensions does not support Python 3.7+, so ports requiring it can't either. --- devel/py-mypy/Makefile | 2 +- devel/thonny/Makefile | 2 +- science/py-chainer-chemistry/Makefile | 2 +- science/py-chainer/Makefile | 2 +- science/py-onnx/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile index 0bb25f2684c5..3d17bf5bad35 100644 --- a/devel/py-mypy/Makefile +++ b/devel/py-mypy/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0.4.0<0.5.0:devel/py-mypy_e ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.4.0<1.5.0:devel/py-typed-ast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} -USES= python:3.5+ shebangfix +USES= python:3.5-3.6 shebangfix USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/thonny/Makefile b/devel/thonny/Makefile index 793d0880eb07..b0e5eafb6967 100644 --- a/devel/thonny/Makefile +++ b/devel/thonny/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= pylint:devel/pylint \ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}serial>=3.2.1:comms/py-serial@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.5-3.6 USE_PYTHON= autoplist distutils .include diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile index a8687c0814e8..6255c7c1c8f7 100644 --- a/science/py-chainer-chemistry/Makefile +++ b/science/py-chainer-chemistry/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} -USES= python +USES= python:-3.6 USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile index 490416db6e4c..31f4a0aaefd4 100644 --- a/science/py-chainer/Makefile +++ b/science/py-chainer/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python +USES= python:-3.6 USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/science/py-onnx/Makefile b/science/py-onnx/Makefile index acb7d1b82715..f1d65a3b6e84 100644 --- a/science/py-onnx/Makefile +++ b/science/py-onnx/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python +USES= python:-3.6 USE_PYTHON= distutils concurrent autoplist BINARY_ALIAS= python=${PYTHON_CMD} -- cgit From a75c411bec4970117437781df8e24c3e24f0c322 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 9 Aug 2019 13:02:31 +0000 Subject: archivers/deutex: Update to 5.2.0 and unbreak After many years of being dormant upstream has continued the development, moved to GitHub and modernized the whole code base. * Remove the patch for deutex.h that is no longer required. [1] * Also take maintainership for a while. Notable changes since the 4.4.0 release: * Removed DeuSF binary and WinTex related features/options. * PNG support added. If compiled in, it is the default extraction format, PPM otherwise. * DeuTex can now build WADs with an arbitrary number of lumps, but prints a warning when more than 4046 are included (the Vanilla Doom limit). * UDMF (Universal Doom Map Format) support. * Real Autoconf and Automake build system to replace the barely-functioning imitation one. * C99-style cleanups to use (u)intN_t types, bool, true, false throughout the code, replacing old defines. [1] https://github.com/Doom-Utils/deutex/releases/tag/v5.2.0 https://github.com/Doom-Utils/deutex/releases/tag/v5.1.0 https://github.com/Doom-Utils/deutex/releases/tag/v5.0.0 --- archivers/deutex/Makefile | 36 ++++++++++++------------------- archivers/deutex/distinfo | 5 +++-- archivers/deutex/files/patch-src_deutex.h | 33 ---------------------------- 3 files changed, 17 insertions(+), 57 deletions(-) delete mode 100644 archivers/deutex/files/patch-src_deutex.h diff --git a/archivers/deutex/Makefile b/archivers/deutex/Makefile index 046740412c51..dcf3f13185b4 100644 --- a/archivers/deutex/Makefile +++ b/archivers/deutex/Makefile @@ -2,13 +2,11 @@ # $FreeBSD$ PORTNAME= deutex -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 5.2.0 +DISTVERSIONPREFIX= v CATEGORIES= archivers games -MASTER_SITES= http://www.teaser.fr/~amajorel/deutex/ \ - http://freebsd.nsu.ru/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= WAD file manipulator for Doom, Heretic, Hexen, and Strife LICENSE= GPLv2 LGPL20 MIT @@ -16,31 +14,25 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB -BROKEN= unfetchable +BUILD_DEPENDS= a2x:textproc/asciidoc -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" +USES= autoreconf pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= Doom-Utils -PLIST_FILES= bin/deusf bin/deutex \ +GNU_CONFIGURE= yes + +PLIST_FILES= bin/deutex \ man/man6/${PORTNAME}.6.gz PORTDOCS= * -OPTIONS_DEFINE= DOCS - -post-extract: - @${REINPLACE_CMD} -e 's,-mkdir,mkdir -p,' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,malloc\.h,stdlib.h,' ${WRKSRC}/src/tools.c - @${REINPLACE_CMD} -e '/blockv/s,VOCHEAD,VOCBLOCK1,' \ - ${WRKSRC}/src/sound.c +OPTIONS_DEFINE= DOCS PNG +OPTIONS_DEFAULT= PNG -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/deusf ${WRKSRC}/deutex \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 \ - ${STAGEDIR}${MAN6PREFIX}/man/man6 +PNG_LIB_DEPENDS= libpng.so:graphics/png do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/dtexman6.txt ${STAGEDIR}${DOCSDIR}/MANUAL + ${INSTALL_MAN} ${WRKSRC}/NEWS.adoc ${WRKSRC}/README.adoc ${STAGEDIR}${DOCSDIR} .include diff --git a/archivers/deutex/distinfo b/archivers/deutex/distinfo index 3e7381a8adff..f2c3b8c0d46a 100644 --- a/archivers/deutex/distinfo +++ b/archivers/deutex/distinfo @@ -1,2 +1,3 @@ -SHA256 (deutex-4.4.0.tar.gz) = e87ff2984c6555f30408ee7aa4e6461aac6f1d3d0a1e21b4e12a797a057ba3b7 -SIZE (deutex-4.4.0.tar.gz) = 215945 +TIMESTAMP = 1565106114 +SHA256 (Doom-Utils-deutex-v5.2.0_GH0.tar.gz) = a53928d2af4dec88da4a644384766cfc94512cc8531ff9fcbaaf7012dd6de56d +SIZE (Doom-Utils-deutex-v5.2.0_GH0.tar.gz) = 124341 diff --git a/archivers/deutex/files/patch-src_deutex.h b/archivers/deutex/files/patch-src_deutex.h deleted file mode 100644 index e410fcd1e6ed..000000000000 --- a/archivers/deutex/files/patch-src_deutex.h +++ /dev/null @@ -1,33 +0,0 @@ ---- src/deutex.h.orig 1999-12-30 23:20:22 UTC -+++ src/deutex.h -@@ -31,23 +31,13 @@ Place, Suite 330, Boston, MA 02111-1307, - #define DeuSF for DOS .EXE Unix Linux OS/2 - *********************************************/ - --#if defined (__alpha) /*__ALPHA__ for Alpha processor?*/ --/*long = int64 on a 64bit processor*/ --typedef char Int8; --typedef short Int16; --typedef int Int32; --typedef unsigned char UInt8; --typedef unsigned short UInt16; --typedef unsigned int UInt32; --#else --/*long = Int32 on a 32 bit processor*/ --typedef char Int8; --typedef short Int16; --typedef long Int32; --typedef unsigned char UInt8; --typedef unsigned short UInt16; --typedef unsigned long UInt32; --#endif -+#include -+typedef int8_t Int8; -+typedef int16_t Int16; -+typedef int32_t Int32; -+typedef uint8_t UInt8; -+typedef uint16_t UInt16; -+typedef uint32_t UInt32; - - #if defined DeuTex - #if defined DeuSF -- cgit From ba3408fa318b45c1bb60ff810766bef992d68def Mon Sep 17 00:00:00 2001 From: zi Date: Fri, 9 Aug 2019 13:07:39 +0000 Subject: - Reset maintainer due to fatal email bounces Reported by: portscout --- security/fprintd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile index cccc7a6755a2..277d23893dc9 100644 --- a/security/fprintd/Makefile +++ b/security/fprintd/Makefile @@ -5,7 +5,7 @@ DISTVERSIONPREFIX= V_ DISTVERSION= 0_8_1 CATEGORIES= security -MAINTAINER= la5lbtyi@aon.at +MAINTAINER= ports@FreeBSD.org COMMENT= Daemon that provides fingerprint scanning functionality over D-Bus LICENSE= GPLv2 -- cgit From 25a45ea37f90a235463890dde05588483d993ff2 Mon Sep 17 00:00:00 2001 From: jrm Date: Fri, 9 Aug 2019 13:20:37 +0000 Subject: sysutils/doctl: Update to version 1.27.0 Upstream changes: https://github.com/digitalocean/doctl/releases/tag/v1.27.0 Sponsored by: DigitalOcean [1] [1] DigitalOcean provided free credit for a VM to test doctl --- sysutils/doctl/Makefile | 2 +- sysutils/doctl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/doctl/Makefile b/sysutils/doctl/Makefile index de00104723b0..bd3a33dcb90e 100644 --- a/sysutils/doctl/Makefile +++ b/sysutils/doctl/Makefile @@ -2,7 +2,7 @@ PORTNAME= doctl DISTVERSIONPREFIX= v -DISTVERSION= 1.26.3 +DISTVERSION= 1.27.0 CATEGORIES= sysutils MAINTAINER= jrm@FreeBSD.org diff --git a/sysutils/doctl/distinfo b/sysutils/doctl/distinfo index 3d542d78827f..f4e95400df56 100644 --- a/sysutils/doctl/distinfo +++ b/sysutils/doctl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565102397 -SHA256 (digitalocean-doctl-v1.26.3_GH0.tar.gz) = d8a0f613ade919188e378fd72145f74d199df5d74fc5b5ef3f7437dbf46ac190 -SIZE (digitalocean-doctl-v1.26.3_GH0.tar.gz) = 3171700 +TIMESTAMP = 1565356126 +SHA256 (digitalocean-doctl-v1.27.0_GH0.tar.gz) = a91e7d78da62bc965a9440cb087e5583d945ce10a3e59211992a304a16f26cad +SIZE (digitalocean-doctl-v1.27.0_GH0.tar.gz) = 3149741 -- cgit From 2b108dbf8cca9c6b2c747cf66f2a5fb1f196906f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 13:38:02 +0000 Subject: Relax USES=python typing-extensions 3.7.4 supports Python 3.7. --- devel/py-typing-extensions/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-typing-extensions/Makefile b/devel/py-typing-extensions/Makefile index 996b33189d1a..9e3134b24e36 100644 --- a/devel/py-typing-extensions/Makefile +++ b/devel/py-typing-extensions/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PY_TYPING} -USES= python:-3.6 +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -- cgit From 96190aa9aa7a2645258c057f0cded53d70bb9436 Mon Sep 17 00:00:00 2001 From: cmt Date: Fri, 9 Aug 2019 14:06:34 +0000 Subject: net-mgmt/check_ssl_cert: update to 1.87.0 https://github.com/matteocorti/check_ssl_cert/releases --- net-mgmt/check_ssl_cert/Makefile | 2 +- net-mgmt/check_ssl_cert/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-mgmt/check_ssl_cert/Makefile b/net-mgmt/check_ssl_cert/Makefile index da27005c13b6..f8c54037c382 100644 --- a/net-mgmt/check_ssl_cert/Makefile +++ b/net-mgmt/check_ssl_cert/Makefile @@ -2,7 +2,7 @@ PORTNAME= check_ssl_cert DISTVERSIONPREFIX= v -DISTVERSION= 1.86.0 +DISTVERSION= 1.87.0 CATEGORIES= net-mgmt MAINTAINER= cmt@FreeBSD.org diff --git a/net-mgmt/check_ssl_cert/distinfo b/net-mgmt/check_ssl_cert/distinfo index 3cb3668c0700..8b5d3cc44aa7 100644 --- a/net-mgmt/check_ssl_cert/distinfo +++ b/net-mgmt/check_ssl_cert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564517536 -SHA256 (matteocorti-check_ssl_cert-v1.86.0_GH0.tar.gz) = f42eca406a6c39e3ac2cc59ffaacdb2674e08aebe814e4804c3b064cf541549d -SIZE (matteocorti-check_ssl_cert-v1.86.0_GH0.tar.gz) = 194234 +TIMESTAMP = 1565349285 +SHA256 (matteocorti-check_ssl_cert-v1.87.0_GH0.tar.gz) = 6fea366221f6e84c9f68399253b494e63dd91320d88fcae17e1186d95ebd0023 +SIZE (matteocorti-check_ssl_cert-v1.87.0_GH0.tar.gz) = 194317 -- cgit From 73a519c4ab72a361db716e7da428813d66a83eeb Mon Sep 17 00:00:00 2001 From: jgh Date: Fri, 9 Aug 2019 15:36:02 +0000 Subject: - reclaim maintainership - pet portlint - add gplv2 license --- mail/muttils/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mail/muttils/Makefile b/mail/muttils/Makefile index 99e4ddc269d3..b769504e93ce 100644 --- a/mail/muttils/Makefile +++ b/mail/muttils/Makefile @@ -8,14 +8,17 @@ MASTER_SITES= https://bitbucket.org/blacktrash/${PORTNAME}/get/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jgh@FreeBSD.org COMMENT= Python utilities for console mail clients (eg. mutt) +LICENSE= GPLv2 + +USES= python:2.7 + CONFLICTS= zh-wenju-[0-9]* talkfilters-[0-9]* reed-[0-9]* CHANGESET= 8bb26094df06 WRKSRC= ${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET} -USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * -- cgit From 7f9f0ba7300838aa729dffd3f94f6ebe3bb4d917 Mon Sep 17 00:00:00 2001 From: leres Date: Fri, 9 Aug 2019 16:47:32 +0000 Subject: security/vuxml: Mark bro < 2.6.3 as vulnerable as per: https://raw.githubusercontent.com/zeek/zeek/1d874e5548a58b3b8fd2a342fe4aa0944e779809/NEWS The issues are a null pointer dereference in the RPC analysis code and a signed integer overflow in BinPAC-generated parser code. Approved by: matthew (mentor, implicit) --- security/vuxml/vuln.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index f51c654dc0e2..99ed2adbc54e 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -58,6 +58,50 @@ Notes: * Do not forget port variants (linux-f10-libxml2, libxml2, etc.) --> + + bro -- Null pointer dereference and Signed integer overflow + + + bro + 2.6.3 + + + + +

Jon Siwek of Corelight reports:

+
+

This is a security patch release to address potential + Denial of Service vulnerabilities:

+
    +
  • + Null pointer dereference in the RPC analysis code. RPC + analyzers (e.g. MOUNT or NFS) are not enabled in the + default configuration.
  • + +
  • + Signed integer overflow in BinPAC-generated parser code. + The result of this is Undefined Behavior with respect to + the array bounds checking conditions that BinPAC generates, + so it's unpredictable what an optimizing compiler may + actually do under the assumption that signed integer + overlows should never happen. The specific symptom which + lead to finding this issue was with the PE analyzer causing + out-of-memory crashes due to large allocations that were + otherwise prevented when the array bounds checking logic + was changed to prevent any possible signed integer overlow.
  • +
+
+ +
+ + https://raw.githubusercontent.com/zeek/zeek/1d874e5548a58b3b8fd2a342fe4aa0944e779809/NEWS + + + 2019-06-22 + 2019-08-09 + +
+ PostgresSQL -- TYPE in pg_temp execute arbitrary SQL during `SECURITY DEFINER` execution -- cgit From 99d743d2903ea872766a6afbf42c90bdf262b5a6 Mon Sep 17 00:00:00 2001 From: leres Date: Fri, 9 Aug 2019 16:59:52 +0000 Subject: security/bro: Update to 2.6.3 and address potential denial of service vulnerabilities: https://raw.githubusercontent.com/zeek/zeek/1d874e5548a58b3b8fd2a342fe4aa0944e779809/NEWS - Null pointer dereference in the RPC analysis code. RPC analyzers (e.g. MOUNT or NFS) are not enabled in the default configuration. - Signed integer overflow in BinPAC-generated parser code. The result of this is Undefined Behavior with respect to the array bounds checking conditions that BinPAC generates, so it's unpredictable what an optimizing compiler may actually do under the assumption that signed integer overlows should never happen. The specific symptom which lead to finding this issue was with the PE analyzer causing out-of-memory crashes due to large allocations that were otherwise prevented when the array bounds checking logic was changed to prevent any possible signed integer overlow. Approved by: matthew (mentor, implicit) MFH: 2019Q3 Security: f56669f5-d799-4ff5-9174-64a6d571c451 --- security/bro/Makefile | 3 +-- security/bro/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/security/bro/Makefile b/security/bro/Makefile index c063ce64d5c8..d48a7074f3e1 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bro -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.6.3 CATEGORIES= security MASTER_SITES= https://www.zeek.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/security/bro/distinfo b/security/bro/distinfo index 2422966a02dc..3a6f2d77cbb6 100644 --- a/security/bro/distinfo +++ b/security/bro/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1559318790 -SHA256 (bro-2.6.2.tar.gz) = 6df6876f3f7b1dd8afeb3d5f88bfb9269f52d5d796258c4414bdd91aa2eac0a6 -SIZE (bro-2.6.2.tar.gz) = 28477996 +TIMESTAMP = 1565320389 +SHA256 (bro-2.6.3.tar.gz) = 469dd7456af388ba65d8722fbfdd5b9182f14def16149aa5ebceb1cfd881697f +SIZE (bro-2.6.3.tar.gz) = 28480249 SHA256 (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 383423f92932c3ef244194954708b3a237b4f37ebc358014f51dcb3b9786896b SIZE (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 24630 -- cgit From a38121393fc030a336350098eaf00b6dcf5b45b5 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 9 Aug 2019 17:23:29 +0000 Subject: sysutils/crate: Improve the BROKEN statements; Add emulators to CATEGORIES The BROKEN statement now is triggered by the presence of the STL's 'filesystem' feature instead of the system version. Submitted by: jbeich (patch for BROKEN statements) --- sysutils/crate/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index 3c875de61e51..a6c3f65e66ab 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -2,7 +2,7 @@ PORTNAME= crate DISTVERSION= 0.1.1 -CATEGORIES= sysutils +CATEGORIES= sysutils emulators MAINTAINER= yuri@FreeBSD.org COMMENT= Containerizer for FreeBSD (alpha-software, expect bugs) @@ -10,9 +10,8 @@ COMMENT= Containerizer for FreeBSD (alpha-software, expect bugs) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= STL feature 'filesystem' isn't available on 11 -.if defined(PACKAGE_BUILDING) -BROKEN_FreeBSD_12= STL feature 'filesystem' isn't available in 12.0-RELEASE-p7 +.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/filesystem) +BROKEN= STL feature 'filesystem' isn't available # ' .endif BUILD_DEPENDS= rang>0:devel/rang -- cgit From 5446adffec12d3a209ae6e72d9a6d3cb0ecd9a65 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 18:34:46 +0000 Subject: Revert r508450 r508454 has fixed the problem (bulk -a with BUILD_ALL_PYTHON_FLAVORS). --- devel/py-mypy/Makefile | 2 +- devel/thonny/Makefile | 2 +- science/py-chainer-chemistry/Makefile | 2 +- science/py-chainer/Makefile | 2 +- science/py-onnx/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile index 3d17bf5bad35..0bb25f2684c5 100644 --- a/devel/py-mypy/Makefile +++ b/devel/py-mypy/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0.4.0<0.5.0:devel/py-mypy_e ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.4.0<1.5.0:devel/py-typed-ast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} -USES= python:3.5-3.6 shebangfix +USES= python:3.5+ shebangfix USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/thonny/Makefile b/devel/thonny/Makefile index b0e5eafb6967..793d0880eb07 100644 --- a/devel/thonny/Makefile +++ b/devel/thonny/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= pylint:devel/pylint \ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}serial>=3.2.1:comms/py-serial@${PY_FLAVOR} -USES= python:3.5-3.6 +USES= python:3.5+ USE_PYTHON= autoplist distutils .include diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile index 6255c7c1c8f7..a8687c0814e8 100644 --- a/science/py-chainer-chemistry/Makefile +++ b/science/py-chainer-chemistry/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} -USES= python:-3.6 +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile index 31f4a0aaefd4..490416db6e4c 100644 --- a/science/py-chainer/Makefile +++ b/science/py-chainer/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python:-3.6 +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/science/py-onnx/Makefile b/science/py-onnx/Makefile index f1d65a3b6e84..acb7d1b82715 100644 --- a/science/py-onnx/Makefile +++ b/science/py-onnx/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python:-3.6 +USES= python USE_PYTHON= distutils concurrent autoplist BINARY_ALIAS= python=${PYTHON_CMD} -- cgit From 6f498c18a4298d83a7c537e897909ec51147195c Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 9 Aug 2019 18:55:02 +0000 Subject: Upgrade to v1.31.0. Release notes at . --- devel/libuv/Makefile | 2 +- devel/libuv/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile index 63bf127da288..86b6075f7ebf 100644 --- a/devel/libuv/Makefile +++ b/devel/libuv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libuv -PORTVERSION= 1.30.1 +PORTVERSION= 1.31.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/libuv/distinfo b/devel/libuv/distinfo index b19d0e240e53..852cc102ff93 100644 --- a/devel/libuv/distinfo +++ b/devel/libuv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562096661 -SHA256 (libuv-libuv-v1.30.1_GH0.tar.gz) = d85566c2c4eae7d8e2c2d27d40e728fea29f9086e98e795c5cdce1a790f43de5 -SIZE (libuv-libuv-v1.30.1_GH0.tar.gz) = 1228593 +TIMESTAMP = 1565375007 +SHA256 (libuv-libuv-v1.31.0_GH0.tar.gz) = ab041ea5d1965a33d4e03ea87718b8922ba4e54abb46c71cf9e040edef2556c0 +SIZE (libuv-libuv-v1.31.0_GH0.tar.gz) = 1238566 -- cgit From 55729c6149d2f670f1acd3f816cc7bf1352a4ba3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:00:48 +0000 Subject: Add py-pebble 4.3.10 Pebble provides a neat API to manage threads and processes within an application. WWW: https://github.com/noxdafox/pebble --- devel/Makefile | 1 + devel/py-pebble/Makefile | 27 +++++++++++++++++++++++++++ devel/py-pebble/distinfo | 3 +++ devel/py-pebble/pkg-descr | 4 ++++ 4 files changed, 35 insertions(+) create mode 100644 devel/py-pebble/Makefile create mode 100644 devel/py-pebble/distinfo create mode 100644 devel/py-pebble/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index 3773b6d29831..0b06b68e2a7d 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4726,6 +4726,7 @@ SUBDIR += py-pathtools SUBDIR += py-paver SUBDIR += py-pbr + SUBDIR += py-pebble SUBDIR += py-pefile SUBDIR += py-pendulum SUBDIR += py-pep8-naming diff --git a/devel/py-pebble/Makefile b/devel/py-pebble/Makefile new file mode 100644 index 000000000000..708b55e01ef3 --- /dev/null +++ b/devel/py-pebble/Makefile @@ -0,0 +1,27 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= pebble +PORTVERSION= 4.3.10 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= Pebble-${PORTVERSION} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Threading and multiprocessing eye-candy + +LICENSE= LGPL3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PY_FUTURES} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +post-patch: + @${REINPLACE_CMD} -e 's|"{}".format(package_version())|"${PORTVERSION}"|' ${WRKSRC}/setup.py + +.include diff --git a/devel/py-pebble/distinfo b/devel/py-pebble/distinfo new file mode 100644 index 000000000000..4c3ad12923e3 --- /dev/null +++ b/devel/py-pebble/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565352584 +SHA256 (Pebble-4.3.10.tar.gz) = c39a7bf99af6525fcf0783a8859fb10a4f20f4f988ddb66fd6fa7588f9c91731 +SIZE (Pebble-4.3.10.tar.gz) = 24393 diff --git a/devel/py-pebble/pkg-descr b/devel/py-pebble/pkg-descr new file mode 100644 index 000000000000..09c1f9a981d8 --- /dev/null +++ b/devel/py-pebble/pkg-descr @@ -0,0 +1,4 @@ +Pebble provides a neat API to manage threads and processes within an +application. + +WWW: https://github.com/noxdafox/pebble -- cgit From 6f7d051e60a2f87e4ee9a64614cbb42956ccf88e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:00:54 +0000 Subject: Add py-django-modelcluster4 4.4 (copied from py-django-modelcluster) - Add PORTSCOUT --- www/Makefile | 1 + www/py-django-modelcluster4/Makefile | 26 ++++++++++++++++++++++++++ www/py-django-modelcluster4/distinfo | 3 +++ www/py-django-modelcluster4/pkg-descr | 7 +++++++ 4 files changed, 37 insertions(+) create mode 100644 www/py-django-modelcluster4/Makefile create mode 100644 www/py-django-modelcluster4/distinfo create mode 100644 www/py-django-modelcluster4/pkg-descr diff --git a/www/Makefile b/www/Makefile index fa87cfa31131..c6966c547360 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1561,6 +1561,7 @@ SUBDIR += py-django-mezzanine-grappelli SUBDIR += py-django-model-utils SUBDIR += py-django-modelcluster + SUBDIR += py-django-modelcluster4 SUBDIR += py-django-modern-rpc SUBDIR += py-django-mptt SUBDIR += py-django-netfields diff --git a/www/py-django-modelcluster4/Makefile b/www/py-django-modelcluster4/Makefile new file mode 100644 index 000000000000..5d42a43db290 --- /dev/null +++ b/www/py-django-modelcluster4/Makefile @@ -0,0 +1,26 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= django-modelcluster +PORTVERSION= 4.4 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 4 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Django extension for working with clusters of models as a single unit + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2015.2:devel/py-pytz@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +PORTSCOUT= limit:^4\. + +.include diff --git a/www/py-django-modelcluster4/distinfo b/www/py-django-modelcluster4/distinfo new file mode 100644 index 000000000000..d1c33c929982 --- /dev/null +++ b/www/py-django-modelcluster4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554486027 +SHA256 (django-modelcluster-4.4.tar.gz) = 59672386191d38c69d6f994c3f9aaab3ff93910ec71e78a0bb6aa9abd4d1b90a +SIZE (django-modelcluster-4.4.tar.gz) = 22244 diff --git a/www/py-django-modelcluster4/pkg-descr b/www/py-django-modelcluster4/pkg-descr new file mode 100644 index 000000000000..815b73a39d65 --- /dev/null +++ b/www/py-django-modelcluster4/pkg-descr @@ -0,0 +1,7 @@ +django-modelcluster extends Django's foreign key relations to make this +possible. It introduces a new type of relation, ParentalKey, where the related +models are stored locally to the 'parent' model until the parent is explicitly +saved. Up to that point, the related models can still be accessed through a +subset of the QuerySet API. + +WWW: https://github.com/wagtail/django-modelcluster -- cgit From c6db3c585a1abbd079aa907f69c82fa0b645d9ff Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:00 +0000 Subject: Update to 0.14.5 Changes: https://github.com/crsmithdev/arrow/releases https://github.com/crsmithdev/arrow/blob/master/HISTORY.md --- devel/py-arrow/Makefile | 2 +- devel/py-arrow/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile index fdd273b29e97..427a0dcb3f17 100644 --- a/devel/py-arrow/Makefile +++ b/devel/py-arrow/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= arrow -PORTVERSION= 0.14.4 +PORTVERSION= 0.14.5 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-arrow/distinfo b/devel/py-arrow/distinfo index e583a8f86168..71d261cb7d0f 100644 --- a/devel/py-arrow/distinfo +++ b/devel/py-arrow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564577796 -SHA256 (arrow-0.14.4.tar.gz) = 47f37968afeaefd0ba3fe4d0c70dc830985f9ab11beeb381d4fc0e8f8151d3d6 -SIZE (arrow-0.14.4.tar.gz) = 582324 +TIMESTAMP = 1565352586 +SHA256 (arrow-0.14.5.tar.gz) = 0186026cfd94ca4fb773f30cc5398289a3027480d335e0e5c0d2772643763137 +SIZE (arrow-0.14.5.tar.gz) = 590609 -- cgit From 811476c610df53e300749d0a15a9faae11dfe9a6 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:05 +0000 Subject: Update to 10.0.0 Changes: https://docs.openstack.org/oslo.messaging/latest/user/history.html --- devel/py-oslo.messaging/Makefile | 2 +- devel/py-oslo.messaging/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-oslo.messaging/Makefile b/devel/py-oslo.messaging/Makefile index d9620d06f403..858f14cf8b58 100644 --- a/devel/py-oslo.messaging/Makefile +++ b/devel/py-oslo.messaging/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oslo.messaging -PORTVERSION= 9.8.0 +PORTVERSION= 10.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.messaging/distinfo b/devel/py-oslo.messaging/distinfo index 99d2fac0a815..45e76edfe587 100644 --- a/devel/py-oslo.messaging/distinfo +++ b/devel/py-oslo.messaging/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563640709 -SHA256 (oslo.messaging-9.8.0.tar.gz) = d16dd7a3640d18f08afe83b8e045939a6cfeaf09af0940efa1282a73cb879447 -SIZE (oslo.messaging-9.8.0.tar.gz) = 250497 +TIMESTAMP = 1565352588 +SHA256 (oslo.messaging-10.0.0.tar.gz) = 51264774e6868db6ac9fa64d555670c32ab3e6fa1b373c1500649a7181a49223 +SIZE (oslo.messaging-10.0.0.tar.gz) = 251626 -- cgit From a4cb42f133a4a4d6dfa7e667d33a3fba406809ee Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:10 +0000 Subject: Update to 2.3.0 Changes: https://docs.openstack.org/oslo.policy/latest/user/history.html --- devel/py-oslo.policy/Makefile | 2 +- devel/py-oslo.policy/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile index 06136492d053..e9bc849cb0f8 100644 --- a/devel/py-oslo.policy/Makefile +++ b/devel/py-oslo.policy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oslo.policy -PORTVERSION= 2.2.0 +PORTVERSION= 2.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.policy/distinfo b/devel/py-oslo.policy/distinfo index 941033c881ba..8200cdd12e81 100644 --- a/devel/py-oslo.policy/distinfo +++ b/devel/py-oslo.policy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556375516 -SHA256 (oslo.policy-2.2.0.tar.gz) = eadaaae32d6f653634ebf1e2cdf87ae21d6f05d555c0a0daa577c905ea31893b -SIZE (oslo.policy-2.2.0.tar.gz) = 91297 +TIMESTAMP = 1565352590 +SHA256 (oslo.policy-2.3.0.tar.gz) = 9a79099384f3e2828e220a533543624d59533f1328689e89721b341bff7a9e8f +SIZE (oslo.policy-2.3.0.tar.gz) = 91306 -- cgit From a80b4135a2999a7d1ad1d28d8f8155ffdb834b72 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:16 +0000 Subject: Update to 0.4.2.7 Changes: https://github.com/KimiNewt/pyshark/releases https://github.com/KimiNewt/pyshark/commits/master --- net/py-pyshark/Makefile | 2 +- net/py-pyshark/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index 4e860fe5395d..08e4824c24dd 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyshark -PORTVERSION= 0.4.2.6 +PORTVERSION= 0.4.2.7 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyshark/distinfo b/net/py-pyshark/distinfo index 863a578a7de0..29d6bb2846bf 100644 --- a/net/py-pyshark/distinfo +++ b/net/py-pyshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565282900 -SHA256 (pyshark-0.4.2.6.tar.gz) = 7a81f1df8536d5f3cabf3db83b3ee7b5e4afbc2ca686e4caf5b36e0e218b6dc6 -SIZE (pyshark-0.4.2.6.tar.gz) = 19917 +TIMESTAMP = 1565352592 +SHA256 (pyshark-0.4.2.7.tar.gz) = 9927274efef35119aecaafbc8b9cd652deb579853d933a8fb2a0ee3266d488d6 +SIZE (pyshark-0.4.2.7.tar.gz) = 19906 -- cgit From 9238ccb2458530dd771bc65873597cecb88fac5f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:21 +0000 Subject: Add TAGGIT option It uses py-dj22-django-taggit because Django 1.11 support was removed in 5.0 update. --- www/py-django-modelcluster/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/www/py-django-modelcluster/Makefile b/www/py-django-modelcluster/Makefile index 72bee6aee0a0..0bb45efb09cf 100644 --- a/www/py-django-modelcluster/Makefile +++ b/www/py-django-modelcluster/Makefile @@ -20,4 +20,9 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes +OPTIONS_DEFINE= TAGGIT +TAGGIT_DESC= Tagging support + +TAGGIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0.20:www/py-dj22-django-taggit@${PY_FLAVOR} + .include -- cgit From ccf58539dd70d9319af687708a5f663fc83b373a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:26 +0000 Subject: Change RUN_DEPENDS from py-django-modelcluster to py-django-modelcluster4 - Bump PORTREVISION for dependency change --- www/py-wagtail/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile index d2b4509c2c9d..5b09a7d094a8 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -3,6 +3,7 @@ PORTNAME= wagtail PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup460>=4.5.1<4.6.1:www/py-beautifulsoup460@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django22>=2.0<2.3:www/py-django22@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-modelcluster>=4.2<5.0:www/py-django-modelcluster@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-modelcluster4>=4.2<5.0:www/py-django-modelcluster4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0.23<1.0:www/py-dj22-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-treebeard>=4.2.0<5.0:www/py-dj22-django-treebeard@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.7.4<4.0:www/py-dj22-djangorestframework@${PY_FLAVOR} \ -- cgit From b09e8f6be5b959e3a581a9f4022b23ce99b9e6b7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:31 +0000 Subject: Update to 2.11.329 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 62ac35674e63..4f3b0819dd59 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.328 +DISTVERSION= 2.11.329 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 7b65a7fcd09f..2ee3f7a461ff 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565282910 -SHA256 (rubygem/aws-sdk-2.11.328.gem) = 72d027944c1fedca6f5b3bd3777547925a4562495e0666659ff49a6a13bd6fdc -SIZE (rubygem/aws-sdk-2.11.328.gem) = 4608 +TIMESTAMP = 1565352594 +SHA256 (rubygem/aws-sdk-2.11.329.gem) = b9e25b021ed9612efacfc2c1e0f47cfee47e67df8ef6a84e074403fc6383d6f2 +SIZE (rubygem/aws-sdk-2.11.329.gem) = 4608 -- cgit From da756a91004c810fe5fe1dca81ca15706a35a597 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:36 +0000 Subject: Update to 2.11.329 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index c1b641bdfe6d..8d8e3ead2ceb 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.328 +DISTVERSION= 2.11.329 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index c908bc3b5af7..39f5be33105a 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565282913 -SHA256 (rubygem/aws-sdk-core-2.11.328.gem) = c68a1a3315e3e6991436871551c4736592d7305619e73bf061e81431592920fe -SIZE (rubygem/aws-sdk-core-2.11.328.gem) = 1631232 +TIMESTAMP = 1565352596 +SHA256 (rubygem/aws-sdk-core-2.11.329.gem) = 97550fbbea66467b49783ccab3f60633023619740ba6facc57f6f21419d84c1e +SIZE (rubygem/aws-sdk-core-2.11.329.gem) = 1635328 -- cgit From 36bf76581ef03ae10159397f083e2856689715fd Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:41 +0000 Subject: Update to 2.11.329 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index caa67cf9ea90..7bda9db4d7e9 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.328 +DISTVERSION= 2.11.329 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 00f5eb871651..6e98c0f295d3 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565282914 -SHA256 (rubygem/aws-sdk-resources-2.11.328.gem) = 294e098ab333bb85657a79f1d1e8d131a0cb085cea7382e74b197dbbf5eb6b21 -SIZE (rubygem/aws-sdk-resources-2.11.328.gem) = 48640 +TIMESTAMP = 1565352598 +SHA256 (rubygem/aws-sdk-resources-2.11.329.gem) = d5af842b68fe7bd9bdf00c4454a0507a4243c8710354923dbf14cbea9e7c4b92 +SIZE (rubygem/aws-sdk-resources-2.11.329.gem) = 48640 -- cgit From d7d96fa4422b30f16e0077909b58dabecdb76fd5 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:46 +0000 Subject: Update to 2.1.0 Changes: https://github.com/rgeo/rgeo/blob/master/History.md --- science/rubygem-rgeo/Makefile | 2 +- science/rubygem-rgeo/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/science/rubygem-rgeo/Makefile b/science/rubygem-rgeo/Makefile index d4f735e6e4af..7ece7f352b5c 100644 --- a/science/rubygem-rgeo/Makefile +++ b/science/rubygem-rgeo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rgeo -PORTVERSION= 2.0.1 +PORTVERSION= 2.1.0 CATEGORIES= science rubygems MASTER_SITES= RG diff --git a/science/rubygem-rgeo/distinfo b/science/rubygem-rgeo/distinfo index 072d1f09fc87..ffb3a670feb7 100644 --- a/science/rubygem-rgeo/distinfo +++ b/science/rubygem-rgeo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552063683 -SHA256 (rubygem/rgeo-2.0.1.gem) = 9b733cba708f366a4766ade0ce36433b81256b4ff9974ac349c4f57c4aa993d2 -SIZE (rubygem/rgeo-2.0.1.gem) = 103936 +TIMESTAMP = 1565352600 +SHA256 (rubygem/rgeo-2.1.0.gem) = f0fe40f73b48abe87c9ddfcb62cb3d026b93fc146b16b75528eb287d88c8a476 +SIZE (rubygem/rgeo-2.1.0.gem) = 103936 -- cgit From 8b7fba55fa841d555e4ee5df5208796321b1c960 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:52 +0000 Subject: Update to 1.01 Changes: https://metacpan.org/changes/distribution/Module-CPANTS-Analyse --- devel/p5-Module-CPANTS-Analyse/Makefile | 2 +- devel/p5-Module-CPANTS-Analyse/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile index 83bf554db0bc..f23eaf28c485 100644 --- a/devel/p5-Module-CPANTS-Analyse/Makefile +++ b/devel/p5-Module-CPANTS-Analyse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Module-CPANTS-Analyse -PORTVERSION= 1.00 +PORTVERSION= 1.01 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Module-CPANTS-Analyse/distinfo b/devel/p5-Module-CPANTS-Analyse/distinfo index 1d46d61beb43..756d477fb3f1 100644 --- a/devel/p5-Module-CPANTS-Analyse/distinfo +++ b/devel/p5-Module-CPANTS-Analyse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549316301 -SHA256 (Module-CPANTS-Analyse-1.00.tar.gz) = 429929cb56b2c5a50caa204ab736ffd09cb8272e9d24e1980ee88e06a078e764 -SIZE (Module-CPANTS-Analyse-1.00.tar.gz) = 38350 +TIMESTAMP = 1565352602 +SHA256 (Module-CPANTS-Analyse-1.01.tar.gz) = bd990ba4d0051b6db2284cab840699e33af542d88182fd454cfa70ead31ec849 +SIZE (Module-CPANTS-Analyse-1.01.tar.gz) = 38930 -- cgit From d295d228bce8655374ddab296e3cecde761c0ac8 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:01:57 +0000 Subject: Update to 1.51 - Take maintainership Changes: https://metacpan.org/changes/distribution/Scalar-List-Utils --- lang/p5-Scalar-List-Utils/Makefile | 4 ++-- lang/p5-Scalar-List-Utils/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/p5-Scalar-List-Utils/Makefile b/lang/p5-Scalar-List-Utils/Makefile index 6ff495228909..80bd14e0cc0c 100644 --- a/lang/p5-Scalar-List-Utils/Makefile +++ b/lang/p5-Scalar-List-Utils/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= Scalar-List-Utils -PORTVERSION= 1.50 +PORTVERSION= 1.51 PORTEPOCH= 1 CATEGORIES= lang perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= perl@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Perl subroutines that would be nice to have in the perl core LICENSE= ART10 GPLv1+ diff --git a/lang/p5-Scalar-List-Utils/distinfo b/lang/p5-Scalar-List-Utils/distinfo index 286ece2b968d..fe7fa28f3852 100644 --- a/lang/p5-Scalar-List-Utils/distinfo +++ b/lang/p5-Scalar-List-Utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519217628 -SHA256 (Scalar-List-Utils-1.50.tar.gz) = 06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675 -SIZE (Scalar-List-Utils-1.50.tar.gz) = 96244 +TIMESTAMP = 1565352604 +SHA256 (Scalar-List-Utils-1.51.tar.gz) = d9c8eab1ac5a6fc75a7e836304626e2cb7b13cf8c9b10d491a144e1ef6760a76 +SIZE (Scalar-List-Utils-1.51.tar.gz) = 96859 -- cgit From 1288438f3aad8c15ce59d9337edf71deba04c464 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:02:04 +0000 Subject: Update to 0.37.0 Changes: https://github.com/certbot/certbot/blob/master/CHANGELOG.md --- security/py-acme/distinfo | 6 +++--- security/py-acme/version.mk | 2 +- security/py-certbot-apache/distinfo | 6 +++--- security/py-certbot-dns-cloudflare/distinfo | 6 +++--- security/py-certbot-dns-cloudxns/distinfo | 6 +++--- security/py-certbot-dns-digitalocean/distinfo | 6 +++--- security/py-certbot-dns-dnsimple/distinfo | 6 +++--- security/py-certbot-dns-dnsmadeeasy/distinfo | 6 +++--- security/py-certbot-dns-gehirn/distinfo | 6 +++--- security/py-certbot-dns-google/distinfo | 6 +++--- security/py-certbot-dns-linode/distinfo | 6 +++--- security/py-certbot-dns-luadns/distinfo | 6 +++--- security/py-certbot-dns-nsone/distinfo | 6 +++--- security/py-certbot-dns-ovh/distinfo | 6 +++--- security/py-certbot-dns-rfc2136/distinfo | 6 +++--- security/py-certbot-dns-route53/Makefile | 2 +- security/py-certbot-dns-route53/distinfo | 6 +++--- security/py-certbot-dns-sakuracloud/distinfo | 6 +++--- security/py-certbot-nginx/distinfo | 6 +++--- security/py-certbot/distinfo | 6 +++--- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index 58ca103398d7..d573cf9e5e1b 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (acme-0.36.0.tar.gz) = 0461ee3c882d865e98e624561843dc135fa1a1412b15603d7ebfbb392de6a668 -SIZE (acme-0.36.0.tar.gz) = 86344 +TIMESTAMP = 1565319958 +SHA256 (acme-0.37.0.tar.gz) = 9178b725ad1f282d3ccab89fbdf36a403447eab7c0c52669279fb33df6fbe161 +SIZE (acme-0.37.0.tar.gz) = 86169 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index 4665cd9f0744..6b73d1bfbe8e 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 0.36.0 +ACME_VERSION= 0.37.0 diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index 5dd1427e46c1..af0a3f5816b2 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-apache-0.36.0.tar.gz) = 458d20a3e9e8a88563d3deb0bbe38752bd2b80100f0e5854e4069390c1b4e5cd -SIZE (certbot-apache-0.36.0.tar.gz) = 180269 +TIMESTAMP = 1565319962 +SHA256 (certbot-apache-0.37.0.tar.gz) = 6d1c413937c0a9419fbd2c67f110cad860e87afdd358650707f32cde71d4fc21 +SIZE (certbot-apache-0.37.0.tar.gz) = 184779 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index d6de34fdc0d1..f848a4d85779 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-cloudflare-0.36.0.tar.gz) = 4f6b6534ea0d273473e500bd95eda27b1f3fbac42fd6dc5a226b9e3e4bc6eae2 -SIZE (certbot-dns-cloudflare-0.36.0.tar.gz) = 13403 +TIMESTAMP = 1565319964 +SHA256 (certbot-dns-cloudflare-0.37.0.tar.gz) = abddf5345ded7f4c72022acb4c4bc39e91a36ac6b72ebd0c07a3c1c341aca81c +SIZE (certbot-dns-cloudflare-0.37.0.tar.gz) = 13008 diff --git a/security/py-certbot-dns-cloudxns/distinfo b/security/py-certbot-dns-cloudxns/distinfo index 83e507cf20cf..73ede42a751f 100644 --- a/security/py-certbot-dns-cloudxns/distinfo +++ b/security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-cloudxns-0.36.0.tar.gz) = 34f4138adfcb8bcbd1f542279c6a882e9e56882a0f231d1bb88426910774dd2f -SIZE (certbot-dns-cloudxns-0.36.0.tar.gz) = 11445 +TIMESTAMP = 1565319966 +SHA256 (certbot-dns-cloudxns-0.37.0.tar.gz) = d8b82aca1d64d58ce1abb2da78523e166729efcdca1952e756f4e27bbf0168f6 +SIZE (certbot-dns-cloudxns-0.37.0.tar.gz) = 11426 diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index 54d5deb872b0..5cdea71a58b3 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-digitalocean-0.36.0.tar.gz) = 5e61d3962c07a04094e913d6ffb6c88846740367010552dc6ff701d91442dd61 -SIZE (certbot-dns-digitalocean-0.36.0.tar.gz) = 12697 +TIMESTAMP = 1565319968 +SHA256 (certbot-dns-digitalocean-0.37.0.tar.gz) = 05d5c5d3da5b003720947bbc7094234b9409d07019c1e075ea593ee8b90b5841 +SIZE (certbot-dns-digitalocean-0.37.0.tar.gz) = 12701 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 748e07078f45..66d98f416694 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-dnsimple-0.36.0.tar.gz) = f3758ff3a4b8e013930bcc22eb844e0c061af18dce9f73c1b7bd59e9f7042d31 -SIZE (certbot-dns-dnsimple-0.36.0.tar.gz) = 11636 +TIMESTAMP = 1565319970 +SHA256 (certbot-dns-dnsimple-0.37.0.tar.gz) = 3cdfd04b126c93d98750c9edad642379f78fe6649e02ed0da5cc2d957d1a3dfa +SIZE (certbot-dns-dnsimple-0.37.0.tar.gz) = 11732 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 55ba9b138506..8db4b248dff5 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-dnsmadeeasy-0.36.0.tar.gz) = 5abeda3782edd1ad805385d0ddfea2f543f21a06b232b74b923511982931f352 -SIZE (certbot-dns-dnsmadeeasy-0.36.0.tar.gz) = 11472 +TIMESTAMP = 1565319972 +SHA256 (certbot-dns-dnsmadeeasy-0.37.0.tar.gz) = a8fc34da562f8cd32d8ea8f17953937d499a752d114060263b61eb491428b998 +SIZE (certbot-dns-dnsmadeeasy-0.37.0.tar.gz) = 11503 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index 0b30b117c99f..a8eca48d244f 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-gehirn-0.36.0.tar.gz) = 110caa0e752ab3c41b61b53f458393b512b3630e7cfbe298a76b1f098e6460ff -SIZE (certbot-dns-gehirn-0.36.0.tar.gz) = 11501 +TIMESTAMP = 1565319974 +SHA256 (certbot-dns-gehirn-0.37.0.tar.gz) = d9b4e5b11e1b6f627983f902e94d3d0a6cdcb82d2f9604aa64d265818c915a30 +SIZE (certbot-dns-gehirn-0.37.0.tar.gz) = 11567 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index 2ec645ca50a5..345253e86417 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-google-0.36.0.tar.gz) = 0ab39b90ee255767ddb76de24b4555a14a5a9265697cbe5ff853a21bad80b79f -SIZE (certbot-dns-google-0.36.0.tar.gz) = 22419 +TIMESTAMP = 1565319976 +SHA256 (certbot-dns-google-0.37.0.tar.gz) = 9a2246adff4bc673037c0b5cdff3675ee26fb8d5f4c2231a14c8a06d4b269e06 +SIZE (certbot-dns-google-0.37.0.tar.gz) = 22116 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index be4796b4e188..8fdabc4949a3 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-linode-0.36.0.tar.gz) = c731ca3d58c3d00b964ccdca8f5af6243017ea58cc7d02e4990338e3f0d03b66 -SIZE (certbot-dns-linode-0.36.0.tar.gz) = 12192 +TIMESTAMP = 1565319978 +SHA256 (certbot-dns-linode-0.37.0.tar.gz) = f85d63840b34faddc0835a63235ffe61a6025544158dbd7479ebdcb4f16c9c39 +SIZE (certbot-dns-linode-0.37.0.tar.gz) = 12083 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index e9eac6cd4632..c5f20723a92e 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-luadns-0.36.0.tar.gz) = 766e492a5994889dc0edc155d9c228bd4fefd6174b5222af5bfd88388e5d48e4 -SIZE (certbot-dns-luadns-0.36.0.tar.gz) = 11349 +TIMESTAMP = 1565319980 +SHA256 (certbot-dns-luadns-0.37.0.tar.gz) = 2d1d50bcc926c14e2efe7ed9e2df02d12e0d6999885a23ee7859fdd9ef6f4adf +SIZE (certbot-dns-luadns-0.37.0.tar.gz) = 11632 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 63b105ea2c4f..af6be38234d5 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-nsone-0.36.0.tar.gz) = 82fd1b650b03d065789883f655541485e0e282b9f06258e92ba38134f1e6f20a -SIZE (certbot-dns-nsone-0.36.0.tar.gz) = 11386 +TIMESTAMP = 1565319982 +SHA256 (certbot-dns-nsone-0.37.0.tar.gz) = 1d5a0561054dcdfc44a52900251166e3e6c6bc3bd296a9bf1c597efea3a63097 +SIZE (certbot-dns-nsone-0.37.0.tar.gz) = 11373 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index 6d03f12a33e2..716ac6b6c4b7 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-ovh-0.36.0.tar.gz) = 9b05e71715bd1f83c92d6ab5582f57bb900ffddc2871f7612cff4961c69a4b62 -SIZE (certbot-dns-ovh-0.36.0.tar.gz) = 11859 +TIMESTAMP = 1565319984 +SHA256 (certbot-dns-ovh-0.37.0.tar.gz) = cc5f2dfe47fd531cc76195e527e5364e502d7071085753cc843173e3a2ab1140 +SIZE (certbot-dns-ovh-0.37.0.tar.gz) = 11689 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 653199783c2e..3f2966d7ec0b 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-rfc2136-0.36.0.tar.gz) = c8991c562a40d43d748944e9d353807693285ba6589ef92aa268aed024c1f579 -SIZE (certbot-dns-rfc2136-0.36.0.tar.gz) = 13971 +TIMESTAMP = 1565319986 +SHA256 (certbot-dns-rfc2136-0.37.0.tar.gz) = 0ebb42200aa51e999cf2a07947cbf9edd84912b3f562f8b36b40ad0e059e303b +SIZE (certbot-dns-rfc2136-0.37.0.tar.gz) = 13682 diff --git a/security/py-certbot-dns-route53/Makefile b/security/py-certbot-dns-route53/Makefile index 7842f22fec51..6e5569f8bebf 100644 --- a/security/py-certbot-dns-route53/Makefile +++ b/security/py-certbot-dns-route53/Makefile @@ -10,7 +10,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Route53 DNS Authenticator plugin for Certbot LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index f0b0f05bbdd6..3463f46b254a 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-route53-0.36.0.tar.gz) = 7632a7d7670714820fdbb9a068d43934fab4e5da325cb6d78e8b02b99bad8316 -SIZE (certbot-dns-route53-0.36.0.tar.gz) = 14178 +TIMESTAMP = 1565319988 +SHA256 (certbot-dns-route53-0.37.0.tar.gz) = a5a418bec8f2b2619614887d1fd5c117b276f061038090d475ba1145888d4afc +SIZE (certbot-dns-route53-0.37.0.tar.gz) = 14412 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index d0981b1a9e45..781ede160e8b 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-dns-sakuracloud-0.36.0.tar.gz) = 3aea095b6fe5e6a50c34e2671387c06d50ad6361fbb09be258ffe34defd44cc6 -SIZE (certbot-dns-sakuracloud-0.36.0.tar.gz) = 11327 +TIMESTAMP = 1565319990 +SHA256 (certbot-dns-sakuracloud-0.37.0.tar.gz) = 75b66b6edfda5614f8f6911f9708b663cfdfc8ba8f983da25e6c76d49d7c9af3 +SIZE (certbot-dns-sakuracloud-0.37.0.tar.gz) = 11594 diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index cbee575f86f6..e90d1323d827 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-nginx-0.36.0.tar.gz) = 4c34e6114dd8204b6667f101579dd9ab2b38fef0dd5a15702585edcb2aefb322 -SIZE (certbot-nginx-0.36.0.tar.gz) = 76634 +TIMESTAMP = 1565319992 +SHA256 (certbot-nginx-0.37.0.tar.gz) = 93c9f8d934b886e5632e1658ea411fbbded9fa55dc07a5bc35d493e2a6cc4ffe +SIZE (certbot-nginx-0.37.0.tar.gz) = 76627 diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index 73338e7d5dcf..0e411d646918 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562931670 -SHA256 (certbot-0.36.0.tar.gz) = bf6745b823644cdca8461150455aeb67d417f87f80b9ec774c716e9587ef20a2 -SIZE (certbot-0.36.0.tar.gz) = 356981 +TIMESTAMP = 1565319960 +SHA256 (certbot-0.37.0.tar.gz) = 34c5a832b43f41438bd84eb247a64607228a865e3cdc5272d7a27c3943a94d8a +SIZE (certbot-0.37.0.tar.gz) = 358657 -- cgit From 211c4ef9132832acee64b005cb7578271f82edc6 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Aug 2019 20:02:13 +0000 Subject: Update to 3.9 - Sort PLIST - Update WWW Changes: http://t-sato.in.coocan.jp/xvkbd/#changelog --- x11/xvkbd/Makefile | 2 +- x11/xvkbd/distinfo | 5 +- x11/xvkbd/files/patch-xvkbd.c | 108 +++++++---------- x11/xvkbd/files/patch-xvkbd.man | 261 ++++++++++++++++++++++------------------ x11/xvkbd/pkg-descr | 2 +- x11/xvkbd/pkg-plist | 3 +- 6 files changed, 193 insertions(+), 188 deletions(-) diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index d2eea3bd5595..faf3cb29db69 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xvkbd -PORTVERSION= 3.7 +PORTVERSION= 3.9 CATEGORIES= x11 MASTER_SITES= http://t-sato.in.coocan.jp/xvkbd/ diff --git a/x11/xvkbd/distinfo b/x11/xvkbd/distinfo index 17903b13a99d..e42ce5cf0542 100644 --- a/x11/xvkbd/distinfo +++ b/x11/xvkbd/distinfo @@ -1,2 +1,3 @@ -SHA256 (xvkbd-3.7.tar.gz) = 895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b -SIZE (xvkbd-3.7.tar.gz) = 81645 +TIMESTAMP = 1565025196 +SHA256 (xvkbd-3.9.tar.gz) = b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d +SIZE (xvkbd-3.9.tar.gz) = 88440 diff --git a/x11/xvkbd/files/patch-xvkbd.c b/x11/xvkbd/files/patch-xvkbd.c index 9d00d53afe1f..f140a309d961 100644 --- a/x11/xvkbd/files/patch-xvkbd.c +++ b/x11/xvkbd/files/patch-xvkbd.c @@ -7,7 +7,7 @@ Forwarded: no Author: Peter Pentchev Last-Update: 2015-05-07 ---- xvkbd.c.orig 2015-02-14 11:32:32 UTC +--- xvkbd.c.orig 2018-02-25 00:55:33 UTC +++ xvkbd.c @@ -470,8 +470,8 @@ static int altgr_mask = 0; static int level3_shift_mask = 0; @@ -33,7 +33,7 @@ Last-Update: 2015-05-07 static void DeleteWindowProc(Widget w, XEvent *event, String *pars, Cardinal *n_pars); static void SaveProperty(void); -+static void SignalUser1(int sig); ++static void SignalUser1(int dummy); + /* * Search for window which has specified instance name (WM_NAME) @@ -48,7 +48,7 @@ Last-Update: 2015-05-07 XClassHint hint; char *win_name; -@@ -802,7 +803,9 @@ static int MyErrorHandler(Display *my_dp +@@ -824,7 +825,9 @@ static int MyErrorHandler(Display *my_dp */ static void SendEvent(XKeyEvent *event) { @@ -58,7 +58,7 @@ Last-Update: 2015-05-07 if (!appres.no_sync) { XSync(event->display, FALSE); -@@ -1099,11 +1102,11 @@ static void SendKeyPressedEvent(KeySym k +@@ -1136,11 +1139,11 @@ static void SendKeyPressedEvent(KeySym k #ifdef USE_XTEST if (appres.xtest && press_release == 0) { @@ -72,7 +72,7 @@ Last-Update: 2015-05-07 event.type = KeyRelease; event.state = 0; -@@ -1281,7 +1284,7 @@ static int n_word_list = 0; +@@ -1332,7 +1335,7 @@ static int n_word_list = 0; static void SetDefaultDictionary(void) { @@ -81,7 +81,7 @@ Last-Update: 2015-05-07 XtVaSetValues(props_dict_entry, XtNstring, dict_filename, NULL); } -@@ -1296,7 +1299,7 @@ static void ReadCompletionDictionary(voi +@@ -1347,7 +1350,7 @@ static void ReadCompletionDictionary(voi struct WORDLIST *p; if (strcmp(cur_dict_filename, dict_filename) == 0) return; @@ -90,7 +90,7 @@ Last-Update: 2015-05-07 if (!first) { int cnt = 0; -@@ -1346,7 +1349,7 @@ static void ReadCompletionDictionary(voi +@@ -1397,7 +1400,7 @@ static void ReadCompletionDictionary(voi static void AddToCompletionText(KeySym keysym) { @@ -99,7 +99,7 @@ Last-Update: 2015-05-07 struct WORDLIST *node_ptr; if (completion_entry != None) { -@@ -1436,7 +1439,7 @@ static void PopupCompletionPanel(void) +@@ -1487,7 +1490,7 @@ static void PopupCompletionPanel(void) ReadCompletionDictionary(); @@ -108,7 +108,7 @@ Last-Update: 2015-05-07 XtVaSetValues(completion_entry, XtNlabel, msg, NULL); completion_text[0] = '\0'; -@@ -1451,11 +1454,11 @@ static void PopupCompletionPanel(void) +@@ -1502,11 +1505,11 @@ static void PopupCompletionPanel(void) */ static void KeyPressed(Widget w, char *key, char *data); @@ -123,7 +123,7 @@ Last-Update: 2015-05-07 int val; Window target_root, child, junk_w; int junk_i; -@@ -1480,8 +1483,7 @@ static void SendString(const unsigned ch +@@ -1536,8 +1539,7 @@ static void SendString(const unsigned ch } else { len = cp2 - cp - 1; if (sizeof(key) <= len) len = sizeof(key) - 1; @@ -133,7 +133,7 @@ Last-Update: 2015-05-07 KeyPressed(None, key, NULL); cp = cp2; } -@@ -1528,11 +1530,12 @@ static void SendString(const unsigned ch +@@ -1584,11 +1586,12 @@ static void SendString(const unsigned ch if ('1' <= *cp && *cp <= '9') { usleep((*cp - '0') * 100000); } else { @@ -147,7 +147,7 @@ Last-Update: 2015-05-07 cp++; if ('1' <= *cp && *cp <= '9') { if (appres.debug) fprintf(stderr, "XTestFakeButtonEvent(%d)\n", *cp - '0'); -@@ -1543,10 +1546,18 @@ static void SendString(const unsigned ch +@@ -1599,10 +1602,18 @@ static void SendString(const unsigned ch fprintf(stderr, "%s: no digit after \"\\m\"\n", PROGRAM_NAME); } @@ -167,7 +167,7 @@ Last-Update: 2015-05-07 target_root = RootWindow(target_dpy, DefaultScreen(target_dpy)); XQueryPointer(target_dpy, target_root, &junk_w, &child, &cur_x, &cur_y, &junk_i, &junk_i, &junk_u); -@@ -1628,7 +1639,7 @@ static void Highlight(char *name, int st +@@ -1684,7 +1695,7 @@ static void Highlight(char *name, int st char name1[50]; Widget w; @@ -176,7 +176,7 @@ Last-Update: 2015-05-07 w = XtNameToWidget(toplevel, name1); if (w != None) { if (strstr(name, "Focus") != NULL) { -@@ -1674,13 +1685,13 @@ static Boolean CheckShiftState(int row, +@@ -1730,13 +1741,13 @@ static Boolean CheckShiftState(int row, static void RefreshShiftState(Boolean force) { static Boolean first = TRUE; @@ -195,7 +195,7 @@ Last-Update: 2015-05-07 int first_row, row, col; Boolean shifted; char *label; -@@ -1768,7 +1779,7 @@ static void RefreshShiftState(Boolean fo +@@ -1824,7 +1835,7 @@ static void RefreshShiftState(Boolean fo Window root, child; int root_x, root_y, x, y; @@ -204,7 +204,7 @@ Last-Update: 2015-05-07 XKeyEvent event; -@@ -1784,28 +1795,28 @@ static void RefreshShiftState(Boolean fo +@@ -1840,28 +1851,28 @@ static void RefreshShiftState(Boolean fo event.same_screen = TRUE; event.state = 0; @@ -238,7 +238,7 @@ Last-Update: 2015-05-07 event.keycode = XKeysymToKeycode(target_dpy, XK_Meta_L); event.type = (shift_state & meta_mask) ? KeyPress : KeyRelease; SendEvent(&event); -@@ -1866,7 +1877,7 @@ static char *GetWindowGeometry(Widget w) +@@ -1922,7 +1933,7 @@ static char *GetWindowGeometry(Widget w) XtVaGetValues(w, XtNx, &x0, XtNy, &y0, NULL); XGetGeometry(dpy, XtWindow(w), &root, &x1, &y1, &wd, &ht, &bd, &dp); @@ -247,7 +247,7 @@ Last-Update: 2015-05-07 return geom; } -@@ -1908,7 +1919,7 @@ static void SetWindowManagerHint(Boolean +@@ -1964,7 +1975,7 @@ static void SetWindowManagerHint(Boolean FALSE, SubstructureNotifyMask | SubstructureRedirectMask, (XEvent *)&ev); if (appres.debug) @@ -256,7 +256,7 @@ Last-Update: 2015-05-07 } } -@@ -1930,7 +1941,7 @@ static void LayoutSelected(Widget w, cha +@@ -1986,7 +1997,7 @@ static void LayoutSelected(Widget w, cha if (key != NULL) { if (strcmp(key, "default") != 0) { sscanf(key, "%29[^/]/%29s", customization, lang); @@ -265,7 +265,7 @@ Last-Update: 2015-05-07 xenv = XtResolvePathname(dpy, "app-defaults", name, NULL, NULL, NULL, 0, NULL); if (xenv == NULL) { fprintf(stderr, "%s: app-default file \"%s\" not installed\n", -@@ -1938,12 +1949,10 @@ static void LayoutSelected(Widget w, cha +@@ -1994,12 +2005,10 @@ static void LayoutSelected(Widget w, cha } } @@ -280,7 +280,7 @@ Last-Update: 2015-05-07 putenv(env_xenv); keyboard_layout = XtNewString(key); -@@ -2063,6 +2072,7 @@ static void PropsItemToggled(Widget w, c +@@ -2119,6 +2128,7 @@ static void PropsItemToggled(Widget w, c XtVaGetValues(XtNameToWidget(props_panel, "*jump_pointer"), XtNstate, &appres.jump_pointer, NULL); @@ -288,7 +288,7 @@ Last-Update: 2015-05-07 appres.key_click_duration = (int)XawToggleGetCurrent(click_buttons); appres.autoclick_delay = (int)XawToggleGetCurrent(autoclick_buttons); -@@ -2129,7 +2139,7 @@ static void PopupPropsPanel(void) +@@ -2185,7 +2195,7 @@ static void PopupPropsPanel(void) if (props_panel == None) { Widget label, button; Widget form, w; @@ -297,7 +297,7 @@ Last-Update: 2015-05-07 int val; props_panel = XtVaCreatePopupShell("props_panel", transientShellWidgetClass, -@@ -2155,7 +2165,7 @@ static void PopupPropsPanel(void) +@@ -2211,7 +2221,7 @@ static void PopupPropsPanel(void) click_buttons = button; for (val = 1; val <= 50; val *= 2) { char s1[10]; @@ -306,7 +306,7 @@ Last-Update: 2015-05-07 button = XtVaCreateManagedWidget(s1, toggleWidgetClass, form, XtNfromVert, w, XtNfromHoriz, button, XtNradioData, (XtPointer)val, -@@ -2177,7 +2187,7 @@ static void PopupPropsPanel(void) +@@ -2233,7 +2243,7 @@ static void PopupPropsPanel(void) autoclick_buttons = button; for (val = 500; val <= 1000; val += 100) { char s1[10]; @@ -315,7 +315,7 @@ Last-Update: 2015-05-07 button = XtVaCreateManagedWidget(s1, toggleWidgetClass, form, XtNfromVert, w, XtNfromHoriz, button, XtNradioData, (XtPointer)val, -@@ -2239,7 +2249,7 @@ static void OpenRemoteDisplay(Widget w, +@@ -2295,7 +2305,7 @@ static void OpenRemoteDisplay(Widget w, focused_subwindow = None; if (target_dpy != NULL && target_dpy != dpy) XCloseDisplay(target_dpy); @@ -324,16 +324,7 @@ Last-Update: 2015-05-07 for (cp = name; isascii(*cp) && isprint(*cp); cp++) ; *cp = '\0'; -@@ -2443,7 +2453,7 @@ static void IconifyWindow(Widget w, Bool - } - } - --static void SignalUser1(void) -+static void SignalUser1(int sig) - { - XWindowAttributes attr; - XGetWindowAttributes(dpy, XtWindow(toplevel), &attr); -@@ -2752,7 +2762,7 @@ static Widget MakeKey(Widget parent, con +@@ -2806,7 +2816,7 @@ static Widget MakeKey(Widget parent, con XtAddCallback(w, XtNcallback, (XtCallbackProc)KeyPressed, (XtPointer)name); if (label != NULL) { @@ -342,7 +333,7 @@ Last-Update: 2015-05-07 if (strcmp(str, "space") == 0) strcpy(str, ""); len = strlen(str); if (3 <= len) { -@@ -2824,9 +2834,9 @@ static void MakeKeypad(Widget form, Widg +@@ -2878,9 +2888,9 @@ static void MakeKeypad(Widget form, Widg || (strncmp(keypad_shift[row][col], "KP_", 3) == 0 && isdigit(keypad_shift[row][col][3]))) color = appres.general_background; @@ -354,7 +345,7 @@ Last-Update: 2015-05-07 key = MakeKey(keypad_box, XtNewString(name), keypad_label[row][col], color); XtVaSetValues(key, XtNfont, font, NULL); -@@ -2928,12 +2938,12 @@ static void MakeKeyboard(Boolean remake) +@@ -2982,12 +2992,12 @@ static void MakeKeyboard(Boolean remake) Widget form, key, left; Pixel color; XFontStruct *font; @@ -369,7 +360,7 @@ Last-Update: 2015-05-07 #include "xvkbd.xbm" #include "iconify.xbm" -@@ -2953,7 +2963,7 @@ static void MakeKeyboard(Boolean remake) +@@ -3007,7 +3017,7 @@ static void MakeKeyboard(Boolean remake) for (row = first_row; row < NUM_KEY_ROWS; row++) { if (keys_normal[row][0] == NULL) continue; @@ -378,7 +369,7 @@ Last-Update: 2015-05-07 key_box[row] = XtVaCreateManagedWidget(name, formWidgetClass, form, NULL); key_box[row + 1] = None; if (row != first_row) -@@ -2963,7 +2973,7 @@ static void MakeKeyboard(Boolean remake) +@@ -3017,7 +3027,7 @@ static void MakeKeyboard(Boolean remake) left = None; for (col = 0; keys_normal[row][col] != NULL; col++) { @@ -387,7 +378,7 @@ Last-Update: 2015-05-07 if (strcmp(name, "MainMenu") == 0) { Widget iconify_button = None; -@@ -3005,11 +3015,11 @@ static void MakeKeyboard(Boolean remake) +@@ -3059,11 +3069,11 @@ static void MakeKeyboard(Boolean remake) color = appres.general_background; font = appres.general_font; if (isalpha(name[0])) font = appres.letter_font; @@ -402,7 +393,7 @@ Last-Update: 2015-05-07 /* keys can be removed by setting its width to 1 */ XtDestroyWidget(key); key = None; -@@ -3045,7 +3055,7 @@ static void MakeKeyboard(Boolean remake) +@@ -3099,7 +3109,7 @@ static void MakeKeyboard(Boolean remake) Window root; int x1, y1; unsigned int wd, ht, bd, dp; @@ -411,7 +402,7 @@ Last-Update: 2015-05-07 XGetGeometry(dpy, XtWindow(toplevel), &root, &x1, &y1, &wd, &ht, &bd, &dp); max_wd = XtScreen(toplevel)->width * appres.max_width_ratio; -@@ -3063,16 +3073,16 @@ static void MakeKeyboard(Boolean remake) +@@ -3118,16 +3128,16 @@ static void MakeKeyboard(Boolean remake) if (!appres.debug && key_box[first_row] != None) { if (appres.keypad) { @@ -433,7 +424,7 @@ Last-Update: 2015-05-07 } } if (0 < strlen(appres.geometry)) { -@@ -3180,11 +3190,11 @@ static void ReadProperty(void) +@@ -3236,11 +3246,11 @@ static void ReadProperty(void) home = getenv("HOME"); if (appres.key_file[0] != '/' && home != NULL && strlen(home) + strlen(appres.key_file) + 1 < sizeof(fkey_filename)) @@ -448,16 +439,16 @@ Last-Update: 2015-05-07 fp = fopen(fkey_filename, "r"); if (fp == NULL) return; -@@ -3199,7 +3209,7 @@ static void ReadProperty(void) - LayoutSelected(None, keyboard_layout, NULL); - } +@@ -3253,7 +3263,7 @@ static void ReadProperty(void) + keyboard_layout, getenv("XENVIRONMENT")); + if (getenv("XENVIRONMENT") == NULL) layout_selected = TRUE; } else if (sscanf(&str[1], "dict_file %s", key) == 1) { - strncpy(dict_filename, key, sizeof(dict_filename)); + snprintf(dict_filename, sizeof(dict_filename), "%s", key); } else if (sscanf(&str[1], "%s %d", key, &val) == 2) { if (strcmp(key, "quick_modifiers") == 0) appres.quick_modifiers = val; -@@ -3273,9 +3283,9 @@ static void FKeyMenuSelected(Widget w, c +@@ -3329,9 +3339,9 @@ static void FKeyMenuSelected(Widget w, c if (key == NULL) strcpy(key2, ""); else if (strncmp(key, "Shift-", strlen("Shift-")) == 0) @@ -469,7 +460,7 @@ Last-Update: 2015-05-07 if (strcmp(cur_fkey, key2) != 0) { if (strlen(cur_fkey) != 0) { -@@ -3298,7 +3308,7 @@ static void FKeyMenuSelected(Widget w, c +@@ -3354,7 +3364,7 @@ static void FKeyMenuSelected(Widget w, c prefix = ""; if (cur_fkey_value_mode[0] == 'c') prefix = "!"; else if (fkey_value[0] == '!' || fkey_value[0] == '\\') prefix = "\\"; @@ -478,7 +469,7 @@ Last-Update: 2015-05-07 } else { /* empty string - remove the entry for the function key */ if (sp != NULL) { if (sp2 != NULL) sp2->next = sp->next; -@@ -3318,10 +3328,10 @@ static void FKeyMenuSelected(Widget w, c +@@ -3374,10 +3384,10 @@ static void FKeyMenuSelected(Widget w, c FKeyValueMenuSelected(None, (value[0] == '!') ? "command" : "string"); if (value[0] == '!' || value[0] == '\\') value = value + 1; @@ -491,7 +482,7 @@ Last-Update: 2015-05-07 } } } -@@ -3385,9 +3395,9 @@ static void PopupFunctionKeyEditor(void) +@@ -3441,9 +3451,9 @@ static void PopupFunctionKeyEditor(void) for (j = 0; j <= 1; j++) { for (i = 1; i <= appres.editable_function_keys; i++) { if (j == 0) @@ -503,7 +494,7 @@ Last-Update: 2015-05-07 key = XtNewString(label); menu_entry = XtVaCreateManagedWidget(key, smeBSBObjectClass, menu, NULL); XtAddCallback(menu_entry, XtNcallback, (XtCallbackProc)FKeyMenuSelected, -@@ -3449,8 +3459,8 @@ static const char *FindFunctionKeyValue( +@@ -3514,8 +3524,8 @@ static const char *FindFunctionKeyValue( else if (shift_state & ControlMask) prefix = 'c'; else if (shift_state & ShiftMask) prefix = 's'; } @@ -514,7 +505,7 @@ Last-Update: 2015-05-07 len = strlen(label); for (sp = fkey_list; sp != NULL; sp = sp->next) { -@@ -3508,8 +3518,10 @@ static void Autoclick(void) +@@ -3573,8 +3583,10 @@ static void Autoclick(void) { StopAutoclick(); @@ -525,16 +516,7 @@ Last-Update: 2015-05-07 } static void ShowBalloon(Widget w, XEvent *event, String *pars, Cardinal *n_pars) -@@ -3590,7 +3602,7 @@ static void SetIconBitmap(Widget w) - static void VisibilityChanged(Widget w, XEvent *event, - String *pars, Cardinal *n_pars) - { -- static cnt = 0; -+ static int cnt = 0; - static time_t t1 = 0; - time_t t2; - -@@ -3638,7 +3650,9 @@ int main(int argc, char *argv[]) +@@ -3703,7 +3715,9 @@ int main(int argc, char *argv[]) Boolean open_keypad_panel = FALSE; char ch; Window child; @@ -544,7 +526,7 @@ Last-Update: 2015-05-07 argc1 = argc; argv1 = malloc(sizeof(char *) * (argc1 + 5)); -@@ -3841,14 +3855,14 @@ char *setlocale(int category, const char +@@ -3905,14 +3919,14 @@ char *setlocale(int category, const char if (locale == NULL) { return cur_locale; } else if (category == LC_ALL) { diff --git a/x11/xvkbd/files/patch-xvkbd.man b/x11/xvkbd/files/patch-xvkbd.man index c15c03a286b0..3dbeeb774739 100644 --- a/x11/xvkbd/files/patch-xvkbd.man +++ b/x11/xvkbd/files/patch-xvkbd.man @@ -3,7 +3,7 @@ Forwarded: no Author: Peter Pentchev Last-Update: 2015-05-07 ---- xvkbd.man.orig 2015-09-12 07:21:58 UTC +--- xvkbd.man.orig 2018-02-25 00:56:26 UTC +++ xvkbd.man @@ -29,7 +29,7 @@ which may make it easier to enter long w .PP @@ -23,7 +23,7 @@ Last-Update: 2015-05-07 or on the Property panel. .SH " Main Menu" -@@ -242,17 +242,17 @@ You may want to set \fIJump Pointer?\fP +@@ -242,38 +242,38 @@ You may want to set \fIJump Pointer?\fP \fICompletion Dictionary\fP Set the filename to be used for word completion. This setting take precedence over the `\fBxvkbd.dictFile\fP' resource @@ -45,7 +45,15 @@ Last-Update: 2015-05-07 Make \fIxvkbd\fP to use \fIXSendEvent()\fP to simulate keyboard events, as it was in \fIxvkbd\fP version 1.0. \fIxvkbd\fP version 1.1 and later will try to use XTEST extension instead -@@ -263,14 +263,14 @@ If XTEST extension is not supported by t + in the default configuration. + Because it is not unusual applications to ignore keyboard events +-generated with \fB-xsendevent\fP, +-you shouldn't use \fB-xsendevent\fP option unless it is really required. ++generated with \fB\-xsendevent\fP, ++you shouldn't use \fB\-xsendevent\fP option unless it is really required. + .sp 0.5 + If XTEST extension is not supported by the X server, + \fIxvkbd\fP will automatically switch to this mode. .sp 0.5 Resource `\fBxvkbd.xtest: false\fP' has the same function. .TP 4 @@ -63,7 +71,7 @@ Last-Update: 2015-05-07 Make \fIxvkbd\fP not to jump the pointer when sending events. In the default, \fIxvkbd\fP will temporary jump the pointer to the focused window, if input focus is set explicitly via \fIFocus\fP button, -@@ -278,14 +278,14 @@ and XTEST extension is to be used to sim +@@ -281,14 +281,14 @@ and XTEST extension is to be used to sim .sp 0.5 Resource `\fBxvkbd.jumpPointer: false\fP' has the same function. .TP 4 @@ -80,7 +88,7 @@ Last-Update: 2015-05-07 Make labels on keys in the \fIxvkbd\fP window to be set independently for each of four shift states, not shifted, \fIShift\fP, \fIAltGr\fP and \fIShift\fP-\fIAltGr\fP. -@@ -296,27 +296,27 @@ and resouce files in the distribution. +@@ -299,27 +299,27 @@ and resouce files in the distribution. .sp 0.5 Resource `\fBxvkbd.modalKeytop: true\fP' has the same function. .TP 4 @@ -99,24 +107,24 @@ Last-Update: 2015-05-07 +by using \fB\-\fP instead of \fB+\fP, but please note that you must take account of size of the window border. -(If you specify `\fB-geometry -0-0\fP', -+(If you specify `\fB\-geometry \-0\-0\fP', ++(If you specify `\fB\-geometry -0-0\fP', the window will not fit in the screen.) .sp 0.5 This can be set by \fBxvkbd.windowGeometry\fP resource (note that it is not \fBxvkbd.geometry\fP), too. .TP 4 -.B "-no-resize" -+.B "\-no\-resize" - Disable resize of the \fIxvkbd\fP window. ++.B "\-no-resize" + Disable resize of the \fIxvkbd\fP window. .sp 0.5 Resource `\fBxvkbd.resizable: false\fP' has the same function. .TP 4 -.B "-no-repeat" -+.B "\-no\-repeat" ++.B "\-no-repeat" Do not auto-repeat even if key is depressed long time. .sp 0.5 If auto-repeat is enabled (this is the default), -@@ -328,31 +328,31 @@ and period of repeat can be set as +@@ -331,31 +331,31 @@ and period of repeat can be set as .sp 0.5 Resource `\fBxvkbd.autoRepeat: false\fP' has the same function. .TP 4 @@ -155,7 +163,7 @@ Last-Update: 2015-05-07 .sp 0.5 If this option is specified, \fIxvkbd\fP will not open its window -@@ -399,28 +399,28 @@ will simulate press and release of the k +@@ -402,28 +402,28 @@ will simulate press and release of the k .IP " - " 6 \fB\\m\fP\fIdigit\fP - simulate click of the specified mouse button .TP 4 @@ -173,9 +181,9 @@ Last-Update: 2015-05-07 and terminate soon after sending the string. .TP 4 -.B "-utf16" -- When used with \fB-file\fP option, +-When used with \fB-file\fP option, +.B "\-utf16" -+ When used with \fB\-file\fP option, ++When used with \fB\-file\fP option, make \fIxvkbd\fP to accept UTF16 characters in the file. .TP 4 -.BI "-delay " value @@ -192,7 +200,7 @@ Last-Update: 2015-05-07 Specify the ID (hexadecimal value leaded with `\fB0x\fP', or decimal value), the name (instance name or class name) of the window, -@@ -438,10 +438,10 @@ or clear the input focus. +@@ -441,10 +441,10 @@ or clear the input focus. If there are two or more windows which have the name specified with this option, the window which was found first will be selected. .TP 4 @@ -205,7 +213,7 @@ Last-Update: 2015-05-07 .sp 0.5 If you want to set input focus to the widget \fBfoo.bar.zot\fP, you can write \fBzot\fP, \fBbar.zot\fP or \fBfoo.bar.zot\fP -@@ -452,24 +452,24 @@ with a single widget of the client. +@@ -455,24 +455,24 @@ with a single widget of the client. For example, .sp .in +4 @@ -220,9 +228,9 @@ Last-Update: 2015-05-07 +.BI "\-remote\-display " display Specify the display (in the meaning of the X Window System) to connect; see also \fIConnect to Remote Display...\fP. - .TP 4 + .TP 4 -.B "-true-keypad" -+.B "\-true\-keypad" ++.B "\-true-keypad" If this option is specified, \fIxvkbd\fP will attempt to use \fIkeysym\fPs such as \fIXK_KP_1\fP instead of \fIXK_1\fP. @@ -234,7 +242,7 @@ Last-Update: 2015-05-07 Specify the default dictionary (list of words) file to be used for word completion. The `\fICompletion Dictionary\fP' filename -@@ -479,7 +479,7 @@ Resource `\fBxvkbd.dictFile: \fP\fIfilen +@@ -482,7 +482,7 @@ Resource `\fBxvkbd.dictFile: \fP\fIfilen .sp 0.5 See also ``Making your own completion dictionary''. .TP 4 @@ -243,7 +251,7 @@ Last-Update: 2015-05-07 Make \fIxvkbd\fP window can be minimized (iconified) even if no window manager is in use. When this feature is enabled, -@@ -488,7 +488,7 @@ and \fIxvkbd\fP window will be minimized +@@ -491,7 +491,7 @@ and \fIxvkbd\fP window will be minimized .sp 0.5 Resource `\fBxvkbd.minimizable: true\fP' has the same function. .TP 4 @@ -252,7 +260,7 @@ Last-Update: 2015-05-07 Disable invocation of external commands, including user assigned command and the online manual reader. Connection to another displays would also be disabled. -@@ -496,25 +496,25 @@ This option may be useful when \fIxvkbd\ +@@ -499,25 +499,25 @@ This option may be useful when \fIxvkbd\ .sp 0.5 Resource `\fBxvkbd.secure: true\fP' has the same function. .TP 4 @@ -283,7 +291,7 @@ Last-Update: 2015-05-07 to apply this for those four modifiers. Maybe this can be useful when attempting to decorate the mouse operations with the modifiers. -@@ -524,101 +524,101 @@ and which can prevent the correct operat +@@ -527,105 +527,105 @@ and which can prevent the correct operat .sp 0.5 Resource `\fBxvkbd.positiveModifiers: \fP\fImodifiers...\fP' has the same function. .TP 4 @@ -298,123 +306,128 @@ Last-Update: 2015-05-07 +.B "\-version" Output version information and exit. - .SH "Screen Shot" + .SH "Screenshot" .TP 4 Default (US) --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-normal.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-normal.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-normal.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-normal.gif .TP 4 Belgian --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-belgian.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-belgian.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-belgian.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-belgian.gif .TP 4 Danish --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-danish.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-danish.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-danish.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-danish.gif .TP 4 French --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-french.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-french.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-french.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-french.gif .sp 0.5 --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-french2.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-french2.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-french2.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-french2.gif .TP 4 German --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-german.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-german.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-german.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-german.gif .TP 4 Icelandic --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-icelandic.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-icelandic.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-icelandic.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-icelandic.gif .TP 4 Italian --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-italian.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-italian.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-italian.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-italian.gif .TP 4 Japanese (JIS-X-6002) --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-jisx6002.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-jisx6002.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-jisx6002.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-jisx6002.gif .TP 4 Japanese (JIS-X-6004) --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-jisx6004.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-jisx6004.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-jisx6004.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-jisx6004.gif .TP 4 Norwegian --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-norwegian.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-norwegian.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-norwegian.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-norwegian.gif .TP 4 Portuguese --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-portuguese.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-portuguese.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-portuguese.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-portuguese.gif .TP 4 Spanish --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-spanish.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-spanish.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-spanish.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-spanish.gif .TP 4 Swedish --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-swedish.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-swedish.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-swedish.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-swedish.gif .TP 4 Swiss/German --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-swissgerman.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-swissgerman.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-swissgerman.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-swissgerman.gif .TP 4 United Kingdom --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-uk.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-uk.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-uk.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-uk.gif .TP 4 Latin-1 --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-latin1.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-latin1.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-latin1.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-latin1.gif .TP 4 Small Keyboard (maybe suitable for PDAs) --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-small.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-small.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-small.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-small.gif .TP 4 Hebrew --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-hebrew.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-hebrew.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-hebrew.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-hebrew.gif .TP 4 Greek --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-greek.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-greek.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-greek.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-greek.gif .TP 4 Turkish --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-turkish.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-turkish.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-turkish.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-turkish.gif .TP 4 Slovene --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-slovene.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-slovene.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-slovene.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-slovene.gif .TP 4 Korean --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-korean.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-korean.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-korean.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-korean.gif .TP 4 Russian (Cyrillic) --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-russian.gif -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-russian.gif +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-russian.gif ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-russian.gif .SH "Download" .TP 4 \fILatest Official Release\fP --\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.7.tar.gz\fP -+\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.7.tar.gz\fP +-\fIhttp://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz\fP ++\fIhttp://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.9.tar.gz\fP .br - - source of version 3.7 (2015-09-12) + - source of version 3.9 (2018-02-25) .TP 4 previous release --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.6.tar.gz -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.6.tar.gz +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.8.tar.gz .br - - source of version 3.6 (2015-02-15) + - source of version 3.8 (2017-06-06) .sp 0.5 --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.5.tar.gz -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.5.tar.gz +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.7.tar.gz ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.7.tar.gz .br - - source of version 3.5 (2013-07-15) + - source of version 3.7 (2015-09-12) + .sp 0.5 +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.6.tar.gz ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.6.tar.gz + .br + - source of version 3.6 (2015-02-15) .PP -@@ -655,8 +655,8 @@ load them via \fIxrdb\fP(1), or +@@ -662,8 +662,8 @@ load them via \fIxrdb\fP(1), or .IP " o " 4 set the filename to the \fB$XENVIRONMENT\fP environment variable, or .IP " o " 4 @@ -425,7 +438,7 @@ Last-Update: 2015-05-07 .IP " o " 4 put them in application default directory as \fBXVkbd\fP. .PP -@@ -668,11 +668,11 @@ directories specified with \fB$XUSERFILE +@@ -675,11 +675,11 @@ directories specified with \fB$XUSERFILE system's application default directory specified with \fB$XFILESEACHPATH\fP environment variable, or else the directory specified when compiling the X @@ -439,7 +452,7 @@ Last-Update: 2015-05-07 near top of the file. .PP \fIxvkbd\fP is distributed with some application default files, -@@ -703,7 +703,7 @@ You may also want to set: +@@ -710,7 +710,7 @@ You may also want to set: to display only the labels for the current shift state, instead of trying to always display all of them in the small keytop. .PP @@ -448,7 +461,7 @@ Last-Update: 2015-05-07 .SH " Removing Unwanted Keys" Keys on \fIxvkbd\fP window can be removed by setting their width to 1. -@@ -777,12 +777,12 @@ when \fBxvkbd.modalKeytop\fP resoruce is +@@ -784,12 +784,12 @@ when \fBxvkbd.modalKeytop\fP resoruce is In all of those resources, each keys are separated by spaces, and rows of keys are terminated with `\fB \\n\\\fP' (note that `\fB\\n\fP' must have space before it). @@ -464,7 +477,7 @@ Last-Update: 2015-05-07 will make \fIxvkbd\fP to use the German layout. For another method to activate those settings, please refer "How to Customize \fIxvkbd\fP" above. -@@ -844,7 +844,7 @@ You can use \fBxev\fP command to check w +@@ -851,7 +851,7 @@ You can use \fBxev\fP command to check w .IP " o " 4 If \fIAlt\fP or \fIMeta\fP is not defined as modifier, the key can't be used as modifier. @@ -473,21 +486,20 @@ Last-Update: 2015-05-07 .IP " o " 4 \fINum Lock\fP (and maybe other modifiers) on the physical keyboard may not work correctly when \fIxvkbd\fP is in use. -@@ -855,10 +855,10 @@ FAQ - Possible Problems and Solutions - http://homepage3.nifty.com/tsato/xvkbd/faq.html +@@ -862,10 +862,10 @@ FAQ - Possible Problems and Solutions + http://t-sato.in.coocan.jp/xvkbd/faq.html .TP 4 Making your own completion dictionary --http://homepage3.nifty.com/tsato/xvkbd/make-dic.html -+http://homepage3.nifty.com/tsato/xvkbd/make\-dic.html +-http://t-sato.in.coocan.jp/xvkbd/make-dic.html ++http://t-sato.in.coocan.jp/xvkbd/make\-dic.html .TP 4 --Hints to use \fBxvkbd -text\fP --http://homepage3.nifty.com/tsato/xvkbd/xvkbd-text.html -+Hints to use \fBxvkbd \-text\fP -+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-text.html + Hints to use \fBxvkbd -text\fP +-http://t-sato.in.coocan.jp/xvkbd/xvkbd-text.html ++http://t-sato.in.coocan.jp/xvkbd/xvkbd\-text.html .TP 4 Note about how to send key events - http://homepage3.nifty.com/tsato/xvkbd/events.html -@@ -879,26 +879,26 @@ which can't be entered directly from key + http://t-sato.in.coocan.jp/xvkbd/events.html +@@ -886,26 +886,26 @@ which can't be entered directly from key can be entered using dedicated key combinations. .IP " - " 6 Make keyboard layout not to be disturbed when @@ -519,7 +531,7 @@ Last-Update: 2015-05-07 .IP " - " 6 \fIxvkbd\fP can now send keys with \fIMode_switch\fP (\fIAltGr\fP) modifier, -@@ -906,9 +906,9 @@ which enables those characters in the po +@@ -913,9 +913,9 @@ which enables those characters in the po .IP " - " 6 \fIxvkbd\fP now support \fIAltGr\fP key so that German (and some other) keyboard layout can be used. @@ -531,7 +543,7 @@ Last-Update: 2015-05-07 in the distribution, which modifies keyboard layout and put some non-ASCII keys on the \fIxvkbd\fP window. .IP " - " 6 -@@ -924,7 +924,7 @@ Labels on keys can now be set independen +@@ -931,7 +931,7 @@ Labels on keys can now be set independen not shifted, \fIShift\fP, \fIAltGr\fP and \fIShift\fP-\fIAltGr\fP. (thanks, Jim) .IP " - " 6 @@ -540,7 +552,7 @@ Last-Update: 2015-05-07 .TP 4 Version 1.2 (2001-02-18) .IP " - " 6 -@@ -952,7 +952,7 @@ so that it will not terminated accidentl +@@ -959,7 +959,7 @@ so that it will not terminated accidentl .TP 4 Version 1.3 (2001-03-19) .IP " - " 6 @@ -549,7 +561,7 @@ Last-Update: 2015-05-07 (contributed from Marcel Portner) .IP " - " 6 \fIxvkbd\fP now catches MappingNotify event and reload the new mapping. -@@ -1002,7 +1002,7 @@ and older \fIxvkbd\fP may not work corre +@@ -1009,7 +1009,7 @@ and older \fIxvkbd\fP may not work corre .TP 4 Version 1.6 (2001-11-10) .IP " - " 6 @@ -558,7 +570,7 @@ Last-Update: 2015-05-07 (thanks, Gregory) .IP " - " 6 New entry `\fIUse XTEST Extension?\fP' is added -@@ -1021,7 +1021,7 @@ after \fIxvkbd\fP is invoked. +@@ -1028,7 +1028,7 @@ after \fIxvkbd\fP is invoked. Show/hide of the keypad and funcion keys on the main window can now be toggled from the main menu. .IP " - " 6 @@ -567,7 +579,7 @@ Last-Update: 2015-05-07 (contributed from Jean-Pierre Demailly) .TP 4 Version 2.1 (2002-01-27) -@@ -1029,9 +1029,9 @@ Version 2.1 (2002-01-27) +@@ -1036,9 +1036,9 @@ Version 2.1 (2002-01-27) When height of the \fIxvkbd\fP window is smaller than \fBXVkbd.modalThreshold\fP, \fIxvkbd\fP will now automatically switch the keytop @@ -579,7 +591,7 @@ Last-Update: 2015-05-07 would send wrong keys - this problem is now fixed. .IP " - " 6 Target \fBdistclean\fP in the \fBImakefile\fP is renamed -@@ -1044,8 +1044,8 @@ Version 2.2 (2002-03-17) +@@ -1051,8 +1051,8 @@ Version 2.2 (2002-03-17) String assigned to function keys can now be edited on a panel popped up via "\fIEdit Function Keys...\fP" in the main menu. .IP " - " 6 @@ -590,7 +602,7 @@ Last-Update: 2015-05-07 its standard input (stdin) to get the string to be sent. .IP " - " 6 In the previous release, -@@ -1074,7 +1074,7 @@ Swiss/German, +@@ -1081,7 +1081,7 @@ Swiss/German, United Kingdom and Latin-1. .IP " - " 6 @@ -599,7 +611,7 @@ Last-Update: 2015-05-07 - this problem is now fixed. .TP 4 Version 2.4 (2002-10-02) -@@ -1135,24 +1135,24 @@ Yet another Japanese keyboard layout, JI +@@ -1142,24 +1142,24 @@ Yet another Japanese keyboard layout, JI .IP " - " 6 It is now possible to minimize (iconify) the main window even if no window manager is in use. @@ -631,7 +643,7 @@ Last-Update: 2015-05-07 and maybe useful when run \fIxvkbd\fP from a display manager. .TP 4 Version 2.7a (2005-05-07) -@@ -1168,17 +1168,17 @@ where we must use \fIISO_Level3_Shift\fP +@@ -1175,17 +1175,17 @@ where we must use \fIISO_Level3_Shift\fP Reference to the target bitmap is changed from \fB/usr/X11R6/include/X11/bitmaps/target\fP to \fB/usr/include/X11/bitmaps/target\fP. .IP " - " 6 @@ -653,7 +665,7 @@ Last-Update: 2015-05-07 via \fB\\x\fP, \fB\\y\fP and \fB\\m\fP special sequences. .TP 4 Version 3.0 (2008-05-05) -@@ -1193,7 +1193,7 @@ Version 3.1 (2010-01-17) +@@ -1200,7 +1200,7 @@ Version 3.1 (2010-01-17) .IP " - " 6 Changed the default setting for automatic click to OFF, which was set ON in the previous release in error and caused confusion. .IP " - " 6 @@ -662,7 +674,7 @@ Last-Update: 2015-05-07 .IP " - " 6 Up to 25x25 keys can now be supported both for the main keyboard and the keypad. .IP " - " 6 -@@ -1201,7 +1201,7 @@ Able to open the keypad panel when start +@@ -1208,7 +1208,7 @@ Able to open the keypad panel when start .IP " - " 6 Fixed errors in some keyboard layout files (Korean, Slovene, UK). .IP " - " 6 @@ -671,22 +683,22 @@ Last-Update: 2015-05-07 .TP 4 Version 3.2 (2010-03-14) .IP " - " 6 -@@ -1212,10 +1212,10 @@ New option `\fIBehave as Toolbar Window? +@@ -1219,10 +1219,10 @@ such as Matchbox window manager. (Thanks `\fIAlways on Top\fP' will work rather better with window managers - which support extended window manager hint \fB_NET_WM_STATE_ABOVE\fP. + which support extended window manager hint \fB_NET_WM_STATE_ABOVE\fP. .IP " - " 6 -\fB-window\fP option can now find window which have title match with +\fB\-window\fP option can now find window which have title match with - the specified string. + the specified string. .IP " - " 6 -\fB-window\fP option now accept wildcard characters +\fB\-window\fP option now accept wildcard characters - `\fB*\fP' and `\fB?\fP'. + `\fB*\fP' and `\fB?\fP'. .IP " - " 6 Word completion dictionary file to be used with `\fIWord Completion...\fP' -@@ -1224,18 +1224,18 @@ Word completion dictionary file to be us +@@ -1231,18 +1231,18 @@ can now be specified on the Property pan Only the words which have two or more characters will be appeared - in the word completion list. + in the word completion list. .IP " - " 6 -New \fB-version\fP option to display version information. +New \fB\-version\fP option to display version information. @@ -695,18 +707,18 @@ Last-Update: 2015-05-07 .IP " - " 6 -\fB-text\fP can now accept \fB\\{\fP\fIkeysym\fP\fB}\fP +\fB\-text\fP can now accept \fB\\{\fP\fIkeysym\fP\fB}\fP - so that the specified key can be processed in more primitive manner, - and so that modofier keys such as \fIControl_L\fP, \fIMeta_L\fP, etc. - can also be simulated. - Also, \fB\\{+\fP\fIkeysym\fP\fB}\fP and \fB\\{-\fP\fIkeysym\fP\fB}\fP - will now simulate press and release of the key, respectively. + so that the specified key can be processed in more primitive manner, + and so that modofier keys such as \fIControl_L\fP, \fIMeta_L\fP, etc. + can also be simulated. + Also, \fB\\{+\fP\fIkeysym\fP\fB}\fP and \fB\\{-\fP\fIkeysym\fP\fB}\fP + will now simulate press and release of the key, respectively. .IP " - " 6 -New option \fB-remote-display\fP to make \fIxvkbd\fP connect to +New option \fB\-remote\-display\fP to make \fIxvkbd\fP connect to - the specified display when startup. + the specified display when startup. .IP " - " 6 Bug fixed: \fBKP_0\fP now works. -@@ -1251,7 +1251,7 @@ as it seems delay of 0 caused problems i +@@ -1258,7 +1258,7 @@ as it seems delay of 0 caused problems i ISO_Left_Tab is assigned to the shifted position of the Tab key on the \fIxvkbd\fP window, so that Shift-Tab can be simulated. .IP " - " 6 @@ -715,7 +727,7 @@ Last-Update: 2015-05-07 .TP 4 Version 3.5 (2013-07-15) .IP " - " 6 -@@ -1262,8 +1262,8 @@ Fixed a problem that "Always on Top" not +@@ -1269,8 +1269,8 @@ Fixed a problem that "Always on Top" not .TP 4 Version 3.6 (2015-02-15) .IP " - " 6 @@ -726,3 +738,12 @@ Last-Update: 2015-05-07 make \fIxvkbd\fP to accept UTF16 characters in the file. .IP " - " 6 Keyboard layout selected with "Change Keyboard Layout..." will be kept +@@ -1306,7 +1306,7 @@ A workaround for this problem is now imp + .TP 4 + Version 3.9 (2018-02-25) + .IP " - " 6 +-Modifiers (Alt, etc.) not working with \fB-text\fP option in the recent releases (Debian Bug#891082). This bug is now fixed. ++Modifiers (Alt, etc.) not working with \fB\-text\fP option in the recent releases (Debian Bug#891082). This bug is now fixed. + + + .SH "Author" diff --git a/x11/xvkbd/pkg-descr b/x11/xvkbd/pkg-descr index 864d77a26c08..e2385ccbde2b 100644 --- a/x11/xvkbd/pkg-descr +++ b/x11/xvkbd/pkg-descr @@ -5,4 +5,4 @@ be used for systems without a hardware keyboard such as kiosk terminals or handheld devices. This program also has facility to send characters specified as the command line option to another client. -WWW: http://homepage3.nifty.com/tsato/xvkbd/ +WWW: http://t-sato.in.coocan.jp/xvkbd/ diff --git a/x11/xvkbd/pkg-plist b/x11/xvkbd/pkg-plist index 83a0aa2b5099..890fd8c7c94f 100644 --- a/x11/xvkbd/pkg-plist +++ b/x11/xvkbd/pkg-plist @@ -20,11 +20,12 @@ lib/X11/app-defaults/XVkbd-portuguese lib/X11/app-defaults/XVkbd-russian lib/X11/app-defaults/XVkbd-slovene lib/X11/app-defaults/XVkbd-small -lib/X11/app-defaults/XVkbd-strip lib/X11/app-defaults/XVkbd-spanish +lib/X11/app-defaults/XVkbd-strip lib/X11/app-defaults/XVkbd-swedish lib/X11/app-defaults/XVkbd-swissgerman lib/X11/app-defaults/XVkbd-turkish +lib/X11/app-defaults/XVkbd-turkishF lib/X11/app-defaults/XVkbd-uk man/man1/xvkbd.1.gz %%PORTDOCS%%%%DOCSDIR%%/README -- cgit From b81810507f1b3f60652c578b4a9904b4b9dd0ea8 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Fri, 9 Aug 2019 20:09:14 +0000 Subject: sysutils/mtm: Fix building on 11.2 amd64 /usr/bin/ld: undefined reference to symbol `intrflush' (try adding -ltinfow) /usr/local/lib/libtinfow.so: could not read symbols: Bad value Reported by: pkg-fallout --- sysutils/mtm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/mtm/Makefile b/sysutils/mtm/Makefile index 61870d07d7b1..6ed7796798fa 100644 --- a/sysutils/mtm/Makefile +++ b/sysutils/mtm/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/mtm \ man/man1/mtm.1.gz CFLAGS+= -I${NCURSESINC} -LDFLAGS+= -L${NCURSESLIB} +LDFLAGS+= -L${NCURSESLIB} -ltinfow PORTDATA= mtm.ti -- cgit From 4a8f01bcf0b5907c7355b7ebaa33f6a34bd5c33e Mon Sep 17 00:00:00 2001 From: jbeich Date: Fri, 9 Aug 2019 20:37:23 +0000 Subject: multimedia/svt-hevc: update to 1.4.0 Changes: https://github.com/OpenVisualCloud/SVT-HEVC/releases/tag/v1.4.0 Reported by: GitHub (watch releases) --- multimedia/ffmpeg/Makefile | 3 +- multimedia/ffmpeg/distinfo | 8 ++-- multimedia/gstreamer1-plugins-svt-hevc/Makefile | 3 +- multimedia/gstreamer1-plugins-svt-hevc/distinfo | 6 +-- .../files/patch-gstsvthevcenc.c | 19 -------- multimedia/svt-hevc/Makefile | 30 +++--------- multimedia/svt-hevc/distinfo | 10 ++-- multimedia/svt-hevc/pkg-plist | 1 - multimedia/x265/Makefile | 1 + multimedia/x265/files/patch-svt-hevc-1.3.0 | 53 ---------------------- 10 files changed, 21 insertions(+), 113 deletions(-) delete mode 100644 multimedia/gstreamer1-plugins-svt-hevc/files/patch-gstsvthevcenc.c delete mode 100644 multimedia/x265/files/patch-svt-hevc-1.3.0 diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 34e115d80b99..08b9b3d8ba47 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ @@ -451,7 +452,7 @@ SVTAV1_PREVENTS_MSG= Only one SVT vendor patch can be applied at the same time # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CONFIGURE_ON= --enable-libsvthevc -SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.3.0/ffmpeg_plugin/:svthevc +SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.4.0/ffmpeg_plugin/:svthevc SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if make(makesum) diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 779248e8128d..5c5bc49c373b 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -3,9 +3,9 @@ SHA256 (ffmpeg-4.2.tar.xz) = 023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe85 SIZE (ffmpeg-4.2.tar.xz) = 9088756 SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 898dbbdb21cfafbb19381463382467fbe5c5a78ca3844f8c5583fa919b7d5a82 SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 19723 -SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d -SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22815 -SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d -SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5602 +SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554 +SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 20927 +SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e +SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5273 SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = d2abcdcbcbff21e7ad8de574230622be993da19e9bddf0a690b1118cfd11c6c1 SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 21580 diff --git a/multimedia/gstreamer1-plugins-svt-hevc/Makefile b/multimedia/gstreamer1-plugins-svt-hevc/Makefile index 70c154d18d75..30ec3a233dcb 100644 --- a/multimedia/gstreamer1-plugins-svt-hevc/Makefile +++ b/multimedia/gstreamer1-plugins-svt-hevc/Makefile @@ -2,8 +2,7 @@ PORTNAME= svt-hevc DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0-32 -DISTVERSIONSUFFIX= -ga0dcd77 +DISTVERSION= 1.4.0 CATEGORIES= multimedia PKGNAMEPREFIX= gstreamer1-plugins- diff --git a/multimedia/gstreamer1-plugins-svt-hevc/distinfo b/multimedia/gstreamer1-plugins-svt-hevc/distinfo index f78a1e5bf2ab..48bb8e7b49ca 100644 --- a/multimedia/gstreamer1-plugins-svt-hevc/distinfo +++ b/multimedia/gstreamer1-plugins-svt-hevc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557301098 -SHA256 (OpenVisualCloud-SVT-HEVC-v1.3.0-32-ga0dcd77_GH0.tar.gz) = cfff9280afd366bea73d093bdfa0a82b700345f09ce486ef7edc0399ab1fab13 -SIZE (OpenVisualCloud-SVT-HEVC-v1.3.0-32-ga0dcd77_GH0.tar.gz) = 1165629 +TIMESTAMP = 1565309873 +SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e +SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319 diff --git a/multimedia/gstreamer1-plugins-svt-hevc/files/patch-gstsvthevcenc.c b/multimedia/gstreamer1-plugins-svt-hevc/files/patch-gstsvthevcenc.c deleted file mode 100644 index 746dad76afd3..000000000000 --- a/multimedia/gstreamer1-plugins-svt-hevc/files/patch-gstsvthevcenc.c +++ /dev/null @@ -1,19 +0,0 @@ -encoderColorFormat was added after 1.3.0, so omit it for now. - -../gstsvthevcenc.c:732:15: error: no member named 'encoderColorFormat' in 'struct EB_H265_ENC_CONFIGURATION' - svt_config->encoderColorFormat = EB_YUV420; - ~~~~~~~~~~ ^ -../gstsvthevcenc.c:732:36: error: use of undeclared identifier 'EB_YUV420' - svt_config->encoderColorFormat = EB_YUV420; - ^ - ---- gstsvthevcenc.c.orig 2019-03-27 13:22:12 UTC -+++ gstsvthevcenc.c -@@ -729,7 +729,6 @@ set_default_svt_configuration (EB_H265_ENC_CONFIGURATI - svt_config->recoveryPointSeiFlag = FALSE; - svt_config->enableTemporalId = 1; - svt_config->encoderBitDepth = 8; -- svt_config->encoderColorFormat = EB_YUV420; - svt_config->compressedTenBitFormat = FALSE; - svt_config->profile = 1; - svt_config->tier = 0; diff --git a/multimedia/svt-hevc/Makefile b/multimedia/svt-hevc/Makefile index dd63209a4295..b5c2916a5983 100644 --- a/multimedia/svt-hevc/Makefile +++ b/multimedia/svt-hevc/Makefile @@ -2,14 +2,9 @@ PORTNAME= svt-hevc DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0 -PORTREVISION= 3 +DISTVERSION= 1.4.0 CATEGORIES= multimedia -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= ad0942db4ce4.patch:-p1 -PATCHFILES+= 87e168e78620.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Scalable HEVC encoder @@ -29,30 +24,19 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= OpenVisualCloud GH_PROJECT= SVT-HEVC +CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= NATIVE post-patch: -# Default CFLAGS are already set by USES=cmake - @${REINPLACE_CMD} -i .flags -E -e 's/ -march=native//' \ - -e 's/-O2 -flto //' \ - -e '/C_FLAGS_(RELEASE|DEBUG)/d' \ - -e '/NASM_FLAGS_DEBUG/d' \ - ${WRKSRC}/CMakeLists.txt -# Avoid devel/yasm dependency - @${REINPLACE_CMD} -i .typo 's/[[:<:]]MAKE_ASM_NASM_COMPILER/C&/' \ +# Keep using nasm and drop vendor -O/-g + @${REINPLACE_CMD} -e '/find_program.*yasm/d' \ + -Ee '/set.*(release|debug)_flags_to_test/,/\)/d' \ ${WRKSRC}/CMakeLists.txt -# Avoid lang/gcc* dependency - @${REINPLACE_CMD} -i .gcc -e 's/gcc-//' \ - -e '/CMAKE_C/{ s/STREQUAL/MATCHES/; s/"GNU/&|Clang/; }' \ - ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/Source/Lib/*/CMakeLists.txt # Avoid conflict with standard types @${GREP} -Flr '_T_DEFINED' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -i .types 's/_T_DEFINED/_DEFINED/' # Avoid platform whitelists for generic non-Windows code - @${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \ - ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/Source/Lib/*/CMakeLists.txt @${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \ - ${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/' + ${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/' .include diff --git a/multimedia/svt-hevc/distinfo b/multimedia/svt-hevc/distinfo index 704590d320bb..48bb8e7b49ca 100644 --- a/multimedia/svt-hevc/distinfo +++ b/multimedia/svt-hevc/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1550104614 -SHA256 (OpenVisualCloud-SVT-HEVC-v1.3.0_GH0.tar.gz) = ef21f3a13e33b4f61af4a0c79337ce9e4f73f6fe13d1c2afe2c3b0712f4158d9 -SIZE (OpenVisualCloud-SVT-HEVC-v1.3.0_GH0.tar.gz) = 1137878 -SHA256 (ad0942db4ce4.patch) = 2165f1b1d658dbbac91f8a2e86976f6692f93fcc6649feacbc6013d811874f48 -SIZE (ad0942db4ce4.patch) = 864 -SHA256 (87e168e78620.patch) = c540e265016dfda819fe7086070d39804e4205b45a2fa94800406798c5839d1c -SIZE (87e168e78620.patch) = 685 +TIMESTAMP = 1565309873 +SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e +SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319 diff --git a/multimedia/svt-hevc/pkg-plist b/multimedia/svt-hevc/pkg-plist index 3a339b16ee9e..a0e77da60b46 100644 --- a/multimedia/svt-hevc/pkg-plist +++ b/multimedia/svt-hevc/pkg-plist @@ -1,5 +1,4 @@ bin/SvtHevcEncApp -bin/SvtHevcEncSimpleApp include/svt-hevc/EbApi.h include/svt-hevc/EbErrorCodes.h include/svt-hevc/EbTime.h diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index c5f2f16e28df..f67aa87528ee 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -3,6 +3,7 @@ PORTNAME= x265 PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/ \ https://downloads.videolan.org/pub/videolan/x265/ \ diff --git a/multimedia/x265/files/patch-svt-hevc-1.3.0 b/multimedia/x265/files/patch-svt-hevc-1.3.0 deleted file mode 100644 index 08c4eb3c2242..000000000000 --- a/multimedia/x265/files/patch-svt-hevc-1.3.0 +++ /dev/null @@ -1,53 +0,0 @@ -encoderColorFormat, tileColumnCount, etc. were added after 1.3.0, so omit it for now. - -source/x265.cpp:570:13: error: no member named 'encoderColorFormat' in 'EB_H265_ENC_CONFIGURATION' - svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp; - ~~~~~~~~ ^ -source/x265.cpp:570:35: error: use of undeclared identifier 'EB_COLOR_FORMAT' - svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp; - ^ -source/common/param.cpp:2505:19: error: no member named 'tileColumnCount' in 'EB_H265_ENC_CONFIGURATION' - svtHevcParam->tileColumnCount = 1; - ~~~~~~~~~~~~ ^ -source/common/param.cpp:2506:19: error: no member named 'tileRowCount' in 'EB_H265_ENC_CONFIGURATION' - svtHevcParam->tileRowCount = 1; - ~~~~~~~~~~~~ ^ -source/common/param.cpp:2507:19: error: no member named 'tileSliceMode' in 'EB_H265_ENC_CONFIGURATION' - svtHevcParam->tileSliceMode = 0; - ~~~~~~~~~~~~ ^ -source/common/param.cpp:2508:19: error: no member named 'unrestrictedMotionVector' in 'EB_H265_ENC_CONFIGURATION' - svtHevcParam->unrestrictedMotionVector = 1; - ~~~~~~~~~~~~ ^ - ---- source/common/param.cpp.orig 2019-07-08 11:10:19 UTC -+++ source/common/param.cpp -@@ -2454,7 +2454,6 @@ void svt_param_default(x265_param* param) - svtHevcParam->frameRateNumerator = 0; - svtHevcParam->frameRateDenominator = 0; - svtHevcParam->encoderBitDepth = 8; -- svtHevcParam->encoderColorFormat = EB_YUV420; - svtHevcParam->compressedTenBitFormat = 0; - svtHevcParam->rateControlMode = 0; - svtHevcParam->sceneChangeDetection = 1; -@@ -2502,11 +2501,6 @@ void svt_param_default(x265_param* param) - svtHevcParam->logicalProcessors = 0; - svtHevcParam->switchThreadsToRtPriority = 1; - svtHevcParam->fpsInVps = 0; -- -- svtHevcParam->tileColumnCount = 1; -- svtHevcParam->tileRowCount = 1; -- svtHevcParam->tileSliceMode = 0; -- svtHevcParam->unrestrictedMotionVector = 1; - } - - int svt_set_preset_tune(x265_param* param, const char* preset, const char* tune) ---- source/x265.cpp.orig 2019-07-08 11:10:19 UTC -+++ source/x265.cpp -@@ -567,7 +567,6 @@ bool CLIOptions::parse(int argc, char **argv) - svtParam->frameRateNumerator = param->fpsNum; - svtParam->frameRateDenominator = param->fpsDenom; - svtParam->framesToBeEncoded = param->totalFrames; -- svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp; - } - #endif - -- cgit From 4aac0d98a18874425b772806e088d7fdd9c59cb3 Mon Sep 17 00:00:00 2001 From: madpilot Date: Fri, 9 Aug 2019 20:43:10 +0000 Subject: Update ristretto to 0.10.0 --- graphics/ristretto/Makefile | 10 ++++------ graphics/ristretto/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index 2f763bbf60dd..270d7bbe4b0b 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ristretto -PORTVERSION= 0.8.5 +PORTVERSION= 0.10.0 CATEGORIES= graphics xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -15,13 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexif.so:graphics/libexif \ libdbus-glib-1.so:devel/dbus-glib \ - libdbus-1.so:devel/dbus \ - libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libdbus-1.so:devel/dbus USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \ - tar:bzip2 xfce -USE_GNOME= cairo gtk20 glib20 intltool + tar:bzip2 xfce:gtk3 +USE_GNOME= cairo gtk30 glib20 intltool USE_XFCE= libmenu USE_XORG= ice sm x11 diff --git a/graphics/ristretto/distinfo b/graphics/ristretto/distinfo index 43fafb05d3f5..624d2466ae10 100644 --- a/graphics/ristretto/distinfo +++ b/graphics/ristretto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563395296 -SHA256 (xfce4/ristretto-0.8.5.tar.bz2) = 7f4805baca9ea77372cbd21b19673e22390bbc7a336ca1ac1a4aaecfbfc79f60 -SIZE (xfce4/ristretto-0.8.5.tar.bz2) = 583736 +TIMESTAMP = 1565382555 +SHA256 (xfce4/ristretto-0.10.0.tar.bz2) = 16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769 +SIZE (xfce4/ristretto-0.10.0.tar.bz2) = 586447 -- cgit From 4c65f575183f44ecf24a9b0d3c170b67f93bea8e Mon Sep 17 00:00:00 2001 From: adridg Date: Fri, 9 Aug 2019 20:47:02 +0000 Subject: Add patch from upstream KDE git for CVE-2019-14744 Upstream description: - https://kde.org/info/security/advisory-20190807-1.txt Upstream solution: KDE Frameworks 5 users: - update to kconfig >= 5.61.0 - or apply the following patch to kconfig: https://cgit.kde.org/kconfig.git/commit/?id=5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 kdelibs4 is also affected, but that was removed from the ports tree over six months ago. MFH: 2019Q3 Security: CVE-2019-14744 --- devel/kf5-kconfig/Makefile | 2 +- ...ch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 | 139 +++++++++++++++++++++ 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile index 2703e8d2b9b7..c1ab8c41d64a 100644 --- a/devel/kf5-kconfig/Makefile +++ b/devel/kf5-kconfig/Makefile @@ -2,7 +2,7 @@ PORTNAME= kconfig DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 b/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 new file mode 100644 index 000000000000..f348c1182926 --- /dev/null +++ b/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 @@ -0,0 +1,139 @@ +commit 5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 +Author: David Faure +Date: Wed Aug 7 09:35:36 2019 +0200 + + Security: remove support for $(...) in config keys with [$e] marker. + + Summary: + It is very unclear at this point what a valid use case for this feature + would possibly be. The old documentation only mentions $(hostname) as + an example, which can be done with $HOSTNAME instead. + + Note that $(...) is still supported in Exec lines of desktop files, + this does not require [$e] anyway (and actually works better without it, + otherwise the $ signs need to be doubled to obey kconfig $e escaping rules...). + + Test Plan: + ctest passes; various testcases with $(...) in desktop files, + directory files, and config files, no longer execute commands. + + Reviewers: mdawson, aacid, broulik, davidedmundson, kossebau, apol, sitter, security-team + + Reviewed By: mdawson, davidedmundson + + Subscribers: ZaWertun, rikmills, fvogt, ngraham, kde-frameworks-devel + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D22979 +diff --git autotests/kconfigtest.cpp autotests/kconfigtest.cpp +index 410b5b8..9af3b46 100644 +--- autotests/kconfigtest.cpp ++++ autotests/kconfigtest.cpp +@@ -38,7 +38,7 @@ + #include + #endif + #ifndef Q_OS_WIN +-#include // gethostname ++#include // getuid + #endif + + KCONFIGGROUP_DECLARE_ENUM_QOBJECT(KConfigTest, Testing) +@@ -546,14 +546,8 @@ void KConfigTest::testPath() + QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" + HOMEPATH)); + QVERIFY(group.hasKey("URL")); + QCOMPARE(group.readEntry("URL", QString()), QString("file://" + HOMEPATH)); +-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) +- // I don't know if this will work on windows +- // This test hangs on OS X + QVERIFY(group.hasKey("hostname")); +- char hostname[256]; +- QVERIFY(::gethostname(hostname, sizeof(hostname)) == 0); +- QCOMPARE(group.readEntry("hostname", QString()), QString::fromLatin1(hostname)); +-#endif ++ QCOMPARE(group.readEntry("hostname", QString()), QStringLiteral("(hostname)")); // the $ got removed because empty var name + QVERIFY(group.hasKey("noeol")); + QCOMPARE(group.readEntry("noeol", QString()), QString("foo")); + +diff --git docs/options.md docs/options.md +index c634c00..4a6e9bc 100644 +--- docs/options.md ++++ docs/options.md +@@ -67,18 +67,15 @@ environment variables (and `XDG_CONFIG_HOME` in particular). + Shell Expansion + --------------- + +-If an entry is marked with `$e`, environment variables and shell commands will +-be expanded. ++If an entry is marked with `$e`, environment variables will be expanded. + + Name[$e]=$USER +- Host[$e]=$(hostname) + + When the "Name" entry is read `$USER` will be replaced with the value of the +-`$USER` environment variable, and `$(hostname)` will be replaced with the output +-of the `hostname` command. ++`$USER` environment variable. + +-Note that the application will replace `$USER` and `$(hostname)` with their +-respective expanded values after saving. To prevent this combine the `$e` option ++Note that the application will replace `$USER` with its ++expanded value after saving. To prevent this combine the `$e` option + with `$i` (immmutable) option. For example: + + Name[$ei]=$USER +diff --git src/core/kconfig.cpp src/core/kconfig.cpp +index e1b11ed..f6824ce 100644 +--- src/core/kconfig.cpp ++++ src/core/kconfig.cpp +@@ -28,19 +28,6 @@ + #include + #include + +-#ifdef _MSC_VER +-static inline FILE *popen(const char *cmd, const char *mode) +-{ +- return _popen(cmd, mode); +-} +-static inline int pclose(FILE *stream) +-{ +- return _pclose(stream); +-} +-#else +-#include +-#endif +- + #include "kconfigbackend_p.h" + #include "kconfiggroup.h" + +@@ -183,29 +170,7 @@ QString KConfigPrivate::expandString(const QString &value) + int nDollarPos = aValue.indexOf(QLatin1Char('$')); + while (nDollarPos != -1 && nDollarPos + 1 < aValue.length()) { + // there is at least one $ +- if (aValue[nDollarPos + 1] == QLatin1Char('(')) { +- int nEndPos = nDollarPos + 1; +- // the next character is not $ +- while ((nEndPos <= aValue.length()) && (aValue[nEndPos] != QLatin1Char(')'))) { +- nEndPos++; +- } +- nEndPos++; +- QString cmd = aValue.mid(nDollarPos + 2, nEndPos - nDollarPos - 3); +- +- QString result; +- +-// FIXME: wince does not have pipes +-#ifndef _WIN32_WCE +- FILE *fs = popen(QFile::encodeName(cmd).data(), "r"); +- if (fs) { +- QTextStream ts(fs, QIODevice::ReadOnly); +- result = ts.readAll().trimmed(); +- pclose(fs); +- } +-#endif +- aValue.replace(nDollarPos, nEndPos - nDollarPos, result); +- nDollarPos += result.length(); +- } else if (aValue[nDollarPos + 1] != QLatin1Char('$')) { ++ if (aValue[nDollarPos + 1] != QLatin1Char('$')) { + int nEndPos = nDollarPos + 1; + // the next character is not $ + QStringRef aVarName; -- cgit From 01b6d8bdf612175b6c869d050f7a890d802cfe0d Mon Sep 17 00:00:00 2001 From: linimon Date: Fri, 9 Aug 2019 21:12:44 +0000 Subject: Temporarily disable the DOCS option on powerpc64. For reasons not yet understood, having this option enabled on powerpc64 consumes all memory and swap during poudriere builds. On certain machines with a recent -CURRENT with patches, this panics the machine. Approved by: portmgr (tier-2 blanket) --- print/py-reportlab/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 4a1a0fc9627d..b34431ad7a65 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -35,6 +35,9 @@ PORTDOCS= reportlab-userguide.pdf OPTIONS_DEFINE= CJK FREETYPE DOCS OPTIONS_DEFAULT= CJK FREETYPE +# XXX disable this 20190809 while linimon investigates why having it +# enabled consumes all memory and swap during poudriere builds. +OPTIONS_EXCLUDE_powerpc64= DOCS CJK_DESC= Adobe CMaps CJK_RUN_DEPENDS= ${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -- cgit From 63e95dc38fd243ca3427a2af31429f3dc84a67ca Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 9 Aug 2019 21:13:56 +0000 Subject: security/vuxml: Document security/doas issues PR: 239629 --- security/vuxml/vuln.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 99ed2adbc54e..aded00ac2bda 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -58,6 +58,36 @@ Notes: * Do not forget port variants (linux-f10-libxml2, libxml2, etc.) --> + + doas -- Prevent passing of environment variables + + + doas + 6.1 + + + + +

Jesse Smith of Resonating Media reports:

+
+

Previous versions of "doas" transferred most environment variables, such + as USER, HOME, and PATH from the original user to the target user. + + Passing these variables could cause files in the wrong path or + home directory to be read (or written to), which resulted in potential + security problems.

+
+ +
+ + https://github.com/slicer69/doas/releases/tag/6.1 + + + 2019-08-03 + 2019-08-09 + +
+ bro -- Null pointer dereference and Signed integer overflow -- cgit From 627346c85e83c3178c2220d378266abc0d8f7a05 Mon Sep 17 00:00:00 2001 From: adridg Date: Fri, 9 Aug 2019 21:21:58 +0000 Subject: Add vuxml for KDE Frameworks CVE --- security/vuxml/vuln.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index aded00ac2bda..e4a9a8730364 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -58,6 +58,35 @@ Notes: * Do not forget port variants (linux-f10-libxml2, libxml2, etc.) --> + + KDE Frameworks -- malicious .desktop files execute code + + + kf5-kconfig + 5.60.0_2 + + + + +

The KDE Community has released a security announcement:

+
+

The syntax Key[$e]=$(shell command) in *.desktop files, .directory files, and configuration files +(typically found in ~/.config) was an intentional feature of KConfig, to allow flexible configuration. +This could however be abused by malicious people to make the users install such files and get code +executed even without intentional action by the user.

+
+ +
+ + CVE-2019-14744 + https://kde.org/info/security/advisory-20190807-1.txt + + + 2019-08-07 + 2019-08-09 + +
+ doas -- Prevent passing of environment variables -- cgit From 52375efc32937e4255c45ebe75cdebc070183049 Mon Sep 17 00:00:00 2001 From: mizhka Date: Fri, 9 Aug 2019 22:33:32 +0000 Subject: [new port] lang/kotlin: add missing bit in Makefile Include lang/kotlin (recently committed) into build. Reported by: antoine@ --- lang/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/Makefile b/lang/Makefile index 92b38dcce548..49a5cc3d783a 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -167,6 +167,7 @@ SUBDIR += jython SUBDIR += kawa SUBDIR += kf5-kross + SUBDIR += kotlin SUBDIR += kross-interpreters SUBDIR += kturtle SUBDIR += lafontaine -- cgit From 7f8205840e56a2cf70aaf20175e1de0c85e531d0 Mon Sep 17 00:00:00 2001 From: jgh Date: Fri, 9 Aug 2019 23:20:14 +0000 Subject: - remove valid endpoints - bump revision Reported by: clusteradm@ --- net/htpdate/Makefile | 1 + net/htpdate/files/htpdate.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index 50543df1c7f2..53e6a46cc934 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -3,6 +3,7 @@ PORTNAME= htpdate PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.vervest.org/htp/archive/c/ \ http://twekkel.home.xs4all.nl/htp/ diff --git a/net/htpdate/files/htpdate.in b/net/htpdate/files/htpdate.in index 73f46d30f437..9626e8308e15 100644 --- a/net/htpdate/files/htpdate.in +++ b/net/htpdate/files/htpdate.in @@ -17,7 +17,7 @@ load_rc_config htpdate htpdate_enable="${htpdate_enable:-"NO"}" -htpdate_servers="${htpdate_servers:-"www.freebsd.org www.linux.com"}" +htpdate_servers="${htpdate_servers:-"www.example.com"}" htpdate_flags="${htpdate_flags:-"-l -s -D"}" name=htpdate -- cgit From f0a0acf849e4edf6609703680e2a31c8e8cc8686 Mon Sep 17 00:00:00 2001 From: jgh Date: Fri, 9 Aug 2019 23:29:45 +0000 Subject: - update to commit b51393e --- sysutils/screenfetch/Makefile | 3 ++- sysutils/screenfetch/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 9b0f6330d53f..f85284436d96 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= screenFetch -PORTVERSION= 3.8.0 DISTVERSIONPREFIX= v +DISTVERSION= 3.8.0-209 +DISTVERSIONSUFFIX= -gb51393e CATEGORIES= sysutils MAINTAINER= jgh@FreeBSD.org diff --git a/sysutils/screenfetch/distinfo b/sysutils/screenfetch/distinfo index 23c05339efe6..a49621735d88 100644 --- a/sysutils/screenfetch/distinfo +++ b/sysutils/screenfetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501025556 -SHA256 (KittyKatt-screenFetch-v3.8.0_GH0.tar.gz) = 248283ee3c24b0dbffb79ed685bdd518554073090c1c167d07ad2a729db26633 -SIZE (KittyKatt-screenFetch-v3.8.0_GH0.tar.gz) = 71970 +TIMESTAMP = 1565392720 +SHA256 (KittyKatt-screenFetch-v3.8.0-209-gb51393e_GH0.tar.gz) = 153039844818c138693bd31679970a240f25b557d925f0cfe856f9d8162a79cb +SIZE (KittyKatt-screenFetch-v3.8.0-209-gb51393e_GH0.tar.gz) = 77182 -- cgit From 4a42a3c8affddbded79f7fa453890405ebb7933e Mon Sep 17 00:00:00 2001 From: novel Date: Sat, 10 Aug 2019 03:29:53 +0000 Subject: misc/osinfo-db: update to 20190805 --- misc/osinfo-db/Makefile | 2 +- misc/osinfo-db/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/osinfo-db/Makefile b/misc/osinfo-db/Makefile index 5835de99a548..b8a4587f68eb 100644 --- a/misc/osinfo-db/Makefile +++ b/misc/osinfo-db/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= osinfo-db -PORTVERSION= 20190726 +PORTVERSION= 20190805 CATEGORIES= misc MASTER_SITES= https://releases.pagure.org/libosinfo/ diff --git a/misc/osinfo-db/distinfo b/misc/osinfo-db/distinfo index 8d8d04648b28..85671dfc56fd 100644 --- a/misc/osinfo-db/distinfo +++ b/misc/osinfo-db/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564901987 -SHA256 (osinfo-db-20190726.tar.xz) = 39c70aebeab302cabbffef56f7db60accda22b0a27ce8d17324311311ec28d4d -SIZE (osinfo-db-20190726.tar.xz) = 89528 +TIMESTAMP = 1565407129 +SHA256 (osinfo-db-20190805.tar.xz) = 7da4477508cb2fb03da90123bafcc2ab1ff6c2d8f911a590cad9a202eb0448d1 +SIZE (osinfo-db-20190805.tar.xz) = 90228 -- cgit From bbb4c93e77202d25e4a56003e0d743953d0793a0 Mon Sep 17 00:00:00 2001 From: arrowd Date: Sat, 10 Aug 2019 07:18:40 +0000 Subject: devel/elm-format: Update to 0.8.2. Submitted by: Evilham Differential Revision: https://reviews.freebsd.org/D21202 --- devel/elm-format/Makefile | 7 +++---- devel/elm-format/distinfo | 20 +++++++++----------- devel/elm-format/files/patch-Setup.hs | 11 ----------- 3 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 devel/elm-format/files/patch-Setup.hs diff --git a/devel/elm-format/Makefile b/devel/elm-format/Makefile index e1881ace1056..ab52d0c8ae9a 100644 --- a/devel/elm-format/Makefile +++ b/devel/elm-format/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= elm-format -PORTVERSION= 0.8.1 +PORTVERSION= 0.8.2 CATEGORIES= devel textproc MAINTAINER= haskell@FreeBSD.org @@ -19,13 +19,13 @@ USE_CABAL= ansi-terminal-0.8.2 \ ansi-wl-pprint-0.6.8.2_2 \ base-orphans-0.8.1 \ bifunctors-5.5.4_1 \ - binary-0.8.6.0 \ + binary-0.8.7.0 \ Cabal-2.4.1.0_1 \ cabal-doctest-1.0.6_2 \ colour-2.3.5 \ comonad-5.0.5 \ concatenative-1.0.1 \ - containers-0.5.11.0_3 \ + containers-0.6.0.1 \ contravariant-1.5.1 \ distributive-0.6 \ exceptions-0.10.2 \ @@ -49,7 +49,6 @@ USE_CABAL= ansi-terminal-0.8.2 \ post-patch: @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' \ - ${WRKSRC}/Setup.hs \ ${WRKSRC}/src/ElmFormat/Version.hs .include diff --git a/devel/elm-format/distinfo b/devel/elm-format/distinfo index 8b1487fb0a24..de1e3445c93b 100644 --- a/devel/elm-format/distinfo +++ b/devel/elm-format/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1563203545 -SHA256 (cabal/elm-format-0.8.1.tar.gz) = fddf0a480e473181c000b2ba30ed55bffb9f9af97cbb34678a3316711bfcdcb7 -SIZE (cabal/elm-format-0.8.1.tar.gz) = 509353 +TIMESTAMP = 1565381463 +SHA256 (cabal/elm-format-0.8.2.tar.gz) = ea18693e226e3ab920f372cb701b9b6fc09e23626b784e22d0f4a8a468de459e +SIZE (cabal/elm-format-0.8.2.tar.gz) = 341522 SHA256 (cabal/Cabal-2.4.1.0/Cabal-2.4.1.0.tar.gz) = 736a902da9fb2c826e75e9f7b4b591983bf58a6a62c8cae9866f6a9d5ace3594 SIZE (cabal/Cabal-2.4.1.0/Cabal-2.4.1.0.tar.gz) = 744637 SHA256 (cabal/Cabal-2.4.1.0/revision/1.cabal) = 56c858cf85e8756a94aaf930f2be4c2eaee623f067e7c55394194d3741147ab7 @@ -19,8 +19,8 @@ SHA256 (cabal/bifunctors-5.5.4/bifunctors-5.5.4.tar.gz) = 29d62cf43fcef94534a585 SIZE (cabal/bifunctors-5.5.4/bifunctors-5.5.4.tar.gz) = 40510 SHA256 (cabal/bifunctors-5.5.4/revision/1.cabal) = 7240cda20b6b51e18d679691fab27784a56fc075cf71927070850f2960171017 SIZE (cabal/bifunctors-5.5.4/revision/1.cabal) = 3313 -SHA256 (cabal/binary-0.8.6.0/binary-0.8.6.0.tar.gz) = 1ee9c4f3cb7e712e2f6ac64faae3224d639b736826a3f810578dc8ba92dae15f -SIZE (cabal/binary-0.8.6.0/binary-0.8.6.0.tar.gz) = 57369 +SHA256 (cabal/binary-0.8.7.0/binary-0.8.7.0.tar.gz) = 1d9defe3fe53ffde464c9715928e5614e613c470f0a1ade55f19d648d2f349e4 +SIZE (cabal/binary-0.8.7.0/binary-0.8.7.0.tar.gz) = 57443 SHA256 (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = decaaa5a73eaabaf3c4f8c644bd7f6e3f428b6244e935c0cf105f75f9b24ed2d SIZE (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = 10007 SHA256 (cabal/cabal-doctest-1.0.6/revision/2.cabal) = c0b4a5b1ff38d2867e7003b4be59f3bd7e8e204ab8c988d96d3a77472ae671cd @@ -31,10 +31,8 @@ SHA256 (cabal/comonad-5.0.5/comonad-5.0.5.tar.gz) = 6c581266675389cef300117f4533 SIZE (cabal/comonad-5.0.5/comonad-5.0.5.tar.gz) = 17911 SHA256 (cabal/concatenative-1.0.1/concatenative-1.0.1.tar.gz) = ed5997924518f0ca6b8afcd4e1ee10d30675bb4c4ba164a4d70b4ddbd8c6bc17 SIZE (cabal/concatenative-1.0.1/concatenative-1.0.1.tar.gz) = 3723 -SHA256 (cabal/containers-0.5.11.0/containers-0.5.11.0.tar.gz) = 58cd226ad5a147b12240f854a1fbadf809fd56cb9532123d60c1b23d13e04948 -SIZE (cabal/containers-0.5.11.0/containers-0.5.11.0.tar.gz) = 231729 -SHA256 (cabal/containers-0.5.11.0/revision/3.cabal) = 28ad7337057442f75bc689315ab4ec7bdf5e6b2c39668f306672cecd82c02798 -SIZE (cabal/containers-0.5.11.0/revision/3.cabal) = 16685 +SHA256 (cabal/containers-0.6.0.1/containers-0.6.0.1.tar.gz) = a71197d356e578651c37986493ff999f54773169acc32e5997c8248aca0bac6a +SIZE (cabal/containers-0.6.0.1/containers-0.6.0.1.tar.gz) = 238343 SHA256 (cabal/contravariant-1.5.1/contravariant-1.5.1.tar.gz) = 088bcce066c110b918273f79bd7902468eb09638563602135950f45ac75e8ec9 SIZE (cabal/contravariant-1.5.1/contravariant-1.5.1.tar.gz) = 16002 SHA256 (cabal/distributive-0.6/distributive-0.6.tar.gz) = a4af1341a63a430dc569dd1e59631f127c40ebdd353a945a74d18682f6bdc1d4 @@ -87,5 +85,5 @@ SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733 SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199 -SHA256 (cabal/avh4-elm-format-0.8.1_GH0.tar.gz) = fddf0a480e473181c000b2ba30ed55bffb9f9af97cbb34678a3316711bfcdcb7 -SIZE (cabal/avh4-elm-format-0.8.1_GH0.tar.gz) = 509353 +SHA256 (cabal/avh4-elm-format-0.8.2_GH0.tar.gz) = ea18693e226e3ab920f372cb701b9b6fc09e23626b784e22d0f4a8a468de459e +SIZE (cabal/avh4-elm-format-0.8.2_GH0.tar.gz) = 341522 diff --git a/devel/elm-format/files/patch-Setup.hs b/devel/elm-format/files/patch-Setup.hs deleted file mode 100644 index 20513fdad55a..000000000000 --- a/devel/elm-format/files/patch-Setup.hs +++ /dev/null @@ -1,11 +0,0 @@ ---- Setup.hs.orig 2018-10-02 05:59:03 UTC -+++ Setup.hs -@@ -23,7 +23,7 @@ writeCustomFile :: FilePath -> IO () - writeCustomFile filepath = do - putStrLn $ "Generating " ++ filepath ++ "..." - -- desc <- readProcess "git" ["describe", "--abbrev=8", "--always"] "" -+ desc <- readProcess "echo" ["%%PORTVERSION%%"] "" - now <- readProcess "date" ["+%s"] "" - - writeFile filepath $ unlines -- cgit From 61dc17bd3cd51ca286a3bb59542785235e262ad7 Mon Sep 17 00:00:00 2001 From: tobik Date: Sat, 10 Aug 2019 07:25:54 +0000 Subject: sysutils/barrier: Update to v2.3.1 Changes: https://github.com/debauchee/barrier/releases/tag/v2.3.1 --- sysutils/barrier/Makefile | 3 +-- sysutils/barrier/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile index 72b42796a025..16d95c838fc6 100644 --- a/sysutils/barrier/Makefile +++ b/sysutils/barrier/Makefile @@ -2,8 +2,7 @@ PORTNAME= barrier DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0 -PORTREVISION= 1 +DISTVERSION= 2.3.1 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/barrier/distinfo b/sysutils/barrier/distinfo index 1e08a0762f2d..e83f426d6282 100644 --- a/sysutils/barrier/distinfo +++ b/sysutils/barrier/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561692019 -SHA256 (debauchee-barrier-v2.3.0_GH0.tar.gz) = 2f5881d05cb646ef551752a0104de13cfbcd9ca12e116bbb444a6537689a06f9 -SIZE (debauchee-barrier-v2.3.0_GH0.tar.gz) = 7243623 +TIMESTAMP = 1565421408 +SHA256 (debauchee-barrier-v2.3.1_GH0.tar.gz) = adf6df33a4a07e05784e825a2549ff22fe288aa184f1caee2c2ffddb2cbcf249 +SIZE (debauchee-barrier-v2.3.1_GH0.tar.gz) = 7243275 -- cgit From 1fdb873edbd6515c913290746a1ef1bd92715d6a Mon Sep 17 00:00:00 2001 From: matthew Date: Sat, 10 Aug 2019 07:56:38 +0000 Subject: Update to 8.3.2 ChangeLog: https://github.com/citusdata/citus/blob/master/CHANGELOG.md --- databases/pg_citus/Makefile | 2 +- databases/pg_citus/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile index b84e89accd94..af062bc4df95 100644 --- a/databases/pg_citus/Makefile +++ b/databases/pg_citus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= citus -PORTVERSION= 8.3.1 +PORTVERSION= 8.3.2 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= pg_ diff --git a/databases/pg_citus/distinfo b/databases/pg_citus/distinfo index 2efd49af1d43..b5100e5ff344 100644 --- a/databases/pg_citus/distinfo +++ b/databases/pg_citus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564552466 -SHA256 (citusdata-citus-v8.3.1_GH0.tar.gz) = a3cb6a1301e62a2d185a10559e46d8dbe5498efd0c58f954d561c41fbd3bb4f3 -SIZE (citusdata-citus-v8.3.1_GH0.tar.gz) = 4003721 +TIMESTAMP = 1565421814 +SHA256 (citusdata-citus-v8.3.2_GH0.tar.gz) = 48bc4bf3a6edf26bfb47a2393b7ed9aa8cb758f6c5bf8da91e083e0dc6a1902a +SIZE (citusdata-citus-v8.3.2_GH0.tar.gz) = 4004019 -- cgit From d11647b694f4b2663ed8737f1f0378a6cd6badac Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Sat, 10 Aug 2019 09:02:29 +0000 Subject: - Update WWW Approved by: portmgr blanket --- misc/colwide/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/colwide/pkg-descr b/misc/colwide/pkg-descr index d55a3174219d..84311485621a 100644 --- a/misc/colwide/pkg-descr +++ b/misc/colwide/pkg-descr @@ -1,4 +1,4 @@ colwide is a Perl script which displays either 80 or specified number of hash (#) characters on the screen. Can be useful to determine terminal width. -WWW: http://www.neelc.org/software/colwide/ +WWW: https://github.com/neelchauhan/colwide -- cgit From b12311fd350d6b73e607423354bae62e28d96b28 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 10 Aug 2019 12:31:34 +0000 Subject: sysutils/burp-devel: Update to 2.3.12 Changelog: * Fix Windows memory breakage when restoring long paths. * Add long directories to tests. * Simplify windows mempool code. * Ability to choose to attempt to strip VSS on Windows restore or not, as well as disabling the Windows restore api, with '-x' and '-X' and options. https://github.com/grke/burp/blob/2.3.12/CHANGELOG PR: 239715 Submitted by: Lorenzo Salvadore (maintainer) --- sysutils/burp-devel/Makefile | 2 +- sysutils/burp-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile index 3e04bd5e7759..1d173d607835 100644 --- a/sysutils/burp-devel/Makefile +++ b/sysutils/burp-devel/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.3.10 +PORTVERSION= 2.3.12 PKGNAMESUFFIX= -devel COMMENT= Network backup and restore program (development) diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo index ad887b6db263..26519d271eb1 100644 --- a/sysutils/burp-devel/distinfo +++ b/sysutils/burp-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562322907 -SHA256 (grke-burp-2.3.10_GH0.tar.gz) = db436708e2ff6e1efbc527140c58e06cd5297017b9160683976e941a42327fb2 -SIZE (grke-burp-2.3.10_GH0.tar.gz) = 620841 +TIMESTAMP = 1565273311 +SHA256 (grke-burp-2.3.12_GH0.tar.gz) = d19cf1471a240ee2de9479527e2dd75b1cea2b1e6d7bb913aab4cad3d028ce16 +SIZE (grke-burp-2.3.12_GH0.tar.gz) = 621358 -- cgit From 35de56df3f0fa8ccd9462528f6db01a672e91bd5 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 10 Aug 2019 14:55:36 +0000 Subject: math/libnormaliz: Update to 3.7.4 Changelog: * Bugfix in face lattice computation * nmz_config.h indicates optional packages https://github.com/Normaliz/Normaliz/releases/tag/v3.7.4 PR: 239716 Submitted by: Lorenzo Salvadore (maintainer) MFH: 2019Q3 --- math/libnormaliz/Makefile | 3 +-- math/libnormaliz/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile index 70c6b8c62040..38431c222589 100644 --- a/math/libnormaliz/Makefile +++ b/math/libnormaliz/Makefile @@ -2,8 +2,7 @@ PORTNAME= libnormaliz DISTVERSIONPREFIX= v -DISTVERSION= 3.7.3 -PORTREVISION= 1 +DISTVERSION= 3.7.4 CATEGORIES= math MAINTAINER= phascolarctos@protonmail.ch diff --git a/math/libnormaliz/distinfo b/math/libnormaliz/distinfo index 9902240103e3..4ccc02d33df0 100644 --- a/math/libnormaliz/distinfo +++ b/math/libnormaliz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560087813 -SHA256 (Normaliz-Normaliz-v3.7.3_GH0.tar.gz) = 23e674b69b034661bbfe7cd589e803ffe7e71c8b53b2178712d759065015d7a4 -SIZE (Normaliz-Normaliz-v3.7.3_GH0.tar.gz) = 9509689 +TIMESTAMP = 1565302647 +SHA256 (Normaliz-Normaliz-v3.7.4_GH0.tar.gz) = 1a33e7695d43ebc09c81c9d0192f304df71640baa3a9fd0c7552a0075b8a1da5 +SIZE (Normaliz-Normaliz-v3.7.4_GH0.tar.gz) = 9343121 -- cgit From 3389ca8247aad88268fd0515d3939da4a6d43965 Mon Sep 17 00:00:00 2001 From: olivier Date: Sat, 10 Aug 2019 15:25:41 +0000 Subject: Update to 7.1 --- net/frr7/Makefile | 6 +++--- net/frr7/distinfo | 6 +++--- net/frr7/files/patch-Makefile.am | 7 +++---- net/frr7/files/patch-configure.ac | 11 ----------- net/frr7/pkg-plist | 7 +++++-- 5 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 net/frr7/files/patch-configure.ac diff --git a/net/frr7/Makefile b/net/frr7/Makefile index 5d1a841dc262..f2546c8d15e0 100644 --- a/net/frr7/Makefile +++ b/net/frr7/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 7.0 -PORTREVISION= 1 +PORTVERSION= 7.1 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 7 @@ -65,7 +64,8 @@ CONFIGURE_ARGS= --enable-user=frr \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ - --disable-pimd + --disable-pimd \ + --with-vtysh-pager=cat MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} MANPAGES_CONFIGURE_OFF= --disable-doc diff --git a/net/frr7/distinfo b/net/frr7/distinfo index 69039dd641af..1a38222f6afc 100644 --- a/net/frr7/distinfo +++ b/net/frr7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552596106 -SHA256 (FRRouting-frr-frr-7.0_GH0.tar.gz) = 15b62dc0c52531e4bcefa6b830e9b9b07d1d0f189c2110307dbc19d80b719354 -SIZE (FRRouting-frr-frr-7.0_GH0.tar.gz) = 5234123 +TIMESTAMP = 1564746190 +SHA256 (FRRouting-frr-frr-7.1_GH0.tar.gz) = 1a66ab4fdb9718997170e9da79d52e5bfdaabc0dac396e4beb758af7bdd48e4f +SIZE (FRRouting-frr-frr-7.1_GH0.tar.gz) = 5387140 diff --git a/net/frr7/files/patch-Makefile.am b/net/frr7/files/patch-Makefile.am index 1355b7b4a57a..a94b80a5b63c 100644 --- a/net/frr7/files/patch-Makefile.am +++ b/net/frr7/files/patch-Makefile.am @@ -1,11 +1,10 @@ ---- Makefile.am.orig 2019-03-14 23:20:16 UTC +--- Makefile.am.orig 2019-08-02 12:14:29 UTC +++ Makefile.am -@@ -123,7 +123,7 @@ include zebra/subdir.am - include watchfrr/subdir.am +@@ -122,7 +122,6 @@ include watchfrr/subdir.am include qpb/subdir.am include fpm/subdir.am + include grpc/subdir.am -include tools/subdir.am -+#include tools/subdir.am include solaris/subdir.am include bgpd/subdir.am diff --git a/net/frr7/files/patch-configure.ac b/net/frr7/files/patch-configure.ac deleted file mode 100644 index f8cd62143801..000000000000 --- a/net/frr7/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2019-02-28 23:32:04 UTC -+++ configure.ac -@@ -391,7 +391,7 @@ AC_ARG_WITH([pkg-git-version], - [ test "x$withval" != "xno" && with_pkg_git_version="yes" ]) - AC_ARG_WITH([vtysh_pager], - AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]), -- VTYSH_PAGER=$withval, VTYSH_PAGER="more") -+ VTYSH_PAGER=$withval, VTYSH_PAGER="cat") - AC_ARG_ENABLE([vtysh], - AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR])) - AC_ARG_ENABLE([doc], diff --git a/net/frr7/pkg-plist b/net/frr7/pkg-plist index c34aa639531f..9884a0019cec 100644 --- a/net/frr7/pkg-plist +++ b/net/frr7/pkg-plist @@ -1,5 +1,6 @@ %%VTYSH%%bin/vtysh include/frr/agg_table.h +include/frr/atomlist.h include/frr/yang.h include/frr/yang_translator.h include/frr/yang_wrappers.h @@ -18,9 +19,7 @@ include/frr/distribute.h include/frr/eigrpd/eigrp_dump.h include/frr/eigrpd/eigrp_topology.h include/frr/eigrpd/eigrpd.h -include/frr/event_counter.h include/frr/ferr.h -include/frr/fifo.h include/frr/filter.h include/frr/freebsd-queue.h include/frr/frr_pthread.h @@ -48,6 +47,7 @@ include/frr/lua.h include/frr/md5.h include/frr/memory.h include/frr/memory_vty.h +include/frr/mlag.h include/frr/module.h include/frr/monotime.h include/frr/mpls.h @@ -84,6 +84,7 @@ include/frr/ringbuf.h include/frr/route_types.h include/frr/routemap.h include/frr/sbuf.h +include/frr/seqlock.h include/frr/sha256.h include/frr/sigevent.h include/frr/smux.h @@ -97,6 +98,8 @@ include/frr/systemd.h include/frr/table.h include/frr/termtable.h include/frr/thread.h +include/frr/typerb.h +include/frr/typesafe.h include/frr/vector.h include/frr/version.h include/frr/vlan.h -- cgit From aa0843173e9f4fd60ae11632219f374f8903b54c Mon Sep 17 00:00:00 2001 From: olivier Date: Sat, 10 Aug 2019 15:39:20 +0000 Subject: Update to 1.6.7 PR: 239713 Submitted by: Marek Zarychta --- net/bird/Makefile | 3 +-- net/bird/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/bird/Makefile b/net/bird/Makefile index 2293a56598f2..934d655bdc68 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bird -PORTVERSION= 1.6.6 -PORTREVISION= 1 +PORTVERSION= 1.6.7 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ diff --git a/net/bird/distinfo b/net/bird/distinfo index eed7140a1034..32c764c3827f 100644 --- a/net/bird/distinfo +++ b/net/bird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553513532 -SHA256 (bird-1.6.6.tar.gz) = 975b3b7aefbe1e0dc9c11e55517f0ca2d82cca1d544e2e926f78bc843aaf2d70 -SIZE (bird-1.6.6.tar.gz) = 1029505 +TIMESTAMP = 1565266049 +SHA256 (bird-1.6.7.tar.gz) = 7eab27ff4b0117a33d20f61b161b647e1fd354b9303c4ed4d3f99260b2173dc9 +SIZE (bird-1.6.7.tar.gz) = 1041299 -- cgit From 394fea9092148cc7677b8a43d20d5b52ac9daee9 Mon Sep 17 00:00:00 2001 From: olivier Date: Sat, 10 Aug 2019 15:40:38 +0000 Subject: Update to 2.0.5 --- net/bird2/Makefile | 3 +-- net/bird2/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/bird2/Makefile b/net/bird2/Makefile index 9a0b8dd44e0c..30efa95ac66f 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bird -DISTVERSION= 2.0.4 -PORTREVISION= 2 +DISTVERSION= 2.0.5 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ PKGNAMESUFFIX= 2 diff --git a/net/bird2/distinfo b/net/bird2/distinfo index 99c59edb7378..13c48d4fdb2e 100644 --- a/net/bird2/distinfo +++ b/net/bird2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553556348 -SHA256 (bird-2.0.4.tar.gz) = 676010b7517d4159b9af37401c26185f561ffcffeba73690a2ef2fad984714de -SIZE (bird-2.0.4.tar.gz) = 1051911 +TIMESTAMP = 1565265942 +SHA256 (bird-2.0.5.tar.gz) = 4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3 +SIZE (bird-2.0.5.tar.gz) = 1099509 -- cgit From 1c28df1271b726910cb8649da50f2ab5e082ed2d Mon Sep 17 00:00:00 2001 From: gerald Date: Sat, 10 Aug 2019 17:48:18 +0000 Subject: Add a note how to work around Wine issuing an error message of i386_set_ldt: Invalid argument Did you reconfigure your kernel with "options USER_LDT"? PR: 224264 Submitted by: rozhuk.im@gmail.com Reviewed by: arrowd MFH: 2019Q3 (documentation to address crash) --- emulators/wine-devel/Makefile | 1 + emulators/wine-devel/pkg-descr | 5 +++++ emulators/wine/Makefile | 2 +- emulators/wine/pkg-descr | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 40132b04da7d..9223f6ff1767 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 4.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/pkg-descr b/emulators/wine-devel/pkg-descr index abc1167a12fc..fbe72fa0942c 100644 --- a/emulators/wine-devel/pkg-descr +++ b/emulators/wine-devel/pkg-descr @@ -11,6 +11,11 @@ Use this port for 32-bit Windows binaries in an i386 environment or 64-bit Windows binaries in an amd64 environment; emulators/i386-wine-devel for 32-bit Windows binaries in an amd64 environment. +If you receive a message of "Did you reconfigure your kernel with +"options USER_LDT"?" add the line + machdep.max_ldt_segment="2048" +to /boot/loader.conf and reboot. + WWW: http://www.winehq.org/ Gerald Pfeifer diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index fb4c33ff402f..a9067ee2f27a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -3,7 +3,7 @@ PORTNAME= wine DISTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/pkg-descr b/emulators/wine/pkg-descr index 84f4d4d2ab7c..fb8d877a30e9 100644 --- a/emulators/wine/pkg-descr +++ b/emulators/wine/pkg-descr @@ -11,6 +11,11 @@ Use this port for 32-bit Windows binaries in an i386 environment or 64-bit Windows binaries in an amd64 environment; use emulators/i386-wine for 32-bit Windows binaries in an amd64 environment. +If you receive a message of "Did you reconfigure your kernel with +"options USER_LDT"?" add the line + machdep.max_ldt_segment="2048" +to /boot/loader.conf and reboot. + WWW: http://www.winehq.org/ Gerald Pfeifer -- cgit From a1ac4a954b865a03a55a18ae29b625a774c83633 Mon Sep 17 00:00:00 2001 From: yuri Date: Sat, 10 Aug 2019 18:39:43 +0000 Subject: sysutils/crate: Update 0.1.1 -> 0.1.2 --- sysutils/crate/Makefile | 2 +- sysutils/crate/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index a6c3f65e66ab..732499d758ae 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= crate -DISTVERSION= 0.1.1 +DISTVERSION= 0.1.2 CATEGORIES= sysutils emulators MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/crate/distinfo b/sysutils/crate/distinfo index 6e43a1b42cf3..d96824e1b817 100644 --- a/sysutils/crate/distinfo +++ b/sysutils/crate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565298013 -SHA256 (yurivict-crate-0.1.1_GH0.tar.gz) = a83ab3a36ed137dca447790dde2b4db50d61bc94ea6990f6ce03c54b30bc929c -SIZE (yurivict-crate-0.1.1_GH0.tar.gz) = 31451 +TIMESTAMP = 1565462236 +SHA256 (yurivict-crate-0.1.2_GH0.tar.gz) = 43aaef93ecfce4ba7890123f1b284ae7d5ffde29781985e6cd2bae3db8039a47 +SIZE (yurivict-crate-0.1.2_GH0.tar.gz) = 33137 -- cgit From 35d0dc8eef99e522a2254ccc9f7d7b47e93b2fc6 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 10 Aug 2019 19:21:57 +0000 Subject: science/py-ruffus: Update to 2.8.2 Changelog: * Implement retry behaviour for input file check. --- science/py-ruffus/Makefile | 2 +- science/py-ruffus/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/science/py-ruffus/Makefile b/science/py-ruffus/Makefile index 35688ecb1da3..60d9785ba473 100644 --- a/science/py-ruffus/Makefile +++ b/science/py-ruffus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ruffus -DISTVERSION= 2.8.1 +DISTVERSION= 2.8.2 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-ruffus/distinfo b/science/py-ruffus/distinfo index 07157a3bc5e7..d64abf5c37b4 100644 --- a/science/py-ruffus/distinfo +++ b/science/py-ruffus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558449615 -SHA256 (ruffus-2.8.1.tar.gz) = 90bc1e57ffb95be11e9c4461a406fee63395898beacd35a1dce9dd2c468c2582 -SIZE (ruffus-2.8.1.tar.gz) = 12182187 +TIMESTAMP = 1565299242 +SHA256 (ruffus-2.8.2.tar.gz) = 352dcad9c004c37feca65d8636531e162a04d6128abb3dd968b5a432ed1cdb1a +SIZE (ruffus-2.8.2.tar.gz) = 12145319 -- cgit From 5a3109f29d8f2037e5617aa82945a460c3121bc8 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 10 Aug 2019 19:25:34 +0000 Subject: textproc/py-pikepdf: Update to 1.6.1 Changelog: https://github.com/pikepdf/pikepdf/blob/v1.6.1/docs/release_notes.rst --- textproc/py-pikepdf/Makefile | 2 +- textproc/py-pikepdf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile index 3fcb543a443e..bc2821f7b600 100644 --- a/textproc/py-pikepdf/Makefile +++ b/textproc/py-pikepdf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pikepdf -DISTVERSION= 1.6.0 +DISTVERSION= 1.6.1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pikepdf/distinfo b/textproc/py-pikepdf/distinfo index d2f319433f20..34b6d0ac7929 100644 --- a/textproc/py-pikepdf/distinfo +++ b/textproc/py-pikepdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564640122 -SHA256 (pikepdf-1.6.0.tar.gz) = 6173fa823ef0e0deb7aca0f5dd94b3a393a5af34d5c3be7d28a1af2e9195ebae -SIZE (pikepdf-1.6.0.tar.gz) = 1648503 +TIMESTAMP = 1565461509 +SHA256 (pikepdf-1.6.1.tar.gz) = 918f48c1226f05f620eb8685545f192181f242621408ddbee4758dd3c1f9473f +SIZE (pikepdf-1.6.1.tar.gz) = 1649486 -- cgit From b8f591741fe1441645be2c437eaf825154fc1a18 Mon Sep 17 00:00:00 2001 From: glewis Date: Sat, 10 Aug 2019 19:28:18 +0000 Subject: Fixes to pkg-install and version handling * In pkg-install, fix the exclusion of the bootstrap directories. [1] * In pkg-install, fix the find expression so it actually finds jdks if there are multiple present. [1] * When determining the VM version, be better about ensuring we end up with only a number. PR: 239705 [1] Submitted by: John Hein [1] --- java/javavmwrapper/Makefile | 2 +- java/javavmwrapper/files/pkg-install.in | 9 ++++++--- java/javavmwrapper/src/javavmwrapper.sh | 16 ++++++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 585455da3501..ca8f2ee07ce5 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.7.2 +PORTVERSION= 2.7.3 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/files/pkg-install.in b/java/javavmwrapper/files/pkg-install.in index dde5ad143032..aab50822f072 100644 --- a/java/javavmwrapper/files/pkg-install.in +++ b/java/javavmwrapper/files/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/java/javavmwrapper/files/pkg-install.in,v 1.3 2006-06-03 17:32:24 glewis Exp $ +# $FreeBSD$ LOCALBASE=%%LOCALBASE%% @@ -10,16 +10,19 @@ if [ "x${2}" != "xPOST-INSTALL" ]; then fi # Ensure all JDKs and JREs are installed -_excl_dirs='bootstrap-openjdk' +jdirs=$(cd "${LOCALBASE}" && find *jdk* *jre* -depth 0 -type d 2> /dev/null) +set -o noglob +_excl_dirs='bootstrap-openjdk.*' _find_expr='-depth 2 -regex .*/bin/java' for dir in ${_excl_dirs}; do _find_expr="${_find_expr} ! -regex ${dir}/bin/java" done -for jvm in `cd "${LOCALBASE}" && find *jdk* *jre* ${_find_expr} 2> /dev/null`; do +for jvm in `cd "${LOCALBASE}" && find $jdirs ${_find_expr} 2> /dev/null`; do if [ -x "${LOCALBASE}/${jvm}" ]; then "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1 fi done +set +o noglob # Ensure all VMs are configured correctly "${PKG_PREFIX}"/bin/checkvms diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index e0277eb41e4a..2dc2995bf2f7 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -175,12 +175,16 @@ sortConfiguration () { _VM=`basename "${_VM}"` # Consistent version numbering for various install directory names # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc. - VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' -e 's|-jre||' \ - 2>/dev/null` - _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' -e 's|-jre||' \ - 2>/dev/null` + VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \ + -e 's|1\.\([0-9][0-9]*\)|\1|' \ + -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ + -e 's|[^0-9]*\([0-9][0-9]*\)[^0-9]*|\1|' + 2>/dev/null` + _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' \ + -e 's|1\.\([0-9][0-9]*\)|\1|' \ + -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ + -e 's|[^0-9]*\([0-9][0-9]*\)[^0-9]*|\1|' + 2>/dev/null` if [ "${VERSION}" -gt "${_VERSION}" ]; then _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}" JAVAVM= -- cgit From 2a8bdd32c82fa71c5996757cb0c69136796b2b8a Mon Sep 17 00:00:00 2001 From: dvl Date: Sat, 10 Aug 2019 19:34:11 +0000 Subject: Upgrade to 20190810 * remove unused files/iocage.in Take maintainership, thank you. PR: 239759 Approved by: wg (maintainer) --- sysutils/iocage-devel/Makefile | 6 ++--- sysutils/iocage-devel/distinfo | 6 ++--- sysutils/iocage-devel/files/iocage.in | 47 ----------------------------------- 3 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 sysutils/iocage-devel/files/iocage.in diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile index b60297c1d191..25e03b985803 100644 --- a/sysutils/iocage-devel/Makefile +++ b/sysutils/iocage-devel/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= iocage-devel -PORTVERSION= 1.0.0.20190308 +PORTVERSION= 1.0.0.20190810 PORTEPOCH= 1 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= wg@FreeBSD.org +MAINTAINER= dvl@FreeBSD.org COMMENT= FreeBSD jail manager written in Python3 LICENSE= BSD2CLAUSE @@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ USE_GITHUB= yes GH_ACCOUNT= iocage GH_PROJECT= iocage -GH_TAGNAME= 1bf088a +GH_TAGNAME= c933509 NO_ARCH= yes USES= python:3.6+ diff --git a/sysutils/iocage-devel/distinfo b/sysutils/iocage-devel/distinfo index 49f386032640..392512af7510 100644 --- a/sysutils/iocage-devel/distinfo +++ b/sysutils/iocage-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552045034 -SHA256 (iocage-iocage-1.0.0.20190308-1bf088a_GH0.tar.gz) = 59523f4e404c04f8821fbbd14596737f9e7f2233f52a1f4e89fbb3a35ac965f7 -SIZE (iocage-iocage-1.0.0.20190308-1bf088a_GH0.tar.gz) = 352106 +TIMESTAMP = 1565464698 +SHA256 (iocage-iocage-1.0.0.20190810-c933509_GH0.tar.gz) = 90f253358149f0b692df133fbf01daa04c4282097cec214ec816d7006de48ada +SIZE (iocage-iocage-1.0.0.20190810-c933509_GH0.tar.gz) = 720585 diff --git a/sysutils/iocage-devel/files/iocage.in b/sysutils/iocage-devel/files/iocage.in deleted file mode 100644 index 0041f8d7a37f..000000000000 --- a/sysutils/iocage-devel/files/iocage.in +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: iocage -# REQUIRE: LOGIN cleanvar sshd ZFS -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable iocage: -# -# iocage_enable="YES" -# -# - -. /etc/rc.subr - -name="iocage" -rcvar=iocage_enable - -# read configuration and set defaults -load_rc_config "$name" -: ${iocage_enable="NO"} -: ${iocage_lang="en_US.UTF-8"} - -start_cmd="iocage_start" -stop_cmd="iocage_stop" -export LANG=$iocage_lang - -iocage_start() -{ - if checkyesno ${rcvar}; then - echo "* [I|O|C] starting jails... " - /usr/local/bin/iocage start --rc - fi -} - -iocage_stop() -{ - if checkyesno ${rcvar}; then - echo "* [I|O|C] stopping jails... " - /usr/local/bin/iocage stop --rc - fi -} - -run_rc_command "$1" -- cgit From e3c08bb0d7b061897f284be117b0b3aaec8ee490 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 10 Aug 2019 19:47:45 +0000 Subject: textproc/scancode-toolkit: Unbreak at runtime after r505457 * Relax the version requirements for devel/py-attrs * Do the same for devel/py-typing that was updated to 3.7 recently * Bump PORTREVISION due changed package contents MFH: 2019Q3 (blanket: runtime fix) --- textproc/scancode-toolkit/Makefile | 2 +- textproc/scancode-toolkit/files/patch-setup.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/textproc/scancode-toolkit/Makefile b/textproc/scancode-toolkit/Makefile index b9f2f551cd40..b63771f27c74 100644 --- a/textproc/scancode-toolkit/Makefile +++ b/textproc/scancode-toolkit/Makefile @@ -3,7 +3,7 @@ PORTNAME= scancode-toolkit DISTVERSIONPREFIX= v DISTVERSION= 3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MAINTAINER= kai@FreeBSD.org diff --git a/textproc/scancode-toolkit/files/patch-setup.py b/textproc/scancode-toolkit/files/patch-setup.py index 6007ce6cde6a..d8fda2deb2fe 100644 --- a/textproc/scancode-toolkit/files/patch-setup.py +++ b/textproc/scancode-toolkit/files/patch-setup.py @@ -39,11 +39,15 @@ # packagedcode 'pefile >= 2018.8.8', -@@ -183,7 +178,6 @@ setup( +@@ -182,9 +177,8 @@ setup( + 'click >= 6.0.0, < 7.0.0', 'colorama >= 0.3.9', 'pluggy >= 0.4.0, < 1.0', - 'attrs >=17.4, < 19.0', +- 'attrs >=17.4, < 19.0', - 'cattrs', - 'typing >=3.6, < 3.7', +- 'typing >=3.6, < 3.7', ++ 'attrs >=17.4', ++ 'typing >=3.6', # scancode outputs + 'jinja2 >= 2.7.0, < 3.0.0', -- cgit From e06208c529850433da3fdafe0f073e21318c5c03 Mon Sep 17 00:00:00 2001 From: cmt Date: Sat, 10 Aug 2019 20:01:33 +0000 Subject: net-mgmt/check_ssl_cert: update to 1.88.0 https://github.com/matteocorti/check_ssl_cert/releases --- net-mgmt/check_ssl_cert/Makefile | 2 +- net-mgmt/check_ssl_cert/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-mgmt/check_ssl_cert/Makefile b/net-mgmt/check_ssl_cert/Makefile index f8c54037c382..2176fdc40f7b 100644 --- a/net-mgmt/check_ssl_cert/Makefile +++ b/net-mgmt/check_ssl_cert/Makefile @@ -2,7 +2,7 @@ PORTNAME= check_ssl_cert DISTVERSIONPREFIX= v -DISTVERSION= 1.87.0 +DISTVERSION= 1.88.0 CATEGORIES= net-mgmt MAINTAINER= cmt@FreeBSD.org diff --git a/net-mgmt/check_ssl_cert/distinfo b/net-mgmt/check_ssl_cert/distinfo index 8b5d3cc44aa7..41d04c175d21 100644 --- a/net-mgmt/check_ssl_cert/distinfo +++ b/net-mgmt/check_ssl_cert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565349285 -SHA256 (matteocorti-check_ssl_cert-v1.87.0_GH0.tar.gz) = 6fea366221f6e84c9f68399253b494e63dd91320d88fcae17e1186d95ebd0023 -SIZE (matteocorti-check_ssl_cert-v1.87.0_GH0.tar.gz) = 194317 +TIMESTAMP = 1565448917 +SHA256 (matteocorti-check_ssl_cert-v1.88.0_GH0.tar.gz) = a4a0eeb29ec33c3ef3034c75d47b31d3f041dde68d4b5df920ddf17882a3326a +SIZE (matteocorti-check_ssl_cert-v1.88.0_GH0.tar.gz) = 197845 -- cgit From 704d574e1af6137354445f6d29173a2ebbb6e570 Mon Sep 17 00:00:00 2001 From: cmt Date: Sat, 10 Aug 2019 22:05:42 +0000 Subject: cad/kicad and libraries: update to 5.1.4 Announcement (soon): http://kicad-pcb.org/blog/2019/08/KiCad-5.1.4-Release/ --- cad/kicad-doc/Makefile | 7 +- cad/kicad-doc/distinfo | 6 +- cad/kicad-library-footprints/Makefile | 3 +- cad/kicad-library-footprints/distinfo | 6 +- cad/kicad-library-footprints/pkg-plist | 199 ++++++++++++++++++++++++++++++--- cad/kicad-library-packages3d/Makefile | 3 +- cad/kicad-library-packages3d/distinfo | 6 +- cad/kicad-library-packages3d/pkg-plist | 28 ++++- cad/kicad-library-symbols/Makefile | 3 +- cad/kicad-library-symbols/distinfo | 6 +- cad/kicad-library-symbols/pkg-plist | 2 + cad/kicad-library-templates/Makefile | 3 +- cad/kicad-library-templates/distinfo | 6 +- cad/kicad/Makefile | 18 +-- cad/kicad/distinfo | 6 +- cad/kicad/pkg-plist | 1 - 16 files changed, 248 insertions(+), 55 deletions(-) diff --git a/cad/kicad-doc/Makefile b/cad/kicad-doc/Makefile index 70eadabcd9ea..bf0ddef0e7fa 100644 --- a/cad/kicad-doc/Makefile +++ b/cad/kicad-doc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= cad PKGNAMESUFFIX= -doc @@ -31,10 +30,10 @@ GH_PROJECT= kicad-doc CONFLICTS= kicad-devel-r2* +NO_ARCH= yes + CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DLANGUAGES="ca;de;en;es;fr;id;it;ja;nl;ru" INSTALL_TARGET= install -NO_ARCH= yes - .include diff --git a/cad/kicad-doc/distinfo b/cad/kicad-doc/distinfo index 912143def4be..f374702027e2 100644 --- a/cad/kicad-doc/distinfo +++ b/cad/kicad-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560964820 -SHA256 (KiCad-kicad-doc-5.1.2_GH0.tar.gz) = db6756f5d10888b3c59ad808f522b3211a128207f7f725795ff941d401e61698 -SIZE (KiCad-kicad-doc-5.1.2_GH0.tar.gz) = 75313181 +TIMESTAMP = 1565359706 +SHA256 (KiCad-kicad-doc-5.1.4_GH0.tar.gz) = 3cc5bd9747a7a094ddf7b765648ccdf2bc0f6b7db36d56ea031470d2c56aa5e5 +SIZE (KiCad-kicad-doc-5.1.4_GH0.tar.gz) = 75365956 diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile index ebda2bb07474..d0d6f64a5f5b 100644 --- a/cad/kicad-library-footprints/Makefile +++ b/cad/kicad-library-footprints/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= cad PKGNAMESUFFIX= -library-footprints diff --git a/cad/kicad-library-footprints/distinfo b/cad/kicad-library-footprints/distinfo index 6ea0e91c83c3..4b4d92daf874 100644 --- a/cad/kicad-library-footprints/distinfo +++ b/cad/kicad-library-footprints/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556524304 -SHA256 (KiCad-kicad-footprints-5.1.2_GH0.tar.gz) = fb0f983393c78dc9bb0b060827a98e57d96abe9881f9fb356c2afdecc0fdbfd1 -SIZE (KiCad-kicad-footprints-5.1.2_GH0.tar.gz) = 5389330 +TIMESTAMP = 1564960405 +SHA256 (KiCad-kicad-footprints-5.1.4_GH0.tar.gz) = 79cb7f15fdfc6510a5260f03c53be341b0ccf152cc3008d3c7a576e926036e37 +SIZE (KiCad-kicad-footprints-5.1.4_GH0.tar.gz) = 5578039 diff --git a/cad/kicad-library-footprints/pkg-plist b/cad/kicad-library-footprints/pkg-plist index 8414d75d4ec4..4a075960ccec 100644 --- a/cad/kicad-library-footprints/pkg-plist +++ b/cad/kicad-library-footprints/pkg-plist @@ -15,6 +15,7 @@ %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_2993.kicad_mod %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3000_1x12mm.kicad_mod %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3001_1x12mm.kicad_mod +%%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3002_1x2032.kicad_mod %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3008_1x2450.kicad_mod %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3009_1x2450.kicad_mod %%DATADIR%%/modules/Battery.pretty/BatteryHolder_Keystone_3034_1x20mm.kicad_mod @@ -163,6 +164,10 @@ %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_Push_1P1T_NO_CK_KMR2.kicad_mod %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_Push_1P1T_NO_CK_KSC6xxJ.kicad_mod %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_Push_1P1T_NO_CK_KSC7xxJ.kicad_mod +%%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_Push_1P1T_NO_CK_PTS125Sx43PSMTR.kicad_mod +%%DATADIR%%/modules/Button_Switch_THT.pretty/SW_Push_1P1T_NO_LED_E-Switch_TL1250.kicad_mod +%%DATADIR%%/modules/Button_Switch_THT.pretty/SW_Push_1P2T_Vertical_E-Switch_800UDP8P1A1M6.kicad_mod +%%DATADIR%%/modules/Button_Switch_THT.pretty/SW_Push_2P2T_Vertical_E-Switch_800UDP8P1A1M6.kicad_mod %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_Push_SPST_NO_Alps_SKRK.kicad_mod %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_SP3T_PCM13.kicad_mod %%DATADIR%%/modules/Button_Switch_SMD.pretty/SW_SPDT_CK-JS102011SAQN.kicad_mod @@ -848,6 +853,7 @@ %%DATADIR%%/modules/Connector.pretty/Banana_Jack_3Pin.kicad_mod %%DATADIR%%/modules/Connector.pretty/CUI_PD-30.kicad_mod %%DATADIR%%/modules/Connector.pretty/CalTest_CT3151.kicad_mod +%%DATADIR%%/modules/Connector.pretty/Connector_SFP_and_Cage.kicad_mod %%DATADIR%%/modules/Connector.pretty/DTF13-12Px.kicad_mod %%DATADIR%%/modules/Connector.pretty/FanPinHeader_1x03_P2.54mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector.pretty/FanPinHeader_1x04_P2.54mm_Vertical.kicad_mod @@ -872,6 +878,8 @@ %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ-3524-SMT_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal_CircularHoles.kicad_mod +%%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal.kicad_mod +%%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal_CircularHoles.kicad_mod %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_Ledino_KB3SPRS_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_Neutrik_NMJ6HCD2_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Audio.pretty/Jack_3.5mm_PJ31060-I_Horizontal.kicad_mod @@ -909,6 +917,7 @@ %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132134-14_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132134-16_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132134_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132203-12_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132289_EdgeMount.kicad_mod %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132291-12_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Coaxial.pretty/SMA_Amphenol_132291_Vertical.kicad_mod @@ -1112,6 +1121,9 @@ %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_200528-0280_1x28-1MP_P1.00mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_200528-0290_1x29-1MP_P1.00mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_200528-0300_1x30-1MP_P1.00mm_Horizontal.kicad_mod +%%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502231-1500_1x15-1SH_P0.5mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502231-2400_1x24-1SH_P0.5mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502231-3300_1x33-1SH_P0.5mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502244-1530_1x15-1MP_P0.5mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502244-2430_1x24-1MP_P0.5mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_FFC-FPC.pretty/Molex_502244-3330_1x33-1MP_P0.5mm_Horizontal.kicad_mod @@ -1280,6 +1292,40 @@ %%DATADIR%%/modules/Connector_Harwin.pretty/Harwin_M20-89020xx_1x20_P2.54mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_BM24_BM24-40DP-2-0.35V_2x20_P0.35mm_PowerPin2_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_BM24_BM24-40DS-2-0.35V_2x20_P0.35mm_PowerPin2_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-10DP-2DSA_2x05_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-12DP-2DSA_2x06_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-14DP-2DSA_2x07_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-16DP-2DSA_2x08_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-18DP-2DSA_2x09_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-20DP-2DSA_2x10_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-22DP-2DSA_2x11_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-24DP-2DSA_2x12_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-26DP-2DSA_2x13_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-28DP-2DSA_2x14_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-30DP-2DSA_2x15_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-32DP-2DSA_2x16_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-4DP-2DSA_2x02_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-6DP-2DSA_2x03_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF11-8DP-2DSA_2x04_P2.00mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-10DS-0.5V_2x05_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-14DS-0.5V_2x07_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-20DS-0.5V_2x10_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-30DS-0.5V_2x15_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-32DS-0.5V_2x16_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-36DS-0.5V_2x18_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-40DS-0.5V_2x20_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-50DS-0.5V_2x25_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12C3.0-60DS-0.5V_2x30_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-10DP-0.5V_2x05_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-14DP-0.5V_2x07_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-20DP-0.5V_2x10_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-30DP-0.5V_2x15_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-32DP-0.5V_2x16_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-36DP-0.5V_2x18_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-40DP-0.5V_2x20_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-50DP-0.5V_2x25_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-60DP-0.5V_2x30_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF12_DF12E3.0-80DP-0.5V_2x40_P0.50mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF13-02P-1.25DSA_1x02_P1.25mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF13-02P-1.25DS_1x02_P1.25mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF13-03P-1.25DSA_1x03_P1.25mm_Vertical.kicad_mod @@ -1333,12 +1379,17 @@ %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF52-7S-0.8H_1x07-1MP_P0.80mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF52-8S-0.8H_1x08-1MP_P0.80mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF52-9S-0.8H_1x09-1MP_P0.80mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-1P-3.96DSA_1x01_P3.96mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-2P-3.96DSA_1x02_P3.96mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-3P-3.96DSA_1x03_P3.96mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-4P-3.96DSA_1x04_P3.96mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-5P-3.96DSA_1x05_P3.96mm_Horizontal.kicad_mod -%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-6P-3.96DSA_1x06_P3.96mm_Horizontal.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-5P-3.96DSA_1x05_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63-6P-3.96DSA_1x06_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63M-1P-3.96DSA_1x01_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63M-2P-3.96DSA_1x02_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63M-3P-3.96DSA_1x03_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63M-4P-3.96DSA_1x04_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63R-1P-3.96DSA_1x01_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63R-2P-3.96DSA_1x02_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63R-3P-3.96DSA_1x03_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63R-4P-3.96DSA_1x04_P3.96mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Hirose.pretty/Hirose_DF63R-5P-3.96DSA_1x05_P3.96mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_IDC.pretty/IDC-Header_2x03_P2.54mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_IDC.pretty/IDC-Header_2x03_P2.54mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_IDC.pretty/IDC-Header_2x04_P2.54mm_Horizontal.kicad_mod @@ -2453,13 +2504,13 @@ %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_502430-6010_2x30_P0.40mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_502430-6410_2x32_P0.40mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_502430-8010_2x40_P0.40mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0200_2x10_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0300_2x15_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0400_2x20_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0500_2x25_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0600_2x30_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0700_2x35_P0.50mm_Vertical.kicad_mod -%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0800_2x40_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0208_2x10_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0308_2x15_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0408_2x20_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0508_2x25_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0608_2x30_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0708_2x35_P0.50mm_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_52991-0808_2x40_P0.50mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_54722-0164_2x08_P0.50mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_54722-0204_2x10_P0.50mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_Molex.pretty/Molex_SlimStack_54722-0224_2x11_P0.50mm_Vertical.kicad_mod @@ -2583,6 +2634,10 @@ %%DATADIR%%/modules/Connector_PCBEdge.pretty/Samtec_MECF-70-02-NP-L-DV_2x70_P1.27mm_Socket_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_PCBEdge.pretty/Samtec_MECF-70-0_-L-DV_2x70_P1.27mm_Polarized_Edge.kicad_mod %%DATADIR%%/modules/Connector_PCBEdge.pretty/Samtec_MECF-70-0_-NP-L-DV_2x70_P1.27mm_Edge.kicad_mod +%%DATADIR%%/modules/Connector_PCBEdge.pretty/molex_EDGELOCK_2-CKT.kicad_mod +%%DATADIR%%/modules/Connector_PCBEdge.pretty/molex_EDGELOCK_4-CKT.kicad_mod +%%DATADIR%%/modules/Connector_PCBEdge.pretty/molex_EDGELOCK_6-CKT.kicad_mod +%%DATADIR%%/modules/Connector_PCBEdge.pretty/molex_EDGELOCK_8-CKT.kicad_mod %%DATADIR%%/modules/Connector_Phoenix_GMSTB.pretty/PhoenixContact_GMSTBA_2,5_10-G-7,62_1x10_P7.62mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Phoenix_GMSTB.pretty/PhoenixContact_GMSTBA_2,5_10-G_1x10_P7.50mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_Phoenix_GMSTB.pretty/PhoenixContact_GMSTBA_2,5_11-G-7,62_1x11_P7.62mm_Horizontal.kicad_mod @@ -5691,10 +5746,12 @@ %%DATADIR%%/modules/Connector_TE-Connectivity.pretty/TE_MATE-N-LOK_1-794107-x_2x11_P4.14mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_TE-Connectivity.pretty/TE_MATE-N-LOK_1-794108-x_2x12_P4.14mm_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_TE-Connectivity.pretty/TE_MATE-N-LOK_1-794374-x_1x01_P4.14mm_Horizontal.kicad_mod +%%DATADIR%%/modules/Connector_TE-Connectivity.pretty/TE_MATE-N-LOK_350211-1_1x04_P5.08mm_Vertical.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB3_A_Molex_48393-001.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB3_A_Plug_Wuerth_692112030100_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_A_CNCTech_1001-011-01101_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_A_Molex_105057_Vertical.kicad_mod +%%DATADIR%%/modules/Connector_USB.pretty/USB_A_Stewart_SS-52100-001_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_A_Wuerth_61400826021_Horizontal_Stacked.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_B_Amphenol_MUSB-D511_Vertical_Rugged.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_B_OST_USB-B1HSxx_Horizontal.kicad_mod @@ -5707,6 +5764,7 @@ %%DATADIR%%/modules/Connector_USB.pretty/USB_C_Receptacle_GCT_USB4085.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_C_Receptacle_JAE_DX07S024WJ1R350.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_C_Receptacle_JAE_DX07S024WJ3R400.kicad_mod +%%DATADIR%%/modules/Connector_USB.pretty/USB_C_Receptacle_Palconn_UTC16-G.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_Micro-B_Amphenol_10103594-0001LF_Horizontal.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_Micro-B_GCT_USB3076-30-A.kicad_mod %%DATADIR%%/modules/Connector_USB.pretty/USB_Micro-B_Molex-105017-0001.kicad_mod @@ -5798,6 +5856,7 @@ %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC01-xxSGB_THT.kicad_mod %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC04-xxSGx_THT.kicad_mod %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC05-xxSK_THT.kicad_mod +%%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_TRACO_TMG-15_THT.kicad_mod %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_TRACO_TMLM-04_THT.kicad_mod %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_TRACO_TMLM-05_THT.kicad_mod %%DATADIR%%/modules/Converter_ACDC.pretty/Converter_ACDC_TRACO_TMLM-10-20_THT.kicad_mod @@ -5813,6 +5872,8 @@ %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_Cincon_EC6Cxx_Single_THT.kicad_mod %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_MeanWell_NID30_THT.kicad_mod %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_MeanWell_NID60_THT.kicad_mod +%%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_Murata_MGJ2DxxxxxxSC_THT.kicad_mod +%%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_Murata_MGJ3.kicad_mod %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_Murata_NCS1SxxxxSC_THT.kicad_mod %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_RECOM_R-78B-2.0_THT.kicad_mod %%DATADIR%%/modules/Converter_DCDC.pretty/Converter_DCDC_RECOM_R-78E-0.5_THT.kicad_mod @@ -6105,6 +6166,7 @@ %%DATADIR%%/modules/Diode_SMD.pretty/D_SOT-23_ANK.kicad_mod %%DATADIR%%/modules/Diode_SMD.pretty/D_SOT-23_NKA.kicad_mod %%DATADIR%%/modules/Diode_SMD.pretty/D_TUMD2.kicad_mod +%%DATADIR%%/modules/Diode_SMD.pretty/Diode_Bridge_Bourns_CD-DF4xxS.kicad_mod %%DATADIR%%/modules/Diode_SMD.pretty/Diode_Bridge_Diotec_ABS.kicad_mod %%DATADIR%%/modules/Diode_SMD.pretty/Diode_Bridge_Diotec_MicroDil_3.0x3.0x1.8mm.kicad_mod %%DATADIR%%/modules/Diode_SMD.pretty/Diode_Bridge_Diotec_SO-DIL-Slim.kicad_mod @@ -6442,10 +6504,12 @@ %%DATADIR%%/modules/Inductor_SMD.pretty/L_6.3x6.3_H3.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_7.3x7.3_H3.5.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_7.3x7.3_H4.5.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_Abracon_ASPI-0630LR.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Abracon_ASPI-3012S.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns-SRN1060.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns-SRN4018.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns-SRN6028.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns_SRN8040TA.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns-SRR1005.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns-SRU8043.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Bourns_SDR1806.kicad_mod @@ -6509,6 +6573,17 @@ %%DATADIR%%/modules/Inductor_SMD.pretty/L_Sagami_CWR1257C.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Sagami_CWR1277C.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_SigTra_SC3316F.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF10145.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF10165.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF12555.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF12565.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF12575.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF6025.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF6028.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF6045.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF7032.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF7045.kicad_mod +%%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_SLF7055.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_VLF10040.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_TDK_VLP8040.kicad_mod %%DATADIR%%/modules/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-1616.kicad_mod @@ -6709,6 +6784,7 @@ %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D10.0mm_P5.00mm_Fastron_07P.kicad_mod %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D10.0mm_P5.00mm_Neosid_SD12_style3.kicad_mod %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D10.0mm_P5.00mm_Neosid_SD12k_style3.kicad_mod +%%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D10.5mm_P4.00x5.00mm_Murata_1200RS.kicad_mod %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D10.5mm_P5.00mm_Abacron_AISR-01.kicad_mod %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D12.0mm_P10.00mm_Neosid_SD12_style1.kicad_mod %%DATADIR%%/modules/Inductor_THT.pretty/L_Radial_D12.0mm_P10.00mm_Neosid_SD12k_style1.kicad_mod @@ -6912,6 +6988,7 @@ %%DATADIR%%/modules/LED_SMD.pretty/LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod %%DATADIR%%/modules/LED_SMD.pretty/LED_Kingbright_AAA3528ESGCT.kicad_mod %%DATADIR%%/modules/LED_SMD.pretty/LED_Kingbright_APFA3010_3x1.5mm_Horizontal.kicad_mod +%%DATADIR%%/modules/LED_SMD.pretty/LED_LiteOn_LTST-S326.kicad_mod %%DATADIR%%/modules/LED_SMD.pretty/LED_PLCC-2.kicad_mod %%DATADIR%%/modules/LED_SMD.pretty/LED_PLCC_2835.kicad_mod %%DATADIR%%/modules/LED_SMD.pretty/LED_PLCC_2835_Handsoldering.kicad_mod @@ -7164,6 +7241,8 @@ %%DATADIR%%/modules/OptoDevice.pretty/LaserDiode_TO38ICut-3.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/LaserDiode_TO5-D9-3.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/LaserDiode_TO56-3.kicad_mod +%%DATADIR%%/modules/OptoDevice.pretty/Lightpipe_Mentor_1276.1004.kicad_mod +%%DATADIR%%/modules/OptoDevice.pretty/Lightpipe_Mentor_1276.2004.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Lite-On_LTR-303ALS-01.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Luna_NSL-32.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Maxim_OLGA-14_3.3x5.6mm_P0.8mm.kicad_mod @@ -7191,6 +7270,8 @@ %%DATADIR%%/modules/OptoDevice.pretty/R_LDR_D13.8mm_P9.0mm_Vertical.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/R_LDR_D20mm_P17.5mm_Vertical.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/R_LDR_D6.4mm_P3.4mm_Vertical.kicad_mod +%%DATADIR%%/modules/OptoDevice.pretty/ST_VL53L0X.kicad_mod +%%DATADIR%%/modules/OptoDevice.pretty/ST_VL53L1X.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Sharp_GP2Y0A41SK0F.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Sharp_IS471F.kicad_mod %%DATADIR%%/modules/OptoDevice.pretty/Sharp_IS485.kicad_mod @@ -7347,6 +7428,46 @@ %%DATADIR%%/modules/Package_BGA.pretty/XFBGA-121_8x8mm_Layout11x11_P0.65mm.kicad_mod %%DATADIR%%/modules/Package_BGA.pretty/XFBGA-36_3.5x3.5mm_Layout6x6_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_BGA.pretty/XFBGA-64_5.0x5.0mm_Layout8x8_P0.5mm.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CLG225.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CLG400.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CLG484_CLG485.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CPG236.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CPG238.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CPGA196.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CSG324.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CSG325.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CSGA225.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_CSGA324.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FBG484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FBG676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FBG900.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG1156.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG1157_FFG1158.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG1761.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG1926_FFG1927_FFG1928_FFG1930.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFG900_FFG901.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FFV1761.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FGG484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FGG676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FGGA484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FGGA676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FHG1761.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FLG1925_FLG1926_FLG1928_FLG1930.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FTG256.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_FTGB196.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RB484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RB676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF1156.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF1157_RF1158.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF1761.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF1930.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RF900.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RFG676.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_RS484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_SBG484.kicad_mod +%%DATADIR%%/modules/Package_BGA.pretty/Xilinx_SBG485.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/Analog_LFCSP-8-1EP_3x3mm_P0.5mm_EP1.53x1.85mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-16-1EP_3x3mm_P0.5mm_EP1.6x1.6mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-16-1EP_3x3mm_P0.5mm_EP1.6x1.6mm_ThermalVias.kicad_mod @@ -7357,9 +7478,15 @@ %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-20-1EP_4x4mm_P0.5mm_EP2.1x2.1mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-20-1EP_4x4mm_P0.5mm_EP2.5x2.5mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-20-1EP_4x4mm_P0.5mm_EP2.5x2.5mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-24-1EP_4x4mm_P0.5mm_EP2.5x2.5mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-24-1EP_4x4mm_P0.5mm_EP2.5x2.5mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-32-1EP_5x5mm_P0.5mm_EP3.25x3.25mm.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm.kicad_mod +%%DATADIR%%/modules/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_CSP.pretty/LFCSP-72-1EP_10x10mm_P0.5mm_EP5.3x5.3mm.kicad_mod @@ -7428,6 +7555,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/Cypress_QFN-56-1EP_8x8mm_P0.5mm_EP6.22x6.22mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_2x3mm_P0.5mm_EP0.64x2.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.55x2.48mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.65x2.38mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.65x2.38mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.75x2.7mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.7x2.5mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/DFN-10_2x2mm_P0.4mm.kicad_mod @@ -7533,6 +7662,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-16-1EP_4x4mm_P0.65mm_EP2.7x2.7mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-16-1EP_5x5mm_P0.8mm_EP2.7x2.7mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-16-1EP_5x5mm_P0.8mm_EP2.7x2.7mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-20-1EP_3.5x3.5mm_P0.5mm_EP2x2mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-20-1EP_3.5x3.5mm_P0.5mm_EP2x2mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-20-1EP_3x3mm_P0.4mm_EP1.65x1.65mm.kicad_mod @@ -7575,6 +7706,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_3x6mm_P0.5mm_EP1.7x4.75mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.4mm_EP2.3x2.3mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.4mm_EP2.3x2.3mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.4mm_EP2.4x2.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x4mm_P0.4mm_EP2.4x2.4mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-28-1EP_4x5mm_P0.5mm_EP2.65x3.65mm.kicad_mod @@ -7600,6 +7733,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_5x5mm_P0.5mm_EP3.65x3.65mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_5x5mm_P0.5mm_EP3.7x3.7mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_5x5mm_P0.5mm_EP3.7x3.7mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_7x7mm_P0.65mm_EP4.65x4.65mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_7x7mm_P0.65mm_EP4.65x4.65mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-32-1EP_7x7mm_P0.65mm_EP4.7x4.7mm.kicad_mod @@ -7620,6 +7755,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-38-1EP_5x7mm_P0.5mm_EP3.15x5.15mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_5x5mm_P0.4mm_EP3.6x3.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_5x5mm_P0.4mm_EP3.6x3.6mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_5x5mm_P0.4mm_EP3.8x3.8mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_5x5mm_P0.4mm_EP3.8x3.8mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-42-1EP_5x6mm_P0.4mm_EP3.7x4.7mm.kicad_mod @@ -7665,6 +7802,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP4.7x4.7mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP5.45x5.45mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP5.45x5.45mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP6x6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP6x6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP7.15x7.15mm.kicad_mod @@ -7679,6 +7818,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-68-1EP_8x8mm_P0.4mm_EP5.2x5.2mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-68-1EP_8x8mm_P0.4mm_EP5.2x5.2mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-72-1EP_10x10mm_P0.5mm_EP6x6mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-72-1EP_10x10mm_P0.5mm_EP6x6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-76-1EP_9x9mm_P0.4mm_EP3.8x3.8mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/QFN-76-1EP_9x9mm_P0.4mm_EP3.8x3.8mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Qorvo_DFN-8-1EP_2x2mm_P0.5mm.kicad_mod @@ -7694,6 +7835,7 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/TQFN-16-1EP_5x5mm_P0.8mm_EP3.1x3.1mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/TQFN-24-1EP_4x4mm_P0.5mm_EP2.8x2.8mm_PullBack.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/TQFN-24-1EP_4x4mm_P0.5mm_EP2.8x2.8mm_PullBack_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_DRB0008A.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_MOF0009A.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_R-PUQFN-N10.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_R-PWQFN-N28_EP2.1x3.1mm.kicad_mod @@ -7702,6 +7844,10 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGE0024C_EP2.1x2.1mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGE0024H_EP2.7x2.7mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGE0024H_EP2.7x2.7mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGV_S-PVQFN-N16_EP2.1x2.1mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGV_S-PVQFN-N16_EP2.1x2.1mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGY_R-PVQFN-N24_EP2.05x3.1mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RGY_R-PVQFN-N24_EP2.05x3.1mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RNN0018A.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RUM0016A_EP2.6x2.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_RUM0016A_EP2.6x2.6mm_ThermalVias.kicad_mod @@ -7747,6 +7893,7 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_S-PWQFN-N24_EP2.7x2.7mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_S-PWQFN-N32_EP2.8x2.8mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_S-PWQFN-N32_EP2.8x2.8mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_S-PX2QFN-14.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_VQFN-RHL-20.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_VQFN-RHL-20_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_WQFN-MR-100_3x3-DapStencil.kicad_mod @@ -7754,6 +7901,7 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/Texas_X2QFN-12_1.6x1.6mm_P0.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/UDFN-10_1.35x2.6mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/UDFN-4_1x1mm_P0.65mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/UDFN-9_1.0x3.8mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/UQFN-10_1.3x1.8mm_P0.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/UQFN-10_1.4x1.8mm_P0.4mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/UQFN-10_1.6x2.1mm_P0.5mm.kicad_mod @@ -7778,6 +7926,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.45x1.45mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.68x1.68mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.68x1.68mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.6x1.6mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.6x1.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.8x1.8mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-16-1EP_3x3mm_P0.5mm_EP1.8x1.8mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/VQFN-20-1EP_3x3mm_P0.45mm_EP1.55x1.55mm.kicad_mod @@ -7803,6 +7953,8 @@ %%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-16-1EP_4x4mm_P0.5mm_EP2.6x2.6mm.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-16-1EP_4x4mm_P0.5mm_EP2.6x2.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-20-1EP_2.5x4.5mm_P0.5mm_EP1x2.9mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm.kicad_mod +%%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_DFN_QFN.pretty/WQFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-10_W10.16mm.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-10_W10.16mm_LongPads.kicad_mod @@ -7963,6 +8115,9 @@ %%DATADIR%%/modules/Package_DIP.pretty/DIP-6_W7.62mm_Socket.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-6_W7.62mm_Socket_LongPads.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-6_W8.89mm_SMDSocket_LongPads.kicad_mod +%%DATADIR%%/modules/Package_DIP.pretty/DIP-8-16_W7.62mm.kicad_mod +%%DATADIR%%/modules/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket.kicad_mod +%%DATADIR%%/modules/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket_LongPads.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-8-N6_W7.62mm.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-8-N7_W7.62mm.kicad_mod %%DATADIR%%/modules/Package_DIP.pretty/DIP-8_W10.16mm.kicad_mod @@ -8089,7 +8244,8 @@ %%DATADIR%%/modules/Package_LGA.pretty/LGA-28_5.2x3.8mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_LGA.pretty/LGA-8_3x5mm_P1.25mm.kicad_mod %%DATADIR%%/modules/Package_LGA.pretty/Linear_LGA-133_15.0x15.0_Layout12x12_P1.27mm.kicad_mod -%%DATADIR%%/modules/Package_LGA.pretty/NXP_MPL115A1_LGA-8_3x5mm_P1.25mm.kicad_mod +%%DATADIR%%/modules/Package_LGA.pretty/NXP_LGA-8_3x5mm_P1.25mm_H1.1mm.kicad_mod +%%DATADIR%%/modules/Package_LGA.pretty/NXP_LGA-8_3x5mm_P1.25mm_H1.2mm.kicad_mod %%DATADIR%%/modules/Package_LGA.pretty/ST_HLGA-10_2.5x2.5mm_P0.6mm_LayoutBorder3x2y.kicad_mod %%DATADIR%%/modules/Package_LGA.pretty/Texas_SIL0008D_MicroSiP-8-1EP_2.8x3mm_P0.65mm_EP1.1x1.9mm.kicad_mod %%DATADIR%%/modules/Package_LGA.pretty/Texas_SIL0008D_MicroSiP-8-1EP_2.8x3mm_P0.65mm_EP1.1x1.9mm_ThermalVias.kicad_mod @@ -8126,6 +8282,8 @@ %%DATADIR%%/modules/Package_QFP.pretty/LQFP-52-1EP_10x10mm_P0.65mm_EP4.8x4.8mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_QFP.pretty/LQFP-52_10x10mm_P0.65mm.kicad_mod %%DATADIR%%/modules/Package_QFP.pretty/LQFP-52_14x14mm_P1mm.kicad_mod +%%DATADIR%%/modules/Package_QFP.pretty/LQFP-64-1EP_10x10mm_P0.5mm_EP5x5mm.kicad_mod +%%DATADIR%%/modules/Package_QFP.pretty/LQFP-64-1EP_10x10mm_P0.5mm_EP5x5mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_QFP.pretty/LQFP-64-1EP_10x10mm_P0.5mm_EP6.5x6.5mm.kicad_mod %%DATADIR%%/modules/Package_QFP.pretty/LQFP-64-1EP_10x10mm_P0.5mm_EP6.5x6.5mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_QFP.pretty/LQFP-64_10x10mm_P0.5mm.kicad_mod @@ -8249,8 +8407,11 @@ %%DATADIR%%/modules/Package_SO.pretty/MSOP-12-1EP_3x4mm_P0.65mm_EP1.65x2.85mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-12-1EP_3x4mm_P0.65mm_EP1.65x2.85mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-12_3x4mm_P0.65mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/MSOP-16-1EP_3x4.039mm_P0.5mm_EP1.651x2.845mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/MSOP-16-1EP_3x4.039mm_P0.5mm_EP1.651x2.845mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-16-1EP_3x4mm_P0.5mm_EP1.65x2.85mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-16-1EP_3x4mm_P0.5mm_EP1.65x2.85mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/MSOP-16_3x4.039mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-16_3x4mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-8-1EP_3x3mm_P0.65mm_EP1.68x1.88mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/MSOP-8-1EP_3x3mm_P0.65mm_EP1.73x1.85mm.kicad_mod @@ -8310,13 +8471,18 @@ %%DATADIR%%/modules/Package_SO.pretty/SOIC-8-N7_3.9x4.9mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOIC-8_3.9x4.9mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOIC-8_5.23x5.23mm_P1.27mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/SOIC-8_5.275x5.275mm_P1.27mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/SOIC-8_7.5x5.85mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOIJ-8_5.3x5.3mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOJ-36_10.16x23.49mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-16_4.4x10.4mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-16_4.55x10.3mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-18_7x12.5mm_P1.27mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/SOP-24_7.5x15.4mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-4_3.8x4.1mm_P2.54mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-4_4.4x2.6mm_P1.27mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/SOP-8-1EP_4.57x4.57mm_P1.27mm_EP4.57x4.45mm.kicad_mod +%%DATADIR%%/modules/Package_SO.pretty/SOP-8-1EP_4.57x4.57mm_P1.27mm_EP4.57x4.45mm_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-8_3.76x4.96mm_P1.27mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SOP-8_6.62x9.15mm_P2.54mm.kicad_mod %%DATADIR%%/modules/Package_SO.pretty/SSO-4_6.7x5.1mm_P2.54mm_Clearance8mm.kicad_mod @@ -8407,6 +8573,7 @@ %%DATADIR%%/modules/Package_SON.pretty/Fairchild_DualPower33-6_3x3mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/Fairchild_MicroPak-6_1.0x1.45mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/Fairchild_MicroPak2-6_1.0x1.0mm_P0.35mm.kicad_mod +%%DATADIR%%/modules/Package_SON.pretty/HUSON-3-1EP_2x2mm_P1.3mm_EP1.1x1.6mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/HVSON-8-1EP_4x4mm_P0.8mm_EP2.2x3.1mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/NXP_XSON-16.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/ROHM_VML0806.kicad_mod @@ -8452,6 +8619,8 @@ %%DATADIR%%/modules/Package_SON.pretty/WSON-6_1.5x1.5mm_P0.5mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_2x2mm_P0.5mm_EP0.9x1.6mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_2x2mm_P0.5mm_EP0.9x1.6mm_ThermalVias.kicad_mod +%%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_3x2.5mm_P0.5mm_EP1.2x1.5mm_PullBack.kicad_mod +%%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_3x2.5mm_P0.5mm_EP1.2x1.5mm_PullBack_ThermalVias.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_3x3mm_P0.5mm_EP1.6x2.0mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_6x5mm_P1.27mm_EP3.4x4.3mm.kicad_mod %%DATADIR%%/modules/Package_SON.pretty/WSON-8-1EP_6x5mm_P1.27mm_EP3.4x4mm.kicad_mod @@ -8576,6 +8745,7 @@ %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/TSOT-23.kicad_mod %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/TSOT-23_HandSoldering.kicad_mod %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/Texas_DRT-3.kicad_mod +%%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/Texas_NDY0011A.kicad_mod %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/Texas_R-PDSO-G6.kicad_mod %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/VSOF5.kicad_mod %%DATADIR%%/modules/Package_TO_SOT_SMD.pretty/Vishay_PowerPAK_SC70-6L_Dual.kicad_mod @@ -8950,6 +9120,7 @@ %%DATADIR%%/modules/RF_Antenna.pretty/Pulse_W3011.kicad_mod %%DATADIR%%/modules/RF_Antenna.pretty/Texas_SWRA117D_2.4GHz_Left.kicad_mod %%DATADIR%%/modules/RF_Antenna.pretty/Texas_SWRA117D_2.4GHz_Right.kicad_mod +%%DATADIR%%/modules/RF_Antenna.pretty/Texas_SWRA416_868MHz_915MHz.kicad_mod %%DATADIR%%/modules/RF_Converter.pretty/Anaren_0805_2012Metric-6.kicad_mod %%DATADIR%%/modules/RF_Converter.pretty/Balun_Johanson_5400BL15B050E.kicad_mod %%DATADIR%%/modules/RF_Converter.pretty/RF_Attenuator_Susumu_PAT1220.kicad_mod diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile index 723a7db26a37..a069ebffc761 100644 --- a/cad/kicad-library-packages3d/Makefile +++ b/cad/kicad-library-packages3d/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= cad PKGNAMESUFFIX= -library-packages3d diff --git a/cad/kicad-library-packages3d/distinfo b/cad/kicad-library-packages3d/distinfo index 276622ed6832..bd5d6c30ba52 100644 --- a/cad/kicad-library-packages3d/distinfo +++ b/cad/kicad-library-packages3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556524500 -SHA256 (KiCad-kicad-packages3D-5.1.2_GH0.tar.gz) = 5c3dfc3cc7f11ce5a19853b86a79dbeef7383ccbf7ecaf9c83728bcc28edef09 -SIZE (KiCad-kicad-packages3D-5.1.2_GH0.tar.gz) = 888156027 +TIMESTAMP = 1564960583 +SHA256 (KiCad-kicad-packages3D-5.1.4_GH0.tar.gz) = 80cc03bca0f78948ed32ed5c5636c692725b85fde859863c02fd5df81f5f4a02 +SIZE (KiCad-kicad-packages3D-5.1.4_GH0.tar.gz) = 888665659 diff --git a/cad/kicad-library-packages3d/pkg-plist b/cad/kicad-library-packages3d/pkg-plist index bdf0b71ee10c..01c6c1ffc163 100644 --- a/cad/kicad-library-packages3d/pkg-plist +++ b/cad/kicad-library-packages3d/pkg-plist @@ -7544,6 +7544,8 @@ %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_EuroQuartz_MT-4Pin_3.2x2.5mm_HandSoldering.wrl %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_HC49-SD.step %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_HC49-SD.wrl +%%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_MicroCrystal_MS1V-T1K.step +%%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_MicroCrystal_MS1V-T1K.wrl %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_SeikoEpson_FA238-4Pin_3.2x2.5mm.step %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_SeikoEpson_FA238-4Pin_3.2x2.5mm.wrl %%DATADIR%%/modules/packages3d/Crystal.3dshapes/Crystal_SMD_SeikoEpson_FA238-4Pin_3.2x2.5mm_HandSoldering.step @@ -7980,6 +7982,18 @@ %%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_1109-5_1.1x0.9mm.wrl %%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_1411-5_1.4x1.1mm.step %%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_1411-5_1.4x1.1mm.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-1.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-1.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-4.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-4.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-5.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-5.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-6.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-6.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-7.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206-7.wrl +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206.step +%%DATADIR%%/modules/packages3d/Filter.3dshapes/Filter_Mini-Circuits_FV1206.wrl %%DATADIR%%/modules/packages3d/Fuse.3dshapes/Fuseholder_Blade_Mini_Keystone_3568.step %%DATADIR%%/modules/packages3d/Fuse.3dshapes/Fuseholder_Blade_Mini_Keystone_3568.wrl %%DATADIR%%/modules/packages3d/Fuse.3dshapes/Fuseholder_Cylinder-5x20mm_Bulgin_FX0456_Vertical_Closed.step @@ -8002,6 +8016,8 @@ %%DATADIR%%/modules/packages3d/Heatsink.3dshapes/Heatsink_125x35x50mm_3xFixationM3.wrl %%DATADIR%%/modules/packages3d/Heatsink.3dshapes/Heatsink_AAVID_573300D00010G_TO-263.step %%DATADIR%%/modules/packages3d/Heatsink.3dshapes/Heatsink_AAVID_573300D00010G_TO-263.wrl +%%DATADIR%%/modules/packages3d/Heatsink.3dshapes/Heatsink_Stonecold_HS-132_32x14mm_2xFixation1.5mm.step +%%DATADIR%%/modules/packages3d/Heatsink.3dshapes/Heatsink_Stonecold_HS-132_32x14mm_2xFixation1.5mm.wrl %%DATADIR%%/modules/packages3d/Inductor_SMD.3dshapes/L_01005_0402Metric.step %%DATADIR%%/modules/packages3d/Inductor_SMD.3dshapes/L_01005_0402Metric.wrl %%DATADIR%%/modules/packages3d/Inductor_SMD.3dshapes/L_0201_0603Metric.step @@ -8410,8 +8426,12 @@ %%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_2816_7142Metric.wrl %%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_2816_7142Metric_Castellated.step %%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_2816_7142Metric_Castellated.wrl +%%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm.step +%%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm.wrl %%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_RGB_5050-6.step %%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_RGB_5050-6.wrl +%%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.step +%%DATADIR%%/modules/packages3d/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.wrl %%DATADIR%%/modules/packages3d/LED_THT.3dshapes/LED_D1.8mm_W1.8mm_H2.4mm_Horizontal_O1.27mm_Z1.6mm.step %%DATADIR%%/modules/packages3d/LED_THT.3dshapes/LED_D1.8mm_W1.8mm_H2.4mm_Horizontal_O1.27mm_Z1.6mm.wrl %%DATADIR%%/modules/packages3d/LED_THT.3dshapes/LED_D1.8mm_W1.8mm_H2.4mm_Horizontal_O1.27mm_Z4.9mm.step @@ -8652,6 +8672,8 @@ %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_DIP-14.wrl %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_DIP-8.step %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_DIP-8.wrl +%%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_SMD_Abracon_ASV-4Pin_7.0x5.1mm.step +%%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_SMD_Abracon_ASV-4Pin_7.0x5.1mm.wrl %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_SMD_EuroQuartz_XO53-4Pin_5.0x3.2mm.step %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_SMD_EuroQuartz_XO53-4Pin_5.0x3.2mm.wrl %%DATADIR%%/modules/packages3d/Oscillator.3dshapes/Oscillator_SeikoEpson_SG-8002DB.step @@ -9966,6 +9988,8 @@ %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIC-8-N7_3.9x4.9mm_P1.27mm.wrl %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.step %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl +%%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIC-8_5.275x5.275mm_P1.27mm.step +%%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIC-8_5.275x5.275mm_P1.27mm.wrl %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIJ-8_5.3x5.3mm_P1.27mm.step %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOIJ-8_5.3x5.3mm_P1.27mm.wrl %%DATADIR%%/modules/packages3d/Package_SO.3dshapes/SOJ-36_10.16x23.49mm_P1.27mm.step @@ -10290,8 +10314,8 @@ %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TO-277B.wrl %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-5.step %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-5.wrl -%%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-6_MK06A.step -%%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-6_MK06A.wrl +%%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-6.step +%%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-6.wrl %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-8.step %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23-8.wrl %%DATADIR%%/modules/packages3d/Package_TO_SOT_SMD.3dshapes/TSOT-23.step diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile index 9d15fb1416fc..1e57140c4f24 100644 --- a/cad/kicad-library-symbols/Makefile +++ b/cad/kicad-library-symbols/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= cad PKGNAMESUFFIX= -library-symbols diff --git a/cad/kicad-library-symbols/distinfo b/cad/kicad-library-symbols/distinfo index bcd224fc6f6a..d9b46ee0b874 100644 --- a/cad/kicad-library-symbols/distinfo +++ b/cad/kicad-library-symbols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556524357 -SHA256 (KiCad-kicad-symbols-5.1.2_GH0.tar.gz) = e89fc4d2ad27a287a9d8924e6c6c4837d39f2a7192797b8c31535ffb18f2dc8c -SIZE (KiCad-kicad-symbols-5.1.2_GH0.tar.gz) = 2858506 +TIMESTAMP = 1564960436 +SHA256 (KiCad-kicad-symbols-5.1.4_GH0.tar.gz) = afa91c22cb2c01a52dfaffc9256085a52a9ee7811f7eef2e9154049de9ed5707 +SIZE (KiCad-kicad-symbols-5.1.4_GH0.tar.gz) = 2897335 diff --git a/cad/kicad-library-symbols/pkg-plist b/cad/kicad-library-symbols/pkg-plist index baf1803e7464..a7384df78089 100644 --- a/cad/kicad-library-symbols/pkg-plist +++ b/cad/kicad-library-symbols/pkg-plist @@ -216,6 +216,8 @@ %%DATADIR%%/library/MCU_NXP_S08.lib %%DATADIR%%/library/MCU_Parallax.dcm %%DATADIR%%/library/MCU_Parallax.lib +%%DATADIR%%/library/MCU_Renesas_Synergy_S1.dcm +%%DATADIR%%/library/MCU_Renesas_Synergy_S1.lib %%DATADIR%%/library/MCU_SiFive.dcm %%DATADIR%%/library/MCU_SiFive.lib %%DATADIR%%/library/MCU_SiliconLabs.dcm diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile index 923faef74e9f..3a17a9fb15b9 100644 --- a/cad/kicad-library-templates/Makefile +++ b/cad/kicad-library-templates/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= cad PKGNAMESUFFIX= -library-tmpl diff --git a/cad/kicad-library-templates/distinfo b/cad/kicad-library-templates/distinfo index 65c87795bca1..e10131109312 100644 --- a/cad/kicad-library-templates/distinfo +++ b/cad/kicad-library-templates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556524386 -SHA256 (KiCad-kicad-templates-5.1.2_GH0.tar.gz) = fd14978af2d5b64d41561c8cd954f386a10e1548d6db2d4998281deffddeffbb -SIZE (KiCad-kicad-templates-5.1.2_GH0.tar.gz) = 1620807 +TIMESTAMP = 1564960456 +SHA256 (KiCad-kicad-templates-5.1.4_GH0.tar.gz) = be2fc20ccf646843af4871ad2d4cd79418e895bc70442569f0b1f423c615bdbb +SIZE (KiCad-kicad-templates-5.1.4_GH0.tar.gz) = 1630338 diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 3a60bbbcc26f..e6eae9d36e1e 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 5.1.2 -PORTREVISION= 1 +PORTVERSION= 5.1.4 PORTEPOCH= 2 CATEGORIES= cad @@ -37,12 +36,15 @@ USE_WX= 3.0 WX_COMPS= python:lib wx USE_GNOME= atk cairo CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include -CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ - -DwxWidgets_USE_UNICODE=ON -DKICAD_SCRIPTING_WXPYTHON=ON\ - -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \ - -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON \ - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \ - -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON \ +CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ + -DwxWidgets_USE_UNICODE=ON \ + -DKICAD_SCRIPTING_WXPYTHON=ON \ + -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \ + -DKICAD_SCRIPTING=ON \ + -DKICAD_SCRIPTING_MODULES=ON \ + -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \ + -DKICAD_USE_OCE=OFF \ + -DKICAD_USE_OCC=ON \ -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo index 633b8b5296e1..e4f61451712f 100644 --- a/cad/kicad/distinfo +++ b/cad/kicad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556524300 -SHA256 (KiCad-kicad-source-mirror-5.1.2_GH0.tar.gz) = b181e81fe25929dd86900790e07067e28c62eaaf954d3a4a7ac4f18ed4745e42 -SIZE (KiCad-kicad-source-mirror-5.1.2_GH0.tar.gz) = 23765445 +TIMESTAMP = 1564938608 +SHA256 (KiCad-kicad-source-mirror-5.1.4_GH0.tar.gz) = cd1f547d968c3c3c13d54531751b430cd06e63f97c788ca8774434c96453aadb +SIZE (KiCad-kicad-source-mirror-5.1.4_GH0.tar.gz) = 23786935 diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist index bbf01bc97622..d2fa317b7f39 100644 --- a/cad/kicad/pkg-plist +++ b/cad/kicad/pkg-plist @@ -45,7 +45,6 @@ share/appdata/kicad.appdata.xml %%PORTDOCS%%%%DOCSDIR%%/development/compiling.md %%PORTDOCS%%%%DOCSDIR%%/development/config-strings.md %%PORTDOCS%%%%DOCSDIR%%/development/pcbnew-plugins.md -%%PORTDOCS%%%%DOCSDIR%%/development/road-map-r5.md %%PORTDOCS%%%%DOCSDIR%%/development/road-map-r6.md %%PORTDOCS%%%%DOCSDIR%%/development/road-map.md %%PORTDOCS%%%%DOCSDIR%%/development/stable-release-policy.md -- cgit From 4cd247f62a6d238cd5ddf26c16f320c67c4a0002 Mon Sep 17 00:00:00 2001 From: yuri Date: Sat, 10 Aug 2019 22:23:41 +0000 Subject: New port: audio/geonkick-lv2: Software percussion synthesizer --- audio/Makefile | 1 + audio/geonkick-lv2/Makefile | 37 ++++++++++++++++++++++ audio/geonkick-lv2/distinfo | 3 ++ .../files/patch-plugin_lv2_CMakeLists.txt | 11 +++++++ .../files/patch-standalone_CMakeLists.txt | 11 +++++++ audio/geonkick-lv2/pkg-descr | 6 ++++ audio/geonkick-lv2/pkg-plist | 13 ++++++++ 7 files changed, 82 insertions(+) create mode 100644 audio/geonkick-lv2/Makefile create mode 100644 audio/geonkick-lv2/distinfo create mode 100644 audio/geonkick-lv2/files/patch-plugin_lv2_CMakeLists.txt create mode 100644 audio/geonkick-lv2/files/patch-standalone_CMakeLists.txt create mode 100644 audio/geonkick-lv2/pkg-descr create mode 100644 audio/geonkick-lv2/pkg-plist diff --git a/audio/Makefile b/audio/Makefile index 1b9abdba0274..cabe42a8778d 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -204,6 +204,7 @@ SUBDIR += funktrackergold SUBDIR += gbemol SUBDIR += gbsplay + SUBDIR += geonkick-lv2 SUBDIR += gervill SUBDIR += ghostess SUBDIR += giada diff --git a/audio/geonkick-lv2/Makefile b/audio/geonkick-lv2/Makefile new file mode 100644 index 000000000000..363c40868909 --- /dev/null +++ b/audio/geonkick-lv2/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= geonkick +DISTVERSIONPREFIX= v +DISTVERSION= 1.8-2 +DISTVERSIONSUFFIX= -g2e148d8 +CATEGORIES= audio +PKGNAMESUFFIX= -lv2 + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Software percussion synthesizer + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/filesystem) +BROKEN= STL feature 'filesystem' isn't available # ' +.endif + +BUILD_DEPENDS= lv2>0:audio/lv2 \ + gmake:devel/gmake \ + rapidjson>0:devel/rapidjson \ + redkite>0:x11-toolkits/redkite +LIB_DEPENDS= libjack.so:audio/jack \ + libsndfile.so:audio/libsndfile + +USES= compiler:c++14-lang cmake:noninja gnome localbase:ldflags pkgconfig shared-mime-info +USE_GITHUB= yes +GH_ACCOUNT= quamplex +USE_GNOME= cairo +USE_XORG= x11 + +CMAKE_ARGS= -DFREEBSD_GMAKE=${GMAKE} + +#INSTALLS_ICONS= yes # disabled because it causes: gtk-update-icon-cache: Failed to open file /usr/local/share/icons/hicolor/.icon-theme.cache : Permission denied + +.include diff --git a/audio/geonkick-lv2/distinfo b/audio/geonkick-lv2/distinfo new file mode 100644 index 000000000000..70fd7a51f30d --- /dev/null +++ b/audio/geonkick-lv2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565342115 +SHA256 (quamplex-geonkick-v1.8-2-g2e148d8_GH0.tar.gz) = 1643ee960c8cd16a6bb817d524ca5a6f0abb8f325a2c97629a3a132e2e1a93d8 +SIZE (quamplex-geonkick-v1.8-2-g2e148d8_GH0.tar.gz) = 2839655 diff --git a/audio/geonkick-lv2/files/patch-plugin_lv2_CMakeLists.txt b/audio/geonkick-lv2/files/patch-plugin_lv2_CMakeLists.txt new file mode 100644 index 000000000000..4241dc1a5018 --- /dev/null +++ b/audio/geonkick-lv2/files/patch-plugin_lv2_CMakeLists.txt @@ -0,0 +1,11 @@ +--- plugin/lv2/CMakeLists.txt.orig 2019-08-07 16:22:12 UTC ++++ plugin/lv2/CMakeLists.txt +@@ -6,7 +6,7 @@ add_library(geonkick_lv2 SHARED + ${GKICK_LV2_SOURCES}) + + target_link_libraries(geonkick_lv2 geonkick_common api_lv2) +-target_link_libraries(geonkick_lv2 "-lstdc++fs") ++#target_link_libraries(geonkick_lv2 "-lstdc++fs") + target_link_libraries(geonkick_lv2 "-lredkite -lX11 -lsndfile -lrt -lm -ldl -lpthread -lcairo") + add_dependencies(geonkick_lv2 api_lv2) + diff --git a/audio/geonkick-lv2/files/patch-standalone_CMakeLists.txt b/audio/geonkick-lv2/files/patch-standalone_CMakeLists.txt new file mode 100644 index 000000000000..0b67695dd7ff --- /dev/null +++ b/audio/geonkick-lv2/files/patch-standalone_CMakeLists.txt @@ -0,0 +1,11 @@ +--- standalone/CMakeLists.txt.orig 2019-08-07 16:23:18 UTC ++++ standalone/CMakeLists.txt +@@ -7,7 +7,7 @@ add_executable(geonkick + + add_dependencies(geonkick api_standalone) + target_link_libraries(geonkick geonkick_common api_standalone) +-target_link_libraries(geonkick "-lstdc++fs") ++#target_link_libraries(geonkick "-lstdc++fs") + target_link_libraries(geonkick "-lredkite -lX11 -ljack -lsndfile -lrt -lm -ldl -lpthread -lcairo") + + install(TARGETS geonkick DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/audio/geonkick-lv2/pkg-descr b/audio/geonkick-lv2/pkg-descr new file mode 100644 index 000000000000..18b34628d909 --- /dev/null +++ b/audio/geonkick-lv2/pkg-descr @@ -0,0 +1,6 @@ +Geonkick is a free software percussion synthesizer. + +Geonkick is a synthesizer that can synthesize elements of percussion. The most +basic examples are: kicks, snares, hit-hats, shakers, claps, sticks. + +WWW: https://github.com/iurienistor/geonkick diff --git a/audio/geonkick-lv2/pkg-plist b/audio/geonkick-lv2/pkg-plist new file mode 100644 index 000000000000..cd6288787428 --- /dev/null +++ b/audio/geonkick-lv2/pkg-plist @@ -0,0 +1,13 @@ +bin/geonkick +lib/lv2/geonkick.lv2/geonkick.ttl +lib/lv2/geonkick.lv2/libgeonkick_lv2.so +lib/lv2/geonkick.lv2/manifest.ttl +share/icons/hicolor/128x128/apps/geonkick.png +share/icons/hicolor/16x16/apps/geonkick.png +share/icons/hicolor/22x22/apps/geonkick.png +share/icons/hicolor/24x24/apps/geonkick.png +share/icons/hicolor/32x32/apps/geonkick.png +share/icons/hicolor/48x48/apps/geonkick.png +share/icons/hicolor/64x64/apps/geonkick.png +share/icons/hicolor/scalable/apps/geonkick.svg +share/mime/packages/geonkick.xml -- cgit From 9c7dec1fbc39ac6880965b728d52821af614962e Mon Sep 17 00:00:00 2001 From: ler Date: Sat, 10 Aug 2019 22:44:28 +0000 Subject: sysutils/lsof: fix build on -current, fix man page - fix build post r350531 [0] - fix manpage. [1] PR: 239686 [1], 239754 [0] Submitted by: yasu@utahime.org [0], jamie@catflap.org [1] --- sysutils/lsof/Makefile | 5 +++-- sysutils/lsof/files/patch-dialects_freebsd_dsock.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 sysutils/lsof/files/patch-dialects_freebsd_dsock.c diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 2b1c54119002..6b93358b9b3a 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -3,7 +3,7 @@ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 8 CATEGORIES= sysutils @@ -36,7 +36,8 @@ IGNORE+= requires kernel sources do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/Lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8 + (cd ${WRKSRC} && ${SED} 's/\\$$/\\DUMMY/' Lsof.8 | mandoc -T man | ${SED} 's/DUMMY$$//' > ${WRKSRC}/lsof.8) + ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8 @${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00* diff --git a/sysutils/lsof/files/patch-dialects_freebsd_dsock.c b/sysutils/lsof/files/patch-dialects_freebsd_dsock.c new file mode 100644 index 000000000000..5a3f822b6db6 --- /dev/null +++ b/sysutils/lsof/files/patch-dialects_freebsd_dsock.c @@ -0,0 +1,11 @@ +--- dialects/freebsd/dsock.c.orig 2019-05-08 07:32:25 UTC ++++ dialects/freebsd/dsock.c +@@ -182,7 +182,7 @@ process_socket(sa) + #endif /* FREEBSDV<4050 */ + + #if defined(HASIPv6) && !defined(HASINRIAIPv6) +- struct in6pcb in6p; ++ struct inpcb in6p; + #endif /* defined(HASIPv6) && !defined(HASINRIAIPv6) */ + + (void) snpf(Lf->type, sizeof(Lf->type), "sock"); -- cgit From 66a5a7ac4bdc7c7529e7003bcb17f3b9ec088b7b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:10 +0000 Subject: Add rubygem-devise-two-factor30-rails5 3.0.3 (copied from rubygem-devise-two-factor-rails5) - Add PORTSCOUT --- security/Makefile | 1 + .../rubygem-devise-two-factor30-rails5/Makefile | 29 ++++++++++++++++++++++ .../rubygem-devise-two-factor30-rails5/distinfo | 3 +++ .../files/patch-gemspec | 11 ++++++++ .../rubygem-devise-two-factor30-rails5/pkg-descr | 3 +++ 5 files changed, 47 insertions(+) create mode 100644 security/rubygem-devise-two-factor30-rails5/Makefile create mode 100644 security/rubygem-devise-two-factor30-rails5/distinfo create mode 100644 security/rubygem-devise-two-factor30-rails5/files/patch-gemspec create mode 100644 security/rubygem-devise-two-factor30-rails5/pkg-descr diff --git a/security/Makefile b/security/Makefile index 92266309e700..9a0289664206 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1084,6 +1084,7 @@ SUBDIR += rubygem-bcrypt_pbkdf SUBDIR += rubygem-devise-two-factor SUBDIR += rubygem-devise-two-factor-rails5 + SUBDIR += rubygem-devise-two-factor30-rails5 SUBDIR += rubygem-devise_pam_authenticatable2 SUBDIR += rubygem-digest-crc SUBDIR += rubygem-doorkeeper diff --git a/security/rubygem-devise-two-factor30-rails5/Makefile b/security/rubygem-devise-two-factor30-rails5/Makefile new file mode 100644 index 000000000000..c306fce94e2e --- /dev/null +++ b/security/rubygem-devise-two-factor30-rails5/Makefile @@ -0,0 +1,29 @@ +# Created by: Torsten Zuhlsdorff +# $FreeBSD$ + +PORTNAME= devise-two-factor +PORTVERSION= 3.0.3 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 30-rails5 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Barebones two-factor authentication with Devise + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-activesupport5>=0:devel/rubygem-activesupport5 \ + rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \ + rubygem-devise-rails5>=4.0:devel/rubygem-devise-rails5 \ + rubygem-railties5>=0:www/rubygem-railties5 \ + rubygem-rotp>=2.0:devel/rubygem-rotp + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +PORTSCOUT= limit:^3\.0\. + +.include diff --git a/security/rubygem-devise-two-factor30-rails5/distinfo b/security/rubygem-devise-two-factor30-rails5/distinfo new file mode 100644 index 000000000000..383d7bd69ae3 --- /dev/null +++ b/security/rubygem-devise-two-factor30-rails5/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523619786 +SHA256 (rubygem/devise-two-factor-3.0.3.gem) = ac5213fa12164e65ed656b61d2406bed88e8378368f7e11e2d4040167cd1c1ac +SIZE (rubygem/devise-two-factor-3.0.3.gem) = 28672 diff --git a/security/rubygem-devise-two-factor30-rails5/files/patch-gemspec b/security/rubygem-devise-two-factor30-rails5/files/patch-gemspec new file mode 100644 index 000000000000..33b2f7571c11 --- /dev/null +++ b/security/rubygem-devise-two-factor30-rails5/files/patch-gemspec @@ -0,0 +1,11 @@ +--- devise-two-factor.gemspec.orig 2016-12-31 23:56:23 UTC ++++ devise-two-factor.gemspec +@@ -28,7 +28,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, ["!= 2", "< 4", ">= 1.3"]) + s.add_runtime_dependency(%q.freeze, ["~> 4.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, ["> 1.0"]) + s.add_development_dependency(%q.freeze, ["> 3"]) diff --git a/security/rubygem-devise-two-factor30-rails5/pkg-descr b/security/rubygem-devise-two-factor30-rails5/pkg-descr new file mode 100644 index 000000000000..314c84f06bb5 --- /dev/null +++ b/security/rubygem-devise-two-factor30-rails5/pkg-descr @@ -0,0 +1,3 @@ +Barebones two-factor authentication with Devise + +WWW: https://github.com/tinfoil/devise-two-factor -- cgit From 18fae8e0bb4913b69b51262016c808efb52e08c4 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:16 +0000 Subject: Add rubygem-webdrivers 4.1.2 Run Selenium tests more easily with automatic installation and updates for all supported webdrivers. WWW: https://github.com/titusfortner/webdrivers --- www/Makefile | 1 + www/rubygem-webdrivers/Makefile | 24 ++++++++++++++++++++++++ www/rubygem-webdrivers/distinfo | 3 +++ www/rubygem-webdrivers/pkg-descr | 4 ++++ 4 files changed, 32 insertions(+) create mode 100644 www/rubygem-webdrivers/Makefile create mode 100644 www/rubygem-webdrivers/distinfo create mode 100644 www/rubygem-webdrivers/pkg-descr diff --git a/www/Makefile b/www/Makefile index c6966c547360..21f6a7d3b87f 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2200,6 +2200,7 @@ SUBDIR += rubygem-url_mount SUBDIR += rubygem-vegas SUBDIR += rubygem-wasabi + SUBDIR += rubygem-webdrivers SUBDIR += rubygem-webmock SUBDIR += rubygem-webpack-rails-rails5 SUBDIR += rubygem-webrobots diff --git a/www/rubygem-webdrivers/Makefile b/www/rubygem-webdrivers/Makefile new file mode 100644 index 000000000000..4281603d397b --- /dev/null +++ b/www/rubygem-webdrivers/Makefile @@ -0,0 +1,24 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= webdrivers +PORTVERSION= 4.1.2 +CATEGORIES= www rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Run Selenium tests more easily with install and updates for all supported webdrivers + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-nokogiri>=1.6<2:textproc/rubygem-nokogiri \ + rubygem-rubyzip>=1.0<2:archivers/rubygem-rubyzip \ + rubygem-selenium-webdriver>=3.0<4.0:www/rubygem-selenium-webdriver + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/www/rubygem-webdrivers/distinfo b/www/rubygem-webdrivers/distinfo new file mode 100644 index 000000000000..9873adc4ff73 --- /dev/null +++ b/www/rubygem-webdrivers/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565476051 +SHA256 (rubygem/webdrivers-4.1.2.gem) = b7dc9f948ca5ab184ddcc129e61b89a2b91a35f434b9e7756f2caa408364ec26 +SIZE (rubygem/webdrivers-4.1.2.gem) = 26624 diff --git a/www/rubygem-webdrivers/pkg-descr b/www/rubygem-webdrivers/pkg-descr new file mode 100644 index 000000000000..5c11fcd53679 --- /dev/null +++ b/www/rubygem-webdrivers/pkg-descr @@ -0,0 +1,4 @@ +Run Selenium tests more easily with automatic installation and updates for all +supported webdrivers. + +WWW: https://github.com/titusfortner/webdrivers -- cgit From ab786a29c09d5c37fa5651040cabb1ad60e36649 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:22 +0000 Subject: Update to 0.97 - Add LICENSE_FILE Changes: https://metacpan.org/changes/distribution/Data-Object --- devel/p5-Data-Object/Makefile | 3 ++- devel/p5-Data-Object/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/p5-Data-Object/Makefile b/devel/p5-Data-Object/Makefile index c69e3d65c24b..a47fca82d05d 100644 --- a/devel/p5-Data-Object/Makefile +++ b/devel/p5-Data-Object/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Data-Object -PORTVERSION= 0.96 +PORTVERSION= 0.97 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,6 +12,7 @@ COMMENT= Data Type Objects for Perl 5 LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Function-Parameters>=2.001003:devel/p5-Function-Parameters \ diff --git a/devel/p5-Data-Object/distinfo b/devel/p5-Data-Object/distinfo index 381b8f14de49..8701dc097cd3 100644 --- a/devel/p5-Data-Object/distinfo +++ b/devel/p5-Data-Object/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554926449 -SHA256 (Data-Object-0.96.tar.gz) = f9b9b209bf1da0f5d0ca7e1f358608a441f726dc84610315b70aff4203045149 -SIZE (Data-Object-0.96.tar.gz) = 250057 +TIMESTAMP = 1565441527 +SHA256 (Data-Object-0.97.tar.gz) = 7e1bfddc54de64410fc32591944102971161492db602fbb9ace825ac52f20ec6 +SIZE (Data-Object-0.97.tar.gz) = 247226 -- cgit From 3b8e87c75dc50ebf9efd1364791fe7579123e5ea Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:27 +0000 Subject: Update WWW - Take maintainership --- devel/p5-Mouse/Makefile | 2 +- devel/p5-Mouse/pkg-descr | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile index 1dd7c21ef647..710159b1b43b 100644 --- a/devel/p5-Mouse/Makefile +++ b/devel/p5-Mouse/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SKAJI PKGNAMEPREFIX= p5- -MAINTAINER= perl@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Moose minus the antlers LICENSE= ART10 GPLv1+ diff --git a/devel/p5-Mouse/pkg-descr b/devel/p5-Mouse/pkg-descr index 022b7eae795e..920ea48f8bbf 100644 --- a/devel/p5-Mouse/pkg-descr +++ b/devel/p5-Mouse/pkg-descr @@ -1,13 +1,17 @@ Moose is a postmodern object system for Perl5. Moose is wonderful. -Unfortunately, Moose has a compile-time penalty. Though significant progress -has been made over the years, the compile time penalty is a non-starter for -some very specific applications. If you are writing a command-line application -or CGI script where startup time is essential, you may not be able to use Moose -(we recommend that you instead use persistent Perl executing environments like +Unfortunately, Moose has a compile-time penalty. Though significant progress has +been made over the years, the compile time penalty is a non-starter for some +very specific applications. If you are writing a command-line application or CGI +script where startup time is essential, you may not be able to use Moose (we +recommend that you instead use persistent Perl executing environments like FastCGI for the latter, if possible). Mouse is a Moose compatible object system, which aims to alleviate this penalty by providing a subset of Moose's functionality. -WWW: https://metacpan.org/pod/Mouse +We're also going as light on dependencies as possible. Mouse currently has no +dependencies except for building/testing modules. Mouse also works without XS, +although it has an XS backend to make it much faster. + +WWW: https://metacpan.org/release/Mouse -- cgit From beae3a1ee53bb6b4fb0162ec213cb9ddd10f5aa0 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:33 +0000 Subject: Update to 2.035 - Reformat pkg-descr - Take maintainership Changes: https://metacpan.org/changes/distribution/PDF-API2 --- textproc/p5-PDF-API2/Makefile | 7 ++++--- textproc/p5-PDF-API2/distinfo | 6 +++--- textproc/p5-PDF-API2/pkg-descr | 24 ++++++++++-------------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile index 57ebee73182c..9524ceb7a8aa 100644 --- a/textproc/p5-PDF-API2/Makefile +++ b/textproc/p5-PDF-API2/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= PDF-API2 -PORTVERSION= 2.034 +PORTVERSION= 2.035 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= perl@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Facilitates the creation and modification of PDF files LICENSE= LGPL21 @@ -18,8 +18,9 @@ RUN_DEPENDS= p5-Font-TTF>=0:x11-fonts/p5-Font-TTF TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \ p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle -NO_ARCH= yes USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include diff --git a/textproc/p5-PDF-API2/distinfo b/textproc/p5-PDF-API2/distinfo index 66a3ce53f296..d1489b56c08f 100644 --- a/textproc/p5-PDF-API2/distinfo +++ b/textproc/p5-PDF-API2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561906609 -SHA256 (PDF-API2-2.034.tar.gz) = 8aa98818fb6e4bebd6f9096e222989dcdd5fd4c5fa2ad1c7f0149053fc68f1cc -SIZE (PDF-API2-2.034.tar.gz) = 3510253 +TIMESTAMP = 1565441549 +SHA256 (PDF-API2-2.035.tar.gz) = 7e4435ff51c808451f53fa161672ba2eaa7c4d49f4ab6506801383882405bf80 +SIZE (PDF-API2-2.035.tar.gz) = 3510872 diff --git a/textproc/p5-PDF-API2/pkg-descr b/textproc/p5-PDF-API2/pkg-descr index cb6a9eecef3e..344f944c7693 100644 --- a/textproc/p5-PDF-API2/pkg-descr +++ b/textproc/p5-PDF-API2/pkg-descr @@ -1,20 +1,16 @@ - PDF::API2 - There seem to be a growing plethora of Perl modules for creating and manipulating PDF files. -This module is 'The Next Generation' of Text::PDF::API which initially -provided a nice API around the Text::PDF::* modules created by Martin Hosken. - -FEATURES +PDF::API2 is 'The Next Generation' of Text::PDF::API which initially provided a +nice API around the Text::PDF::* modules created by Martin Hosken. - . Works with more than one PDF file open at once - . It presents a object-oriented API to the user - . Supports the 14 base PDF Core Fonts - . Supports TrueType fonts - . Supports Adobe-Type1 Fonts (pfb/pfa/afm) - . Supports native Embedding of bitmap images (jpeg,ppm,png,gif) - . Supports modification of existing pdfs - and import/cloning of pages +Features: +- Works with more than one PDF file open at once +- It presents a object-oriented API to the user +- Supports the 14 base PDF Core Fonts +- Supports TrueType fonts +- Supports Adobe-Type1 Fonts (pfb/pfa/afm) +- Supports native Embedding of bitmap images (jpeg, ppm, png,gif) +- Supports modification of existing pdfs and import/cloning of pages WWW: https://metacpan.org/release/PDF-API2 -- cgit From ffd151bee4fd186d88cabae357a5521f94141924 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:38 +0000 Subject: Update to 1.0.5 Changes: https://github.com/jupyterlab/jupyterlab/commits/master --- devel/py-jupyterlab/Makefile | 2 +- devel/py-jupyterlab/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-jupyterlab/Makefile b/devel/py-jupyterlab/Makefile index e39fcba7ee86..7b37dad07e47 100644 --- a/devel/py-jupyterlab/Makefile +++ b/devel/py-jupyterlab/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jupyterlab -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jupyterlab/distinfo b/devel/py-jupyterlab/distinfo index 5793c7481168..472254316cf1 100644 --- a/devel/py-jupyterlab/distinfo +++ b/devel/py-jupyterlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564577818 -SHA256 (jupyterlab-1.0.4.tar.gz) = 32a72032ad537a7410f11c8c08243fce68d8d503f09376461f344778f35f0d6e -SIZE (jupyterlab-1.0.4.tar.gz) = 12071565 +TIMESTAMP = 1565441529 +SHA256 (jupyterlab-1.0.5.tar.gz) = 89260836abeee287516bd6d2c722e4299b1eed0d842df961c3a9976a9c0c9260 +SIZE (jupyterlab-1.0.5.tar.gz) = 12304397 -- cgit From 139e2d25cf22209b12569addb7001987aca17468 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:44 +0000 Subject: Update to 1.10.0 Changes: https://github.com/pyvisa/pyvisa/releases https://github.com/pyvisa/pyvisa/blob/master/CHANGES --- devel/py-pyvisa/Makefile | 3 +-- devel/py-pyvisa/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile index c819a5bb1a24..d97e0da3718d 100644 --- a/devel/py-pyvisa/Makefile +++ b/devel/py-pyvisa/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pyvisa -PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTVERSION= 1.10.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyvisa/distinfo b/devel/py-pyvisa/distinfo index 2d482cd2ec1e..d95577c613f1 100644 --- a/devel/py-pyvisa/distinfo +++ b/devel/py-pyvisa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534255156 -SHA256 (PyVISA-1.9.1.tar.gz) = d387dd215928bcc40f4ac21f1f344ca7a511ec3e8078f76876fa717174dbb993 -SIZE (PyVISA-1.9.1.tar.gz) = 440456 +TIMESTAMP = 1565441531 +SHA256 (PyVISA-1.10.0.tar.gz) = 9133a5c1c28ae30c9846d55039a2361ad9f9f9af21920c1b0310145977afc313 +SIZE (PyVISA-1.10.0.tar.gz) = 6813100 -- cgit From 9616841f0fefc9ffe7ddba1867edeb0259db750a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:48:49 +0000 Subject: Update to 0.4.2.8 Changes: https://github.com/KimiNewt/pyshark/releases https://github.com/KimiNewt/pyshark/commits/master --- net/py-pyshark/Makefile | 2 +- net/py-pyshark/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index 08e4824c24dd..6d9a67def4da 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyshark -PORTVERSION= 0.4.2.7 +PORTVERSION= 0.4.2.8 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyshark/distinfo b/net/py-pyshark/distinfo index 29d6bb2846bf..a1325380986d 100644 --- a/net/py-pyshark/distinfo +++ b/net/py-pyshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565352592 -SHA256 (pyshark-0.4.2.7.tar.gz) = 9927274efef35119aecaafbc8b9cd652deb579853d933a8fb2a0ee3266d488d6 -SIZE (pyshark-0.4.2.7.tar.gz) = 19906 +TIMESTAMP = 1565441533 +SHA256 (pyshark-0.4.2.8.tar.gz) = 46ee30c6f23fb18c7ed6dd26a86e76c223b40e3dcc66d51c34f6df3915bc41cc +SIZE (pyshark-0.4.2.8.tar.gz) = 19909 -- cgit From 7aa93507d3a11503758b33aa0f9a9cc9c0352b1c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:33 +0000 Subject: Cosmetic change --- databases/rubygem-activemodel5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-activemodel5/Makefile b/databases/rubygem-activemodel5/Makefile index 24d807b8c32a..773106bccc3f 100644 --- a/databases/rubygem-activemodel5/Makefile +++ b/databases/rubygem-activemodel5/Makefile @@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport5>=${PORTVERSION}:devel/rubygem-activesupport5 -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 9ab860955d3b0fd85d012e375fdae581d027902b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:38 +0000 Subject: Cosmetic change --- databases/rubygem-activemodel50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-activemodel50/Makefile b/databases/rubygem-activemodel50/Makefile index 10a173d3f430..ac785e7e2474 100644 --- a/databases/rubygem-activemodel50/Makefile +++ b/databases/rubygem-activemodel50/Makefile @@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport50>=${PORTVERSION}:devel/rubygem-activesupport50 -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From fceddef9856e549273138a323e1e0d744f6e4061 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:43 +0000 Subject: Cosmetic change --- databases/rubygem-activerecord5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-activerecord5/Makefile b/databases/rubygem-activerecord5/Makefile index 0d365a4521a9..a1f2c90fddc9 100644 --- a/databases/rubygem-activerecord5/Makefile +++ b/databases/rubygem-activerecord5/Makefile @@ -17,11 +17,11 @@ RUN_DEPENDS= rubygem-activemodel5>=${PORTVERSION}:databases/rubygem-activemodel5 rubygem-activesupport5>=${PORTVERSION}:devel/rubygem-activesupport5 \ rubygem-arel8>=8.0:databases/rubygem-arel8 -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 601b7591827a82d6106e1e11c37647caceb69b21 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:48 +0000 Subject: Cosmetic change --- databases/rubygem-activerecord50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-activerecord50/Makefile b/databases/rubygem-activerecord50/Makefile index 52b0930649eb..025d39168f84 100644 --- a/databases/rubygem-activerecord50/Makefile +++ b/databases/rubygem-activerecord50/Makefile @@ -17,11 +17,11 @@ RUN_DEPENDS= rubygem-activemodel50>=${PORTVERSION}:databases/rubygem-activemodel rubygem-activesupport50>=${PORTVERSION}:devel/rubygem-activesupport50 \ rubygem-arel7>=7.0:databases/rubygem-arel7 -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 70ff83b5dcba0f25b798d667a68a90184239c26a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:53 +0000 Subject: Cosmetic change --- devel/rubygem-activesupport5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-activesupport5/Makefile b/devel/rubygem-activesupport5/Makefile index 7329d991abeb..db2d816142b2 100644 --- a/devel/rubygem-activesupport5/Makefile +++ b/devel/rubygem-activesupport5/Makefile @@ -18,11 +18,11 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.2:devel/rubygem-concurrent-ruby \ rubygem-minitest>=5.1:devel/rubygem-minitest \ rubygem-tzinfo>=1.1:devel/rubygem-tzinfo -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 1ae478e20e1e44116b8acb1d21d24a0e80b13227 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:49:58 +0000 Subject: Cosmetic change --- devel/rubygem-activesupport50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-activesupport50/Makefile b/devel/rubygem-activesupport50/Makefile index 60f6b0fab7f3..aafa73a8a7a5 100644 --- a/devel/rubygem-activesupport50/Makefile +++ b/devel/rubygem-activesupport50/Makefile @@ -18,11 +18,11 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.2:devel/rubygem-concurrent-ruby \ rubygem-minitest>=5.1:devel/rubygem-minitest \ rubygem-tzinfo>=1.1:devel/rubygem-tzinfo -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 6059b7977605132ae5f885108c9c8e789591de68 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:03 +0000 Subject: Take maintainership --- databases/rubygem-globalid/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile index 7c60d8579335..2db6bdb8dee0 100644 --- a/databases/rubygem-globalid/Makefile +++ b/databases/rubygem-globalid/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.4.2 CATEGORIES= databases rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= URIs for your models makes it easy to pass references around LICENSE= MIT -- cgit From 6af1823e41ff1ff3a766823ba6913a417dec442d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:07 +0000 Subject: Update version requirement of RUN_DEPENDS - Take maintainership --- databases/rubygem-globalid-rails5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-globalid-rails5/Makefile b/databases/rubygem-globalid-rails5/Makefile index 14a122b25360..b873b420d245 100644 --- a/databases/rubygem-globalid-rails5/Makefile +++ b/databases/rubygem-globalid-rails5/Makefile @@ -7,13 +7,13 @@ CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= URIs for your models makes it easy to pass references around LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-activesupport5>0:devel/rubygem-activesupport5 +RUN_DEPENDS= rubygem-activesupport5>=4.2.0:devel/rubygem-activesupport5 USES= gem USE_RUBY= yes -- cgit From c5c550c43cca3a3bdecab8d94eb0d4e37a02bbfd Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:12 +0000 Subject: Take maintainership --- databases/rubygem-globalid-rails50/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databases/rubygem-globalid-rails50/Makefile b/databases/rubygem-globalid-rails50/Makefile index 18a971ed4bb7..6999471143f5 100644 --- a/databases/rubygem-globalid-rails50/Makefile +++ b/databases/rubygem-globalid-rails50/Makefile @@ -7,7 +7,7 @@ CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= URIs for your models makes it easy to pass references around LICENSE= MIT -- cgit From 48d4f65fa8289aed104839ed7102c60e4dbb5c81 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:17 +0000 Subject: Cosmetic change --- devel/rubygem-activejob5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-activejob5/Makefile b/devel/rubygem-activejob5/Makefile index de00d981c85f..f4e32222bd3f 100644 --- a/devel/rubygem-activejob5/Makefile +++ b/devel/rubygem-activejob5/Makefile @@ -16,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport5>=${PORTVERSION}:devel/rubygem-activesupport5 \ rubygem-globalid-rails5>=0.3.6:databases/rubygem-globalid-rails5 -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 6e98d125d199bd7abad94bfed80be09c38891758 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:22 +0000 Subject: Cosmetic change --- devel/rubygem-activejob50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-activejob50/Makefile b/devel/rubygem-activejob50/Makefile index bb60def28522..df3e3f112c28 100644 --- a/devel/rubygem-activejob50/Makefile +++ b/devel/rubygem-activejob50/Makefile @@ -16,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport50>=${PORTVERSION}:devel/rubygem-activesupport50 \ rubygem-globalid-rails50>=0.3.6:databases/rubygem-globalid-rails50 -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 815d8a3451f8b2738ef2842fc015c549ec4ff05a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:27 +0000 Subject: Update to 2.11.330 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 4f3b0819dd59..bd4ec1aef278 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.329 +DISTVERSION= 2.11.330 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 2ee3f7a461ff..dae045ac5c20 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565352594 -SHA256 (rubygem/aws-sdk-2.11.329.gem) = b9e25b021ed9612efacfc2c1e0f47cfee47e67df8ef6a84e074403fc6383d6f2 -SIZE (rubygem/aws-sdk-2.11.329.gem) = 4608 +TIMESTAMP = 1565441535 +SHA256 (rubygem/aws-sdk-2.11.330.gem) = 7206970daadb0cd0e1796d3021ee5354a522875b1c643347b7674129c04c7231 +SIZE (rubygem/aws-sdk-2.11.330.gem) = 4608 -- cgit From c3f183097cecd64a65649db26bfcb8d278a74964 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:33 +0000 Subject: Update to 2.11.330 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 8d8e3ead2ceb..9e32c8058b40 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.329 +DISTVERSION= 2.11.330 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 39f5be33105a..d575782f868b 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565352596 -SHA256 (rubygem/aws-sdk-core-2.11.329.gem) = 97550fbbea66467b49783ccab3f60633023619740ba6facc57f6f21419d84c1e -SIZE (rubygem/aws-sdk-core-2.11.329.gem) = 1635328 +TIMESTAMP = 1565441537 +SHA256 (rubygem/aws-sdk-core-2.11.330.gem) = 31e6f269cc70560e90252e4a6c353ddf7726fb32b699a2a6a362e2b5ca8197ba +SIZE (rubygem/aws-sdk-core-2.11.330.gem) = 1636352 -- cgit From 663512e389482620bfe73f9c07ee57e1ac510bca Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:38 +0000 Subject: Update to 2.11.330 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 7bda9db4d7e9..5a7b8d657c58 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.329 +DISTVERSION= 2.11.330 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 6e98c0f295d3..80ce508308b3 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565352598 -SHA256 (rubygem/aws-sdk-resources-2.11.329.gem) = d5af842b68fe7bd9bdf00c4454a0507a4243c8710354923dbf14cbea9e7c4b92 -SIZE (rubygem/aws-sdk-resources-2.11.329.gem) = 48640 +TIMESTAMP = 1565441539 +SHA256 (rubygem/aws-sdk-resources-2.11.330.gem) = f0faa70a0c7dd5fd2b8e286b78f81e9e2fe14c904bb770d8f9ede419d59bec2a +SIZE (rubygem/aws-sdk-resources-2.11.330.gem) = 48640 -- cgit From e53b564acdb3fccca8949a2d0d440ab9b15ff0ab Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:43 +0000 Subject: Take maintainership --- devel/rubygem-coffee-rails-rails5/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/devel/rubygem-coffee-rails-rails5/Makefile b/devel/rubygem-coffee-rails-rails5/Makefile index 9a145dca3ef0..86b3d3fd2f47 100644 --- a/devel/rubygem-coffee-rails-rails5/Makefile +++ b/devel/rubygem-coffee-rails-rails5/Makefile @@ -7,7 +7,7 @@ CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Coffee Script adapter for the Rails asset pipeline LICENSE= MIT @@ -16,8 +16,9 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \ rubygem-railties5>=4.0.0:www/rubygem-railties5 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From 0cca5cec7eb0f0f09d2b7efc9d273038c7a60cfb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:48 +0000 Subject: Take maintainership --- devel/rubygem-coffee-rails-rails50/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-coffee-rails-rails50/Makefile b/devel/rubygem-coffee-rails-rails50/Makefile index ddbbe7c24794..06c290de9d88 100644 --- a/devel/rubygem-coffee-rails-rails50/Makefile +++ b/devel/rubygem-coffee-rails-rails50/Makefile @@ -7,17 +7,18 @@ CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Coffee Script adapter for the Rails asset pipeline LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \ - rubygem-railties50>=5.0.0:www/rubygem-railties50 + rubygem-railties50>=4.0.0:www/rubygem-railties50 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From fd1a9989ae66196cddc51ef62a2de36f0f15531d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:53 +0000 Subject: Update WWW --- devel/rubygem-rb-inotify/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/rubygem-rb-inotify/pkg-descr b/devel/rubygem-rb-inotify/pkg-descr index d7145ec3e57b..2f8974a83235 100644 --- a/devel/rubygem-rb-inotify/pkg-descr +++ b/devel/rubygem-rb-inotify/pkg-descr @@ -1,3 +1,3 @@ rubygem-rb-inotify is a ruby wrapper for libinotify, using ffi. -WWW: https://github.com/nex3/rb-inotify +WWW: https://github.com/guard/rb-inotify -- cgit From 8333d4703b84e02f54d34450d4bbda8560d926ee Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:50:58 +0000 Subject: Update to 4.0.1 Changes: https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md --- dns/rubygem-public_suffix/Makefile | 3 +-- dns/rubygem-public_suffix/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile index dde54d1cc023..048fcf3c89a4 100644 --- a/dns/rubygem-public_suffix/Makefile +++ b/dns/rubygem-public_suffix/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= public_suffix -PORTVERSION= 4.0.0 -PORTREVISION= 1 +PORTVERSION= 4.0.1 CATEGORIES= dns rubygems MASTER_SITES= RG diff --git a/dns/rubygem-public_suffix/distinfo b/dns/rubygem-public_suffix/distinfo index 60b7169ac34e..276bb1cdb896 100644 --- a/dns/rubygem-public_suffix/distinfo +++ b/dns/rubygem-public_suffix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564757739 -SHA256 (rubygem/public_suffix-4.0.0.gem) = f6f39d8e6d5d2f1ceb19913f9355f93a9c96a798c952e11f4c97c27127ad547f -SIZE (rubygem/public_suffix-4.0.0.gem) = 99840 +TIMESTAMP = 1565441541 +SHA256 (rubygem/public_suffix-4.0.1.gem) = 6035585fe67676a195ba53fa5860625a70e057cf2226ecc5bbede125a4d8ce76 +SIZE (rubygem/public_suffix-4.0.1.gem) = 100352 -- cgit From 1783e4cd7b0d8870c5b8822f5b4dbf1acb5969e0 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:03 +0000 Subject: Cosmetic change --- mail/rubygem-actionmailer5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/rubygem-actionmailer5/Makefile b/mail/rubygem-actionmailer5/Makefile index 8a56f37f25ff..1a1386d927a5 100644 --- a/mail/rubygem-actionmailer5/Makefile +++ b/mail/rubygem-actionmailer5/Makefile @@ -19,11 +19,11 @@ RUN_DEPENDS= rubygem-actionpack5>=${PORTVERSION}:www/rubygem-actionpack5 \ rubygem-mail>=2.5.4:mail/rubygem-mail \ rubygem-rails-dom-testing-rails5>=2.0:textproc/rubygem-rails-dom-testing-rails5 -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 5f472a6a50feb7a6fa5c56d98da6e38c82ad7c63 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:08 +0000 Subject: Cosmetic change --- mail/rubygem-actionmailer50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/rubygem-actionmailer50/Makefile b/mail/rubygem-actionmailer50/Makefile index e7f990d8ba04..c2deb728cc6c 100644 --- a/mail/rubygem-actionmailer50/Makefile +++ b/mail/rubygem-actionmailer50/Makefile @@ -19,11 +19,11 @@ RUN_DEPENDS= rubygem-actionpack50>=${PORTVERSION}:www/rubygem-actionpack50 \ rubygem-mail>=2.5.4:mail/rubygem-mail \ rubygem-rails-dom-testing-rails50>=2.0:textproc/rubygem-rails-dom-testing-rails50 -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From c8e919dca127fc796cae3766ec52486b2c0788c5 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:13 +0000 Subject: Update to 3.1.0 Changes: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md https://github.com/tinfoil/devise-two-factor/commits/master --- security/rubygem-devise-two-factor-rails5/Makefile | 2 +- security/rubygem-devise-two-factor-rails5/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/rubygem-devise-two-factor-rails5/Makefile b/security/rubygem-devise-two-factor-rails5/Makefile index da121f1d3e6b..201d2675038d 100644 --- a/security/rubygem-devise-two-factor-rails5/Makefile +++ b/security/rubygem-devise-two-factor-rails5/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= devise-two-factor -PORTVERSION= 3.0.3 +PORTVERSION= 3.1.0 CATEGORIES= security rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 diff --git a/security/rubygem-devise-two-factor-rails5/distinfo b/security/rubygem-devise-two-factor-rails5/distinfo index 383d7bd69ae3..a0b8b6fe249c 100644 --- a/security/rubygem-devise-two-factor-rails5/distinfo +++ b/security/rubygem-devise-two-factor-rails5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523619786 -SHA256 (rubygem/devise-two-factor-3.0.3.gem) = ac5213fa12164e65ed656b61d2406bed88e8378368f7e11e2d4040167cd1c1ac -SIZE (rubygem/devise-two-factor-3.0.3.gem) = 28672 +TIMESTAMP = 1565441543 +SHA256 (rubygem/devise-two-factor-3.1.0.gem) = c4ae641aef51339b10e8f2e0ee56c6abbaa81caa9d653926c1b4fb9ce13df33f +SIZE (rubygem/devise-two-factor-3.1.0.gem) = 29184 -- cgit From c075d846a0936c07e9105203dfbcc3a33fc2d4ce Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:18 +0000 Subject: Take maintainership --- textproc/rubygem-rails-dom-testing/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/textproc/rubygem-rails-dom-testing/Makefile b/textproc/rubygem-rails-dom-testing/Makefile index 3c5f557735bd..8681a8daa06e 100644 --- a/textproc/rubygem-rails-dom-testing/Makefile +++ b/textproc/rubygem-rails-dom-testing/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 2.0.3 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Analyse and compare DOMs using Nokogiri LICENSE= MIT @@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \ rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From d72c1c352912e9651662fd0dd7dbd3f9c607cd1f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:23 +0000 Subject: Fix RUN_DEPENDS - Update version requirement of RUN_DEPENDS - Bump PORTREVISION for dependency change - Take maintainership --- textproc/rubygem-rails-dom-testing-rails5/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/textproc/rubygem-rails-dom-testing-rails5/Makefile b/textproc/rubygem-rails-dom-testing-rails5/Makefile index 76110c607f1b..37ec3d440b64 100644 --- a/textproc/rubygem-rails-dom-testing-rails5/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails5/Makefile @@ -3,22 +3,23 @@ PORTNAME= rails-dom-testing PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Analyse and compare DOMs using Nokogiri LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-activesupport5>0:devel/rubygem-activesupport5 \ - rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \ - rubygem-rails-deprecated_sanitizer-rails5>=1.0.1:devel/rubygem-rails-deprecated_sanitizer-rails5 +RUN_DEPENDS= rubygem-activesupport5>=4.2.0:devel/rubygem-activesupport5 \ + rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From ff146f388f9e331b17dfadcdfc916a1652cacb0c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:27 +0000 Subject: Fix RUN_DEPENDS - Update version requirement of RUN_DEPENDS - Bump PORTREVISION for dependency change - Take maintainership --- textproc/rubygem-rails-dom-testing-rails50/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/textproc/rubygem-rails-dom-testing-rails50/Makefile b/textproc/rubygem-rails-dom-testing-rails50/Makefile index fef59927beb7..92c79c616a50 100644 --- a/textproc/rubygem-rails-dom-testing-rails50/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails50/Makefile @@ -3,22 +3,23 @@ PORTNAME= rails-dom-testing PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Analyse and compare DOMs using Nokogiri LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-activesupport50>0:devel/rubygem-activesupport50 \ - rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \ - rubygem-rails-deprecated_sanitizer-rails50>=1.0.1:devel/rubygem-rails-deprecated_sanitizer-rails50 +RUN_DEPENDS= rubygem-activesupport50>=4.2.0:devel/rubygem-activesupport50 \ + rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From 0d530a958ecb5ea0d2cf0c7e57946259061414a3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:32 +0000 Subject: Update to 1.2.0 - Add LICENSE_FILE - Update version requirement of RUN_DEPENDS - Take maintainership Changes: https://github.com/rails/rails-html-sanitizer/releases --- textproc/rubygem-rails-html-sanitizer/Makefile | 12 +++++++----- textproc/rubygem-rails-html-sanitizer/distinfo | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/textproc/rubygem-rails-html-sanitizer/Makefile b/textproc/rubygem-rails-html-sanitizer/Makefile index e86582d8ff1f..a7b4deefebd6 100644 --- a/textproc/rubygem-rails-html-sanitizer/Makefile +++ b/textproc/rubygem-rails-html-sanitizer/Makefile @@ -1,19 +1,21 @@ # $FreeBSD$ PORTNAME= rails-html-sanitizer -PORTVERSION= 1.0.4 +PORTVERSION= 1.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sanitize HTML fragments in Rails applications LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-loofah>=2.2.2:textproc/rubygem-loofah +RUN_DEPENDS= rubygem-loofah>=2.2.2<3:textproc/rubygem-loofah -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/textproc/rubygem-rails-html-sanitizer/distinfo b/textproc/rubygem-rails-html-sanitizer/distinfo index e8d8ab035e32..ff1efb80175d 100644 --- a/textproc/rubygem-rails-html-sanitizer/distinfo +++ b/textproc/rubygem-rails-html-sanitizer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521810566 -SHA256 (rubygem/rails-html-sanitizer-1.0.4.gem) = 99cbc3d267856f6731663e654140be298393b1ee966027efab5dbcd44ade67bf -SIZE (rubygem/rails-html-sanitizer-1.0.4.gem) = 15872 +TIMESTAMP = 1565447556 +SHA256 (rubygem/rails-html-sanitizer-1.2.0.gem) = 386f7b52a3c7a436ae2faa9886da3e5dc1b06c7ac90a9c58a1781d35eaef9c46 +SIZE (rubygem/rails-html-sanitizer-1.2.0.gem) = 16384 -- cgit From ed25a840e7ad087dc9112ab8f8d4364b0633d882 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:37 +0000 Subject: Cosmetic change --- www/rubygem-actioncable5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-actioncable5/Makefile b/www/rubygem-actioncable5/Makefile index 73cda8b4a5c4..93302f606aa6 100644 --- a/www/rubygem-actioncable5/Makefile +++ b/www/rubygem-actioncable5/Makefile @@ -17,11 +17,11 @@ RUN_DEPENDS= rubygem-actionpack5>=${PORTVERSION}:www/rubygem-actionpack5 \ rubygem-nio4r>=2.0:devel/rubygem-nio4r \ rubygem-websocket-driver>=0.6.1:www/rubygem-websocket-driver -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From e168ba5fe18ebe1da4aafccd63228ef974b8490c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:42 +0000 Subject: Cosmetic change --- www/rubygem-actioncable50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-actioncable50/Makefile b/www/rubygem-actioncable50/Makefile index 9b30a68ed71c..d897f311d47e 100644 --- a/www/rubygem-actioncable50/Makefile +++ b/www/rubygem-actioncable50/Makefile @@ -17,11 +17,11 @@ RUN_DEPENDS= rubygem-actionpack50>=${PORTVERSION}:www/rubygem-actionpack50 \ rubygem-nio4r>=1.2:devel/rubygem-nio4r \ rubygem-websocket-driver>=0.6.1:www/rubygem-websocket-driver -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From c9939e53918c9f13e6b79736cd9326dca255cdda Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:47 +0000 Subject: Cosmetic change --- www/rubygem-actionpack5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-actionpack5/Makefile b/www/rubygem-actionpack5/Makefile index b31dbb41738e..1aedc5809208 100644 --- a/www/rubygem-actionpack5/Makefile +++ b/www/rubygem-actionpack5/Makefile @@ -20,11 +20,11 @@ RUN_DEPENDS= rubygem-actionview5>=${PORTVERSION}:devel/rubygem-actionview5 \ rubygem-rails-dom-testing-rails5>=2.0:textproc/rubygem-rails-dom-testing-rails5 \ rubygem-rails-html-sanitizer>=1.0.2:textproc/rubygem-rails-html-sanitizer -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 9d05574ebcbb1c2e20321d60cc3c8d4fba50018e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:52 +0000 Subject: Cosmetic change --- www/rubygem-actionpack50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-actionpack50/Makefile b/www/rubygem-actionpack50/Makefile index 276e78748359..5762e349a320 100644 --- a/www/rubygem-actionpack50/Makefile +++ b/www/rubygem-actionpack50/Makefile @@ -20,11 +20,11 @@ RUN_DEPENDS= rubygem-actionview50>=${PORTVERSION}:devel/rubygem-actionview50 \ rubygem-rails-dom-testing-rails50>=2.0:textproc/rubygem-rails-dom-testing-rails50 \ rubygem-rails-html-sanitizer>=1.0.2:textproc/rubygem-rails-html-sanitizer -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 8a3294dd0b964821ffebb449539a97f6e196c8dc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:51:57 +0000 Subject: Cosmetic change --- www/rubygem-rails5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-rails5/Makefile b/www/rubygem-rails5/Makefile index e3d4d831fe7a..7343fa9b9018 100644 --- a/www/rubygem-rails5/Makefile +++ b/www/rubygem-rails5/Makefile @@ -49,8 +49,6 @@ RUN_DEPENDS= rubygem-actioncable5>=${PORTVERSION}:www/rubygem-actioncable5 \ rubygem-uglifier>=3.2.0:www/rubygem-uglifier \ rubygem-web-console>=3.5.0:devel/rubygem-web-console -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes @@ -59,4 +57,6 @@ NO_ARCH= yes CPE_VENDOR= rubyonrails CPE_PRODUCT= ruby_on_rails +PORTSCOUT= limit:^5\.1\. + .include -- cgit From d921a6e50342f754377382e0afa59e48235f90e8 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:01 +0000 Subject: Cosmetic change --- www/rubygem-rails50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-rails50/Makefile b/www/rubygem-rails50/Makefile index 630d8744c4f5..e28d4d2bb96b 100644 --- a/www/rubygem-rails50/Makefile +++ b/www/rubygem-rails50/Makefile @@ -47,8 +47,6 @@ RUN_DEPENDS= rubygem-actioncable50>=${PORTVERSION}:www/rubygem-actioncable50 \ rubygem-uglifier>=3.2.0:www/rubygem-uglifier \ rubygem-web-console-rails50>=3.5.0:devel/rubygem-web-console-rails50 -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes @@ -57,4 +55,6 @@ NO_ARCH= yes CPE_VENDOR= rubyonrails CPE_PRODUCT= ruby_on_rails +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 81f3043067f98e657fe5eaefcca964e06c34615a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:06 +0000 Subject: Update CONFLICTS_INSTALL --- www/rubygem-railties4/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/rubygem-railties4/Makefile b/www/rubygem-railties4/Makefile index 1eeeb1e2ae2f..2eb7ecb55c23 100644 --- a/www/rubygem-railties4/Makefile +++ b/www/rubygem-railties4/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS= rubygem-actionpack4>=${PORTVERSION}:www/rubygem-actionpack4 \ rubygem-rake>=0.8.7:devel/rubygem-rake \ rubygem-thor>=0.18.1:devel/rubygem-thor -CONFLICTS_INSTALL= rubygem-railties5 rubygem-railties50 - USES= gem USE_RUBY= yes @@ -26,4 +24,6 @@ NO_ARCH= yes PLIST_FILES= bin/rails +CONFLICTS_INSTALL= rubygem-railties5 rubygem-railties50 rubygem-railties52 + .include -- cgit From 9bfd4ef881c8ec28d2d8ad509268c9dec5f6b0e4 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:11 +0000 Subject: Update CONFLICTS_INSTALL --- www/rubygem-railties5/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/rubygem-railties5/Makefile b/www/rubygem-railties5/Makefile index 727304df14bf..b0b7a1ee86a2 100644 --- a/www/rubygem-railties5/Makefile +++ b/www/rubygem-railties5/Makefile @@ -19,10 +19,6 @@ RUN_DEPENDS= rubygem-actionpack5>=${PORTVERSION}:www/rubygem-actionpack5 \ rubygem-rake>=0.8.7:devel/rubygem-rake \ rubygem-thor>=0.18.1:devel/rubygem-thor -CONFLICTS_INSTALL= rubygem-railties4 rubygem-railties50 - -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes @@ -30,4 +26,8 @@ NO_ARCH= yes PLIST_FILES= bin/rails +CONFLICTS_INSTALL= rubygem-railties4 rubygem-railties50 rubygem-railties52 + +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 5f44785f4491bdfd1fb2c3e779746fa80d737cb3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:16 +0000 Subject: Update CONFLICTS_INSTALL --- www/rubygem-railties50/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/rubygem-railties50/Makefile b/www/rubygem-railties50/Makefile index b50faf1c7d79..6a55f8d085f7 100644 --- a/www/rubygem-railties50/Makefile +++ b/www/rubygem-railties50/Makefile @@ -19,10 +19,6 @@ RUN_DEPENDS= rubygem-actionpack50>=${PORTVERSION}:www/rubygem-actionpack50 \ rubygem-rake>=0.8.7:devel/rubygem-rake \ rubygem-thor>=0.18.1:devel/rubygem-thor -CONFLICTS_INSTALL= rubygem-railties4 rubygem-railties5 - -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes @@ -30,4 +26,8 @@ NO_ARCH= yes PLIST_FILES= bin/rails +CONFLICTS_INSTALL= rubygem-railties4 rubygem-railties5 rubygem-railties52 + +PORTSCOUT= limit:^5\.0\. + .include -- cgit From f6b9efa3d3977317772a962248e108d68630bbff Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:21 +0000 Subject: Update to 0.779 - Add NO_ARCH Changes: https://metacpan.org/changes/distribution/Rose-DB --- databases/p5-Rose-DB/Makefile | 8 +++++--- databases/p5-Rose-DB/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile index fdfd3cca4d37..3ee9289966cd 100644 --- a/databases/p5-Rose-DB/Makefile +++ b/databases/p5-Rose-DB/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Rose-DB -PORTVERSION= 0.778 +PORTVERSION= 0.779 PORTEPOCH= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN @@ -28,9 +28,11 @@ RUN_DEPENDS= p5-Bit-Vector>=6.4:math/p5-Bit-Vector \ p5-Time-Clock>=0:devel/p5-Time-Clock \ p5-YAML-Syck>=0:textproc/p5-YAML-Syck -PORTSCOUT= skipv:0.7591 - USES= perl5 USE_PERL5= configure +NO_ARCH= yes + +PORTSCOUT= skipv:0.7591 + .include diff --git a/databases/p5-Rose-DB/distinfo b/databases/p5-Rose-DB/distinfo index 89311d91bc82..7042a4da5060 100644 --- a/databases/p5-Rose-DB/distinfo +++ b/databases/p5-Rose-DB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1467379885 -SHA256 (Rose-DB-0.778.tar.gz) = a45e2fddf2cc452092d14456b4b3f749339b901e0837015a76185314e0487e66 -SIZE (Rose-DB-0.778.tar.gz) = 116605 +TIMESTAMP = 1565379539 +SHA256 (Rose-DB-0.779.tar.gz) = 1ff5e769ac6618913f99d27a50a4c57e56e5fbbe073e4d284a28b5e63f2414f5 +SIZE (Rose-DB-0.779.tar.gz) = 117786 -- cgit From 59577fd67864e2b17313b7e1d086a7ae3cff2c59 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:26 +0000 Subject: Add NO_ARCH --- devel/p5-Rose-Object/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile index c2e62586078e..94af7e0fe38f 100644 --- a/devel/p5-Rose-Object/Makefile +++ b/devel/p5-Rose-Object/Makefile @@ -19,4 +19,6 @@ TEST_DEPENDS= p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From 61a7f120ea75e6a5980430be6359b3f231431398 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:31 +0000 Subject: Add NO_ARCH --- databases/p5-SQL-ReservedWords/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile index 487fd33017cd..6895d45ca9d4 100644 --- a/databases/p5-SQL-ReservedWords/Makefile +++ b/databases/p5-SQL-ReservedWords/Makefile @@ -20,4 +20,6 @@ RUN_DEPENDS= p5-Sub-Exporter>=0:devel/p5-Sub-Exporter USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From 628af0b35ba2569068e5cdd6f3033751d519f6f6 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:36 +0000 Subject: Update to 1.20 Changes: https://metacpan.org/changes/distribution/Carp-Assert-More --- devel/p5-Carp-Assert-More/Makefile | 2 +- devel/p5-Carp-Assert-More/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile index 0277d611a9d4..a1c14425a6c1 100644 --- a/devel/p5-Carp-Assert-More/Makefile +++ b/devel/p5-Carp-Assert-More/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Carp-Assert-More -PORTVERSION= 1.18 +PORTVERSION= 1.20 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Carp-Assert-More/distinfo b/devel/p5-Carp-Assert-More/distinfo index a217c08004c9..ad25f0e0e391 100644 --- a/devel/p5-Carp-Assert-More/distinfo +++ b/devel/p5-Carp-Assert-More/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564157989 -SHA256 (Carp-Assert-More-1.18.tar.gz) = 8fc096b98c2a5de36b84a623fe21ed18e4c2f7e0a461ba0f4f93f17a96bff44c -SIZE (Carp-Assert-More-1.18.tar.gz) = 12848 +TIMESTAMP = 1565441545 +SHA256 (Carp-Assert-More-1.20.tar.gz) = 852904ce242298935e2102603393fb3a7e9a83a39dc4e90acbd573f76483569a +SIZE (Carp-Assert-More-1.20.tar.gz) = 13282 -- cgit From 243231ae914c922d4f6c30a7bc9892cbc753963b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:41 +0000 Subject: Update to 2.13 - Add LICENSE_FILE Changes: https://metacpan.org/changes/distribution/Class-Method-Modifiers --- devel/p5-Class-Method-Modifiers/Makefile | 6 ++++-- devel/p5-Class-Method-Modifiers/distinfo | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/devel/p5-Class-Method-Modifiers/Makefile b/devel/p5-Class-Method-Modifiers/Makefile index 65f695301780..63bb86e1590a 100644 --- a/devel/p5-Class-Method-Modifiers/Makefile +++ b/devel/p5-Class-Method-Modifiers/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Class-Method-Modifiers -PORTVERSION= 2.12 +PORTVERSION= 2.13 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,13 +12,15 @@ COMMENT= Provides Moose-like method modifiers LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= p5-Moose>=0:devel/p5-Moose \ p5-Test-Fatal>=0:devel/p5-Test-Fatal \ - p5-Test-Requires>0:devel/p5-Test-Requires + p5-Test-Needs>=0:devel/p5-Test-Needs USES= perl5 USE_PERL5= configure + NO_ARCH= yes .include diff --git a/devel/p5-Class-Method-Modifiers/distinfo b/devel/p5-Class-Method-Modifiers/distinfo index d9771bd0ad63..97ab8629a4f2 100644 --- a/devel/p5-Class-Method-Modifiers/distinfo +++ b/devel/p5-Class-Method-Modifiers/distinfo @@ -1,2 +1,3 @@ -SHA256 (Class-Method-Modifiers-2.12.tar.gz) = e44c1073020bf55b8c97975ed77235fd7e2a6a56f29b5c702301721184e27ac8 -SIZE (Class-Method-Modifiers-2.12.tar.gz) = 38979 +TIMESTAMP = 1565441547 +SHA256 (Class-Method-Modifiers-2.13.tar.gz) = ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63 +SIZE (Class-Method-Modifiers-2.13.tar.gz) = 41385 -- cgit From eaa723b8f1080c2595d809c9eb3c5a562e9dbbbf Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:52:46 +0000 Subject: Add NO_ARCH --- devel/p5-DateTime-Format-MySQL/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile index 1c456500535b..feb13c1d55b6 100644 --- a/devel/p5-DateTime-Format-MySQL/Makefile +++ b/devel/p5-DateTime-Format-MySQL/Makefile @@ -20,4 +20,6 @@ RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \ USES= perl5 USE_PERL5= modbuild +NO_ARCH= yes + .include -- cgit From 5c78f4b383c4f48d22fe7c45d4580c6db37053e6 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:12 +0000 Subject: Add NO_ARCH --- devel/p5-Time-Clock/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/p5-Time-Clock/Makefile b/devel/p5-Time-Clock/Makefile index 8aa9a54f9ce7..da7e9c8751c4 100644 --- a/devel/p5-Time-Clock/Makefile +++ b/devel/p5-Time-Clock/Makefile @@ -17,4 +17,6 @@ LICENSE_COMB= dual USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From dbb74b16126d39a1d0362038b838c4ad0ba04d45 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:17 +0000 Subject: Update to 4.10.1 Changes: https://github.com/ipython/ipykernel/commits/4.x https://github.com/ipython/ipykernel/commits/v4.10.1 --- devel/py-ipykernel/Makefile | 3 +-- devel/py-ipykernel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile index a226e7c56927..cf0d2f670831 100644 --- a/devel/py-ipykernel/Makefile +++ b/devel/py-ipykernel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ipykernel -PORTVERSION= 4.10.0 -PORTREVISION= 2 +PORTVERSION= 4.10.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipykernel/distinfo b/devel/py-ipykernel/distinfo index e28216ea1d3e..297b06366735 100644 --- a/devel/py-ipykernel/distinfo +++ b/devel/py-ipykernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539030193 -SHA256 (ipykernel-4.10.0.tar.gz) = 699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad -SIZE (ipykernel-4.10.0.tar.gz) = 96242 +TIMESTAMP = 1565352606 +SHA256 (ipykernel-4.10.1.tar.gz) = eeb74b2bcfe0ced5a7900361f98fa1171288aa47ed4b522efe5acb167c6cf5fb +SIZE (ipykernel-4.10.1.tar.gz) = 95087 -- cgit From bf297d05b47ab3c52236580aee853236e66d24da Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:23 +0000 Subject: Update to 5.1.2 Changes: https://github.com/ipython/ipykernel/blob/master/docs/changelog.rst --- devel/py-ipykernel5/Makefile | 2 +- devel/py-ipykernel5/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-ipykernel5/Makefile b/devel/py-ipykernel5/Makefile index 05d496aecb40..040309c1316c 100644 --- a/devel/py-ipykernel5/Makefile +++ b/devel/py-ipykernel5/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ipykernel -PORTVERSION= 5.1.1 +PORTVERSION= 5.1.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipykernel5/distinfo b/devel/py-ipykernel5/distinfo index 790a303cd74e..6363f4b594d4 100644 --- a/devel/py-ipykernel5/distinfo +++ b/devel/py-ipykernel5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558182197 -SHA256 (ipykernel-5.1.1.tar.gz) = f0e962052718068ad3b1d8bcc703794660858f58803c3798628817f492a8769c -SIZE (ipykernel-5.1.1.tar.gz) = 101399 +TIMESTAMP = 1565352608 +SHA256 (ipykernel-5.1.2.tar.gz) = b503913e0b4cce7ed2de965457dfb2edd633e8234161a60e23f2fe2161345d12 +SIZE (ipykernel-5.1.2.tar.gz) = 103286 -- cgit From b0f4accfbb16f8768a7cfbe250b70c83fd3f6e85 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:28 +0000 Subject: Update to 5.6.0 Changes: https://github.com/jupyter/nbconvert/blob/master/docs/source/changelog.rst --- devel/py-nbconvert/Makefile | 6 +++--- devel/py-nbconvert/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile index 3cb057e71701..c0fa84f71eeb 100644 --- a/devel/py-nbconvert/Makefile +++ b/devel/py-nbconvert/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nbconvert -PORTVERSION= 5.5.0 +PORTVERSION= 5.6.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +16,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=5.3.1:devel/py-jupyter_client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mistune>=0.8.1:textproc/py-mistune@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mistune>=0.8.1<2:textproc/py-mistune@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbformat>=4.4:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ diff --git a/devel/py-nbconvert/distinfo b/devel/py-nbconvert/distinfo index ae4f09af74d4..8bb503d04c4f 100644 --- a/devel/py-nbconvert/distinfo +++ b/devel/py-nbconvert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556288907 -SHA256 (nbconvert-5.5.0.tar.gz) = 138381baa41d83584459b5cfecfc38c800ccf1f37d9ddd0bd440783346a4c39c -SIZE (nbconvert-5.5.0.tar.gz) = 583216 +TIMESTAMP = 1565352610 +SHA256 (nbconvert-5.6.0.tar.gz) = 427a468ec26e7d68a529b95f578d5cbf018cb4c1f889e897681c2b6d11897695 +SIZE (nbconvert-5.6.0.tar.gz) = 701743 -- cgit From c1cbce587eaf0fffcfeb58e67e4e27a1bacbaf35 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:36 +0000 Subject: Update to 0.37.1 Changes: https://github.com/certbot/certbot/blob/master/CHANGELOG.md --- security/py-acme/distinfo | 6 +++--- security/py-acme/version.mk | 2 +- security/py-certbot-apache/distinfo | 6 +++--- security/py-certbot-dns-cloudflare/distinfo | 6 +++--- security/py-certbot-dns-cloudxns/distinfo | 6 +++--- security/py-certbot-dns-digitalocean/distinfo | 6 +++--- security/py-certbot-dns-dnsimple/distinfo | 6 +++--- security/py-certbot-dns-dnsmadeeasy/distinfo | 6 +++--- security/py-certbot-dns-gehirn/distinfo | 6 +++--- security/py-certbot-dns-google/distinfo | 6 +++--- security/py-certbot-dns-linode/distinfo | 6 +++--- security/py-certbot-dns-luadns/distinfo | 6 +++--- security/py-certbot-dns-nsone/distinfo | 6 +++--- security/py-certbot-dns-ovh/distinfo | 6 +++--- security/py-certbot-dns-rfc2136/distinfo | 6 +++--- security/py-certbot-dns-route53/distinfo | 6 +++--- security/py-certbot-dns-sakuracloud/distinfo | 6 +++--- security/py-certbot-nginx/distinfo | 6 +++--- security/py-certbot/distinfo | 6 +++--- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index d573cf9e5e1b..e2ed88ad5ae2 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319958 -SHA256 (acme-0.37.0.tar.gz) = 9178b725ad1f282d3ccab89fbdf36a403447eab7c0c52669279fb33df6fbe161 -SIZE (acme-0.37.0.tar.gz) = 86169 +TIMESTAMP = 1565381278 +SHA256 (acme-0.37.1.tar.gz) = c069a761990751f7c4bf51d2e87ae10319bf460de6629d2908c9fa6f69e97111 +SIZE (acme-0.37.1.tar.gz) = 86534 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index 6b73d1bfbe8e..21e692e66980 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 0.37.0 +ACME_VERSION= 0.37.1 diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index af0a3f5816b2..1e31a8a0d952 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319962 -SHA256 (certbot-apache-0.37.0.tar.gz) = 6d1c413937c0a9419fbd2c67f110cad860e87afdd358650707f32cde71d4fc21 -SIZE (certbot-apache-0.37.0.tar.gz) = 184779 +TIMESTAMP = 1565381281 +SHA256 (certbot-apache-0.37.1.tar.gz) = e46c2644451101c0e216aa1f525a577cc903efaf871e0e4da277224a4439040c +SIZE (certbot-apache-0.37.1.tar.gz) = 180567 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index f848a4d85779..3cd53c316cbc 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319964 -SHA256 (certbot-dns-cloudflare-0.37.0.tar.gz) = abddf5345ded7f4c72022acb4c4bc39e91a36ac6b72ebd0c07a3c1c341aca81c -SIZE (certbot-dns-cloudflare-0.37.0.tar.gz) = 13008 +TIMESTAMP = 1565381283 +SHA256 (certbot-dns-cloudflare-0.37.1.tar.gz) = e7cb8da2d49f1a6aab2b7ec9885b0fc2dd0be31f6db9832fe4be359203d324e6 +SIZE (certbot-dns-cloudflare-0.37.1.tar.gz) = 13463 diff --git a/security/py-certbot-dns-cloudxns/distinfo b/security/py-certbot-dns-cloudxns/distinfo index 73ede42a751f..41889ca5e960 100644 --- a/security/py-certbot-dns-cloudxns/distinfo +++ b/security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319966 -SHA256 (certbot-dns-cloudxns-0.37.0.tar.gz) = d8b82aca1d64d58ce1abb2da78523e166729efcdca1952e756f4e27bbf0168f6 -SIZE (certbot-dns-cloudxns-0.37.0.tar.gz) = 11426 +TIMESTAMP = 1565381284 +SHA256 (certbot-dns-cloudxns-0.37.1.tar.gz) = dd1fc3e19cb97d93b94ec9eab0042e18430c00616416c240ae740c494dbec6c8 +SIZE (certbot-dns-cloudxns-0.37.1.tar.gz) = 11453 diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index 5cdea71a58b3..20af6a6de444 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319968 -SHA256 (certbot-dns-digitalocean-0.37.0.tar.gz) = 05d5c5d3da5b003720947bbc7094234b9409d07019c1e075ea593ee8b90b5841 -SIZE (certbot-dns-digitalocean-0.37.0.tar.gz) = 12701 +TIMESTAMP = 1565381286 +SHA256 (certbot-dns-digitalocean-0.37.1.tar.gz) = 40b24d1fb8f66e2ffcb7472286f10c4e9f5c6f9f3b7e01a4af0c59de1ec7d3d6 +SIZE (certbot-dns-digitalocean-0.37.1.tar.gz) = 12702 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 66d98f416694..177235d9fc21 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319970 -SHA256 (certbot-dns-dnsimple-0.37.0.tar.gz) = 3cdfd04b126c93d98750c9edad642379f78fe6649e02ed0da5cc2d957d1a3dfa -SIZE (certbot-dns-dnsimple-0.37.0.tar.gz) = 11732 +TIMESTAMP = 1565381287 +SHA256 (certbot-dns-dnsimple-0.37.1.tar.gz) = 180037c3e56984845637afd916389cb22ed59528a36e30dbf7428f0edbd3c065 +SIZE (certbot-dns-dnsimple-0.37.1.tar.gz) = 11638 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 8db4b248dff5..82730ed13549 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319972 -SHA256 (certbot-dns-dnsmadeeasy-0.37.0.tar.gz) = a8fc34da562f8cd32d8ea8f17953937d499a752d114060263b61eb491428b998 -SIZE (certbot-dns-dnsmadeeasy-0.37.0.tar.gz) = 11503 +TIMESTAMP = 1565381288 +SHA256 (certbot-dns-dnsmadeeasy-0.37.1.tar.gz) = ed75d7aa578382f6c5967390f27de124540afb27184949c5ae7aec54ba80f671 +SIZE (certbot-dns-dnsmadeeasy-0.37.1.tar.gz) = 11472 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index a8eca48d244f..8eea836f3234 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319974 -SHA256 (certbot-dns-gehirn-0.37.0.tar.gz) = d9b4e5b11e1b6f627983f902e94d3d0a6cdcb82d2f9604aa64d265818c915a30 -SIZE (certbot-dns-gehirn-0.37.0.tar.gz) = 11567 +TIMESTAMP = 1565381290 +SHA256 (certbot-dns-gehirn-0.37.1.tar.gz) = bc5a6513875478ea1ec431c1d5daadda4df5368133328955b581815c03403ee2 +SIZE (certbot-dns-gehirn-0.37.1.tar.gz) = 11500 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index 345253e86417..644935887632 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319976 -SHA256 (certbot-dns-google-0.37.0.tar.gz) = 9a2246adff4bc673037c0b5cdff3675ee26fb8d5f4c2231a14c8a06d4b269e06 -SIZE (certbot-dns-google-0.37.0.tar.gz) = 22116 +TIMESTAMP = 1565381291 +SHA256 (certbot-dns-google-0.37.1.tar.gz) = 8a7470274bdad84a7a7250bdce1a241855226816632db596dcb772fb2a33883f +SIZE (certbot-dns-google-0.37.1.tar.gz) = 22419 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index 8fdabc4949a3..218ccb4a6bc0 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319978 -SHA256 (certbot-dns-linode-0.37.0.tar.gz) = f85d63840b34faddc0835a63235ffe61a6025544158dbd7479ebdcb4f16c9c39 -SIZE (certbot-dns-linode-0.37.0.tar.gz) = 12083 +TIMESTAMP = 1565381293 +SHA256 (certbot-dns-linode-0.37.1.tar.gz) = 779c85cc9dc8885eb11334330c3075ef61d6370165c2ed7653d2961cd5e62e3a +SIZE (certbot-dns-linode-0.37.1.tar.gz) = 12195 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index c5f20723a92e..3ef4fd7bd031 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319980 -SHA256 (certbot-dns-luadns-0.37.0.tar.gz) = 2d1d50bcc926c14e2efe7ed9e2df02d12e0d6999885a23ee7859fdd9ef6f4adf -SIZE (certbot-dns-luadns-0.37.0.tar.gz) = 11632 +TIMESTAMP = 1565381294 +SHA256 (certbot-dns-luadns-0.37.1.tar.gz) = 9d81665a1e9e47541315cba640b06ae0ba1fa5971d81a223c2df350739a21101 +SIZE (certbot-dns-luadns-0.37.1.tar.gz) = 11352 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index af6be38234d5..58440f3a9f5c 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319982 -SHA256 (certbot-dns-nsone-0.37.0.tar.gz) = 1d5a0561054dcdfc44a52900251166e3e6c6bc3bd296a9bf1c597efea3a63097 -SIZE (certbot-dns-nsone-0.37.0.tar.gz) = 11373 +TIMESTAMP = 1565381295 +SHA256 (certbot-dns-nsone-0.37.1.tar.gz) = 095a60ecaec18859fa1b584a8af4f4a561d7f38d3e3b0bff7b1d0f15e6cf3eef +SIZE (certbot-dns-nsone-0.37.1.tar.gz) = 11387 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index 716ac6b6c4b7..836253c5a397 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319984 -SHA256 (certbot-dns-ovh-0.37.0.tar.gz) = cc5f2dfe47fd531cc76195e527e5364e502d7071085753cc843173e3a2ab1140 -SIZE (certbot-dns-ovh-0.37.0.tar.gz) = 11689 +TIMESTAMP = 1565381296 +SHA256 (certbot-dns-ovh-0.37.1.tar.gz) = c86fcd265d2900abc042aeecfff564f74fac6be1ecec9b2a4660ee7f265cfd1c +SIZE (certbot-dns-ovh-0.37.1.tar.gz) = 11857 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 3f2966d7ec0b..7b4a654c5b80 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319986 -SHA256 (certbot-dns-rfc2136-0.37.0.tar.gz) = 0ebb42200aa51e999cf2a07947cbf9edd84912b3f562f8b36b40ad0e059e303b -SIZE (certbot-dns-rfc2136-0.37.0.tar.gz) = 13682 +TIMESTAMP = 1565381298 +SHA256 (certbot-dns-rfc2136-0.37.1.tar.gz) = 6baee5db3d7f064cbca6ef7bbc4be9fed245cafa0a3a3252b49693c478318e16 +SIZE (certbot-dns-rfc2136-0.37.1.tar.gz) = 13975 diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index 3463f46b254a..418a65215733 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319988 -SHA256 (certbot-dns-route53-0.37.0.tar.gz) = a5a418bec8f2b2619614887d1fd5c117b276f061038090d475ba1145888d4afc -SIZE (certbot-dns-route53-0.37.0.tar.gz) = 14412 +TIMESTAMP = 1565381299 +SHA256 (certbot-dns-route53-0.37.1.tar.gz) = 63210adc2688ceb3a57a76e59c97df93d2b03c21caf536b2b9879a4aab5697ea +SIZE (certbot-dns-route53-0.37.1.tar.gz) = 14174 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index 781ede160e8b..c3ce1d33875d 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319990 -SHA256 (certbot-dns-sakuracloud-0.37.0.tar.gz) = 75b66b6edfda5614f8f6911f9708b663cfdfc8ba8f983da25e6c76d49d7c9af3 -SIZE (certbot-dns-sakuracloud-0.37.0.tar.gz) = 11594 +TIMESTAMP = 1565381301 +SHA256 (certbot-dns-sakuracloud-0.37.1.tar.gz) = e3216097917059dc94d96984d4150b8b0ae37429fe8e8ca9cbe9de2f7cabd7df +SIZE (certbot-dns-sakuracloud-0.37.1.tar.gz) = 11325 diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index e90d1323d827..b1669cea483c 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319992 -SHA256 (certbot-nginx-0.37.0.tar.gz) = 93c9f8d934b886e5632e1658ea411fbbded9fa55dc07a5bc35d493e2a6cc4ffe -SIZE (certbot-nginx-0.37.0.tar.gz) = 76627 +TIMESTAMP = 1565381302 +SHA256 (certbot-nginx-0.37.1.tar.gz) = 02a7ec15bd388d0f0e94a34c86a8f8d618ec7d5ffde0c206039bb4c46b294ce4 +SIZE (certbot-nginx-0.37.1.tar.gz) = 76860 diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index 0e411d646918..f659578acd76 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565319960 -SHA256 (certbot-0.37.0.tar.gz) = 34c5a832b43f41438bd84eb247a64607228a865e3cdc5272d7a27c3943a94d8a -SIZE (certbot-0.37.0.tar.gz) = 358657 +TIMESTAMP = 1565381280 +SHA256 (certbot-0.37.1.tar.gz) = aace73e63b0c11cdb4b0bd33e1780c1fbe0ce5669dc72e80c3aa9500145daf16 +SIZE (certbot-0.37.1.tar.gz) = 358248 -- cgit From 0a17e58e474a7e31419df3c6e91212d22059376a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:45 +0000 Subject: Cosmetic change --- devel/rubygem-sprockets-rails-rails5/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-sprockets-rails-rails5/Makefile b/devel/rubygem-sprockets-rails-rails5/Makefile index 804c3562ed17..ddd69a0be6ec 100644 --- a/devel/rubygem-sprockets-rails-rails5/Makefile +++ b/devel/rubygem-sprockets-rails-rails5/Makefile @@ -17,8 +17,9 @@ RUN_DEPENDS= rubygem-actionpack5>=4.0:www/rubygem-actionpack5 \ rubygem-activesupport5>=4.0:devel/rubygem-activesupport5 \ rubygem-sprockets3>=3.0.0:devel/rubygem-sprockets3 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From 8d0ceecfcb7a259ed154ac285ac1caee02beaa92 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:50 +0000 Subject: Cosmetic change --- devel/rubygem-sprockets-rails-rails50/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-sprockets-rails-rails50/Makefile b/devel/rubygem-sprockets-rails-rails50/Makefile index 59cf455b0364..2d09abcc2221 100644 --- a/devel/rubygem-sprockets-rails-rails50/Makefile +++ b/devel/rubygem-sprockets-rails-rails50/Makefile @@ -17,8 +17,9 @@ RUN_DEPENDS= rubygem-actionpack50>=4.0:www/rubygem-actionpack50 \ rubygem-activesupport50>=4.0:devel/rubygem-activesupport50 \ rubygem-sprockets3>=3.0.0:devel/rubygem-sprockets3 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From fe399876f6b53c98247fc74a587a958b56631bee Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:55 +0000 Subject: Change RUN_DEPENDS from rubygem-devise-two-factor-rails5 to rubygem-devise-two-factor30-rails5 - Bump PORTREVISION for dependency change --- www/gitlab-ce/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 0cef4ceb524d..5f29c4ce49d6 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 12.0.4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -56,7 +56,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-jwt21>=2.1.0:www/rubygem-jwt21 \ rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ - rubygem-devise-two-factor-rails5>=3.0.0:security/rubygem-devise-two-factor-rails5 \ + rubygem-devise-two-factor30-rails5>=3.0.0:security/rubygem-devise-two-factor30-rails5 \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \ -- cgit From 3601ec15d9e6dea198ee861926afe34dbc6c90c9 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:54:59 +0000 Subject: Update to 1.2.0 - While I'm here, use = instead of += for PLIST_SUB Changes: https://git.launchpad.net/authentication-results-python/tree/CHANGES PR: 239751 Submitted by: Yasuhiro KIMURA (maintainer) --- mail/py-authres/Makefile | 7 ++++--- mail/py-authres/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mail/py-authres/Makefile b/mail/py-authres/Makefile index 1a898ab2864c..a37823d6cd15 100644 --- a/mail/py-authres/Makefile +++ b/mail/py-authres/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= authres -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,11 +13,12 @@ COMMENT= Python module for RFC 5451 Authentication-Results headers LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -NO_ARCH= yes USES= python USE_PYTHON= autoplist concurrent distutils -PLIST_SUB+= PORTNAME=${PORTNAME} +NO_ARCH= yes + +PLIST_SUB= PORTNAME=${PORTNAME} PORTDOCS= CHANGES README diff --git a/mail/py-authres/distinfo b/mail/py-authres/distinfo index c0e93a29ee40..6d5d9358df89 100644 --- a/mail/py-authres/distinfo +++ b/mail/py-authres/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540881243 -SHA256 (authres-1.1.1.tar.gz) = eb8c7e65ebb371ec70e7fb8226b13fc159b882a1ae70753384c4fe2040a7ac2f -SIZE (authres-1.1.1.tar.gz) = 23180 +TIMESTAMP = 1565379142 +SHA256 (authres-1.2.0.tar.gz) = 93d1b995ad7ce21e62db649f361048125dd6022563a0ae8a23909465f1fd25b7 +SIZE (authres-1.2.0.tar.gz) = 23226 -- cgit From db2115615d66b0ae17a3a4c2883e93ebdde2adbe Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:55:05 +0000 Subject: Update to 14.9.14 Changes: https://git.sdaoden.eu/cgit/s-nail.git/tree/NEWS PR: 14.9.14 Submitted by: Yasuhiro KIMURA (maintainer) --- mail/s-nail/Makefile | 2 +- mail/s-nail/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/s-nail/Makefile b/mail/s-nail/Makefile index 555dcf22e6b3..a2a95369cdf2 100644 --- a/mail/s-nail/Makefile +++ b/mail/s-nail/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= s-nail -PORTVERSION= 14.9.13 +PORTVERSION= 14.9.14 CATEGORIES= mail MASTER_SITES= https://www.sdaoden.eu/downloads/ diff --git a/mail/s-nail/distinfo b/mail/s-nail/distinfo index 66f9021a9299..36d767e3ccbd 100644 --- a/mail/s-nail/distinfo +++ b/mail/s-nail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552066831 -SHA256 (s-nail-14.9.13.tar.xz) = edfa287d04bfcd03dd1c23277885b385ff47cfff92d0a116467996addba9ddd4 -SIZE (s-nail-14.9.13.tar.xz) = 734416 +TIMESTAMP = 1565379324 +SHA256 (s-nail-14.9.14.tar.xz) = 1e4e002ff83fb697b9f33a786e6bdac0d6d0511a3cc1089cce299078a04a25ba +SIZE (s-nail-14.9.14.tar.xz) = 753980 -- cgit From 9833e442f9353f2969a8e42eef1f2c651f7b077c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sat, 10 Aug 2019 22:55:10 +0000 Subject: Update to 1.16 Changes: https://github.com/miquels/liblockfile/blob/master/Changelog PR: 239753 Submitted by: Yasuhiro KIMURA (maintainer) --- devel/liblockfile/Makefile | 2 +- devel/liblockfile/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/liblockfile/Makefile b/devel/liblockfile/Makefile index 6968ed7dfa50..edbe6ce72b55 100644 --- a/devel/liblockfile/Makefile +++ b/devel/liblockfile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= liblockfile -PORTVERSION= 1.14 +PORTVERSION= 1.16 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/liblockfile/distinfo b/devel/liblockfile/distinfo index c37390ae7e23..aaed3e0d414f 100644 --- a/devel/liblockfile/distinfo +++ b/devel/liblockfile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513860470 -SHA256 (miquels-liblockfile-v1.14_GH0.tar.gz) = be85dba347889d9b65cbd361a611e6b88e044fdca9c98e5139d5fbc9ba37ccc8 -SIZE (miquels-liblockfile-v1.14_GH0.tar.gz) = 67813 +TIMESTAMP = 1565379232 +SHA256 (miquels-liblockfile-v1.16_GH0.tar.gz) = dfc552c72a93a28279017e81c9e1924b12cc97e4faca8faf5ddbba6b6f048e01 +SIZE (miquels-liblockfile-v1.16_GH0.tar.gz) = 68591 -- cgit From 1b12fe6fb66565618aee1f864d4035282ccbf095 Mon Sep 17 00:00:00 2001 From: linimon Date: Sun, 11 Aug 2019 00:00:54 +0000 Subject: Add USE_CSTD=c99 to fix the following error on GCC-based architectures: main.c:252: error: 'for' loop initial declaration used outside C99 mode Approved by: portmgr (tier-2 blanket) --- graphics/scrot/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile index 3b9373f8f435..5ae8b2c3bd90 100644 --- a/graphics/scrot/Makefile +++ b/graphics/scrot/Makefile @@ -19,6 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= resurrecting-open-source-projects USES= autoreconf +USE_CSTD= c99 GNU_CONFIGURE= yes USE_XORG= x11 xfixes xcursor -- cgit From 2f97f946c202c476cae6d9266b1d4399849e3e5c Mon Sep 17 00:00:00 2001 From: linimon Date: Sun, 11 Aug 2019 00:13:02 +0000 Subject: Add compiler:c++11-lang to USES to fix build on gcc-based architectures: Target "hNN_WT__MD_435082866799_000" requires the language dialect "CXX11" (with compiler extensions), but CMake does not know the compile flags to use to enable it. Approved by: portmgr (tier-2 blanket) --- science/openkim-models/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/openkim-models/Makefile b/science/openkim-models/Makefile index f8684fa2a2ac..72d220fad645 100644 --- a/science/openkim-models/Makefile +++ b/science/openkim-models/Makefile @@ -14,6 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= xxd:editors/vim-console LIB_DEPENDS= libkim-api.so:science/kim-api -USES= cmake:noninja fortran tar:txz +USES= cmake:noninja compiler:c++11-lang fortran tar:txz .include -- cgit From e010a69eb894b53c54a99606e202e1386e19d94d Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:12 +0000 Subject: devel/py-adb: update to 1.3.0.9 (snapshot) Changes: https://github.com/google/python-adb/compare/0e50795...d0be33c --- devel/py-adb/Makefile | 4 ++-- devel/py-adb/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile index 70c7e3a30728..3f19dd8dd46d 100644 --- a/devel/py-adb/Makefile +++ b/devel/py-adb/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= adb -DISTVERSION= 1.3.0-7 -DISTVERSIONSUFFIX= -g0e50795 +DISTVERSION= 1.3.0-9 +DISTVERSIONSUFFIX= -gd0be33c CATEGORIES= devel comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-adb/distinfo b/devel/py-adb/distinfo index 728d283da824..ae03779edcfd 100644 --- a/devel/py-adb/distinfo +++ b/devel/py-adb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559087043 -SHA256 (google-python-adb-1.3.0-7-g0e50795_GH0.tar.gz) = ca5d787cfafa3f3bd6047d2a233cdcd55d0da8b5e64f8c59bb808dbbd5ba02a3 -SIZE (google-python-adb-1.3.0-7-g0e50795_GH0.tar.gz) = 36830 +TIMESTAMP = 1563486978 +SHA256 (google-python-adb-1.3.0-9-gd0be33c_GH0.tar.gz) = 2a2cd811380d06605be088e442319dc7566ec46adf41ba498aa91a48ec31818b +SIZE (google-python-adb-1.3.0-9-gd0be33c_GH0.tar.gz) = 36838 -- cgit From 1406ed2c6451052d9b32641949857767b44e7444 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:21 +0000 Subject: emulators/citra: update to s20190810 Changes: https://github.com/citra-emu/citra/compare/76aec4d67...d18d2a0a1 --- emulators/citra-qt5/Makefile | 2 +- emulators/citra/Makefile | 6 +++--- emulators/citra/distinfo | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emulators/citra-qt5/Makefile b/emulators/citra-qt5/Makefile index ac7516fe5ba0..690002e635c2 100644 --- a/emulators/citra-qt5/Makefile +++ b/emulators/citra-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index bf1a02e32c9a..fe527ba69f63 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20190729 -PORTREVISION?= 1 +PORTVERSION= s20190810 +PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 76aec4d67 +GH_TAGNAME= d18d2a0a1 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 1283cfb87b9e..d80c49cec351 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1564396390 -SHA256 (citra-emu-citra-s20190729-76aec4d67_GH0.tar.gz) = 1337584d6ebab3dcc84ad86cb48314625367ecf3816df832027a1b4265e799a8 -SIZE (citra-emu-citra-s20190729-76aec4d67_GH0.tar.gz) = 5049701 +TIMESTAMP = 1565428397 +SHA256 (citra-emu-citra-s20190810-d18d2a0a1_GH0.tar.gz) = 00beb372dda107983da25cc5c9d5fc6858663261d696a542437b146c8b711182 +SIZE (citra-emu-citra-s20190810-d18d2a0a1_GH0.tar.gz) = 5054035 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c -- cgit From af5b9e57732ad5c1dbebd31a6f79863b695fc405 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:29 +0000 Subject: emulators/rpcs3: update to 0.0.6.8457 Changes: https://github.com/RPCS3/rpcs3/compare/05813c7e9...94d33003a --- emulators/rpcs3/Makefile | 4 ++-- emulators/rpcs3/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index c66d08c5dad5..2088bc5bd460 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.6-8443 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g05813c7e9 +DISTVERSION= 0.0.6-8457 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g94d33003a CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 8cbdcd014666..489477849048 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1564942579 -SHA256 (RPCS3-rpcs3-v0.0.6-8443-g05813c7e9_GH0.tar.gz) = 14dff0e16d94ff3068bc6a79aa7e37fe8ce1286a456423fa4a0b3a4844c0ae4b -SIZE (RPCS3-rpcs3-v0.0.6-8443-g05813c7e9_GH0.tar.gz) = 5532101 +TIMESTAMP = 1565455657 +SHA256 (RPCS3-rpcs3-v0.0.6-8457-g94d33003a_GH0.tar.gz) = f1dfa44327b2e6515cc524d66c091d8dd7aadffe71d5183beb3fa8f764e6f4e2 +SIZE (RPCS3-rpcs3-v0.0.6-8457-g94d33003a_GH0.tar.gz) = 5532923 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e -- cgit From 80782e61304b0eb8847ecca1f85534aea3c167e7 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:37 +0000 Subject: multimedia/svt-av1: update to 0.6.0.158 Changes: https://github.com/OpenVisualCloud/SVT-AV1/compare/97d9dc62...d0f64ffa --- multimedia/svt-av1/Makefile | 4 ++-- multimedia/svt-av1/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile index 69f5fa3091cc..6d6c25e78e50 100644 --- a/multimedia/svt-av1/Makefile +++ b/multimedia/svt-av1/Makefile @@ -2,8 +2,8 @@ PORTNAME= svt-av1 DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0-156 -DISTVERSIONSUFFIX= -g97d9dc62 +DISTVERSION= 0.6.0-158 +DISTVERSIONSUFFIX= -gd0f64ffa CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo index 9b07c9941458..ec4786aa902b 100644 --- a/multimedia/svt-av1/distinfo +++ b/multimedia/svt-av1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565045328 -SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-156-g97d9dc62_GH0.tar.gz) = 8e1695a7353f8e21319577c1f500ae00728fece801382f304fc03ba89376d8be -SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-156-g97d9dc62_GH0.tar.gz) = 2745032 +TIMESTAMP = 1565302481 +SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-158-gd0f64ffa_GH0.tar.gz) = 11cc87938d16ea4a620fbb7c5884e04738a2afb07522f5f7228d5e41c1e321af +SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-158-gd0f64ffa_GH0.tar.gz) = 2745126 -- cgit From abd9d8b25c2463ed568be5fe281291d42c5ae146 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:44 +0000 Subject: multimedia/rav1e: update to s20190809 Changes: https://github.com/xiph/rav1e/compare/df6451a...ec0c7787 --- multimedia/rav1e/Makefile | 19 +++++++++---------- multimedia/rav1e/distinfo | 36 +++++++++++++++++------------------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile index a34c4a16f98c..b8a8967e2c98 100644 --- a/multimedia/rav1e/Makefile +++ b/multimedia/rav1e/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rav1e -PORTVERSION= s20190802 +PORTVERSION= s20190809 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -16,14 +16,14 @@ BUILD_DEPENDS_amd64= nasm:devel/nasm USES= cargo USE_GITHUB= yes GH_ACCOUNT= xiph -GH_TAGNAME= df6451a +GH_TAGNAME= ec0c7787 PLIST_FILES= bin/${PORTNAME} CARGO_CRATES= adler32-1.0.3 \ - aho-corasick-0.7.4 \ + aho-corasick-0.7.6 \ ansi_term-0.11.0 \ aom-sys-0.1.2 \ - arc-swap-0.3.11 \ + arc-swap-0.4.1 \ arg_enum_proc_macro-0.1.1 \ arrayvec-0.4.11 \ atty-0.2.13 \ @@ -111,7 +111,7 @@ CARGO_CRATES= adler32-1.0.3 \ rand-0.6.5 \ rand_chacha-0.1.1 \ rand_core-0.3.1 \ - rand_core-0.4.0 \ + rand_core-0.4.2 \ rand_hc-0.1.0 \ rand_isaac-0.1.1 \ rand_jitter-0.1.4 \ @@ -125,7 +125,7 @@ CARGO_CRATES= adler32-1.0.3 \ redox_syscall-0.1.56 \ regex-1.1.9 \ regex-automata-0.1.8 \ - regex-syntax-0.6.10 \ + regex-syntax-0.6.11 \ rustc-demangle-0.1.15 \ rustc_version-0.2.3 \ ryu-1.0.0 \ @@ -140,10 +140,10 @@ CARGO_CRATES= adler32-1.0.3 \ serde_json-1.0.40 \ shlex-0.1.1 \ signal-hook-0.1.10 \ - signal-hook-registry-1.1.0 \ + signal-hook-registry-1.1.1 \ smallvec-0.6.10 \ strsim-0.8.0 \ - syn-0.15.42 \ + syn-0.15.43 \ synstructure-0.10.2 \ termcolor-1.0.5 \ termios-0.3.1 \ @@ -153,10 +153,9 @@ CARGO_CRATES= adler32-1.0.3 \ time-0.1.42 \ tinytemplate-1.0.2 \ toml-0.2.1 \ - ucd-util-0.1.5 \ unicode-width-0.1.5 \ unicode-xid-0.1.0 \ - utf8-ranges-1.0.3 \ + utf8-ranges-1.0.4 \ vec_map-0.8.1 \ vergen-3.0.4 \ version_check-0.1.5 \ diff --git a/multimedia/rav1e/distinfo b/multimedia/rav1e/distinfo index 1651ca64c9b4..d792b61da96c 100644 --- a/multimedia/rav1e/distinfo +++ b/multimedia/rav1e/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1564785642 +TIMESTAMP = 1565393124 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734 -SHA256 (rust/crates/aho-corasick-0.7.4.tar.gz) = 36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282 -SIZE (rust/crates/aho-corasick-0.7.4.tar.gz) = 55480 +SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d +SIZE (rust/crates/aho-corasick-0.7.6.tar.gz) = 108953 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/aom-sys-0.1.2.tar.gz) = 9d12f80222f2f70f5d16c8c0986f393f4638feba82af2a9700c9616fc9ea2a31 SIZE (rust/crates/aom-sys-0.1.2.tar.gz) = 3047 -SHA256 (rust/crates/arc-swap-0.3.11.tar.gz) = bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841 -SIZE (rust/crates/arc-swap-0.3.11.tar.gz) = 46282 +SHA256 (rust/crates/arc-swap-0.4.1.tar.gz) = 1507f9b80b3ef096751728cf3f43bb0111ec906e44f5d8587e02c10643b9a2cd +SIZE (rust/crates/arc-swap-0.4.1.tar.gz) = 43831 SHA256 (rust/crates/arg_enum_proc_macro-0.1.1.tar.gz) = 1d1b07cc212b3172ea01cd9b21afe073e3562cb83ecb0da4eb981fcf91a6690d SIZE (rust/crates/arg_enum_proc_macro-0.1.1.tar.gz) = 3358 SHA256 (rust/crates/arrayvec-0.4.11.tar.gz) = b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba @@ -183,8 +183,8 @@ SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085a SIZE (rust/crates/rand_chacha-0.1.1.tar.gz) = 11703 SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483 -SHA256 (rust/crates/rand_core-0.4.0.tar.gz) = d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0 -SIZE (rust/crates/rand_core-0.4.0.tar.gz) = 20326 +SHA256 (rust/crates/rand_core-0.4.2.tar.gz) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc +SIZE (rust/crates/rand_core-0.4.2.tar.gz) = 20243 SHA256 (rust/crates/rand_hc-0.1.0.tar.gz) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4 SIZE (rust/crates/rand_hc-0.1.0.tar.gz) = 11644 SHA256 (rust/crates/rand_isaac-0.1.1.tar.gz) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08 @@ -211,8 +211,8 @@ SHA256 (rust/crates/regex-1.1.9.tar.gz) = d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56 SIZE (rust/crates/regex-1.1.9.tar.gz) = 246517 SHA256 (rust/crates/regex-automata-0.1.8.tar.gz) = 92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9 SIZE (rust/crates/regex-automata-0.1.8.tar.gz) = 92234 -SHA256 (rust/crates/regex-syntax-0.6.10.tar.gz) = cd5485bf1523a9ed51c4964273f22f63f24e31632adb5dad134f488f86a3875c -SIZE (rust/crates/regex-syntax-0.6.10.tar.gz) = 276985 +SHA256 (rust/crates/regex-syntax-0.6.11.tar.gz) = b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f +SIZE (rust/crates/regex-syntax-0.6.11.tar.gz) = 283238 SHA256 (rust/crates/rustc-demangle-0.1.15.tar.gz) = a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af SIZE (rust/crates/rustc-demangle-0.1.15.tar.gz) = 18640 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a @@ -241,14 +241,14 @@ SHA256 (rust/crates/shlex-0.1.1.tar.gz) = 7fdf1b9db47230893d76faad238fd6097fd6d6 SIZE (rust/crates/shlex-0.1.1.tar.gz) = 5687 SHA256 (rust/crates/signal-hook-0.1.10.tar.gz) = 4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68 SIZE (rust/crates/signal-hook-0.1.10.tar.gz) = 20840 -SHA256 (rust/crates/signal-hook-registry-1.1.0.tar.gz) = 913661ac8848a61e39684a3c3e7a7a14a4deec7f54b4976d0641e70dda3939b1 -SIZE (rust/crates/signal-hook-registry-1.1.0.tar.gz) = 13797 +SHA256 (rust/crates/signal-hook-registry-1.1.1.tar.gz) = 1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc +SIZE (rust/crates/signal-hook-registry-1.1.1.tar.gz) = 13795 SHA256 (rust/crates/smallvec-0.6.10.tar.gz) = ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7 SIZE (rust/crates/smallvec-0.6.10.tar.gz) = 22064 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309 -SHA256 (rust/crates/syn-0.15.42.tar.gz) = eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e -SIZE (rust/crates/syn-0.15.42.tar.gz) = 185561 +SHA256 (rust/crates/syn-0.15.43.tar.gz) = ee06ea4b620ab59a2267c6b48be16244a3389f8bfa0986bdd15c35b890b00af3 +SIZE (rust/crates/syn-0.15.43.tar.gz) = 184065 SHA256 (rust/crates/synstructure-0.10.2.tar.gz) = 02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f SIZE (rust/crates/synstructure-0.10.2.tar.gz) = 17988 SHA256 (rust/crates/termcolor-1.0.5.tar.gz) = 96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e @@ -267,14 +267,12 @@ SHA256 (rust/crates/tinytemplate-1.0.2.tar.gz) = 4574b75faccaacddb9b284faecdf0b5 SIZE (rust/crates/tinytemplate-1.0.2.tar.gz) = 24614 SHA256 (rust/crates/toml-0.2.1.tar.gz) = 736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4 SIZE (rust/crates/toml-0.2.1.tar.gz) = 47258 -SHA256 (rust/crates/ucd-util-0.1.5.tar.gz) = fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874 -SIZE (rust/crates/ucd-util-0.1.5.tar.gz) = 26284 SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 -SHA256 (rust/crates/utf8-ranges-1.0.3.tar.gz) = 9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde -SIZE (rust/crates/utf8-ranges-1.0.3.tar.gz) = 8496 +SHA256 (rust/crates/utf8-ranges-1.0.4.tar.gz) = b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba +SIZE (rust/crates/utf8-ranges-1.0.4.tar.gz) = 8575 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959 SHA256 (rust/crates/vergen-3.0.4.tar.gz) = 6aba5e34f93dc7051dfad05b98a18e9156f27e7b431fe1d2398cb6061c0a1dba @@ -297,5 +295,5 @@ SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 SHA256 (rust/crates/y4m-0.3.3.tar.gz) = b14191e41f540837886792294aa9269c2d63eb8733ed0499590935fef7bbb94f SIZE (rust/crates/y4m-0.3.3.tar.gz) = 11108 -SHA256 (xiph-rav1e-s20190802-df6451a_GH0.tar.gz) = fc0168a13fd755013d23be3034be1cd4bb126cdb4782a7553c432a291460efac -SIZE (xiph-rav1e-s20190802-df6451a_GH0.tar.gz) = 449636 +SHA256 (xiph-rav1e-s20190809-ec0c7787_GH0.tar.gz) = 3734e2717c20d5789c7e9780d4035f7b885faba5bf38f6fc9cb23a3737a1cddc +SIZE (xiph-rav1e-s20190809-ec0c7787_GH0.tar.gz) = 456176 -- cgit From a95f8bcd69c3e76ac3382d9836cb305cdecd1c6d Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:45:53 +0000 Subject: multimedia/aom: update to 1.0.0.2231 Changes: https://aomedia.googlesource.com/aom/+log/008d3404b..9666276ac --- multimedia/aom/Makefile | 4 ++-- multimedia/aom/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index 30ab05341fc6..dcfd5b5bddd1 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-2196 -DISTVERSIONSUFFIX= -g008d3404b +DISTVERSION= 1.0.0-2231 +DISTVERSIONSUFFIX= -g9666276ac CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 8298e633cd51..5b0b35e116ac 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565048484 -SHA256 (jbeich-aom-v1.0.0-2196-g008d3404b_GH0.tar.gz) = 8830a55c41adf97f07938239e8e5ff4f5b1641950ed82d2ecf44e4142ccaf812 -SIZE (jbeich-aom-v1.0.0-2196-g008d3404b_GH0.tar.gz) = 3396590 +TIMESTAMP = 1565394276 +SHA256 (jbeich-aom-v1.0.0-2231-g9666276ac_GH0.tar.gz) = 8ba8f84c1dc61a1da1570e7da6b2fd8c38cc27ed8116433758bb1a1d52830833 +SIZE (jbeich-aom-v1.0.0-2231-g9666276ac_GH0.tar.gz) = 3397458 -- cgit From 995be9ebddc7f7a4e61f0e0f1822191c82ba0db5 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:46:01 +0000 Subject: lang/rust-nightly: update to 1.38.0.20190811 Changes: https://github.com/rust-lang/rust/compare/c4715198b50d...9703ef666123 --- lang/rust-nightly/Makefile | 2 +- lang/rust-nightly/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 4210bf76edc2..3dcfa0b42cb8 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2019-08-06 +NIGHTLY_DATE= 2019-08-11 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 9e12e8d4050d..ab76658d0e86 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1565039369 -SHA256 (rust/2019-08-06/rustc-nightly-src.tar.xz) = 09d129649a8dbc54fe1ad3a4dfdafaa7df33924ca39f63231aceeed06ae5950d -SIZE (rust/2019-08-06/rustc-nightly-src.tar.xz) = 93917072 +TIMESTAMP = 1565463949 +SHA256 (rust/2019-08-11/rustc-nightly-src.tar.xz) = 02cae8bdef758eb92a37bd445cb7f6b59a347bc0620edba8eab6c9bb15ceb94d +SIZE (rust/2019-08-11/rustc-nightly-src.tar.xz) = 93985272 SHA256 (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2e3f9fd2ba916facd3239df2bab16420161c6aa62d03317caa3b038ce56e5738 SIZE (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70343111 SHA256 (rust/2019-07-04/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 735c8a380bd369ca4b1c05cb3f93d3fad41e073a94146230f4e851be66f23b0f -- cgit From 075ea3f22987d3ef2c574d387fcb55d496ae3b04 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 00:49:33 +0000 Subject: mail/thunderbird: update to 68.0 Changes: https://www.thunderbird.net/thunderbird/68.0/releasenotes/ --- mail/thunderbird/Makefile | 24 +- mail/thunderbird/distinfo | 6 +- mail/thunderbird/files/patch-addon-search | 18 +- mail/thunderbird/files/patch-bug1144632 | 100 - mail/thunderbird/files/patch-bug1288587 | 4 +- mail/thunderbird/files/patch-bug1375074 | 83 - mail/thunderbird/files/patch-bug1411481 | 83 - mail/thunderbird/files/patch-bug1438678 | 1000 - mail/thunderbird/files/patch-bug1442583 | 43 - mail/thunderbird/files/patch-bug1444798 | 45 - mail/thunderbird/files/patch-bug1445907 | 75 - mail/thunderbird/files/patch-bug1447359 | 45 - mail/thunderbird/files/patch-bug1448770 | 27 - mail/thunderbird/files/patch-bug1451292 | 33 - mail/thunderbird/files/patch-bug1456556 | 22 - mail/thunderbird/files/patch-bug1458219 | 26 - mail/thunderbird/files/patch-bug1467882 | 137 - mail/thunderbird/files/patch-bug1507655 | 29 + mail/thunderbird/files/patch-bug1519729 | 131 - mail/thunderbird/files/patch-bug1530098 | 198 - mail/thunderbird/files/patch-bug1559213 | 100 + mail/thunderbird/files/patch-bug847568 | 40 +- mail/thunderbird/files/patch-bug991253 | 17 - .../files/patch-dom_media_flac_FlacDecoder.cpp | 6 +- mail/thunderbird/files/patch-toolkit_moz.configure | 15 - mail/thunderbird/files/patch-u2f-hid-rs62 | 31339 ------------------- mail/thunderbird/files/patch-z-bug1436911 | 1136 - 27 files changed, 178 insertions(+), 34604 deletions(-) delete mode 100644 mail/thunderbird/files/patch-bug1144632 delete mode 100644 mail/thunderbird/files/patch-bug1375074 delete mode 100644 mail/thunderbird/files/patch-bug1411481 delete mode 100644 mail/thunderbird/files/patch-bug1438678 delete mode 100644 mail/thunderbird/files/patch-bug1442583 delete mode 100644 mail/thunderbird/files/patch-bug1444798 delete mode 100644 mail/thunderbird/files/patch-bug1445907 delete mode 100644 mail/thunderbird/files/patch-bug1447359 delete mode 100644 mail/thunderbird/files/patch-bug1448770 delete mode 100644 mail/thunderbird/files/patch-bug1451292 delete mode 100644 mail/thunderbird/files/patch-bug1456556 delete mode 100644 mail/thunderbird/files/patch-bug1458219 delete mode 100644 mail/thunderbird/files/patch-bug1467882 create mode 100644 mail/thunderbird/files/patch-bug1507655 delete mode 100644 mail/thunderbird/files/patch-bug1519729 delete mode 100644 mail/thunderbird/files/patch-bug1530098 create mode 100644 mail/thunderbird/files/patch-bug1559213 delete mode 100644 mail/thunderbird/files/patch-bug991253 delete mode 100644 mail/thunderbird/files/patch-toolkit_moz.configure delete mode 100644 mail/thunderbird/files/patch-u2f-hid-rs62 delete mode 100644 mail/thunderbird/files/patch-z-bug1436911 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 35c0ca0d182a..fc3cde24c33d 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,34 +2,33 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 60.8.0 -PORTREVISION= 3 +DISTVERSION= 68.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.19:devel/nspr \ - nss>=3.36.7:security/nss \ - icu>=59.1,1:devel/icu \ +BUILD_DEPENDS= nspr>=4.21:devel/nspr \ + nss>=3.44.1:security/nss \ + icu>=63.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=1.7.6:print/harfbuzz \ - graphite2>=1.3.11:graphics/graphite2 \ - png>=1.6.34:graphics/png \ + harfbuzz>=2.4.0:print/harfbuzz \ + graphite2>=1.3.13:graphics/graphite2 \ + png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.22.0:databases/sqlite3 \ + sqlite3>=3.28.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ - yasm:devel/yasm \ + nasm:devel/nasm \ zip:archivers/zip SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -webp -vpx +USE_MOZILLA= -hunspell -vpx USES= tar:xz @@ -44,6 +43,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING +OPTIONS_EXCLUDE=WAYLAND .include "${.CURDIR}/../../www/firefox/Makefile.options" .include diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index cb1565f0f34f..09eeaa9755d3 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562167567 -SHA256 (thunderbird-60.8.0.source.tar.xz) = 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1 -SIZE (thunderbird-60.8.0.source.tar.xz) = 285643576 +TIMESTAMP = 1565456453 +SHA256 (thunderbird-68.0.source.tar.xz) = 61812e9d4d65add8aff718454b8d54dc7f75948b9880059b5294c0e7e7f871b3 +SIZE (thunderbird-68.0.source.tar.xz) = 332745736 diff --git a/mail/thunderbird/files/patch-addon-search b/mail/thunderbird/files/patch-addon-search index d270991c7b20..78b76a5d1fd1 100644 --- a/mail/thunderbird/files/patch-addon-search +++ b/mail/thunderbird/files/patch-addon-search @@ -5,9 +5,9 @@ diff --git mail/app/profile/all-thunderbird.js mail/app/profile/all-thunderbird. index 75c2c5e435e35..4d8c09c02759b 100644 --- comm/mail/app/profile/all-thunderbird.js +++ comm/mail/app/profile/all-thunderbird.js -@@ -166,10 +166,10 @@ pref("extensions.getAddons.maxResults", 15); - pref("extensions.getAddons.get.url", "https://live.thunderbird.net/services.addons/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); - pref("extensions.getAddons.compatOverides.url", "https://live.thunderbird.net/services.addons/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); +@@ -153,10 +153,10 @@ pref("extensions.getAddons.maxResults", 15); + pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); + pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/"); -pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); +pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=thunderbird"); @@ -16,10 +16,10 @@ index 75c2c5e435e35..4d8c09c02759b 100644 -pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); +pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/Linux"); - pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=thunderbird"); pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%"); -@@ -190,9 +190,9 @@ pref("security.cert_pinning.enforcement_level", 1); +@@ -180,9 +180,9 @@ pref("security.cert_pinning.enforcement_level", 1); // .. etc .. // pref("extensions.update.enabled", true); @@ -44,11 +44,11 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } -diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm index f70fd8d7e3bd8..81e8cd7764fdf 100644 ---- toolkit/mozapps/extensions/internal/XPIProvider.jsm -+++ toolkit/mozapps/extensions/internal/XPIProvider.jsm -@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { +--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm ++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -355,7 +355,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { diff --git a/mail/thunderbird/files/patch-bug1144632 b/mail/thunderbird/files/patch-bug1144632 deleted file mode 100644 index b852bebac093..000000000000 --- a/mail/thunderbird/files/patch-bug1144632 +++ /dev/null @@ -1,100 +0,0 @@ -commit 7e0038706036 -Author: Lee Salzman -Date: Thu May 24 14:50:31 2018 -0400 - - Bug 1144632 - fix big-endian Skia builds. r=rhunt - - MozReview-Commit-ID: JQivGBE45qy ---- - gfx/skia/skia/include/core/SkColorPriv.h | 15 ++++----------- - gfx/skia/skia/include/core/SkImageInfo.h | 2 +- - gfx/skia/skia/include/gpu/GrTypes.h | 5 +---- - gfx/skia/skia/src/core/SkColorData.h | 15 ++++----------- - 4 files changed, 10 insertions(+), 27 deletions(-) - -diff --git gfx/skia/skia/include/core/SkColorPriv.h gfx/skia/skia/include/core/SkColorPriv.h -index 0cd02e8034062..8a7f1501ba434 100644 ---- gfx/skia/skia/include/core/SkColorPriv.h -+++ gfx/skia/skia/include/core/SkColorPriv.h -@@ -55,17 +55,10 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) { - * Here we enforce this constraint. - */ - --#ifdef SK_CPU_BENDIAN -- #define SK_RGBA_R32_SHIFT 24 -- #define SK_RGBA_G32_SHIFT 16 -- #define SK_RGBA_B32_SHIFT 8 -- #define SK_RGBA_A32_SHIFT 0 --#else -- #define SK_RGBA_R32_SHIFT 0 -- #define SK_RGBA_G32_SHIFT 8 -- #define SK_RGBA_B32_SHIFT 16 -- #define SK_RGBA_A32_SHIFT 24 --#endif -+#define SK_RGBA_R32_SHIFT 0 -+#define SK_RGBA_G32_SHIFT 8 -+#define SK_RGBA_B32_SHIFT 16 -+#define SK_RGBA_A32_SHIFT 24 - - #define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24) - #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24) -diff --git gfx/skia/skia/include/core/SkImageInfo.h gfx/skia/skia/include/core/SkImageInfo.h -index ece47f5c418a8..5b36ba1e4518a 100644 ---- gfx/skia/skia/include/core/SkImageInfo.h -+++ gfx/skia/skia/include/core/SkImageInfo.h -@@ -84,7 +84,7 @@ enum SkColorType { - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kN32_SkColorType = kRGBA_8888_SkColorType, - #else -- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" -+ kN32_SkColorType = kBGRA_8888_SkColorType, - #endif - }; - -diff --git gfx/skia/skia/include/gpu/GrTypes.h gfx/skia/skia/include/gpu/GrTypes.h -index c88d9ee63b38f..fdca5f29e527b 100644 ---- gfx/skia/skia/include/gpu/GrTypes.h -+++ gfx/skia/skia/include/gpu/GrTypes.h -@@ -344,15 +344,12 @@ enum GrPixelConfig { - static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; - - // Aliases for pixel configs that match skia's byte order. --#ifndef SK_CPU_LENDIAN -- #error "Skia gpu currently assumes little endian" --#endif - #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; - #else -- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." -+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; - #endif - - /** -diff --git gfx/skia/skia/src/core/SkColorData.h gfx/skia/skia/src/core/SkColorData.h -index 3fc0113105a5b..43ae01eeaee3e 100644 ---- gfx/skia/skia/src/core/SkColorData.h -+++ gfx/skia/skia/src/core/SkColorData.h -@@ -32,17 +32,10 @@ - * Here we enforce this constraint. - */ - --#ifdef SK_CPU_BENDIAN -- #define SK_BGRA_B32_SHIFT 24 -- #define SK_BGRA_G32_SHIFT 16 -- #define SK_BGRA_R32_SHIFT 8 -- #define SK_BGRA_A32_SHIFT 0 --#else -- #define SK_BGRA_B32_SHIFT 0 -- #define SK_BGRA_G32_SHIFT 8 -- #define SK_BGRA_R32_SHIFT 16 -- #define SK_BGRA_A32_SHIFT 24 --#endif -+#define SK_BGRA_B32_SHIFT 0 -+#define SK_BGRA_G32_SHIFT 8 -+#define SK_BGRA_R32_SHIFT 16 -+#define SK_BGRA_A32_SHIFT 24 - - #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) - #error "can't define PMCOLOR to be RGBA and BGRA" diff --git a/mail/thunderbird/files/patch-bug1288587 b/mail/thunderbird/files/patch-bug1288587 index e10ef8537a4a..f8190a7176e8 100644 --- a/mail/thunderbird/files/patch-bug1288587 +++ b/mail/thunderbird/files/patch-bug1288587 @@ -43,13 +43,13 @@ index 855214a..1e91d51 100644 topobjdir = topobjdir[:-7] with LineIO(lambda l: log.info(l)) as out: -@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help): +@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig log.info('Creating Python environment') manager.build(python) python = normsep(manager.python_path) - if python != normsep(sys.executable): + if not normsep(sys.executable).startswith(normsep(virtualenvs_root)): log.info('Reexecuting in the virtualenv') if env_python: - del os.environ['PYTHON'] diff --git a/mail/thunderbird/files/patch-bug1375074 b/mail/thunderbird/files/patch-bug1375074 deleted file mode 100644 index 7289d1e34a86..000000000000 --- a/mail/thunderbird/files/patch-bug1375074 +++ /dev/null @@ -1,83 +0,0 @@ -commit fc25eb4380d0 -Author: Lars T Hansen -Date: Wed Feb 28 13:57:52 2018 +0100 - - Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl - - --HG-- - extra : rebase_source : 4a2824b23cf7453d07c962123f780c0ff2fd5292 - extra : source : dec6ab6522a4eb4b3c2defc5078b38ed904f3383 ---- - js/src/jit-test/tests/bug1375074.js | 18 ++++++++++++++++++ - js/src/vm/UnboxedObject.cpp | 25 ++++++++++++++++++++++++- - 2 files changed, 42 insertions(+), 1 deletion(-) - -diff --git js/src/jit-test/tests/bug1375074.js js/src/jit-test/tests/bug1375074.js -new file mode 100644 -index 0000000000000..8bf01d96903fc ---- /dev/null -+++ js/src/jit-test/tests/bug1375074.js -@@ -0,0 +1,18 @@ -+// This forces the VM to start creating unboxed objects and thus stresses a -+// particular path into generated code for a specialized unboxed object -+// constructor. -+ -+var K = 2000; // 2000 should be plenty -+var s = "["; -+var i; -+for ( i=0; i < K-1; i++ ) -+ s = s + `{"i":${i}},`; -+s += `{"i":${i}}]`; -+var v = JSON.parse(s); -+ -+assertEq(v.length == K, true); -+ -+for ( i=0; i < K; i++) { -+ assertEq(v[i] instanceof Object, true); -+ assertEq(v[i].i, i); -+} -diff --git js/src/vm/UnboxedObject.cpp js/src/vm/UnboxedObject.cpp -index c8c178965c488..5badf328ede4f 100644 ---- js/src/vm/UnboxedObject.cpp -+++ js/src/vm/UnboxedObject.cpp -@@ -86,8 +86,15 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = - #endif - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for -- // addressing. -+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. - masm.initStackPtr(); - #endif - -@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = - if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg); - masm.PopRegsInMask(savedNonVolatileRegisters); - -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else - masm.abiret(); -+#endif - - masm.bind(&failureStoreOther); - diff --git a/mail/thunderbird/files/patch-bug1411481 b/mail/thunderbird/files/patch-bug1411481 deleted file mode 100644 index 10ee86b96544..000000000000 --- a/mail/thunderbird/files/patch-bug1411481 +++ /dev/null @@ -1,83 +0,0 @@ -commit 57a55d1c2d33 -Author: sotaro -Date: Wed Mar 21 08:59:38 2018 +0900 - - Bug 1411481- Enable SkiaGL canvas usage on Mac r=jrmuizel ---- - dom/canvas/CanvasRenderingContext2D.cpp | 3 ++- - gfx/thebes/gfxPlatform.cpp | 3 ++- - gfx/thebes/gfxPlatform.h | 2 +- - gfx/thebes/gfxWindowsPlatform.cpp | 7 +++++++ - gfx/thebes/gfxWindowsPlatform.h | 2 ++ - 5 files changed, 14 insertions(+), 3 deletions(-) - -diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingContext2D.cpp -index ef3f868bdbf7..8666564b4d0c 100644 ---- dom/canvas/CanvasRenderingContext2D.cpp -+++ dom/canvas/CanvasRenderingContext2D.cpp -@@ -1358,7 +1358,8 @@ bool CanvasRenderingContext2D::AllowOpenGLCanvas() con - // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE - // as well, so it wouldn't help much. - -- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) && -+ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL || -+ mCompositorBackend == LayersBackend::LAYERS_WR) && - gfxPlatform::GetPlatform()->AllowOpenGLCanvas(); - } - -diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp -index b9beea68d8c5..82635f9ab3ce 100644 ---- gfx/thebes/gfxPlatform.cpp -+++ gfx/thebes/gfxPlatform.cpp -@@ -1341,7 +1341,8 @@ bool gfxPlatform::AllowOpenGLCanvas() { - // The callers have to do the right thing. - bool correctBackend = - !XRE_IsParentProcess() || -- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) && -+ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL || -+ mCompositorBackend == LayersBackend::LAYERS_WR) && - (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA)); - - if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) { -diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h -index c988eb1168a8..3bbf2b763f26 100644 ---- gfx/thebes/gfxPlatform.h -+++ gfx/thebes/gfxPlatform.h -@@ -265,7 +265,7 @@ class gfxPlatform { - /// asking for it, we will examine the commands in the first few seconds - /// of the canvas usage, and potentially change to accelerated or - /// non-accelerated canvas. -- bool AllowOpenGLCanvas(); -+ virtual bool AllowOpenGLCanvas(); - virtual void InitializeSkiaCacheLimits(); - - static bool AsyncPanZoomEnabled(); -diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp -index 9ba6f40c6cc0..4d65791d075f 100644 ---- gfx/thebes/gfxWindowsPlatform.cpp -+++ gfx/thebes/gfxWindowsPlatform.cpp -@@ -466,6 +466,11 @@ void gfxWindowsPlatform::UpdateRenderMode() { - } - } - -+bool gfxWindowsPlatform::AllowOpenGLCanvas() { -+ // OpenGL canvas is not supported on windows -+ return false; -+} -+ - mozilla::gfx::BackendType gfxWindowsPlatform::GetContentBackendFor( - mozilla::layers::LayersBackend aLayers) { - mozilla::gfx::BackendType defaultBackend = -diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h -index 47048de8f5f5..47ec0e9e5547 100644 ---- gfx/thebes/gfxWindowsPlatform.h -+++ gfx/thebes/gfxWindowsPlatform.h -@@ -171,6 +171,8 @@ class gfxWindowsPlatform : public gfxPlatform { - void SchedulePaintIfDeviceReset() override; - void CheckForContentOnlyDeviceReset(); - -+ bool AllowOpenGLCanvas() override; -+ - mozilla::gfx::BackendType GetContentBackendFor( - mozilla::layers::LayersBackend aLayers) override; - diff --git a/mail/thunderbird/files/patch-bug1438678 b/mail/thunderbird/files/patch-bug1438678 deleted file mode 100644 index 9758b775eca9..000000000000 --- a/mail/thunderbird/files/patch-bug1438678 +++ /dev/null @@ -1,1000 +0,0 @@ -commit 68124009fc5a -Author: Nicholas Nethercote -Date: Fri Feb 16 17:54:16 2018 +1100 - - Bug 1438678 - Pass early prefs via shared memory instead of the command line. r=bobowen,jld,glandium. - - This patch replaces the large -intPrefs/-boolPrefs/-stringPrefs flags with - a short-lived, anonymous, shared memory segment that is used to pass the early - prefs. - - Removing the bloat from the command line is nice, but more important is the - fact that this will let us pass more prefs at content process start-up, which - will allow us to remove the early/late prefs split (bug 1436911). - - Although this mechanism is only used for prefs, it's conceivable that it could - be used for other data that must be received very early by children, and for - which the command line isn't ideal. - - Notable details: - - - Much of the patch deals with the various platform-specific ways of passing - handles/fds to children. - - - Linux and Mac: we use a fixed fd (8) in combination with the new - GeckoChildProcessHost::AddFdToRemap() function (which ensures the child - won't close the fd). - - - Android: like Linux and Mac, but the handles get passed via "parcels" and - we use the new SetPrefsFd() function instead of the fixed fd. - - - Windows: there is no need to duplicate the handle because Windows handles - are system-wide. But we do use the new - GeckoChildProcessHost::AddHandleToShare() function to add it to the list of - inheritable handles. We also ensure that list is processed on all paths - (MOZ_SANDBOX with sandbox, MOZ_SANDBOX without sandbox, non-MOZ_SANDBOX) so - that the handles are marked as inheritable. The handle is passed via the - -prefsHandle flag. - - The -prefsLen flag is used on all platforms to indicate the size of the - shared memory segment. - - - The patch also moves the serialization/deserialization of the prefs in/out of - the shared memory into libpref, which is a better spot for it. (This means - Preferences::MustSendToContentProcesses() can be removed.) - - MozReview-Commit-ID: 8fREEBiYFvc - - --HG-- - extra : rebase_source : 7e4c8ebdbcd7d74d6bd2ab3c9e75a6a17dbd8dfe ---- - dom/ipc/ContentParent.cpp | 91 +++++++------- - dom/ipc/ContentProcess.cpp | 121 ++++++++++--------- - dom/ipc/ContentProcess.h | 5 + - ipc/chromium/src/base/process_util_win.cc | 4 + - ipc/glue/GeckoChildProcessHost.cpp | 36 +++--- - ipc/glue/GeckoChildProcessHost.h | 10 ++ - .../org/mozilla/gecko/process/IChildProcess.aidl | 3 +- - .../main/java/org/mozilla/gecko/GeckoThread.java | 13 +- - .../org/mozilla/gecko/mozglue/GeckoLoader.java | 2 +- - .../mozilla/gecko/process/GeckoProcessManager.java | 19 +-- - .../gecko/process/GeckoServiceChildProcess.java | 4 +- - modules/libpref/Preferences.cpp | 134 +++++++++++++++++++-- - modules/libpref/Preferences.h | 17 +-- - mozglue/android/APKOpen.cpp | 4 +- - toolkit/xre/Bootstrap.cpp | 4 +- - toolkit/xre/Bootstrap.h | 2 +- - toolkit/xre/nsEmbedFunctions.cpp | 3 +- - widget/android/GeneratedJNIWrappers.cpp | 4 +- - widget/android/GeneratedJNIWrappers.h | 5 +- - xpcom/build/nsXULAppAPI.h | 2 +- - 20 files changed, 318 insertions(+), 165 deletions(-) - -diff --git dom/ipc/ContentParent.cpp dom/ipc/ContentParent.cpp -index e27f3eedc1b1..60be7005354b 100644 ---- dom/ipc/ContentParent.cpp -+++ dom/ipc/ContentParent.cpp -@@ -7,6 +7,7 @@ - #include "mozilla/DebugOnly.h" - - #include "base/basictypes.h" -+#include "base/shared_memory.h" - - #include "ContentParent.h" - #include "TabParent.h" -@@ -1857,64 +1858,56 @@ bool ContentParent::LaunchSubprocess( - extraArgs.push_back(idStr); - extraArgs.push_back(IsForBrowser() ? "-isForBrowser" : "-notForBrowser"); - -- nsAutoCStringN<1024> boolPrefs; -- nsAutoCStringN<1024> intPrefs; -- nsAutoCStringN<1024> stringPrefs; -+ // Prefs information is passed via anonymous shared memory to avoid bloating -+ // the command line. - -- size_t prefsLen; -- ContentPrefs::GetEarlyPrefs(&prefsLen); -+ // Serialize the early prefs. -+ nsAutoCStringN<1024> prefs; -+ Preferences::SerializeEarlyPreferences(prefs); - -- for (unsigned int i = 0; i < prefsLen; i++) { -- const char* prefName = ContentPrefs::GetEarlyPref(i); -- MOZ_ASSERT( -- i == 0 || strcmp(prefName, ContentPrefs::GetEarlyPref(i - 1)) > 0, -- "Content process preferences should be sorted alphabetically."); -- -- if (!Preferences::MustSendToContentProcesses(prefName)) { -- continue; -- } -- -- switch (Preferences::GetType(prefName)) { -- case nsIPrefBranch::PREF_INT: -- intPrefs.Append( -- nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName))); -- break; -- case nsIPrefBranch::PREF_BOOL: -- boolPrefs.Append( -- nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName))); -- break; -- case nsIPrefBranch::PREF_STRING: { -- nsAutoCString value; -- Preferences::GetCString(prefName, value); -- stringPrefs.Append( -- nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get())); -- } break; -- case nsIPrefBranch::PREF_INVALID: -- break; -- default: -- printf("preference type: %x\n", Preferences::GetType(prefName)); -- MOZ_CRASH(); -- } -+ // Set up the shared memory. -+ base::SharedMemory shm; -+ if (!shm.Create("", /* read_only */ false, /* open_existing */ false, -+ prefs.Length())) { -+ NS_ERROR("failed to create shared memory in the parent"); -+ MarkAsDead(); -+ return false; - } -+ if (!shm.Map(prefs.Length())) { -+ NS_ERROR("failed to map shared memory in the parent"); -+ MarkAsDead(); -+ return false; -+ } - -- nsCString schedulerPrefs = Scheduler::GetPrefs(); -+ // Copy the serialized prefs into the shared memory. -+ memcpy(static_cast(shm.memory()), prefs.get(), prefs.Length()); - -- // Only do these ones if they're non-empty. -- if (!intPrefs.IsEmpty()) { -- extraArgs.push_back("-intPrefs"); -- extraArgs.push_back(intPrefs.get()); -- } -- if (!boolPrefs.IsEmpty()) { -- extraArgs.push_back("-boolPrefs"); -- extraArgs.push_back(boolPrefs.get()); -- } -- if (!stringPrefs.IsEmpty()) { -- extraArgs.push_back("-stringPrefs"); -- extraArgs.push_back(stringPrefs.get()); -- } -+#if defined(XP_WIN) -+ // Record the handle as to-be-shared, and pass it via a command flag. This -+ // works because Windows handles are system-wide. -+ HANDLE prefsHandle = shm.handle(); -+ mSubprocess->AddHandleToShare(prefsHandle); -+ extraArgs.push_back("-prefsHandle"); -+ extraArgs.push_back( -+ nsPrintfCString("%zu", reinterpret_cast(prefsHandle)).get()); -+#else -+ // In contrast, Unix fds are per-process. So remap the fd to a fixed one that -+ // will be used in the child. -+ // XXX: bug 1440207 is about improving how fixed fds are used. -+ // -+ // Note: on Android, AddFdToRemap() sets up the fd to be passed via a Parcel, -+ // and the fixed fd isn't used. However, we still need to mark it for -+ // remapping so it doesn't get closed in the child. -+ mSubprocess->AddFdToRemap(shm.handle().fd, kPrefsFileDescriptor); -+#endif - -+ // Pass the length via a command flag. -+ extraArgs.push_back("-prefsLen"); -+ extraArgs.push_back(nsPrintfCString("%zu", uintptr_t(prefs.Length())).get()); -+ - // Scheduler prefs need to be handled differently because the scheduler needs - // to start up in the content process before the normal preferences service. -+ nsCString schedulerPrefs = Scheduler::GetPrefs(); - extraArgs.push_back("-schedulerPrefs"); - extraArgs.push_back(schedulerPrefs.get()); - -@@ -1923,6 +1916,7 @@ bool ContentParent::LaunchSubprocess( - } - - if (!mSubprocess->LaunchAndWaitForProcessHandle(extraArgs)) { -+ NS_ERROR("failed to launch child in the parent"); - MarkAsDead(); - return false; - } -diff --git dom/ipc/ContentProcess.cpp dom/ipc/ContentProcess.cpp -index e3c1f16910c6..2441c8cb9224 100644 ---- dom/ipc/ContentProcess.cpp -+++ dom/ipc/ContentProcess.cpp -@@ -8,6 +8,8 @@ - - #include "ContentProcess.h" - #include "ContentPrefs.h" -+#include "base/shared_memory.h" -+#include "mozilla/Preferences.h" - #include "mozilla/Scheduler.h" - - #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX) -@@ -15,7 +17,6 @@ - #endif - - #if (defined(XP_WIN) || defined(XP_MACOSX)) && defined(MOZ_CONTENT_SANDBOX) --#include "mozilla/Preferences.h" - #include "mozilla/SandboxSettings.h" - #include "nsAppDirectoryServiceDefs.h" - #include "nsDirectoryService.h" -@@ -76,14 +77,21 @@ static void SetUpSandboxEnvironment() { - } - #endif - -+#ifdef ANDROID -+static int gPrefsFd = -1; -+ -+void SetPrefsFd(int aFd) { gPrefsFd = aFd; } -+#endif -+ - bool ContentProcess::Init(int aArgc, char* aArgv[]) { - // If passed in grab the application path for xpcom init - bool foundAppdir = false; - bool foundChildID = false; - bool foundIsForBrowser = false; -- bool foundIntPrefs = false; -- bool foundBoolPrefs = false; -- bool foundStringPrefs = false; -+#ifdef XP_WIN -+ bool foundPrefsHandle = false; -+#endif -+ bool foundPrefsLen = false; - bool foundSchedulerPrefs = false; - - uint64_t childID; -@@ -96,7 +104,8 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) { - #endif - - char* schedulerPrefs = nullptr; -- InfallibleTArray prefsArray; -+ base::SharedMemoryHandle prefsHandle = base::SharedMemory::NULLHandle(); -+ size_t prefsLen = 0; - for (int idx = aArgc; idx > 0; idx--) { - if (!aArgv[idx]) { - continue; -@@ -128,55 +137,24 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) { - } - isForBrowser = strcmp(aArgv[idx], "-notForBrowser"); - foundIsForBrowser = true; -- } else if (!strcmp(aArgv[idx], "-intPrefs")) { -+#ifdef XP_WIN -+ } else if (!strcmp(aArgv[idx], "-prefsHandle")) { - char* str = aArgv[idx + 1]; -- while (*str) { -- int32_t index = strtol(str, &str, 10); -- MOZ_ASSERT(str[0] == ':'); -- str++; -- MaybePrefValue value( -- PrefValue(static_cast(strtol(str, &str, 10)))); -- MOZ_ASSERT(str[0] == '|'); -- str++; -- // XXX: we assume these values as default values, which may not be -- // true. We also assume they are unlocked. Fortunately, these prefs -- // get reset properly by the first IPC message. -- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, MaybePrefValue()); -- prefsArray.AppendElement(pref); -- } -- foundIntPrefs = true; -- } else if (!strcmp(aArgv[idx], "-boolPrefs")) { -+ MOZ_ASSERT(str[0] != '\0'); -+ // ContentParent uses %zu to print a word-sized unsigned integer. So even -+ // though strtoull() returns a long long int, it will fit in a uintptr_t. -+ prefsHandle = reinterpret_cast(strtoull(str, &str, 10)); -+ MOZ_ASSERT(str[0] == '\0'); -+ foundPrefsHandle = true; -+#endif -+ } else if (!strcmp(aArgv[idx], "-prefsLen")) { - char* str = aArgv[idx + 1]; -- while (*str) { -- int32_t index = strtol(str, &str, 10); -- MOZ_ASSERT(str[0] == ':'); -- str++; -- MaybePrefValue value(PrefValue(!!strtol(str, &str, 10))); -- MOZ_ASSERT(str[0] == '|'); -- str++; -- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, MaybePrefValue()); -- prefsArray.AppendElement(pref); -- } -- foundBoolPrefs = true; -- } else if (!strcmp(aArgv[idx], "-stringPrefs")) { -- char* str = aArgv[idx + 1]; -- while (*str) { -- int32_t index = strtol(str, &str, 10); -- MOZ_ASSERT(str[0] == ':'); -- str++; -- int32_t length = strtol(str, &str, 10); -- MOZ_ASSERT(str[0] == ';'); -- str++; -- MaybePrefValue value(PrefValue(nsCString(str, length))); -- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, MaybePrefValue()); -- prefsArray.AppendElement(pref); -- str += length + 1; -- MOZ_ASSERT(*(str - 1) == '|'); -- } -- foundStringPrefs = true; -+ MOZ_ASSERT(str[0] != '\0'); -+ // ContentParent uses %zu to print a word-sized unsigned integer. So even -+ // though strtoull() returns a long long int, it will fit in a uintptr_t. -+ prefsLen = strtoull(str, &str, 10); -+ MOZ_ASSERT(str[0] == '\0'); -+ foundPrefsLen = true; - } else if (!strcmp(aArgv[idx], "-schedulerPrefs")) { - schedulerPrefs = aArgv[idx + 1]; - foundSchedulerPrefs = true; -@@ -201,19 +179,42 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) { - #endif /* XP_MACOSX && MOZ_CONTENT_SANDBOX */ - - bool allFound = foundAppdir && foundChildID && foundIsForBrowser && -- foundIntPrefs && foundBoolPrefs && foundStringPrefs && -- foundSchedulerPrefs; -- -+ foundPrefsLen && foundSchedulerPrefs -+#ifdef XP_WIN -+ && foundPrefsHandle -+#endif - #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX) -- allFound &= foundProfile; -+ && foundProfile - #endif -+ && true; - - if (allFound) { - break; - } - } - -- Preferences::SetEarlyPreferences(&prefsArray); -+#ifdef ANDROID -+ // Android is different; get the FD via gPrefsFd instead of a fixed fd. -+ MOZ_RELEASE_ASSERT(gPrefsFd != -1); -+ prefsHandle = base::FileDescriptor(gPrefsFd, /* auto_close */ true); -+#elif XP_UNIX -+ prefsHandle = base::FileDescriptor(kPrefsFileDescriptor, -+ /* auto_close */ true); -+#endif -+ -+ // Set up early prefs from the shared memory. -+ base::SharedMemory shm; -+ if (!shm.SetHandle(prefsHandle, /* read_only */ true)) { -+ NS_ERROR("failed to open shared memory in the child"); -+ return false; -+ } -+ if (!shm.Map(prefsLen)) { -+ NS_ERROR("failed to map shared memory in the child"); -+ return false; -+ } -+ Preferences::DeserializeEarlyPreferences(static_cast(shm.memory()), -+ prefsLen); -+ - Scheduler::SetPrefs(schedulerPrefs); - mContent.Init(IOThreadChild::message_loop(), ParentPid(), - IOThreadChild::channel(), childID, isForBrowser); -diff --git dom/ipc/ContentProcess.h dom/ipc/ContentProcess.h -index a3854c761e10..6582c94da496 100644 ---- dom/ipc/ContentProcess.h -+++ dom/ipc/ContentProcess.h -@@ -45,6 +45,11 @@ class ContentProcess : public mozilla::ipc::ProcessChi - DISALLOW_EVIL_CONSTRUCTORS(ContentProcess); - }; - -+#ifdef ANDROID -+// Android doesn't use -prefsHandle, it gets that FD another way. -+void SetPrefsFd(int aFd); -+#endif -+ - } // namespace dom - } // namespace mozilla - -diff --git ipc/chromium/src/base/process_util_win.cc ipc/chromium/src/base/process_util_win.cc -index 3ed54cd744ac..46667985cd71 100644 ---- ipc/chromium/src/base/process_util_win.cc -+++ ipc/chromium/src/base/process_util_win.cc -@@ -320,6 +320,11 @@ bool LaunchApp(const std::wstring& cmdline, const Laun - LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL; - std::vector handlesToInherit; - for (HANDLE h : options.handles_to_inherit) { -+ if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) == -+ 0) { -+ MOZ_DIAGNOSTIC_ASSERT(false, "SetHandleInformation failed"); -+ return false; -+ } - handlesToInherit.push_back(h); - } - -diff --git ipc/glue/GeckoChildProcessHost.cpp ipc/glue/GeckoChildProcessHost.cpp -index d18ed9edd4ca..3be1c51d10bb 100644 ---- ipc/glue/GeckoChildProcessHost.cpp -+++ ipc/glue/GeckoChildProcessHost.cpp -@@ -1018,9 +1018,6 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal - - if (!CrashReporter::IsDummy()) { - PROsfd h = PR_FileDesc2NativeHandle(crashAnnotationWritePipe); --#if defined(MOZ_SANDBOX) -- mSandboxBroker.AddHandleToShare(reinterpret_cast(h)); --#endif // defined(MOZ_SANDBOX) - mLaunchOptions->handles_to_inherit.push_back(reinterpret_cast(h)); - std::string hStr = std::to_string(h); - cmdLine.AppendLooseValue(UTF8ToWide(hStr)); -@@ -1031,6 +1028,11 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal - - #if defined(MOZ_SANDBOX) - if (shouldSandboxCurrentProcess) { -+ // Mark the handles to inherit as inheritable. -+ for (HANDLE h : mLaunchOptions->handles_to_inherit) { -+ mSandboxBroker.AddHandleToShare(h); -+ } -+ - if (mSandboxBroker.LaunchApp(cmdLine.program().c_str(), - cmdLine.command_line_string().c_str(), - mLaunchOptions->env_map, mProcessType, -@@ -1154,7 +1156,7 @@ void GeckoChildProcessHost::LaunchAndroidService( - const char* type, const std::vector& argv, - const base::file_handle_mapping_vector& fds_to_remap, - ProcessHandle* process_handle) { -- MOZ_ASSERT((fds_to_remap.size() > 0) && (fds_to_remap.size() <= 3)); -+ MOZ_RELEASE_ASSERT((2 <= fds_to_remap.size()) && (fds_to_remap.size() <= 4)); - JNIEnv* const env = mozilla::jni::GetEnvForThread(); - MOZ_ASSERT(env); - -@@ -1164,23 +1166,26 @@ void GeckoChildProcessHost::LaunchAndroidService( - for (int ix = 0; ix < argvSize; ix++) { - jargs->SetElement(ix, jni::StringParam(argv[ix].c_str(), env)); - } -- base::file_handle_mapping_vector::const_iterator it = fds_to_remap.begin(); -- int32_t ipcFd = it->first; -- it++; -- // If the Crash Reporter is disabled, there will not be a second file -- // descriptor. -+ -+ // XXX: this processing depends entirely on the internals of -+ // ContentParent::LaunchSubprocess() -+ // GeckoChildProcessHost::PerformAsyncLaunchInternal(), and the order in -+ // which they append to fds_to_remap. There must be a better way to do it. -+ // See bug 1440207. -+ int32_t prefsFd = fds_to_remap[0].first; -+ int32_t ipcFd = fds_to_remap[1].first; - int32_t crashFd = -1; - int32_t crashAnnotationFd = -1; -- if (it != fds_to_remap.end() && !CrashReporter::IsDummy()) { -- crashFd = it->first; -- it++; -+ if (fds_to_remap.size() == 3) { -+ crashAnnotationFd = fds_to_remap[2].first; - } -- if (it != fds_to_remap.end()) { -- crashAnnotationFd = it->first; -- it++; -+ if (fds_to_remap.size() == 4) { -+ crashFd = fds_to_remap[2].first; -+ crashAnnotationFd = fds_to_remap[3].first; - } -- int32_t handle = java::GeckoProcessManager::Start(type, jargs, ipcFd, crashFd, -- crashAnnotationFd); -+ -+ int32_t handle = java::GeckoProcessManager::Start(type, jargs, prefsFd, ipcFd, -+ crashFd, crashAnnotationFd); - - if (process_handle) { - *process_handle = handle; -diff --git ipc/glue/GeckoChildProcessHost.h ipc/glue/GeckoChildProcessHost.h -index 631c42066bc7..0345e221abcc 100644 ---- ipc/glue/GeckoChildProcessHost.h -+++ ipc/glue/GeckoChildProcessHost.h -@@ -94,6 +94,16 @@ class GeckoChildProcessHost : public ChildProcessHost - task_t GetChildTask() { return mChildTask; } - #endif - -+#ifdef XP_WIN -+ void AddHandleToShare(HANDLE aHandle) { -+ mLaunchOptions->handles_to_inherit.push_back(aHandle); -+ } -+#else -+ void AddFdToRemap(int aSrcFd, int aDstFd) { -+ mLaunchOptions->fds_to_remap.push_back(std::make_pair(aSrcFd, aDstFd)); -+ } -+#endif -+ - /** - * Must run on the IO thread. Cause the OS process to exit and - * ensure its OS resources are cleaned up. -diff --git mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl -index ba26ae1ba06b..a2535f44c72b 100644 ---- mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl -+++ mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl -@@ -12,6 +12,7 @@ import android.os.ParcelFileDescriptor; - interface IChildProcess { - int getPid(); - boolean start(in IProcessManager procMan, in String[] args, in Bundle extras, -- in ParcelFileDescriptor ipcPfd, in ParcelFileDescriptor crashReporterPfd, -+ in ParcelFileDescriptor prefsPfd, in ParcelFileDescriptor ipcPfd, -+ in ParcelFileDescriptor crashReporterPfd, - in ParcelFileDescriptor crashAnnotationPfd); - } -diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java -index dfabfd05daf0..8311920afeec 100644 ---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java -+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java -@@ -128,6 +128,7 @@ public class GeckoThread extends Thread { - public static final int FLAG_PRELOAD_CHILD = 2; // Preload child during main thread start. - - private static final String EXTRA_ARGS = "args"; -+ private static final String EXTRA_PREFS_FD = "prefsFd"; - private static final String EXTRA_IPC_FD = "ipcFd"; - private static final String EXTRA_CRASH_FD = "crashFd"; - private static final String EXTRA_CRASH_ANNOTATION_FD = "crashAnnotationFd"; -@@ -149,7 +150,8 @@ public class GeckoThread extends Thread { - - private synchronized boolean init(final GeckoProfile profile, final String[] args, - final Bundle extras, final int flags, -- final int ipcFd, final int crashFd, -+ final int prefsFd, final int ipcFd, -+ final int crashFd, - final int crashAnnotationFd) { - ThreadUtils.assertOnUiThread(); - uiThreadId = android.os.Process.myTid(); -@@ -163,6 +165,7 @@ public class GeckoThread extends Thread { - mFlags = flags; - - mExtras = (extras != null) ? new Bundle(extras) : new Bundle(3); -+ mExtras.putInt(EXTRA_PREFS_FD, prefsFd); - mExtras.putInt(EXTRA_IPC_FD, ipcFd); - mExtras.putInt(EXTRA_CRASH_FD, crashFd); - mExtras.putInt(EXTRA_CRASH_ANNOTATION_FD, crashAnnotationFd); -@@ -174,15 +177,16 @@ public class GeckoThread extends Thread { - - public static boolean initMainProcess(final GeckoProfile profile, final String[] args, - final Bundle extras, final int flags) { -- return INSTANCE.init(profile, args, extras, flags, -+ return INSTANCE.init(profile, args, extras, flags, /* fd */ -1, - /* fd */ -1, /* fd */ -1, /* fd */ -1); - } - - public static boolean initChildProcess(final String[] args, final Bundle extras, -- final int ipcFd, final int crashFd, -+ final int prefsFd, final int ipcFd, -+ final int crashFd, - final int crashAnnotationFd) { - return INSTANCE.init(/* profile */ null, args, extras, /* flags */ 0, -- ipcFd, crashFd, crashAnnotationFd); -+ prefsFd, ipcFd, crashFd, crashAnnotationFd); - } - - private static boolean canUseProfile(final Context context, final GeckoProfile profile, -@@ -442,6 +446,7 @@ public class GeckoThread extends Thread { - - // And go. - GeckoLoader.nativeRun(args, -+ mExtras.getInt(EXTRA_PREFS_FD, -1), - mExtras.getInt(EXTRA_IPC_FD, -1), - mExtras.getInt(EXTRA_CRASH_FD, -1), - mExtras.getInt(EXTRA_CRASH_ANNOTATION_FD, -1)); -diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java -index b1830fd86945..ac128b651e7b 100644 ---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java -+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java -@@ -463,7 +463,7 @@ public final class GeckoLoader { - public static native boolean verifyCRCs(String apkName); - - // These methods are implemented in mozglue/android/APKOpen.cpp -- public static native void nativeRun(String[] args, int ipcFd, int crashFd, int crashAnnotationFd); -+ public static native void nativeRun(String[] args, int prefsFd, int ipcFd, int crashFd, int crashAnnotationFd); - private static native void loadGeckoLibsNative(String apkName); - private static native void loadSQLiteLibsNative(String apkName); - private static native void loadNSSLibsNative(String apkName); -diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java -index b762e1c9a3eb..dba329ba8f92 100644 ---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java -+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java -@@ -169,14 +169,14 @@ public final class GeckoProcessManager extends IProcessManager.Stub { - - @WrapForJNI - private static int start(final String type, final String[] args, -- final int ipcFd, final int crashFd, -- final int crashAnnotationFd) { -- return INSTANCE.start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ false); -+ final int prefsFd, final int ipcFd, -+ final int crashFd, final int crashAnnotationFd) { -+ return INSTANCE.start(type, args, prefsFd, ipcFd, crashFd, crashAnnotationFd, /* retry */ false); - } - -- private int start(final String type, final String[] args, final int ipcFd, -- final int crashFd, final int crashAnnotationFd, -- final boolean retry) { -+ private int start(final String type, final String[] args, final int prefsFd, -+ final int ipcFd, final int crashFd, -+ final int crashAnnotationFd, final boolean retry) { - final ChildConnection connection = getConnection(type); - final IChildProcess child = connection.bind(); - if (child == null) { -@@ -184,10 +184,12 @@ public final class GeckoProcessManager extends IProcessManager.Stub { - } - - final Bundle extras = GeckoThread.getActiveExtras(); -+ final ParcelFileDescriptor prefsPfd; - final ParcelFileDescriptor ipcPfd; - final ParcelFileDescriptor crashPfd; - final ParcelFileDescriptor crashAnnotationPfd; - try { -+ prefsPfd = ParcelFileDescriptor.fromFd(prefsFd); - ipcPfd = ParcelFileDescriptor.fromFd(ipcFd); - crashPfd = (crashFd >= 0) ? ParcelFileDescriptor.fromFd(crashFd) : null; - crashAnnotationPfd = (crashAnnotationFd >= 0) ? ParcelFileDescriptor.fromFd(crashAnnotationFd) : null; -@@ -198,7 +200,8 @@ public final class GeckoProcessManager extends IProcessManager.Stub { - - boolean started = false; - try { -- started = child.start(this, args, extras, ipcPfd, crashPfd, crashAnnotationPfd); -+ started = child.start(this, args, extras, prefsPfd, ipcPfd, crashPfd, -+ crashAnnotationPfd); - } catch (final RemoteException e) { - } - -@@ -209,7 +212,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub { - } - Log.w(LOGTAG, "Attempting to kill running child " + type); - connection.unbind(); -- return start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ true); -+ return start(type, args, prefsFd, ipcFd, crashFd, crashAnnotationFd, /* retry */ true); - } - - try { -diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java -index f1f6ce109fda..6dc19813fc10 100644 ---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java -+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java -@@ -63,6 +63,7 @@ public class GeckoServiceChildProcess extends Service { - public boolean start(final IProcessManager procMan, - final String[] args, - final Bundle extras, -+ final ParcelFileDescriptor prefsPfd, - final ParcelFileDescriptor ipcPfd, - final ParcelFileDescriptor crashReporterPfd, - final ParcelFileDescriptor crashAnnotationPfd) { -@@ -74,6 +75,7 @@ public class GeckoServiceChildProcess extends Service { - sProcessManager = procMan; - } - -+ final int prefsFd = prefsPfd.detachFd(); - final int ipcFd = ipcPfd.detachFd(); - final int crashReporterFd = crashReporterPfd != null ? - crashReporterPfd.detachFd() : -1; -@@ -83,7 +85,7 @@ public class GeckoServiceChildProcess extends Service { - ThreadUtils.postToUiThread(new Runnable() { - @Override - public void run() { -- if (GeckoThread.initChildProcess(args, extras, ipcFd, crashReporterFd, -+ if (GeckoThread.initChildProcess(args, extras, prefsFd, ipcFd, crashReporterFd, - crashAnnotationFd)) { - GeckoThread.launch(); - } -diff --git modules/libpref/Preferences.cpp modules/libpref/Preferences.cpp -index 330ed4a09b54..b884591c9271 100644 ---- modules/libpref/Preferences.cpp -+++ modules/libpref/Preferences.cpp -@@ -2637,7 +2637,7 @@ class AddPreferencesMemoryReporterRunnable : public Ru - - } // namespace - --// A list of prefs sent early from the parent, via the command line. -+// A list of prefs sent early from the parent, via shared memory. - static InfallibleTArray* gEarlyDomPrefs; - - /* static */ already_AddRefed -@@ -2782,12 +2782,123 @@ Preferences::~Preferences() { - NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch, - nsISupportsWeakReference) - --/* static */ void Preferences::SetEarlyPreferences( -- const nsTArray* aDomPrefs) { -+/* static */ void Preferences::SerializeEarlyPreferences(nsCString& aStr) { -+ MOZ_RELEASE_ASSERT(InitStaticMembers()); -+ -+ nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs; -+ size_t numEarlyPrefs; -+ dom::ContentPrefs::GetEarlyPrefs(&numEarlyPrefs); -+ -+ for (unsigned int i = 0; i < numEarlyPrefs; i++) { -+ const char* prefName = dom::ContentPrefs::GetEarlyPref(i); -+ MOZ_ASSERT_IF(i > 0, -+ strcmp(prefName, dom::ContentPrefs::GetEarlyPref(i - 1)) > 0); -+ -+ Pref* pref = pref_HashTableLookup(prefName); -+ if (!pref || !pref->MustSendToContentProcesses()) { -+ continue; -+ } -+ -+ switch (pref->Type()) { -+ case PrefType::Bool: -+ boolPrefs.Append( -+ nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName))); -+ break; -+ case PrefType::Int: -+ intPrefs.Append( -+ nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName))); -+ break; -+ case PrefType::String: { -+ nsAutoCString value; -+ Preferences::GetCString(prefName, value); -+ stringPrefs.Append( -+ nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get())); -+ } break; -+ case PrefType::None: -+ break; -+ default: -+ printf_stderr("preference type: %d\n", int(pref->Type())); -+ MOZ_CRASH(); -+ } -+ } -+ -+ aStr.Truncate(); -+ aStr.Append(boolPrefs); -+ aStr.Append('\n'); -+ aStr.Append(intPrefs); -+ aStr.Append('\n'); -+ aStr.Append(stringPrefs); -+ aStr.Append('\n'); -+ aStr.Append('\0'); -+} -+ -+/* static */ void Preferences::DeserializeEarlyPreferences(char* aStr, -+ size_t aStrLen) { - MOZ_ASSERT(!XRE_IsParentProcess()); - -- gEarlyDomPrefs = new InfallibleTArray(mozilla::Move(*aDomPrefs)); -+ MOZ_ASSERT(!gEarlyDomPrefs); -+ gEarlyDomPrefs = new InfallibleTArray(); - -+ char* p = aStr; -+ -+ // XXX: we assume these pref values are default values, which may not be -+ // true. We also assume they are unlocked. Fortunately, these prefs get reset -+ // properly by the first IPC message. -+ -+ // Get the bool prefs. -+ while (*p != '\n') { -+ int32_t index = strtol(p, &p, 10); -+ MOZ_ASSERT(p[0] == ':'); -+ p++; -+ int v = strtol(p, &p, 10); -+ MOZ_ASSERT(v == 0 || v == 1); -+ dom::MaybePrefValue value(dom::PrefValue(!!v)); -+ MOZ_ASSERT(p[0] == '|'); -+ p++; -+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -+ /* isLocked */ false, value, dom::MaybePrefValue()); -+ gEarlyDomPrefs->AppendElement(pref); -+ } -+ p++; -+ -+ // Get the int prefs. -+ while (*p != '\n') { -+ int32_t index = strtol(p, &p, 10); -+ MOZ_ASSERT(p[0] == ':'); -+ p++; -+ dom::MaybePrefValue value( -+ dom::PrefValue(static_cast(strtol(p, &p, 10)))); -+ MOZ_ASSERT(p[0] == '|'); -+ p++; -+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -+ /* isLocked */ false, value, dom::MaybePrefValue()); -+ gEarlyDomPrefs->AppendElement(pref); -+ } -+ p++; -+ -+ // Get the string prefs. -+ while (*p != '\n') { -+ int32_t index = strtol(p, &p, 10); -+ MOZ_ASSERT(p[0] == ':'); -+ p++; -+ int32_t length = strtol(p, &p, 10); -+ MOZ_ASSERT(p[0] == ';'); -+ p++; -+ dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length))); -+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -+ /* isLocked */ false, value, dom::MaybePrefValue()); -+ gEarlyDomPrefs->AppendElement(pref); -+ p += length + 1; -+ MOZ_ASSERT(*(p - 1) == '|'); -+ } -+ p++; -+ -+ MOZ_ASSERT(*p == '\0'); -+ -+ // We finished parsing on a '\0'. That should be the last char in the shared -+ // memory. -+ MOZ_ASSERT(aStr + aStrLen - 1 == p); -+ - #ifdef DEBUG - MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet); - gPhase = ContentProcessPhase::eEarlyPrefsSet; -@@ -3894,14 +4005,6 @@ static nsresult pref_ReadPrefFromJar(nsZipArchive* aJa - - Pref* pref = pref_HashTableLookup(aPrefName); - return pref && pref->HasUserValue(); --} -- --/* static */ bool Preferences::MustSendToContentProcesses( -- const char* aPrefName) { -- NS_ENSURE_TRUE(InitStaticMembers(), false); -- -- Pref* pref = pref_HashTableLookup(aPrefName); -- return pref && pref->MustSendToContentProcesses(); - } - - /* static */ int32_t Preferences::GetType(const char* aPrefName) { -diff --git modules/libpref/Preferences.h modules/libpref/Preferences.h -index 1cb825ecbfe5..c149db62b525 100644 ---- modules/libpref/Preferences.h -+++ modules/libpref/Preferences.h -@@ -41,6 +41,11 @@ class PrefValue; - - struct PrefsSizes; - -+#ifdef XP_UNIX -+// XXX: bug 1440207 is about improving how fixed fds such as this are used. -+static const int kPrefsFileDescriptor = 8; -+#endif -+ - // Keep this in sync with PrefType in parser/src/lib.rs. - enum class PrefValueKind : uint8_t { Default, User }; - -@@ -191,9 +196,6 @@ class Preferences final : public nsIPrefService, - // Whether the pref has a user value or not. - static bool HasUserValue(const char* aPref); - -- // Must the pref be sent to content processes when they start? -- static bool MustSendToContentProcesses(const char* aPref); -- - // Adds/Removes the observer for the root pref branch. See nsIPrefBranch.idl - // for details. - static nsresult AddStrongObserver(nsIObserver* aObserver, const char* aPref); -@@ -277,11 +279,12 @@ class Preferences final : public nsIPrefService, - - // When a content process is created these methods are used to pass prefs in - // bulk from the parent process. "Early" preferences are ones that are needed -- // very early on in the content process's lifetime; they are passed via the -- // command line. "Late" preferences are the remainder, which are passed via -- // IPC message. -+ // very early on in the content process's lifetime; they are passed via a -+ // special shared memory segment. "Late" preferences are the remainder, which -+ // are passed via a standard IPC message. -+ static void SerializeEarlyPreferences(nsCString& aStr); -+ static void DeserializeEarlyPreferences(char* aStr, size_t aStrLen); - static void GetPreferences(InfallibleTArray* aSettings); -- static void SetEarlyPreferences(const nsTArray* aSettings); - static void SetLatePreferences(const nsTArray* aSettings); - - // When a single pref is changed in the parent process, these methods are -diff --git mozglue/android/APKOpen.cpp mozglue/android/APKOpen.cpp -index 5f1ef55b605e..b57192488725 100644 ---- mozglue/android/APKOpen.cpp -+++ mozglue/android/APKOpen.cpp -@@ -378,7 +378,8 @@ static void FreeArgv(char** argv, int argc) { - extern "C" APKOPEN_EXPORT void MOZ_JNICALL - Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv* jenv, jclass jc, - jobjectArray jargs, -- int ipcFd, int crashFd, -+ int prefsFd, int ipcFd, -+ int crashFd, - int crashAnnotationFd) { - int argc = 0; - char** argv = CreateArgvFromObjectArray(jenv, jargs, &argc); -@@ -393,7 +394,8 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(J - gBootstrap->GeckoStart(jenv, argv, argc, sAppData); - ElfLoader::Singleton.ExpectShutdown(true); - } else { -- gBootstrap->XRE_SetAndroidChildFds(jenv, ipcFd, crashFd, crashAnnotationFd); -+ gBootstrap->XRE_SetAndroidChildFds(jenv, prefsFd, ipcFd, crashFd, -+ crashAnnotationFd); - gBootstrap->XRE_SetProcessType(argv[argc - 1]); - - XREChildData childData; -diff --git toolkit/xre/Bootstrap.cpp toolkit/xre/Bootstrap.cpp -index 5688519822a9..7e857969a4fb 100644 ---- toolkit/xre/Bootstrap.cpp -+++ toolkit/xre/Bootstrap.cpp -@@ -71,9 +71,11 @@ class BootstrapImpl final : public Bootstrap { - ::GeckoStart(aEnv, argv, argc, aAppData); - } - -- virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd, -+ virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd, -+ int aCrashFd, - int aCrashAnnotationFd) override { -- ::XRE_SetAndroidChildFds(aEnv, aIPCFd, aCrashFd, aCrashAnnotationFd); -+ ::XRE_SetAndroidChildFds(aEnv, aPrefsFd, aIPCFd, aCrashFd, -+ aCrashAnnotationFd); - } - #endif - -diff --git toolkit/xre/Bootstrap.h toolkit/xre/Bootstrap.h -index 686d0a38e324..77adcef80e1f 100644 ---- toolkit/xre/Bootstrap.h -+++ toolkit/xre/Bootstrap.h -@@ -112,8 +112,8 @@ class Bootstrap { - virtual void GeckoStart(JNIEnv* aEnv, char** argv, int argc, - const StaticXREAppData& aAppData) = 0; - -- virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd, -- int aCrashAnnotationFd) = 0; -+ virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd, -+ int aCrashFd, int aCrashAnnotationFd) = 0; - #endif - - #ifdef LIBFUZZER -diff --git toolkit/xre/nsEmbedFunctions.cpp toolkit/xre/nsEmbedFunctions.cpp -index 53bd2bc2eb47..83184e97ba92 100644 ---- toolkit/xre/nsEmbedFunctions.cpp -+++ toolkit/xre/nsEmbedFunctions.cpp -@@ -226,9 +226,10 @@ GeckoProcessType sChildProcessType = GeckoProcessType_ - } // namespace mozilla - - #if defined(MOZ_WIDGET_ANDROID) --void XRE_SetAndroidChildFds(JNIEnv* env, int ipcFd, int crashFd, -+void XRE_SetAndroidChildFds(JNIEnv* env, int prefsFd, int ipcFd, int crashFd, - int crashAnnotationFd) { - mozilla::jni::SetGeckoThreadEnv(env); -+ mozilla::dom::SetPrefsFd(prefsFd); - IPC::Channel::SetClientChannelFd(ipcFd); - CrashReporter::SetNotificationPipeForChild(crashFd); - CrashReporter::SetCrashAnnotationPipeForChild(crashAnnotationFd); -diff --git widget/android/GeneratedJNIWrappers.cpp widget/android/GeneratedJNIWrappers.cpp -index e3f6af0cc575..4165df59f0e8 100644 ---- widget/android/GeneratedJNIWrappers.cpp -+++ widget/android/GeneratedJNIWrappers.cpp -@@ -2355,9 +2355,9 @@ constexpr char GeckoProcessManager::GetEditableParent_t::signature[]; - constexpr char GeckoProcessManager::Start_t::name[]; - constexpr char GeckoProcessManager::Start_t::signature[]; - --auto GeckoProcessManager::Start(mozilla::jni::String::Param a0, mozilla::jni::ObjectArray::Param a1, int32_t a2, int32_t a3, int32_t a4) -> int32_t -+auto GeckoProcessManager::Start(mozilla::jni::String::Param a0, mozilla::jni::ObjectArray::Param a1, int32_t a2, int32_t a3, int32_t a4, int32_t a5) -> int32_t - { -- return mozilla::jni::Method::Call(GeckoProcessManager::Context(), nullptr, a0, a1, a2, a3, a4); -+ return mozilla::jni::Method::Call(GeckoProcessManager::Context(), nullptr, a0, a1, a2, a3, a4, a5); - } - - const char GeckoServiceChildProcess::name[] = -diff --git widget/android/GeneratedJNIWrappers.h widget/android/GeneratedJNIWrappers.h -index ece79ac94a71..228affa1e550 100644 ---- widget/android/GeneratedJNIWrappers.h -+++ widget/android/GeneratedJNIWrappers.h -@@ -6696,10 +6696,11 @@ public: - mozilla::jni::ObjectArray::Param, - int32_t, - int32_t, -+ int32_t, - int32_t> Args; - static constexpr char name[] = "start"; - static constexpr char signature[] = -- "(Ljava/lang/String;[Ljava/lang/String;III)I"; -+ "(Ljava/lang/String;[Ljava/lang/String;IIII)I"; - static const bool isStatic = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; -@@ -6709,7 +6710,7 @@ public: - mozilla::jni::DispatchTarget::CURRENT; - }; - -- static auto Start(mozilla::jni::String::Param, mozilla::jni::ObjectArray::Param, int32_t, int32_t, int32_t) -> int32_t; -+ static auto Start(mozilla::jni::String::Param, mozilla::jni::ObjectArray::Param, int32_t, int32_t, int32_t, int32_t) -> int32_t; - - static const mozilla::jni::CallingThread callingThread = - mozilla::jni::CallingThread::ANY; -diff --git xpcom/build/nsXULAppAPI.h xpcom/build/nsXULAppAPI.h -index 94f6daf864c9..d6ac10d51d76 100644 ---- xpcom/build/nsXULAppAPI.h -+++ xpcom/build/nsXULAppAPI.h -@@ -378,7 +378,8 @@ XRE_API(const char*, XRE_ChildProcessTypeToString, - - #if defined(MOZ_WIDGET_ANDROID) - XRE_API(void, XRE_SetAndroidChildFds, -- (JNIEnv * env, int ipcFd, int crashFd, int crashAnnotationFd)) -+ (JNIEnv * env, int prefsFd, int ipcFd, int crashFd, -+ int crashAnnotationFd)) - #endif // defined(MOZ_WIDGET_ANDROID) - - XRE_API(void, XRE_SetProcessType, (const char* aProcessTypeString)) diff --git a/mail/thunderbird/files/patch-bug1442583 b/mail/thunderbird/files/patch-bug1442583 deleted file mode 100644 index 902a5f268283..000000000000 --- a/mail/thunderbird/files/patch-bug1442583 +++ /dev/null @@ -1,43 +0,0 @@ -commit 7371a080accd -Author: Lars T Hansen -Date: Mon Mar 5 09:55:28 2018 +0100 - - Bug 1442583 - Properly initialize ARM64 icache flushing machinery. r=sstangl - - --HG-- - extra : rebase_source : 73b5921da1fa0a19d6072e35d09bd7b528bb6bfc - extra : intermediate-source : 19516efbbf6750ba04e11c7099586d5be2fe818f - extra : source : 4316cc82d6302edf839a4af6fcb815f0ffa9f65c ---- - js/src/jit/ProcessExecutableMemory.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git js/src/jit/ProcessExecutableMemory.cpp js/src/jit/ProcessExecutableMemory.cpp -index e763a9d68dc17..8a6d50b6a7845 100644 ---- js/src/jit/ProcessExecutableMemory.cpp -+++ js/src/jit/ProcessExecutableMemory.cpp -@@ -20,6 +20,9 @@ - #include "jsutil.h" - - #include "gc/Memory.h" -+#ifdef JS_CODEGEN_ARM64 -+#include "jit/arm64/vixl/Cpu-vixl.h" -+#endif - #include "threading/LockGuard.h" - #include "threading/Mutex.h" - #include "util/Windows.h" -@@ -574,7 +577,13 @@ void js::jit::DeallocateExecutableMemory(void* addr, s - execMemory.deallocate(addr, bytes, /* decommit = */ true); - } - --bool js::jit::InitProcessExecutableMemory() { return execMemory.init(); } -+bool js::jit::InitProcessExecutableMemory() { -+#ifdef JS_CODEGEN_ARM64 -+ // Initialize instruction cache flushing. -+ vixl::CPU::SetUp(); -+#endif -+ return execMemory.init(); -+} - - void js::jit::ReleaseProcessExecutableMemory() { execMemory.release(); } - diff --git a/mail/thunderbird/files/patch-bug1444798 b/mail/thunderbird/files/patch-bug1444798 deleted file mode 100644 index 2268bc9d4484..000000000000 --- a/mail/thunderbird/files/patch-bug1444798 +++ /dev/null @@ -1,45 +0,0 @@ -commit 7871e211ec43 -Author: sotaro -Date: Fri Mar 16 21:03:59 2018 +0900 - - Bug 1444798 - Fix ExternalImageCallback func types r=jrmuizel ---- - gfx/webrender_bindings/src/bindings.rs | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git gfx/webrender_bindings/src/bindings.rs gfx/webrender_bindings/src/bindings.rs -index 8517d7dd33e5..cf885ee713f3 100644 ---- gfx/webrender_bindings/src/bindings.rs -+++ gfx/webrender_bindings/src/bindings.rs -@@ -312,8 +312,8 @@ struct WrExternalImage { - size: usize, - } - --type LockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage; --type UnlockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8); -+type LockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage; -+type UnlockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8); - - #[repr(C)] - pub struct WrExternalImageHandler { -@@ -327,7 +327,8 @@ impl ExternalImageHandler for WrExternalImageHandler { - id: ExternalImageId, - channel_index: u8) - -> ExternalImage { -- let image = (self.lock_func)(self.external_image_obj, id.into(), channel_index); -+ -+ let image = unsafe { (self.lock_func)(self.external_image_obj, id.into(), channel_index) }; - ExternalImage { - uv: TexelRect::new(image.u0, image.v0, image.u1, image.v1), - source: match image.image_type { -@@ -341,7 +342,9 @@ impl ExternalImageHandler for WrExternalImageHandler { - fn unlock(&mut self, - id: ExternalImageId, - channel_index: u8) { -- (self.unlock_func)(self.external_image_obj, id.into(), channel_index); -+ unsafe { -+ (self.unlock_func)(self.external_image_obj, id.into(), channel_index); -+ } - } - } - diff --git a/mail/thunderbird/files/patch-bug1445907 b/mail/thunderbird/files/patch-bug1445907 deleted file mode 100644 index 924ac0aa7cd7..000000000000 --- a/mail/thunderbird/files/patch-bug1445907 +++ /dev/null @@ -1,75 +0,0 @@ -commit 0c6dd4a750db -Author: Lars T Hansen -Date: Mon Mar 19 09:58:06 2018 +0100 - - Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl ---- - js/src/irregexp/NativeRegExpMacroAssembler.cpp | 25 ++++++++++++++++++++++++- - js/src/jit-test/tests/regexp/bug1445907.js | 15 +++++++++++++++ - 2 files changed, 39 insertions(+), 1 deletion(-) - -diff --git js/src/irregexp/NativeRegExpMacroAssembler.cpp js/src/irregexp/NativeRegExpMacroAssembler.cpp -index 28a4c35e75bfe..c08b005cf856b 100644 ---- js/src/irregexp/NativeRegExpMacroAssembler.cpp -+++ js/src/irregexp/NativeRegExpMacroAssembler.cpp -@@ -123,7 +123,15 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only) - masm.bind(&entry_label_); - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing. -+ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. - masm.initStackPtr(); - #endif - -@@ -421,7 +429,22 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only) - for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) - masm.Pop(*iter); - -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else - masm.abiret(); -+#endif - - // Backtrack code (branch target for conditional backtracks). - if (backtrack_label_.used()) { -diff --git js/src/jit-test/tests/regexp/bug1445907.js js/src/jit-test/tests/regexp/bug1445907.js -new file mode 100644 -index 0000000000000..75b23753eaf93 ---- /dev/null -+++ js/src/jit-test/tests/regexp/bug1445907.js -@@ -0,0 +1,15 @@ -+// On ARM64, we failed to save x28 properly when generating code for the regexp -+// matcher. -+// -+// There's wasm and Debugger code here because the combination forces the use of -+// x28 and exposes the bug when running on the simulator. -+ -+if (!wasmIsSupported()) -+ quit(); -+ -+var g = newGlobal(''); -+var dbg = new Debugger(g); -+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`); -+var re = /./; -+dbg.onEnterFrame = function(frame) { re.exec("x") }; -+result = g.eval("m.exports.test()"); diff --git a/mail/thunderbird/files/patch-bug1447359 b/mail/thunderbird/files/patch-bug1447359 deleted file mode 100644 index e99792bfef47..000000000000 --- a/mail/thunderbird/files/patch-bug1447359 +++ /dev/null @@ -1,45 +0,0 @@ -commit fef467b5a93d -Author: Luke Wagner -Date: Thu Mar 22 10:28:13 2018 -0500 - - Bug 1447359 - Baldr: add AutoForbidPools in a few missing places (r=lth) - - --HG-- - extra : rebase_source : 75f1909deb352391529ce5e58a89e5f9cfeb3662 ---- - js/src/jit/arm64/MacroAssembler-arm64-inl.h | 1 + - js/src/jit/arm64/MacroAssembler-arm64.cpp | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git js/src/jit/arm64/MacroAssembler-arm64-inl.h js/src/jit/arm64/MacroAssembler-arm64-inl.h -index 7061cbfd93ebb..190442f7afa0a 100644 ---- js/src/jit/arm64/MacroAssembler-arm64-inl.h -+++ js/src/jit/arm64/MacroAssembler-arm64-inl.h -@@ -268,6 +268,7 @@ void MacroAssembler::add64(Imm64 imm, Register64 dest) - CodeOffset MacroAssembler::sub32FromStackPtrWithPatch(Register dest) { - vixl::UseScratchRegisterScope temps(this); - const ARMRegister scratch = temps.AcquireX(); -+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 3); - CodeOffset offs = CodeOffset(currentOffset()); - movz(scratch, 0, 0); - movk(scratch, 0, 16); -diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp -index 7b599b7e9d610..4e8fdb6a67019 100644 ---- js/src/jit/arm64/MacroAssembler-arm64.cpp -+++ js/src/jit/arm64/MacroAssembler-arm64.cpp -@@ -666,6 +666,7 @@ void MacroAssembler::patchNearJumpToNop(uint8_t* jump) - } - - CodeOffset MacroAssembler::nopPatchableToCall(const wasm::CallSiteDesc& desc) { -+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1); - CodeOffset offset(currentOffset()); - Nop(); - append(desc, CodeOffset(currentOffset())); -@@ -1002,6 +1003,7 @@ void MacroAssembler::comment(const char* msg) { Assemb - // wasm support - - CodeOffset MacroAssembler::wasmTrapInstruction() { -+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1); - CodeOffset offs(currentOffset()); - Unreachable(); - return offs; diff --git a/mail/thunderbird/files/patch-bug1448770 b/mail/thunderbird/files/patch-bug1448770 deleted file mode 100644 index 0d7c4a101ca8..000000000000 --- a/mail/thunderbird/files/patch-bug1448770 +++ /dev/null @@ -1,27 +0,0 @@ -Disable GL_EXT_debug_marker due to crashes on x86 with Mesa drivers. - -diff --git gfx/webrender/src/query.rs gfx/webrender/src/query.rs -index 999abc749115..68850ef025e4 100644 ---- gfx/webrender/src/query.rs -+++ gfx/webrender/src/query.rs -@@ -274,17 +274,20 @@ pub struct GpuMarker { - - impl GpuMarker { - fn new(gl: &Rc, message: &str) -> Self { -+#[cfg(not(target_arch = "x86"))] - gl.push_group_marker_ext(message); - GpuMarker { gl: Rc::clone(gl) } - } - - fn fire(gl: &Rc, message: &str) { -+#[cfg(not(target_arch = "x86"))] - gl.insert_event_marker_ext(message); - } - } - - impl Drop for GpuMarker { - fn drop(&mut self) { -+#[cfg(not(target_arch = "x86"))] - self.gl.pop_group_marker_ext(); - } - } diff --git a/mail/thunderbird/files/patch-bug1451292 b/mail/thunderbird/files/patch-bug1451292 deleted file mode 100644 index 54e30883f3e3..000000000000 --- a/mail/thunderbird/files/patch-bug1451292 +++ /dev/null @@ -1,33 +0,0 @@ -commit b3a02fddbce8 -Author: Lars T Hansen -Date: Wed Apr 4 15:48:48 2018 +0200 - - Bug 1451292 - Better payload for arm64 breakpoint instruction. r=sstangl - - At least some non-zero payloads confuse GDB and make it iloop on the - breakpoint instruction rather than break to the command line as it - should. There seems to be no reason not to use a zero payload. - - --HG-- - extra : rebase_source : 6d6f9aa2911b86b02572f88948d48bc2238c6353 - extra : amend_source : 9fed9235d481a9eadafc4a3e0075c9fef8b6050d ---- - js/src/jit/arm64/MacroAssembler-arm64.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp -index 4ea64b1225d00..a212de0ec2f45 100644 ---- js/src/jit/arm64/MacroAssembler-arm64.cpp -+++ js/src/jit/arm64/MacroAssembler-arm64.cpp -@@ -249,8 +249,9 @@ void MacroAssemblerCompat::profilerEnterFrame(Register - } - - void MacroAssemblerCompat::breakpoint() { -- static int code = 0xA77; -- Brk((code++) & 0xffff); -+ // Note, other payloads are possible, but GDB is known to misinterpret them -+ // sometimes and iloop on the breakpoint instead of stopping properly. -+ Brk(0); - } - - // Either `any` is valid or `sixtyfour` is valid. Return a 32-bit ARMRegister diff --git a/mail/thunderbird/files/patch-bug1456556 b/mail/thunderbird/files/patch-bug1456556 deleted file mode 100644 index d7f3b4f690c5..000000000000 --- a/mail/thunderbird/files/patch-bug1456556 +++ /dev/null @@ -1,22 +0,0 @@ -commit f6fc0b418aa3 -Author: Andrea Marchesini -Date: Tue May 1 08:47:13 2018 +0200 - - Bug 1456556 - FetchConsumer scope-exit RAII must grab 'self' by value, r=erahm ---- - dom/fetch/FetchConsumer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git dom/fetch/FetchConsumer.cpp dom/fetch/FetchConsumer.cpp -index 134bf7f2e703a..3c3687fea1d5a 100644 ---- dom/fetch/FetchConsumer.cpp -+++ dom/fetch/FetchConsumer.cpp -@@ -560,7 +560,7 @@ void FetchBodyConsumer::ContinueConsumeBody(n - - RefPtr> self = this; - auto autoReleaseObject = -- mozilla::MakeScopeExit([&] { self->ReleaseObject(); }); -+ mozilla::MakeScopeExit([self] { self->ReleaseObject(); }); - - if (aShuttingDown) { - // If shutting down, we don't want to resolve any promise. diff --git a/mail/thunderbird/files/patch-bug1458219 b/mail/thunderbird/files/patch-bug1458219 deleted file mode 100644 index 0b86d436d050..000000000000 --- a/mail/thunderbird/files/patch-bug1458219 +++ /dev/null @@ -1,26 +0,0 @@ -commit cfe84bdd1ce1 -Author: Jonathan Watt -Date: Wed Apr 25 14:54:26 2018 +0100 - - Bug 1458219 - Remove the 'property_name' macro. r=xidorn ---- - servo/components/style/properties/properties.mako.rs | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs -index a1d2ee9d085a..5e3d8eaeaaf8 100644 ---- servo/components/style/properties/properties.mako.rs -+++ servo/components/style/properties/properties.mako.rs -@@ -56,12 +56,6 @@ use style_adjuster::StyleAdjuster; - - pub use self::declaration_block::*; - --#[cfg(feature = "gecko")] --#[macro_export] --macro_rules! property_name { -- ($s: tt) => { atom!($s) } --} -- - <%! - from data import Method, Keyword, to_rust_ident, to_camel_case, SYSTEM_FONT_LONGHANDS - import os.path diff --git a/mail/thunderbird/files/patch-bug1467882 b/mail/thunderbird/files/patch-bug1467882 deleted file mode 100644 index eb5b027f13cf..000000000000 --- a/mail/thunderbird/files/patch-bug1467882 +++ /dev/null @@ -1,137 +0,0 @@ - -# HG changeset patch -# User Alex Chronopoulos -# Date 1528999505 25200 -# Node ID 0e40938905915ec04bbbccb4f093182a6785ac3a -# Parent a75f33744de61543dc840cbb0324fedf997c3931 -Bug 1467882 - Update cubeb from upstream to 0677b30. r=kinetik - -diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA ---- media/libcubeb/README_MOZILLA -+++ media/libcubeb/README_MOZILLA -@@ -1,8 +1,8 @@ - The source from this directory was copied from the cubeb - git repository using the update.sh script. The only changes - made were those applied by update.sh and the addition of - Makefile.in build files for the Mozilla build system. - - The cubeb git repository is: git://github.com/kinetiknz/cubeb.git - --The git commit ID used was abf6ae235b0f15a2656f2d8692ac13708188165e (2018-06-01 13:02:45 +1200) -+The git commit ID used was 0677b3027b78c629586b099b5155aa6ac7422674 (2018-06-12 08:48:55 -0700) -diff --git a/media/libcubeb/src/cubeb_sndio.c b/media/libcubeb/src/cubeb_sndio.c ---- media/libcubeb/src/cubeb_sndio.c -+++ media/libcubeb/src/cubeb_sndio.c -@@ -46,27 +46,43 @@ struct cubeb_stream { - unsigned int pbpf; /* play bytes per frame */ - unsigned int rchan; /* number of rec channels */ - unsigned int pchan; /* number of play channels */ - unsigned int nblks; /* number of blocks in the buffer */ - uint64_t hwpos; /* frame number Joe hears right now */ - uint64_t swpos; /* number of frames produced/consumed */ - cubeb_data_callback data_cb; /* cb to preapare data */ - cubeb_state_callback state_cb; /* cb to notify about state changes */ -+ float volume; /* current volume */ - }; - - static void --float_to_s16(void *ptr, long nsamp) -+s16_setvol(void *ptr, long nsamp, float volume) -+{ -+ int16_t *dst = ptr; -+ int32_t mult = volume * 32768; -+ int32_t s; -+ -+ while (nsamp-- > 0) { -+ s = *dst; -+ s = (s * mult) >> 15; -+ *(dst++) = s; -+ } -+} -+ -+static void -+float_to_s16(void *ptr, long nsamp, float volume) - { - int16_t *dst = ptr; - float *src = ptr; -+ float mult = volume * 32768; - int s; - - while (nsamp-- > 0) { -- s = lrintf(*(src++) * 32768); -+ s = lrintf(*(src++) * mult); - if (s < -32768) - s = -32768; - else if (s > 32767) - s = 32767; - *(dst++) = s; - } - } - -@@ -164,18 +180,22 @@ sndio_mainloop(void *arg) - /* need to write (aka drain) the partial play block we got */ - pend = nfr * s->pbpf; - eof = 1; - } - - if (prime > 0) - prime--; - -- if ((s->mode & SIO_PLAY) && s->conv) -- float_to_s16(s->pbuf, nfr * s->pchan); -+ if (s->mode & SIO_PLAY) { -+ if (s->conv) -+ float_to_s16(s->pbuf, nfr * s->pchan, s->volume); -+ else -+ s16_setvol(s->pbuf, nfr * s->pchan, s->volume); -+ } - - if (s->mode & SIO_REC) - rstart = 0; - if (s->mode & SIO_PLAY) - pstart = 0; - } - - events = 0; -@@ -367,16 +387,17 @@ sndio_stream_init(cubeb * context, - if (s->pbuf == NULL) - goto err; - } - if (s->mode & SIO_REC) { - s->rbuf = malloc(bps * rpar.rchan * rpar.round); - if (s->rbuf == NULL) - goto err; - } -+ s->volume = 1.; - *stream = s; - DPR("sndio_stream_init() end, ok\n"); - (void)context; - (void)stream_name; - return CUBEB_OK; - err: - if (s->hdl) - sio_close(s->hdl); -@@ -471,17 +492,21 @@ sndio_stream_get_position(cubeb_stream * - return CUBEB_OK; - } - - static int - sndio_stream_set_volume(cubeb_stream *s, float volume) - { - DPR("sndio_stream_set_volume(%f)\n", volume); - pthread_mutex_lock(&s->mtx); -- sio_setvol(s->hdl, SIO_MAXVOL * volume); -+ if (volume < 0.) -+ volume = 0.; -+ else if (volume > 1.0) -+ volume = 1.; -+ s->volume = volume; - pthread_mutex_unlock(&s->mtx); - return CUBEB_OK; - } - - int - sndio_stream_get_latency(cubeb_stream * stm, uint32_t * latency) - { - // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open - diff --git a/mail/thunderbird/files/patch-bug1507655 b/mail/thunderbird/files/patch-bug1507655 new file mode 100644 index 000000000000..e923ec0c08e1 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1507655 @@ -0,0 +1,29 @@ +Revert bug 1497976 as close_fds on Python 2 is too slow + +diff --git build/moz.configure/util.configure build/moz.configure/util.configure +index 25862fee7c32..3fc725a5124e 100644 +--- build/moz.configure/util.configure ++++ build/moz.configure/util.configure +@@ -22,7 +22,6 @@ + + # A wrapper to obtain a process' output and return code. + # Returns a tuple (retcode, stdout, stderr). +-@imports('os') + @imports(_from='__builtin__', _import='unicode') + @imports('subprocess') + @imports(_from='mozbuild.shellutil', _import='quote') +@@ -45,13 +44,7 @@ + + log.debug('Executing: `%s`', quote(*args)) + proc = subprocess.Popen(args, stdout=subprocess.PIPE, +- stderr=subprocess.PIPE, +- # On Python 2 on Windows, close_fds prevents the +- # process from inheriting stdout/stderr. +- # Elsewhere, it simply prevents it from inheriting +- # extra file descriptors, which is what we want. +- close_fds=os.name != 'nt', +- **kwargs) ++ stderr=subprocess.PIPE, **kwargs) + stdout, stderr = proc.communicate() + return proc.wait(), stdout, stderr + diff --git a/mail/thunderbird/files/patch-bug1519729 b/mail/thunderbird/files/patch-bug1519729 deleted file mode 100644 index e91ebcec56fc..000000000000 --- a/mail/thunderbird/files/patch-bug1519729 +++ /dev/null @@ -1,131 +0,0 @@ -commit 9bdfa9fecaf1 -Author: Simon Sapin -Date: Fri Jan 11 14:02:28 2019 +0100 - - Bug 1519729 - Remove unused macro. r=emilio - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 ---- - servo/components/style_traits/values.rs | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 6da235c07b64..2851082c22e0 100644 ---- servo/components/style_traits/values.rs -+++ servo/components/style_traits/values.rs -@@ -158,24 +158,6 @@ where - } - } - --#[macro_export] --macro_rules! serialize_function { -- ($dest: expr, $name: ident($( $arg: expr, )+)) => { -- serialize_function!($dest, $name($($arg),+)) -- }; -- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { -- { -- $dest.write_str(concat!(stringify!($name), "("))?; -- $first_arg.to_css($dest)?; -- $( -- $dest.write_str(", ")?; -- $arg.to_css($dest)?; -- )* -- $dest.write_char(')') -- } -- } --} -- - /// Convenience wrapper to serialise CSS values separated by a given string. - pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { - inner: &'a mut CssWriter<'b, W>, - -commit 9d5e559547d0 -Author: Simon Sapin -Date: Fri Jan 11 14:03:44 2019 +0100 - - Bug 1519729 - Document public macros. r=emilio - - Undocumented public macros emit warnings in nightly-2019-01-11, - and we #![deny] that warning. - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 ---- - servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- - servo/components/style_traits/values.rs | 2 +- - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs -index 2d91273be15a..9220c3b1a665 100644 ---- servo/components/style/properties/properties.mako.rs -+++ servo/components/style/properties/properties.mako.rs -@@ -3821,7 +3821,14 @@ impl AliasId { - } - } - --// NOTE(emilio): Callers are responsible to deal with prefs. -+/// Call the given macro with tokens like this for each longhand and shorthand properties -+/// that is enabled in content: -+/// -+/// ``` -+/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], -+/// ``` -+/// -+/// NOTE(emilio): Callers are responsible to deal with prefs. - #[macro_export] - macro_rules! css_properties_accessors { - ($macro_name: ident) => { -@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { - } - } - -+/// Call the given macro with tokens like this for each longhand properties: -+/// -+/// ``` -+/// { snake_case_ident, true } -+/// ``` -+/// -+/// … where the boolean indicates whether the property value type -+/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. - #[macro_export] - macro_rules! longhand_properties_idents { - ($macro_name: ident) => { -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 2851082c22e0..0d7ee3f506ce 100644 ---- servo/components/style_traits/values.rs -+++ servo/components/style_traits/values.rs -@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --#[macro_export] -+/// Define an enum type with unit variants that each corrsepond to a CSS keyword. - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { - #[allow(missing_docs)] - -commit 2b08ae08b260 -Author: lqd -Date: Fri Jan 11 16:35:26 2019 +0100 - - Bug 1519729 - Typo fix in new doc-comment. r=emilio - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 - - Co-Authored-By: SimonSapin ---- - servo/components/style_traits/values.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 0d7ee3f506ce..582e34eb3db0 100644 ---- servo/components/style_traits/values.rs -+++ servo/components/style_traits/values.rs -@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --/// Define an enum type with unit variants that each corrsepond to a CSS keyword. -+/// Define an enum type with unit variants that each correspond to a CSS keyword. - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { - #[allow(missing_docs)] diff --git a/mail/thunderbird/files/patch-bug1530098 b/mail/thunderbird/files/patch-bug1530098 deleted file mode 100644 index 8124ade6d0db..000000000000 --- a/mail/thunderbird/files/patch-bug1530098 +++ /dev/null @@ -1,198 +0,0 @@ -https://github.com/rust-lang/libc/commit/5e187562eed6 -https://github.com/rust-lang/libc/commit/e628de2d7d40 -https://github.com/rust-lang/libc/commit/6c1e2dec8f2b -https://github.com/rust-lang/libc/commit/69c9c541f76c - -diff --git third_party/rust/libc/.cargo-checksum.json third_party/rust/libc/.cargo-checksum.json -index 587d7582bc89..7cdb11ee2d6b 100644 ---- third_party/rust/libc/.cargo-checksum.json -+++ third_party/rust/libc/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".travis.yml":"8088167016d06169f8b1eb86ba5f413cdfcb776bd95af46f968d146665ff5afe","Cargo.toml":"74e837a30336b387d94fc92db3d1ece407b47318ca1362a2b8f37dfb28064e54","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"a550fd6c92b62c70925cc6a75dd1d40ae93f9a77e3c4e9baacdf014fa0cae550","appveyor.yml":"216f7ac4561aa5810dc84ce5a9950897a8c0496e0615d0211d62348b1c8dc720","ci/README.md":"2e3d7ad13f8c3202e57d2af73aeeebde306221dce7c0907e462e25767a692d6b","ci/android-install-ndk.sh":"725db9025c5905849916bf7c910f98ff0e753484397c2a1f836d48a576d10890","ci/android-install-sdk.sh":"5c3fbe402ac611239ac7715a61f247d1c55fa012f33a5be0b0127dfc196965cf","ci/android-sysimage.sh":"901415631752827454c827e8c51906ba4260612e4021eda98eb7fff771c7d0e8","ci/docker/aarch64-linux-android/Dockerfile":"e17945fba1786dfe766006f50e79baf3f4151ca0c0c14ae96f91483bf345afd7","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"5f430271941e1eecdf9d1a5fb701dd5622e2c4b9da03140fd829bf216e55529d","ci/docker/aarch64-unknown-linux-musl/Dockerfile":"1e8c66067bcbd718119db5eb6e69390c4f0ea72c1543e09b6846a36ef66cd21b","ci/docker/arm-linux-androideabi/Dockerfile":"4e0bdc13254f99bd0db195f91331c634050426e3e4a0fcc63ef25ab795fe2d46","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"dbb025b53b27e406893184290836a50133ecae8295711d5e05b4e41fac9bd262","ci/docker/arm-unknown-linux-musleabihf/Dockerfile":"12b50abdc5605e3a39eff6bb0d0fccb0885896933c5bfbb3d0cbde9068492a0f","ci/docker/asmjs-unknown-emscripten/Dockerfile":"0d9aea5119c2cd136cc2c0a578105d91210e45901ac49b17c5e45f458b1c7551","ci/docker/i686-linux-android/Dockerfile":"4e8377ec0bd9ad2df23bf2c5373200a12750dc9f28c4f10bc83a0150fe1623ee","ci/docker/i686-unknown-linux-gnu/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/i686-unknown-linux-musl/Dockerfile":"f95cd8b514f48686d774b85e4dffccce1a5acd68749d8ff59b204419d448d575","ci/docker/mips-unknown-linux-gnu/Dockerfile":"6d2a9daa299003497c1d441d07b69f730ad75ee49f34520f959b5158e60072e0","ci/docker/mips-unknown-linux-musl/Dockerfile":"4773b2656a7dd6a3b106fcb737428436652edf3d1f48181de3f62c16bf5bd49d","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"7c4d26232f1c1553a6612d9b0b3faac9887e139eaffa025f70d34113dcee812f","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"edb4144c07ade1a8bd65272ec1d3672ad794e9e6b7d01197896e159a70175b58","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"0ca9c12b5618c6d2df04ff820d56fb28e05b43e45eaa506480126b03c5072d48","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"4b247dcc399395815ec9153c1247cc03d764896c484eddcb196d0bf8650d6311","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e949717a8ba5e123940729ff47ce1c45989c8b8247c576f1488f698b534e0283","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"018591017f499414a9f79477e1c39baa6a47f71fce6812fb1868fb0fcdfb8cea","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"9860f478c5b2dc3bcf76d2cda7f71922a2a2ef54898cc2ed6ea9b9eff094a5c0","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"1471a694817758331ecdbb23857537563ad7ae56aa3a88e49bf9cd421addcafe","ci/docker/wasm32-unknown-emscripten/Dockerfile":"bd072d6ae91a9160693e402dd77462d3c9dd0716711e719a62af330ae479eb4e","ci/docker/wasm32-unknown-emscripten/node-wrapper.sh":"0eef37c3c4fb16dbc083148b7e7af45f2ae60bd9a1b3a77e1d43da79efbd30c6","ci/docker/x86_64-linux-android/Dockerfile":"aeeaa540189ca712369c564c9a14cbace63217dadcfaf879a2cb40fbdeb08199","ci/docker/x86_64-rumprun-netbsd/Dockerfile":"e8f9287b267c6058eec42d1bca0007cb9a78a1d244dd8e11088368cb61fb17d6","ci/docker/x86_64-rumprun-netbsd/runtest.rs":"53302e9ed39293c1ec68ab56287593907d4aaf5bac9c1c2857b29f754a71d62b","ci/docker/x86_64-unknown-freebsd/Dockerfile":"ab1f14c65c29f3721c7c091bdec2e865fb1abf45fdcdc867201d087966e396c4","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"ab3fa45765802b8155996796fcad9fb82096360ac587e38e6faa3ec345268796","ci/docker/x86_64-unknown-linux-gnux32/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"0c31058e39d9f25c6f4f9b7fe78c7c8d135f32bfe52199e9b2e7fa10d5dc3940","ci/dox.sh":"d77171a9da467bb01fc702a28fc3b5099f82a485a627f3d5593a9830c3e1a77c","ci/emscripten-entry.sh":"c97bbec520b57af9b1ae264ca991560e99c3852c99b00a2f673c614d1ba17498","ci/emscripten.sh":"6f66c7b5c3d34a41afc59ceb0a8c3b0880cd6fd9a6344b874ae80bac0639ccb2","ci/ios/deploy_and_run_on_ios_simulator.rs":"be6d2ccfe78df5d77a2c4ee40ffbd22b1bb2ac0a0cf6b2a108f21406f22ce1a8","ci/landing-page-footer.html":"b70b3112c2147f5c967e7481061ef38bc2d79a28dd55a16fb916d9c9426da2c4","ci/landing-page-head.html":"ad69663fac7924f27d0209bc519d55838e86edfc4133713a6fd08caadac1b142","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab7ad3b7a344833ee726aba6b647cf5952e56f0ad1ba420b13325","ci/run-docker.sh":"be83bc5a8b5ef913a7c9941ffca24734716028650c9a876123c4c160672c18de","ci/run-qemu.sh":"bb859421170871ef23a8940c5e150efec0c01b95e32d2ce2d37b79a45d9d346c","ci/run.sh":"86b7d1ce555ed5eeeac6b44fd0e9563166ff38ba38e56a82d70800ace3b65946","ci/runtest-android.rs":"a07ddbdd276aedda7876c7e676774178a60d9aeab95df01275a4ee95f59e3044","ci/style.rs":"940c06a676cff1dfc1555b887e46867c6aacc473956cd6aaafaed71824facdb2","ci/test-runner-linux":"cb3713d9e4fa1d9a7c039dfd077af0939921c1f2bf969c9e680ee66e87dc30a4","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"1c2dc787a1b3438970ccd04153c93538719b1a27445707913b90b6f0cdcdde77","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"8f6037887281b828d8541ce8a549dacaed5d29c05fd9cf78b169838476b82741","src/fuchsia/aarch64.rs":"8366ac6f51e494aad9266ccab2b3a95c5ed7aa3a9f77ea672413283440919743","src/fuchsia/mod.rs":"e5b7e6ff40e670200c52919b53474627931b4def18d452323999de201953cf21","src/fuchsia/powerpc64.rs":"390e8db54271a1d5f512d54a21b328091a792378bf9b42b49b6c1a72388da4ec","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"bbad6abf79078649e76c2379c3c3fcbc4198430736e726a01d96a8f1439e8cb1","src/macros.rs":"8ad55edea39fad158e80c5df0d7b520b6863f5088db4db286ba31c12cbc4d67d","src/redox/mod.rs":"685d4d39911e855bf0fd7879b9a02bc15cefebfb0f520382c1a1353364f0d523","src/redox/net.rs":"f2e1922883f208cb46c00744da4a68feccfbec576c6981978ad404e46f818c8b","src/unix/bsd/apple/b32.rs":"41699d2802327b0a4d4aa50cd20b1e366b442176cbedab27ca888ac0446c9156","src/unix/bsd/apple/b64.rs":"0cda592881a1db30f2d96ff0f67cf4214aa99881dfe4f2fb474ef7ec78bd204a","src/unix/bsd/apple/mod.rs":"ac02092ad74cb81fa789e89d541d79525d2298ac77842847b48e5fd1a83fff0d","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"7a8df4e8079ed60ad4ac35362901eb2fea4d53384709e4ac45930899b84f8eaf","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/freebsd/mod.rs":"1b158199be42b37708f10d0e73164cf0b63a2b5ae0e6fcc1feab5944f5377f24","src/unix/bsd/freebsdlike/freebsd/x86.rs":"54311d3ebf2bb091ab22361e377e6ef9224aec2ecfe459fbfcedde4932db9c58","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/mod.rs":"9ddcc86d3bb76f426e26c4df8d853b3715a7d6d9006acaa4fa26b2b0f5bb3314","src/unix/bsd/mod.rs":"a1030452eed4ec52a39e9f39040e8fae4309143c7af145efadd9b425caa39672","src/unix/bsd/netbsdlike/mod.rs":"6fb522d55eced39ef1bc28873f9ae8d5ab141acde09c5cb6a22aeca577d916ad","src/unix/bsd/netbsdlike/netbsd/mod.rs":"1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e","src/unix/bsd/netbsdlike/netbsd/other/b32/mod.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/netbsd/other/b64/mod.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/netbsd/other/mod.rs":"4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"92459d80b8e5b570c0efe35a1d244d38f23072cd28b6581dfcb313dc9bfc3d51","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"37fea61239bd53cd951fd7bc800229f663be2e9ad2e1539ebdf73767ca28b469","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"973331fd80876db55467913556d81f45ea1ede03322fef9c5d552aba833d2207","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"7c959cdb3415f68a0f948117b9aa87a17463e57ab97cc3235f2567454b706653","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"8b8a7a51e1bc20407e42b0ab6c1a0cd1c8fc4f3ef61a04ccb7c8e312495ce30b","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"a8bb096695eea74fb1c5c6766c1e680d28378c452dbc622fa5f91c6ce204306f","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"af909129f76f9bbe571dee2e78f43afd63ff6e46c27a429da43c239537330283","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"d9f59ee9a994490122986b7ae5e3064bf9ce0b888349a388a50341a4c7069842","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"2fbe398c1fb5251dda6213741a193e50aae4622807cb255d1dd2e82b536f0c65","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"90d4f6b063fd4de42fd302cbc9d9902fd99ac1d71dc48cb8bc6ad7b4c902e481","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"eadc87bfea5f5e8ea50a3776b526cea2b0bfaf6d55240ba88134e19670f8a3a6","src/unix/notbsd/emscripten.rs":"d2d817af2b1496c1ee173f216c478a3a1c26223ef938797103bc50a265284662","src/unix/notbsd/linux/mips/mips32.rs":"a483ddfd10765b7d5090dc21686eee8842649cd21236828a42d634114885f5f9","src/unix/notbsd/linux/mips/mips64.rs":"9fff696e3943cf206b549d1ae13fa361828e9a8454e2d5730eeaa1c172ff370d","src/unix/notbsd/linux/mips/mod.rs":"af1b7bffff09aa5d8662e6452f72bc1e55b6639899b8c2a4be9cd1cfb245de01","src/unix/notbsd/linux/mod.rs":"081cb74be8b465c9cf86289f675cb7c6f7d7eee39713a6764e1871eabcbaee44","src/unix/notbsd/linux/musl/b32/arm.rs":"9d9bff31ab0925a1f62a20945d36a83b94ce3ab78dd202cd468bb31556b21725","src/unix/notbsd/linux/musl/b32/mips.rs":"cb38c463aebfc235f31880db158dd47c6e21f182a092d3f3087d92994b7711da","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"3930a2825657ac9208935341e29cfa62f6e37fc5c6b2c0d0dc9ac8c3b5569d59","src/unix/notbsd/linux/musl/b32/x86.rs":"c02dd333012cf65cb8873fa211eff5e63d466be55451a347510e3d4f50ed515e","src/unix/notbsd/linux/musl/b64/aarch64.rs":"4d79d86d11fbb8cb7a74084e410a1140e3c89dfc1842cdfb213f3a0ca93046df","src/unix/notbsd/linux/musl/b64/mod.rs":"caac00326693b372d6805e4dda239475e7fef36368881f372c006264844fda0d","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"24514e41be4b5f5e0ffbe8a25a99dae8989489b607db59e8bfa345f8e65c9963","src/unix/notbsd/linux/musl/b64/x86_64.rs":"25340999290a63d564ec149532c905f59c312ec369f8806d6b15df66fa1b8857","src/unix/notbsd/linux/musl/mod.rs":"17c70acf9c6eabeb73916c2abb7d7e8b0310214090faae4a8dc2fd183a9b45ba","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"dac0fd1054a0fa163bce85df58c4ad4d222d8b7353bdb4364482b46c19991d03","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"d57f3e06a0ac8affc5bf9d17e1f217ef1d1d714c947f47e647e0e038deaf48b2","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"024057a910d0b885c63443165d34ce33f972973a9a8f5979906198180b19ad8b","src/unix/notbsd/linux/other/b64/sparc64.rs":"bb28f201e29c7f490a42dd2673eb8180fd82c1824a5d21aeb5aed674ffcc6e07","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"afba464e903d350325a1ca3d9d5af1659efc0ede83a43dbac4dbd60c522e2ad1","src/unix/notbsd/linux/other/mod.rs":"add154a8cfe9392d5a73b6055eb1419902e2b8b5458c22586a6ef8f90f89501b","src/unix/notbsd/linux/s390x.rs":"033cb7c4ee00af352698615de0248a5c6c9bcff57ba671ee22d31b70ef86fb4a","src/unix/notbsd/mod.rs":"134502158bab09d5189249ef400c9ddf7fdf5d1a1bd3134484ca82b80a0833e7","src/unix/solaris/mod.rs":"9c52a7479b56d3bc1f2c9ba5bb44f71ab1470989a54d3d0d85571e19489e4b7e","src/unix/uclibc/mips/mips32.rs":"9739c5fb47f389a0394ef08ee30da97a3de0a1300020731a8cc0a033616011b2","src/unix/uclibc/mips/mips64.rs":"230583280bbc7b3c7fcdb61244f51fa1af5944ca127c7cf83c598fe2313713d0","src/unix/uclibc/mips/mod.rs":"3f86061d05a8da7d923310550b7d40c6223f0c907d77edc86b7a78da1d647f76","src/unix/uclibc/mod.rs":"8cf2db30468476b917a60fdffe475917302875a3a4150f29a042ebee182545d1","src/unix/uclibc/x86_64/l4re.rs":"68fd3a833fd1f7caf784a084224f384bdbdfb8b5a14ef94c4f5155409afb3439","src/unix/uclibc/x86_64/mod.rs":"419182836aedd426a5c9e6b8667058adf86ac8f43af73ce8d00c503f8ff8f414","src/unix/uclibc/x86_64/other.rs":"f03b47842896f2f3ae6f8ebdcbcf0276454f880349d9cf00e3d304f8136893c5","src/windows.rs":"e41357d610608bad81abf285306ad8b127b6f02d5132f63c4942861980b47d59"},"package":"76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"} -\ No newline at end of file -+{"files":{"Cargo.toml":"74e837a30336b387d94fc92db3d1ece407b47318ca1362a2b8f37dfb28064e54","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"a550fd6c92b62c70925cc6a75dd1d40ae93f9a77e3c4e9baacdf014fa0cae550","appveyor.yml":"216f7ac4561aa5810dc84ce5a9950897a8c0496e0615d0211d62348b1c8dc720","ci/README.md":"2e3d7ad13f8c3202e57d2af73aeeebde306221dce7c0907e462e25767a692d6b","ci/android-install-ndk.sh":"725db9025c5905849916bf7c910f98ff0e753484397c2a1f836d48a576d10890","ci/android-install-sdk.sh":"5c3fbe402ac611239ac7715a61f247d1c55fa012f33a5be0b0127dfc196965cf","ci/android-sysimage.sh":"901415631752827454c827e8c51906ba4260612e4021eda98eb7fff771c7d0e8","ci/docker/aarch64-linux-android/Dockerfile":"e17945fba1786dfe766006f50e79baf3f4151ca0c0c14ae96f91483bf345afd7","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"5f430271941e1eecdf9d1a5fb701dd5622e2c4b9da03140fd829bf216e55529d","ci/docker/aarch64-unknown-linux-musl/Dockerfile":"1e8c66067bcbd718119db5eb6e69390c4f0ea72c1543e09b6846a36ef66cd21b","ci/docker/arm-linux-androideabi/Dockerfile":"4e0bdc13254f99bd0db195f91331c634050426e3e4a0fcc63ef25ab795fe2d46","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"dbb025b53b27e406893184290836a50133ecae8295711d5e05b4e41fac9bd262","ci/docker/arm-unknown-linux-musleabihf/Dockerfile":"12b50abdc5605e3a39eff6bb0d0fccb0885896933c5bfbb3d0cbde9068492a0f","ci/docker/asmjs-unknown-emscripten/Dockerfile":"0d9aea5119c2cd136cc2c0a578105d91210e45901ac49b17c5e45f458b1c7551","ci/docker/i686-linux-android/Dockerfile":"4e8377ec0bd9ad2df23bf2c5373200a12750dc9f28c4f10bc83a0150fe1623ee","ci/docker/i686-unknown-linux-gnu/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/i686-unknown-linux-musl/Dockerfile":"f95cd8b514f48686d774b85e4dffccce1a5acd68749d8ff59b204419d448d575","ci/docker/mips-unknown-linux-gnu/Dockerfile":"6d2a9daa299003497c1d441d07b69f730ad75ee49f34520f959b5158e60072e0","ci/docker/mips-unknown-linux-musl/Dockerfile":"4773b2656a7dd6a3b106fcb737428436652edf3d1f48181de3f62c16bf5bd49d","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"7c4d26232f1c1553a6612d9b0b3faac9887e139eaffa025f70d34113dcee812f","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"edb4144c07ade1a8bd65272ec1d3672ad794e9e6b7d01197896e159a70175b58","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"0ca9c12b5618c6d2df04ff820d56fb28e05b43e45eaa506480126b03c5072d48","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"4b247dcc399395815ec9153c1247cc03d764896c484eddcb196d0bf8650d6311","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e949717a8ba5e123940729ff47ce1c45989c8b8247c576f1488f698b534e0283","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"018591017f499414a9f79477e1c39baa6a47f71fce6812fb1868fb0fcdfb8cea","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"9860f478c5b2dc3bcf76d2cda7f71922a2a2ef54898cc2ed6ea9b9eff094a5c0","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"1471a694817758331ecdbb23857537563ad7ae56aa3a88e49bf9cd421addcafe","ci/docker/wasm32-unknown-emscripten/Dockerfile":"bd072d6ae91a9160693e402dd77462d3c9dd0716711e719a62af330ae479eb4e","ci/docker/wasm32-unknown-emscripten/node-wrapper.sh":"0eef37c3c4fb16dbc083148b7e7af45f2ae60bd9a1b3a77e1d43da79efbd30c6","ci/docker/x86_64-linux-android/Dockerfile":"aeeaa540189ca712369c564c9a14cbace63217dadcfaf879a2cb40fbdeb08199","ci/docker/x86_64-rumprun-netbsd/Dockerfile":"e8f9287b267c6058eec42d1bca0007cb9a78a1d244dd8e11088368cb61fb17d6","ci/docker/x86_64-rumprun-netbsd/runtest.rs":"53302e9ed39293c1ec68ab56287593907d4aaf5bac9c1c2857b29f754a71d62b","ci/docker/x86_64-unknown-freebsd/Dockerfile":"ab1f14c65c29f3721c7c091bdec2e865fb1abf45fdcdc867201d087966e396c4","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"ab3fa45765802b8155996796fcad9fb82096360ac587e38e6faa3ec345268796","ci/docker/x86_64-unknown-linux-gnux32/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"0c31058e39d9f25c6f4f9b7fe78c7c8d135f32bfe52199e9b2e7fa10d5dc3940","ci/dox.sh":"d77171a9da467bb01fc702a28fc3b5099f82a485a627f3d5593a9830c3e1a77c","ci/emscripten-entry.sh":"c97bbec520b57af9b1ae264ca991560e99c3852c99b00a2f673c614d1ba17498","ci/emscripten.sh":"6f66c7b5c3d34a41afc59ceb0a8c3b0880cd6fd9a6344b874ae80bac0639ccb2","ci/ios/deploy_and_run_on_ios_simulator.rs":"be6d2ccfe78df5d77a2c4ee40ffbd22b1bb2ac0a0cf6b2a108f21406f22ce1a8","ci/landing-page-footer.html":"b70b3112c2147f5c967e7481061ef38bc2d79a28dd55a16fb916d9c9426da2c4","ci/landing-page-head.html":"ad69663fac7924f27d0209bc519d55838e86edfc4133713a6fd08caadac1b142","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab7ad3b7a344833ee726aba6b647cf5952e56f0ad1ba420b13325","ci/run-docker.sh":"be83bc5a8b5ef913a7c9941ffca24734716028650c9a876123c4c160672c18de","ci/run-qemu.sh":"bb859421170871ef23a8940c5e150efec0c01b95e32d2ce2d37b79a45d9d346c","ci/run.sh":"86b7d1ce555ed5eeeac6b44fd0e9563166ff38ba38e56a82d70800ace3b65946","ci/runtest-android.rs":"a07ddbdd276aedda7876c7e676774178a60d9aeab95df01275a4ee95f59e3044","ci/style.rs":"940c06a676cff1dfc1555b887e46867c6aacc473956cd6aaafaed71824facdb2","ci/test-runner-linux":"cb3713d9e4fa1d9a7c039dfd077af0939921c1f2bf969c9e680ee66e87dc30a4","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"1c2dc787a1b3438970ccd04153c93538719b1a27445707913b90b6f0cdcdde77","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"8f6037887281b828d8541ce8a549dacaed5d29c05fd9cf78b169838476b82741","src/fuchsia/aarch64.rs":"8366ac6f51e494aad9266ccab2b3a95c5ed7aa3a9f77ea672413283440919743","src/fuchsia/mod.rs":"e5b7e6ff40e670200c52919b53474627931b4def18d452323999de201953cf21","src/fuchsia/powerpc64.rs":"390e8db54271a1d5f512d54a21b328091a792378bf9b42b49b6c1a72388da4ec","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"bbad6abf79078649e76c2379c3c3fcbc4198430736e726a01d96a8f1439e8cb1","src/macros.rs":"8ad55edea39fad158e80c5df0d7b520b6863f5088db4db286ba31c12cbc4d67d","src/redox/mod.rs":"685d4d39911e855bf0fd7879b9a02bc15cefebfb0f520382c1a1353364f0d523","src/redox/net.rs":"f2e1922883f208cb46c00744da4a68feccfbec576c6981978ad404e46f818c8b","src/unix/bsd/apple/b32.rs":"41699d2802327b0a4d4aa50cd20b1e366b442176cbedab27ca888ac0446c9156","src/unix/bsd/apple/b64.rs":"0cda592881a1db30f2d96ff0f67cf4214aa99881dfe4f2fb474ef7ec78bd204a","src/unix/bsd/apple/mod.rs":"ac02092ad74cb81fa789e89d541d79525d2298ac77842847b48e5fd1a83fff0d","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"9acb311f2f5acf8ce5d28ce60b3eef5715d8f92e25be9adb0c4c78fdb1eee090","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"8976c6416f5946876275abce890d66a16f4d8998aaec0a0fed74ed4eac98ec03","src/unix/bsd/freebsdlike/freebsd/arm.rs":"28f41704ad6ad9fac15b1480c4c31ca3a4d7e101e9a33a1ce8f89960d5f6501b","src/unix/bsd/freebsdlike/freebsd/mod.rs":"791b92bcfb2224a0631032cada52e20934a9b8509e8c4c9d32f5ba60d864f13b","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"8976c6416f5946876275abce890d66a16f4d8998aaec0a0fed74ed4eac98ec03","src/unix/bsd/freebsdlike/freebsd/x86.rs":"e39bf5584f55a4943dcdeda7a086fa093057f0d842c5f93ab6e7321d9eee74a3","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"d16bc0f9d50108c8724c172d716162ab931361f208e5a7b0e60e592258026e53","src/unix/bsd/freebsdlike/mod.rs":"cbf11c5742e217caa435bf841ab9b03dd9e5278dbfecb0f85722a79e90b5ee90","src/unix/bsd/mod.rs":"a1030452eed4ec52a39e9f39040e8fae4309143c7af145efadd9b425caa39672","src/unix/bsd/netbsdlike/mod.rs":"6fb522d55eced39ef1bc28873f9ae8d5ab141acde09c5cb6a22aeca577d916ad","src/unix/bsd/netbsdlike/netbsd/mod.rs":"1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e","src/unix/bsd/netbsdlike/netbsd/other/b32/mod.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/netbsd/other/b64/mod.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/netbsd/other/mod.rs":"4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"92459d80b8e5b570c0efe35a1d244d38f23072cd28b6581dfcb313dc9bfc3d51","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"37fea61239bd53cd951fd7bc800229f663be2e9ad2e1539ebdf73767ca28b469","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"973331fd80876db55467913556d81f45ea1ede03322fef9c5d552aba833d2207","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"7c959cdb3415f68a0f948117b9aa87a17463e57ab97cc3235f2567454b706653","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"8b8a7a51e1bc20407e42b0ab6c1a0cd1c8fc4f3ef61a04ccb7c8e312495ce30b","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"a8bb096695eea74fb1c5c6766c1e680d28378c452dbc622fa5f91c6ce204306f","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"af909129f76f9bbe571dee2e78f43afd63ff6e46c27a429da43c239537330283","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"d9f59ee9a994490122986b7ae5e3064bf9ce0b888349a388a50341a4c7069842","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"2fbe398c1fb5251dda6213741a193e50aae4622807cb255d1dd2e82b536f0c65","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"90d4f6b063fd4de42fd302cbc9d9902fd99ac1d71dc48cb8bc6ad7b4c902e481","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"eadc87bfea5f5e8ea50a3776b526cea2b0bfaf6d55240ba88134e19670f8a3a6","src/unix/notbsd/emscripten.rs":"d2d817af2b1496c1ee173f216c478a3a1c26223ef938797103bc50a265284662","src/unix/notbsd/linux/mips/mips32.rs":"a483ddfd10765b7d5090dc21686eee8842649cd21236828a42d634114885f5f9","src/unix/notbsd/linux/mips/mips64.rs":"9fff696e3943cf206b549d1ae13fa361828e9a8454e2d5730eeaa1c172ff370d","src/unix/notbsd/linux/mips/mod.rs":"af1b7bffff09aa5d8662e6452f72bc1e55b6639899b8c2a4be9cd1cfb245de01","src/unix/notbsd/linux/mod.rs":"081cb74be8b465c9cf86289f675cb7c6f7d7eee39713a6764e1871eabcbaee44","src/unix/notbsd/linux/musl/b32/arm.rs":"9d9bff31ab0925a1f62a20945d36a83b94ce3ab78dd202cd468bb31556b21725","src/unix/notbsd/linux/musl/b32/mips.rs":"cb38c463aebfc235f31880db158dd47c6e21f182a092d3f3087d92994b7711da","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"3930a2825657ac9208935341e29cfa62f6e37fc5c6b2c0d0dc9ac8c3b5569d59","src/unix/notbsd/linux/musl/b32/x86.rs":"c02dd333012cf65cb8873fa211eff5e63d466be55451a347510e3d4f50ed515e","src/unix/notbsd/linux/musl/b64/aarch64.rs":"4d79d86d11fbb8cb7a74084e410a1140e3c89dfc1842cdfb213f3a0ca93046df","src/unix/notbsd/linux/musl/b64/mod.rs":"caac00326693b372d6805e4dda239475e7fef36368881f372c006264844fda0d","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"24514e41be4b5f5e0ffbe8a25a99dae8989489b607db59e8bfa345f8e65c9963","src/unix/notbsd/linux/musl/b64/x86_64.rs":"25340999290a63d564ec149532c905f59c312ec369f8806d6b15df66fa1b8857","src/unix/notbsd/linux/musl/mod.rs":"17c70acf9c6eabeb73916c2abb7d7e8b0310214090faae4a8dc2fd183a9b45ba","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"dac0fd1054a0fa163bce85df58c4ad4d222d8b7353bdb4364482b46c19991d03","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"d57f3e06a0ac8affc5bf9d17e1f217ef1d1d714c947f47e647e0e038deaf48b2","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"024057a910d0b885c63443165d34ce33f972973a9a8f5979906198180b19ad8b","src/unix/notbsd/linux/other/b64/sparc64.rs":"bb28f201e29c7f490a42dd2673eb8180fd82c1824a5d21aeb5aed674ffcc6e07","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"afba464e903d350325a1ca3d9d5af1659efc0ede83a43dbac4dbd60c522e2ad1","src/unix/notbsd/linux/other/mod.rs":"add154a8cfe9392d5a73b6055eb1419902e2b8b5458c22586a6ef8f90f89501b","src/unix/notbsd/linux/s390x.rs":"033cb7c4ee00af352698615de0248a5c6c9bcff57ba671ee22d31b70ef86fb4a","src/unix/notbsd/mod.rs":"134502158bab09d5189249ef400c9ddf7fdf5d1a1bd3134484ca82b80a0833e7","src/unix/solaris/mod.rs":"9c52a7479b56d3bc1f2c9ba5bb44f71ab1470989a54d3d0d85571e19489e4b7e","src/unix/uclibc/mips/mips32.rs":"9739c5fb47f389a0394ef08ee30da97a3de0a1300020731a8cc0a033616011b2","src/unix/uclibc/mips/mips64.rs":"230583280bbc7b3c7fcdb61244f51fa1af5944ca127c7cf83c598fe2313713d0","src/unix/uclibc/mips/mod.rs":"3f86061d05a8da7d923310550b7d40c6223f0c907d77edc86b7a78da1d647f76","src/unix/uclibc/mod.rs":"8cf2db30468476b917a60fdffe475917302875a3a4150f29a042ebee182545d1","src/unix/uclibc/x86_64/l4re.rs":"68fd3a833fd1f7caf784a084224f384bdbdfb8b5a14ef94c4f5155409afb3439","src/unix/uclibc/x86_64/mod.rs":"419182836aedd426a5c9e6b8667058adf86ac8f43af73ce8d00c503f8ff8f414","src/unix/uclibc/x86_64/other.rs":"f03b47842896f2f3ae6f8ebdcbcf0276454f880349d9cf00e3d304f8136893c5","src/windows.rs":"e41357d610608bad81abf285306ad8b127b6f02d5132f63c4942861980b47d59"},"package":"76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"} -\ No newline at end of file -diff --git src/unix/bsd/freebsdlike/dragonfly/mod.rs src/unix/bsd/freebsdlike/dragonfly/mod.rs -index 9e1082e53..8149917ee 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type clock_t = u64; - pub type ino_t = u64; - pub type lwpid_t = i32; -@@ -210,6 +211,12 @@ s! { - pub sdl_rcf: ::c_ushort, - pub sdl_route: [::c_ushort; 16], - } -+ -+ pub struct stack_t { -+ pub ss_sp: *mut ::c_char, -+ pub ss_size: ::size_t, -+ pub ss_flags: ::c_int, -+ } - } - - pub const RAND_MAX: ::c_int = 0x7fff_ffff; -diff --git src/unix/bsd/freebsdlike/freebsd/aarch64.rs src/unix/bsd/freebsdlike/freebsd/aarch64.rs -index 3d61f889d..ef3b13acb 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = u8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; -diff --git src/unix/bsd/freebsdlike/freebsd/arm.rs src/unix/bsd/freebsdlike/freebsd/arm.rs -new file mode 100644 -index 000000000..bc4da64d0 ---- /dev/null -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/arm.rs -@@ -0,0 +1,37 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_atime_pad: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_mtime_pad: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_ctime_pad: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_birthtime_pad: ::c_long, -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; -diff --git src/unix/bsd/freebsdlike/freebsd/mod.rs src/unix/bsd/freebsdlike/freebsd/mod.rs -index a64dbc468..60f38a0c6 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -182,6 +182,12 @@ s! { - pub sdl_slen: ::c_uchar, - pub sdl_data: [::c_char; 46], - } -+ -+ pub struct stack_t { -+ pub ss_sp: *mut ::c_void, -+ pub ss_size: ::size_t, -+ pub ss_flags: ::c_int, -+ } - } - - pub const SIGEV_THREAD_ID: ::c_int = 4; -@@ -1034,6 +1040,12 @@ cfg_if! { - } else if #[cfg(target_arch = "aarch64")] { - mod aarch64; - pub use self::aarch64::*; -+ } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; -+ } else if #[cfg(target_arch = "powerpc64")] { -+ mod powerpc64; -+ pub use self::powerpc64::*; - } else { - // Unknown target_arch - } -diff --git src/unix/bsd/freebsdlike/freebsd/powerpc64.rs src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -new file mode 100644 -index 000000000..c06e1aec8 ---- /dev/null -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -@@ -0,0 +1,33 @@ -+pub type c_char = u8; -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type time_t = i64; -+pub type suseconds_t = i64; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; -diff --git src/unix/bsd/freebsdlike/freebsd/x86.rs src/unix/bsd/freebsdlike/freebsd/x86.rs -index 8a5e5f9fb..84ebf24cf 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i32; - pub type c_ulong = u32; - pub type time_t = i32; -diff --git src/unix/bsd/freebsdlike/freebsd/x86_64.rs src/unix/bsd/freebsdlike/freebsd/x86_64.rs -index 3d61f889d..148149b11 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; -diff --git src/unix/bsd/freebsdlike/mod.rs src/unix/bsd/freebsdlike/mod.rs -index 75a7a670e..4e40cb651 100644 ---- third_party/rust/libc/src/unix/bsd/freebsdlike/mod.rs -+++ third_party/rust/libc/src/unix/bsd/freebsdlike/mod.rs -@@ -1,4 +1,3 @@ --pub type c_char = i8; - pub type dev_t = u32; - pub type mode_t = u16; - pub type pthread_attr_t = *mut ::c_void; -@@ -82,13 +81,6 @@ s! { - pub sa_mask: sigset_t, - } - -- pub struct stack_t { -- // In FreeBSD 11 and later, ss_sp is actually a void* -- pub ss_sp: *mut ::c_char, -- pub ss_size: ::size_t, -- pub ss_flags: ::c_int, -- } -- - pub struct sched_param { - pub sched_priority: ::c_int, - } diff --git a/mail/thunderbird/files/patch-bug1559213 b/mail/thunderbird/files/patch-bug1559213 new file mode 100644 index 000000000000..0100df8d09b0 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1559213 @@ -0,0 +1,100 @@ +commit 717bba28411c +Author: Jory A. Pratt +Date: Thu Jun 13 11:53:00 2019 -0700 + + Bug 1559213 - Allow to use system av1 libs instead of bundled. +--- + config/external/moz.build | 5 +++-- + config/system-headers.mozbuild | 8 ++++++++ + dom/media/platforms/moz.build | 5 +++++ + toolkit/moz.configure | 19 ++++++++++++++++++- + 4 files changed, 34 insertions(+), 3 deletions(-) + +diff --git config/external/moz.build config/external/moz.build +index 03e4fa143bd1..a67d10b11fe6 100644 +--- config/external/moz.build ++++ config/external/moz.build +@@ -37,8 +37,9 @@ if not CONFIG['MOZ_SYSTEM_LIBVPX']: + external_dirs += ['media/libvpx'] + + if CONFIG['MOZ_AV1']: +- external_dirs += ['media/libaom'] +- external_dirs += ['media/libdav1d'] ++ if not CONFIG['MOZ_SYSTEM_AV1']: ++ external_dirs += ['media/libaom'] ++ external_dirs += ['media/libdav1d'] + + if not CONFIG['MOZ_SYSTEM_PNG']: + external_dirs += ['media/libpng'] +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index bcf5c4925564..48964a999a9b 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -1304,6 +1304,14 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: + 'SelectSingleContentItemPage.h', + ] + ++if CONFIG['MOZ_SYSTEM_AV1']: ++ system_headers += [ ++ 'aom/aom_decoder.h', ++ 'aom/aomdx.h', ++ 'aom/aom_image.h', ++ 'dav1d/dav1d.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build +index 092cee0c9b66..38e45de5b5f0 100644 +--- dom/media/platforms/moz.build ++++ dom/media/platforms/moz.build +@@ -80,6 +80,11 @@ if CONFIG['MOZ_AV1']: + 'agnostic/AOMDecoder.cpp', + 'agnostic/DAV1DDecoder.cpp', + ] ++ if CONFIG['MOZ_SYSTEM_AV1']: ++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS'] ++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] + + if CONFIG['MOZ_OMX']: + EXPORTS += [ +diff --git toolkit/moz.configure toolkit/moz.configure +index 82b5a59acf42..e2329560b42b 100644 +--- toolkit/moz.configure ++++ toolkit/moz.configure +@@ -441,7 +441,23 @@ def av1(value): + if value: + return True + +-@depends(target, nasm_version, when=av1 & compile_environment) ++option('--with-system-av1', ++ help="Use system av1 (located with pkgconfig)") ++ ++system_libaom_info = pkg_check_modules('MOZ_SYSTEM_LIBAOM', 'aom >= 1.0.0', ++ when='--with-system-av1') ++ ++system_libdav1d_info = pkg_check_modules('MOZ_SYSTEM_LIBDAV1D', 'dav1d >= 0.1.1', ++ when='--with-system-av1') ++ ++@depends(system_libaom_info, system_libdav1d_info) ++def system_av1(system_libaom_info, system_libdav1d_info): ++ has_av1_libs = False ++ if system_libaom_info and system_libdav1d_info: ++ has_av1_libs = True ++ return has_av1_libs ++ ++@depends(target, nasm_version, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment) + def dav1d_asm(target, nasm_version): + if target.os != 'Android': + if target.cpu == 'aarch64': +@@ -457,6 +473,7 @@ set_config('MOZ_DAV1D_ASM', dav1d_asm) + set_define('MOZ_DAV1D_ASM', dav1d_asm) + set_config('MOZ_AV1', av1) + set_define('MOZ_AV1', av1) ++set_config('MOZ_SYSTEM_AV1', depends_if(system_av1)(lambda _: True)) + + # Built-in fragmented MP4 support. + # ============================================================== diff --git a/mail/thunderbird/files/patch-bug847568 b/mail/thunderbird/files/patch-bug847568 index 31dbf22a1fc4..9d243256a6d5 100644 --- a/mail/thunderbird/files/patch-bug847568 +++ b/mail/thunderbird/files/patch-bug847568 @@ -4,8 +4,8 @@ diff --git config/system-headers.mozbuild config/system-headers.mozbuild index 7620b4d00623..09d3db5ca8c0 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1312,6 +1312,19 @@ if not CONFIG['MOZ_TREE_PIXMAN']: - 'pixman.h', +@@ -1300,6 +1300,19 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: + 'SelectSingleContentItemPage.h', ] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: @@ -28,7 +28,7 @@ diff --git dom/base/moz.build dom/base/moz.build index 8e19020315ae..2fcdbb6f7b42 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +@@ -495,6 +495,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] @@ -72,10 +72,10 @@ diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla index 22c76a7df020..a01490bd49ee 100644 --- gfx/harfbuzz/README-mozilla +++ gfx/harfbuzz/README-mozilla -@@ -19,3 +19,8 @@ the mozilla tree. +@@ -15,3 +15,8 @@ from within the gfx/harfbuzz directory. If the collection of source files changes, manual updates to moz.build may be - needed, as we don't use the upstream makefiles. + needed as we don't use the upstream makefiles. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. +Make sure to keep pkg-config version check within toolkit/moz.configure in sync @@ -111,7 +111,7 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py index e06ae3457a47..93faa61594a3 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -148,6 +148,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -125,7 +125,7 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build index 2118677ca3a8..e4978b413784 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -822,6 +822,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -139,7 +139,7 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build index 56f1b9fe3f4b..0ac1100b0df3 100644 --- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): +@@ -288,7 +288,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] @@ -170,7 +170,7 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 79c26e3e7001..c4d93bc5f7dc 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -73,3 +73,6 @@ USE_LIBS += ['icu'] +@@ -76,3 +76,6 @@ USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] @@ -181,7 +181,7 @@ diff --git old-configure.in old-configure.in index 95a58b634593..b614eef85c89 100644 --- old-configure.in +++ old-configure.in -@@ -4333,6 +4333,27 @@ dnl ======================================================== +@@ -3951,6 +3951,27 @@ dnl ======================================================== AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) @@ -198,7 +198,7 @@ index 95a58b634593..b614eef85c89 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,10) ++ #if !GR2_VERSION_REQUIRE(1,3,12) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -213,9 +213,9 @@ diff --git toolkit/library/moz.build toolkit/library/moz.build index 24f940e1ed7e..079a575adec3 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] +@@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: + if CONFIG['MOZ_SYSTEM_WEBP']: + OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] @@ -223,14 +223,14 @@ index 24f940e1ed7e..079a575adec3 100644 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + if CONFIG['MOZ_SYSTEM_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] diff --git toolkit/moz.configure toolkit/moz.configure index 9297e4d6f501..d8e273887e4b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS', +@@ -894,6 +894,26 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags) @@ -249,11 +249,11 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.4.0', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # Mortar + # Marionette remote protocol # ============================================================== - option('--enable-mortar', help='Enable mortar extension') + # diff --git a/mail/thunderbird/files/patch-bug991253 b/mail/thunderbird/files/patch-bug991253 deleted file mode 100644 index a9931030e915..000000000000 --- a/mail/thunderbird/files/patch-bug991253 +++ /dev/null @@ -1,17 +0,0 @@ ---- extensions/spellcheck/hunspell/glue/mozHunspell.cpp~ -+++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp -@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo - } - } - -+ // load system hunspell dictionaries -+ nsCOMPtr hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, getter_AddRefs(hunDir)); -+ if (hunDir) { -+ LoadDictionariesFromDir(hunDir); -+ } -+ - // find dictionaries from extensions requiring restart - nsCOMPtr dictDirs; - rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, diff --git a/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp b/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp index 1df3736c2211..d797b41ed389 100644 --- a/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp +++ b/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp @@ -7,7 +7,7 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -7,6 +7,7 @@ #include "FlacDecoder.h" #include "MediaContainerType.h" - #include "MediaPrefs.h" + #include "mozilla/StaticPrefs.h" +#include "PDMFactory.h" namespace mozilla { @@ -15,10 +15,10 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX - return MediaPrefs::FlacEnabled(); + return StaticPrefs::MediaFlacEnabled(); +#elif defined(MOZ_FFMPEG) + RefPtr platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), + /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. diff --git a/mail/thunderbird/files/patch-toolkit_moz.configure b/mail/thunderbird/files/patch-toolkit_moz.configure deleted file mode 100644 index 6927df0b3ce5..000000000000 --- a/mail/thunderbird/files/patch-toolkit_moz.configure +++ /dev/null @@ -1,15 +0,0 @@ -diff --git toolkit/moz.configure toolkit/moz.configure -index 1befea00c485..7999b7acd5bd 100644 ---- toolkit/moz.configure -+++ toolkit/moz.configure -@@ -842,8 +842,8 @@ def webrender(value, milestone): - enable_webrender = None - - if value.origin == 'default': -- # if nothing is specified, default to just building on Nightly -- build_webrender = milestone.is_nightly -+ # build by default downstream -+ build_webrender = True - elif len(value) and value[0] == 'build': - # if explicitly set to 'build', then we build but don't enable - build_webrender = True diff --git a/mail/thunderbird/files/patch-u2f-hid-rs62 b/mail/thunderbird/files/patch-u2f-hid-rs62 deleted file mode 100644 index 9aa4b1ca26e9..000000000000 --- a/mail/thunderbird/files/patch-u2f-hid-rs62 +++ /dev/null @@ -1,31339 +0,0 @@ -https://github.com/jcjones/u2f-hid-rs/pull/62 - -diff --git Cargo.lock Cargo.lock -index 4bfba0eb2f52..cd4d80035d81 100644 ---- Cargo.lock -+++ Cargo.lock -@@ -486,6 +486,15 @@ dependencies = [ - "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -+[[package]] -+name = "devd-rs" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ - [[package]] - name = "dtoa" - version = "0.4.2" -@@ -1170,6 +1179,14 @@ name = "nom" - version = "1.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - -+[[package]] -+name = "nom" -+version = "3.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ - [[package]] - name = "nserror" - version = "0.1.0" -@@ -1863,6 +1880,7 @@ dependencies = [ - "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -2220,6 +2238,7 @@ dependencies = [ - "checksum darling_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "167dd3e235c2f1da16a635c282630452cdf49191eb05711de1bcd1d3d5068c00" - "checksum darling_macro 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c53edaba455f6073a10c27c72440860eb3f60444f8c8660a391032eeae744d82" - "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" -+"checksum devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c9ac481c38baf400d3b732e4a06850dfaa491d1b6379a249d9d40d14c2434c" - "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" - "checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d" - "checksum dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461" -@@ -2279,6 +2298,7 @@ dependencies = [ - "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09" - "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" - "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" -+"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" - "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525" - "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba" - "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01" -diff --git dom/webauthn/u2f-hid-rs/Cargo.toml dom/webauthn/u2f-hid-rs/Cargo.toml -index a0ab8ce71067..046de1e46f15 100644 ---- dom/webauthn/u2f-hid-rs/Cargo.toml -+++ dom/webauthn/u2f-hid-rs/Cargo.toml -@@ -6,6 +6,9 @@ authors = ["Kyle Machulis ", "J.C. Jones { - match $val { -- Ok(v) => { v } -- Err(e) => { return $or(e); } -+ Ok(v) => v, -+ Err(e) => { -+ return $or(e); -+ } - } -- } -+ }; - } - - fn u2f_get_key_handle_from_register_response(register_response: &Vec) -> io::Result> { -@@ -46,15 +47,13 @@ fn main() { - let challenge_str = format!("{}{}", - r#"{"challenge": "1vQ9mxionq0ngCnjD-wTsv1zUSrGRtFqG2xP09SbZ70","#, - r#" "version": "U2F_V2", "appId": "http://demo.yubico.com"}"#); -- let mut challenge = Sha256::new(); -- challenge.input_str(&challenge_str); -- let mut chall_bytes: Vec = vec![0; challenge.output_bytes()]; -- challenge.result(&mut chall_bytes); -+ let mut challenge = Sha256::default(); -+ challenge.input(challenge_str.as_bytes()); -+ let chall_bytes = Vec::from(challenge.result().as_slice()); - -- let mut application = Sha256::new(); -- application.input_str("http://demo.yubico.com"); -- let mut app_bytes: Vec = vec![0; application.output_bytes()]; -- application.result(&mut app_bytes); -+ let mut application = Sha256::default(); -+ application.input("http://demo.yubico.com".as_bytes()); -+ let app_bytes = Vec::from(application.result().as_slice()); - - let manager = U2FManager::new().unwrap(); - let flags = RegisterFlags::empty(); -diff --git dom/webauthn/u2f-hid-rs/src/freebsd/device.rs dom/webauthn/u2f-hid-rs/src/freebsd/device.rs -new file mode 100644 -index 000000000000..5b9e7f2a912e ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/freebsd/device.rs -@@ -0,0 +1,88 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+extern crate libc; -+ -+use std::ffi::{CString, OsString}; -+use std::io; -+use std::io::{Read, Write}; -+use std::os::unix::prelude::*; -+ -+use consts::CID_BROADCAST; -+use platform::uhid; -+use u2ftypes::U2FDevice; -+use util::from_unix_result; -+ -+#[derive(Debug)] -+pub struct Device { -+ path: OsString, -+ fd: libc::c_int, -+ cid: [u8; 4], -+} -+ -+impl Device { -+ pub fn new(path: OsString) -> io::Result { -+ let cstr = CString::new(path.as_bytes())?; -+ let fd = unsafe { libc::open(cstr.as_ptr(), libc::O_RDWR) }; -+ let fd = from_unix_result(fd)?; -+ Ok(Self { -+ path, -+ fd, -+ cid: CID_BROADCAST, -+ }) -+ } -+ -+ pub fn is_u2f(&self) -> bool { -+ uhid::is_u2f_device(self.fd) -+ } -+} -+ -+impl Drop for Device { -+ fn drop(&mut self) { -+ // Close the fd, ignore any errors. -+ let _ = unsafe { libc::close(self.fd) }; -+ } -+} -+ -+impl PartialEq for Device { -+ fn eq(&self, other: &Device) -> bool { -+ self.path == other.path -+ } -+} -+ -+impl Read for Device { -+ fn read(&mut self, buf: &mut [u8]) -> io::Result { -+ let bufp = buf.as_mut_ptr() as *mut libc::c_void; -+ let rv = unsafe { libc::read(self.fd, bufp, buf.len()) }; -+ from_unix_result(rv as usize) -+ } -+} -+ -+impl Write for Device { -+ fn write(&mut self, buf: &[u8]) -> io::Result { -+ let report_id = buf[0] as i64; -+ // Skip report number when not using numbered reports. -+ let start = if report_id == 0x0 { 1 } else { 0 }; -+ let data = &buf[start..]; -+ -+ let data_ptr = data.as_ptr() as *const libc::c_void; -+ let rv = unsafe { libc::write(self.fd, data_ptr, data.len()) }; -+ from_unix_result(rv as usize + 1) -+ } -+ -+ // USB HID writes don't buffer, so this will be a nop. -+ fn flush(&mut self) -> io::Result<()> { -+ Ok(()) -+ } -+} -+ -+impl U2FDevice for Device { -+ fn get_cid<'a>(&'a self) -> &'a [u8; 4] { -+ &self.cid -+ } -+ -+ fn set_cid(&mut self, cid: [u8; 4]) { -+ self.cid = cid; -+ } -+} -diff --git dom/webauthn/u2f-hid-rs/src/freebsd/mod.rs dom/webauthn/u2f-hid-rs/src/freebsd/mod.rs -new file mode 100644 -index 000000000000..7ed5727157d5 ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/freebsd/mod.rs -@@ -0,0 +1,9 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+pub mod device; -+pub mod transaction; -+ -+mod monitor; -+mod uhid; -diff --git dom/webauthn/u2f-hid-rs/src/freebsd/monitor.rs dom/webauthn/u2f-hid-rs/src/freebsd/monitor.rs -new file mode 100644 -index 000000000000..174c11d8955c ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/freebsd/monitor.rs -@@ -0,0 +1,139 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+use devd_rs; -+use std::collections::HashMap; -+use std::ffi::OsString; -+use std::sync::Arc; -+use std::{fs, io}; -+ -+use runloop::RunLoop; -+ -+const POLL_TIMEOUT: usize = 100; -+ -+pub enum Event { -+ Add(OsString), -+ Remove(OsString), -+} -+ -+impl Event { -+ fn from_devd(event: devd_rs::Event) -> Option { -+ match event { -+ devd_rs::Event::Attach { -+ ref dev, -+ parent: _, -+ location: _, -+ } if dev.starts_with("uhid") => -+ { -+ Some(Event::Add(("/dev/".to_owned() + dev).into())) -+ } -+ devd_rs::Event::Detach { -+ ref dev, -+ parent: _, -+ location: _, -+ } if dev.starts_with("uhid") => -+ { -+ Some(Event::Remove(("/dev/".to_owned() + dev).into())) -+ } -+ _ => None, -+ } -+ } -+} -+ -+fn convert_error(e: devd_rs::Error) -> io::Error { -+ e.into() -+} -+ -+pub struct Monitor -+where -+ F: Fn(OsString, &Fn() -> bool) + Sync, -+{ -+ runloops: HashMap, -+ new_device_cb: Arc, -+} -+ -+impl Monitor -+where -+ F: Fn(OsString, &Fn() -> bool) + Send + Sync + 'static, -+{ -+ pub fn new(new_device_cb: F) -> Self { -+ Self { -+ runloops: HashMap::new(), -+ new_device_cb: Arc::new(new_device_cb), -+ } -+ } -+ -+ pub fn run(&mut self, alive: &Fn() -> bool) -> io::Result<()> { -+ let mut ctx = devd_rs::Context::new().map_err(convert_error)?; -+ -+ // Iterate all existing devices. -+ for dev in fs::read_dir("/dev")? { -+ if let Ok(dev) = dev { -+ let filename_ = dev.file_name(); -+ let filename = filename_.to_str().unwrap_or(""); -+ if filename.starts_with("uhid") { -+ self.add_device(("/dev/".to_owned() + filename).into()); -+ } -+ } -+ } -+ -+ // Loop until we're stopped by the controlling thread, or fail. -+ while alive() { -+ // Wait for new events, break on failure. -+ match ctx.wait_for_event(POLL_TIMEOUT) { -+ Err(devd_rs::Error::Timeout) => (), -+ Err(e) => return Err(e.into()), -+ Ok(event) => { -+ if let Some(event) = Event::from_devd(event) { -+ self.process_event(event); -+ } -+ } -+ } -+ } -+ -+ // Remove all tracked devices. -+ self.remove_all_devices(); -+ -+ Ok(()) -+ } -+ -+ fn process_event(&mut self, event: Event) { -+ match event { -+ Event::Add(path) => { -+ self.add_device(path); -+ } -+ Event::Remove(path) => { -+ self.remove_device(path); -+ } -+ } -+ } -+ -+ fn add_device(&mut self, path: OsString) { -+ let f = self.new_device_cb.clone(); -+ let key = path.clone(); -+ -+ let runloop = RunLoop::new(move |alive| { -+ if alive() { -+ f(path, alive); -+ } -+ }); -+ -+ if let Ok(runloop) = runloop { -+ self.runloops.insert(key, runloop); -+ } -+ } -+ -+ fn remove_device(&mut self, path: OsString) { -+ if let Some(runloop) = self.runloops.remove(&path) { -+ runloop.cancel(); -+ } -+ } -+ -+ fn remove_all_devices(&mut self) { -+ while !self.runloops.is_empty() { -+ let path = self.runloops.keys().next().unwrap().clone(); -+ self.remove_device(path); -+ } -+ } -+} -diff --git dom/webauthn/u2f-hid-rs/src/freebsd/transaction.rs dom/webauthn/u2f-hid-rs/src/freebsd/transaction.rs -new file mode 100644 -index 000000000000..8f5ed990c8a0 ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/freebsd/transaction.rs -@@ -0,0 +1,48 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+use platform::monitor::Monitor; -+use runloop::RunLoop; -+use std::ffi::OsString; -+use util::OnceCallback; -+ -+pub struct Transaction { -+ // Handle to the thread loop. -+ thread: Option, -+} -+ -+impl Transaction { -+ pub fn new( -+ timeout: u64, -+ callback: OnceCallback, -+ new_device_cb: F, -+ ) -> Result -+ where -+ F: Fn(OsString, &Fn() -> bool) + Sync + Send + 'static, -+ T: 'static, -+ { -+ let thread = RunLoop::new_with_timeout( -+ move |alive| { -+ // Create a new device monitor. -+ let mut monitor = Monitor::new(new_device_cb); -+ -+ // Start polling for new devices. -+ try_or!(monitor.run(alive), |_| callback.call(Err(::Error::Unknown))); -+ -+ // Send an error, if the callback wasn't called already. -+ callback.call(Err(::Error::NotAllowed)); -+ }, -+ timeout, -+ ).map_err(|_| ::Error::Unknown)?; -+ -+ Ok(Self { -+ thread: Some(thread), -+ }) -+ } -+ -+ pub fn cancel(&mut self) { -+ // This must never be None. -+ self.thread.take().unwrap().cancel(); -+ } -+} -diff --git dom/webauthn/u2f-hid-rs/src/freebsd/uhid.rs dom/webauthn/u2f-hid-rs/src/freebsd/uhid.rs -new file mode 100644 -index 000000000000..dc7fd0ca7a3f ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/freebsd/uhid.rs -@@ -0,0 +1,90 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+extern crate libc; -+ -+use std::io; -+use std::os::unix::io::RawFd; -+use std::ptr; -+ -+use hidproto::*; -+use util::from_unix_result; -+ -+#[allow(non_camel_case_types)] -+#[repr(C)] -+#[derive(Debug)] -+pub struct GenDescriptor { -+ ugd_data: *mut u8, -+ ugd_lang_id: u16, -+ ugd_maxlen: u16, -+ ugd_actlen: u16, -+ ugd_offset: u16, -+ ugd_config_index: u8, -+ ugd_string_index: u8, -+ ugd_iface_index: u8, -+ ugd_altif_index: u8, -+ ugd_endpt_index: u8, -+ ugd_report_index: u8, -+ reserved: [u8; 16], -+} -+ -+impl Default for GenDescriptor { -+ fn default() -> GenDescriptor { -+ GenDescriptor { -+ ugd_data: ptr::null_mut(), -+ ugd_lang_id: 0, -+ ugd_maxlen: 65535, -+ ugd_actlen: 0, -+ ugd_offset: 0, -+ ugd_config_index: 0, -+ ugd_string_index: 0, -+ ugd_iface_index: 0, -+ ugd_altif_index: 0, -+ ugd_endpt_index: 0, -+ ugd_report_index: 0, -+ reserved: [0; 16], -+ } -+ } -+} -+ -+const IOWR: u32 = 0x40000000 | 0x80000000; -+ -+const IOCPARM_SHIFT: u32 = 13; -+const IOCPARM_MASK: u32 = ((1 << IOCPARM_SHIFT) - 1); -+ -+const TYPESHIFT: u32 = 8; -+const SIZESHIFT: u32 = 16; -+ -+macro_rules! ioctl { -+ ($dir:expr, $name:ident, $ioty:expr, $nr:expr, $size:expr; $ty:ty) => { -+ pub unsafe fn $name(fd: libc::c_int, val: *mut $ty) -> io::Result { -+ let ioc = ($dir as u32) | (($size as u32 & IOCPARM_MASK) << SIZESHIFT) -+ | (($ioty as u32) << TYPESHIFT) | ($nr as u32); -+ from_unix_result(libc::ioctl(fd, ioc as libc::c_ulong, val)) -+ } -+ }; -+} -+ -+// https://github.com/freebsd/freebsd/blob/master/sys/dev/usb/usb_ioctl.h -+ioctl!(IOWR, usb_get_report_desc, b'U', 21, 32; /*struct*/ GenDescriptor); -+ -+fn read_report_descriptor(fd: RawFd) -> io::Result { -+ let mut desc = GenDescriptor::default(); -+ let _ = unsafe { usb_get_report_desc(fd, &mut desc)? }; -+ desc.ugd_maxlen = desc.ugd_actlen; -+ let mut value = Vec::with_capacity(desc.ugd_actlen as usize); -+ unsafe { -+ value.set_len(desc.ugd_actlen as usize); -+ } -+ desc.ugd_data = value.as_mut_ptr(); -+ let _ = unsafe { usb_get_report_desc(fd, &mut desc)? }; -+ Ok(ReportDescriptor { value }) -+} -+ -+pub fn is_u2f_device(fd: RawFd) -> bool { -+ match read_report_descriptor(fd) { -+ Ok(desc) => has_fido_usage(desc), -+ Err(_) => false, // Upon failure, just say it's not a U2F device. -+ } -+} -diff --git dom/webauthn/u2f-hid-rs/src/hidproto.rs dom/webauthn/u2f-hid-rs/src/hidproto.rs -new file mode 100644 -index 000000000000..ea30890e0e1e ---- /dev/null -+++ dom/webauthn/u2f-hid-rs/src/hidproto.rs -@@ -0,0 +1,158 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+// Shared code for platforms that use raw HID access (Linux, FreeBSD, etc.) -+ -+use std::mem; -+ -+use consts::{FIDO_USAGE_U2FHID, FIDO_USAGE_PAGE}; -+ -+// The 4 MSBs (the tag) are set when it's a long item. -+const HID_MASK_LONG_ITEM_TAG: u8 = 0b11110000; -+// The 2 LSBs denote the size of a short item. -+const HID_MASK_SHORT_ITEM_SIZE: u8 = 0b00000011; -+// The 6 MSBs denote the tag (4) and type (2). -+const HID_MASK_ITEM_TAGTYPE: u8 = 0b11111100; -+// tag=0000, type=10 (local) -+const HID_ITEM_TAGTYPE_USAGE: u8 = 0b00001000; -+// tag=0000, type=01 (global) -+const HID_ITEM_TAGTYPE_USAGE_PAGE: u8 = 0b00000100; -+ -+pub struct ReportDescriptor { -+ pub value: Vec, -+} -+ -+impl ReportDescriptor { -+ fn iter(self) -> ReportDescriptorIterator { -+ ReportDescriptorIterator::new(self) -+ } -+} -+ -+#[derive(Debug)] -+pub enum Data { -+ UsagePage { data: u32 }, -+ Usage { data: u32 }, -+} -+ -+pub struct ReportDescriptorIterator { -+ desc: ReportDescriptor, -+ pos: usize, -+} -+ -+impl ReportDescriptorIterator { -+ fn new(desc: ReportDescriptor) -> Self { -+ Self { desc, pos: 0 } -+ } -+ -+ fn next_item(&mut self) -> Option { -+ let item = get_hid_item(&self.desc.value[self.pos..]); -+ if item.is_none() { -+ self.pos = self.desc.value.len(); // Close, invalid data. -+ return None; -+ } -+ -+ let (tag_type, key_len, data) = item.unwrap(); -+ -+ // Advance if we have a valid item. -+ self.pos += key_len + data.len(); -+ -+ // We only check short items. -+ if key_len > 1 { -+ return None; // Check next item. -+ } -+ -+ // Short items have max. length of 4 bytes. -+ assert!(data.len() <= mem::size_of::()); -+ -+ // Convert data bytes to a uint. -+ let data = read_uint_le(data); -+ -+ match tag_type { -+ HID_ITEM_TAGTYPE_USAGE_PAGE => Some(Data::UsagePage { data }), -+ HID_ITEM_TAGTYPE_USAGE => Some(Data::Usage { data }), -+ _ => None, -+ } -+ } -+} -+ -+impl Iterator for ReportDescriptorIterator { -+ type Item = Data; -+ -+ fn next(&mut self) -> Option { -+ if self.pos >= self.desc.value.len() { -+ return None; -+ } -+ -+ self.next_item().or_else(|| self.next()) -+ } -+} -+ -+fn get_hid_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -+ if (buf[0] & HID_MASK_LONG_ITEM_TAG) == HID_MASK_LONG_ITEM_TAG { -+ get_hid_long_item(buf) -+ } else { -+ get_hid_short_item(buf) -+ } -+} -+ -+fn get_hid_long_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -+ // A valid long item has at least three bytes. -+ if buf.len() < 3 { -+ return None; -+ } -+ -+ let len = buf[1] as usize; -+ -+ // Ensure that there are enough bytes left in the buffer. -+ if len > buf.len() - 3 { -+ return None; -+ } -+ -+ Some((buf[2], 3 /* key length */, &buf[3..])) -+} -+ -+fn get_hid_short_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -+ // This is a short item. The bottom two bits of the key -+ // contain the length of the data section (value) for this key. -+ let len = match buf[0] & HID_MASK_SHORT_ITEM_SIZE { -+ s @ 0...2 => s as usize, -+ _ => 4, /* _ == 3 */ -+ }; -+ -+ // Ensure that there are enough bytes left in the buffer. -+ if len > buf.len() - 1 { -+ return None; -+ } -+ -+ Some(( -+ buf[0] & HID_MASK_ITEM_TAGTYPE, -+ 1, /* key length */ -+ &buf[1..1 + len], -+ )) -+} -+ -+fn read_uint_le(buf: &[u8]) -> u32 { -+ assert!(buf.len() <= 4); -+ // Parse the number in little endian byte order. -+ buf.iter().rev().fold(0, |num, b| (num << 8) | (*b as u32)) -+} -+ -+pub fn has_fido_usage(desc: ReportDescriptor) -> bool { -+ let mut usage_page = None; -+ let mut usage = None; -+ -+ for data in desc.iter() { -+ match data { -+ Data::UsagePage { data } => usage_page = Some(data), -+ Data::Usage { data } => usage = Some(data), -+ } -+ -+ // Check the values we found. -+ if let (Some(usage_page), Some(usage)) = (usage_page, usage) { -+ return usage_page == FIDO_USAGE_PAGE as u32 && usage == FIDO_USAGE_U2FHID as u32; -+ } -+ } -+ -+ false -+} -diff --git dom/webauthn/u2f-hid-rs/src/lib.rs dom/webauthn/u2f-hid-rs/src/lib.rs -index 1307497e91ac..e0cdc5080924 100644 ---- dom/webauthn/u2f-hid-rs/src/lib.rs -+++ dom/webauthn/u2f-hid-rs/src/lib.rs -@@ -5,6 +5,9 @@ - #[macro_use] - mod util; - -+#[cfg(any(target_os = "linux", target_os = "freebsd"))] -+pub mod hidproto; -+ - #[cfg(any(target_os = "linux"))] - extern crate libudev; - -@@ -12,6 +15,13 @@ extern crate libudev; - #[path = "linux/mod.rs"] - pub mod platform; - -+#[cfg(any(target_os = "freebsd"))] -+extern crate devd_rs; -+ -+#[cfg(any(target_os = "freebsd"))] -+#[path = "freebsd/mod.rs"] -+pub mod platform; -+ - #[cfg(any(target_os = "macos"))] - extern crate core_foundation_sys; - -@@ -23,7 +33,9 @@ pub mod platform; - #[path = "windows/mod.rs"] - pub mod platform; - --#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))] -+#[cfg( -+ not(any(target_os = "linux", target_os = "freebsd", target_os = "macos", target_os = "windows")) -+)] - #[path = "stub/mod.rs"] - pub mod platform; - -@@ -39,8 +51,8 @@ extern crate bitflags; - - mod consts; - mod statemachine; --mod u2ftypes; - mod u2fprotocol; -+mod u2ftypes; - - mod manager; - pub use manager::U2FManager; -@@ -88,9 +100,9 @@ pub enum Error { - NotAllowed = 5, - } - -+#[cfg(fuzzing)] -+pub use consts::*; - #[cfg(fuzzing)] - pub use u2fprotocol::*; - #[cfg(fuzzing)] - pub use u2ftypes::*; --#[cfg(fuzzing)] --pub use consts::*; -diff --git dom/webauthn/u2f-hid-rs/src/linux/device.rs dom/webauthn/u2f-hid-rs/src/linux/device.rs -index 6ed57106920f..35569f88a190 100644 ---- dom/webauthn/u2f-hid-rs/src/linux/device.rs -+++ dom/webauthn/u2f-hid-rs/src/linux/device.rs -@@ -11,8 +11,8 @@ use std::os::unix::prelude::*; - - use consts::CID_BROADCAST; - use platform::hidraw; --use util::from_unix_result; - use u2ftypes::U2FDevice; -+use util::from_unix_result; - - #[derive(Debug)] - pub struct Device { -diff --git dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs -index 0ce5d379c3f7..182fe0ec5f2e 100644 ---- dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs -+++ dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs -@@ -8,22 +8,16 @@ use std::io; - use std::mem; - use std::os::unix::io::RawFd; - --use consts::{FIDO_USAGE_U2FHID, FIDO_USAGE_PAGE}; -+use hidproto::*; - use util::{from_unix_result, io_err}; - - #[allow(non_camel_case_types)] - #[repr(C)] --pub struct ReportDescriptor { -+pub struct LinuxReportDescriptor { - size: ::libc::c_int, - value: [u8; 4096], - } - --impl ReportDescriptor { -- fn iter(self) -> ReportDescriptorIterator { -- ReportDescriptorIterator::new(self) -- } --} -- - const NRBITS: u32 = 8; - const TYPEBITS: u32 = 8; - -@@ -35,28 +29,15 @@ const TYPESHIFT: u32 = NRSHIFT + NRBITS as u32; - const SIZESHIFT: u32 = TYPESHIFT + TYPEBITS as u32; - const DIRSHIFT: u32 = SIZESHIFT + SIZEBITS as u32; - --// The 4 MSBs (the tag) are set when it's a long item. --const HID_MASK_LONG_ITEM_TAG: u8 = 0b11110000; --// The 2 LSBs denote the size of a short item. --const HID_MASK_SHORT_ITEM_SIZE: u8 = 0b00000011; --// The 6 MSBs denote the tag (4) and type (2). --const HID_MASK_ITEM_TAGTYPE: u8 = 0b11111100; --// tag=0000, type=10 (local) --const HID_ITEM_TAGTYPE_USAGE: u8 = 0b00001000; --// tag=0000, type=01 (global) --const HID_ITEM_TAGTYPE_USAGE_PAGE: u8 = 0b00000100; -- - // https://github.com/torvalds/linux/blob/master/include/uapi/linux/hid.h - const HID_MAX_DESCRIPTOR_SIZE: usize = 4096; - - macro_rules! ioctl { -- ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => ( -+ ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => { - pub unsafe fn $name(fd: libc::c_int, val: *mut $ty) -> io::Result { - let size = mem::size_of::<$ty>(); -- let ioc = (($dir as u32) << DIRSHIFT) | -- (($ioty as u32) << TYPESHIFT) | -- (($nr as u32) << NRSHIFT) | -- ((size as u32) << SIZESHIFT); -+ let ioc = (($dir as u32) << DIRSHIFT) | (($ioty as u32) << TYPESHIFT) -+ | (($nr as u32) << NRSHIFT) | ((size as u32) << SIZESHIFT); - - #[cfg(not(target_env = "musl"))] - type IocType = libc::c_ulong; -@@ -65,120 +46,12 @@ macro_rules! ioctl { - - from_unix_result(libc::ioctl(fd, ioc as IocType, val)) - } -- ); -+ }; - } - - // https://github.com/torvalds/linux/blob/master/include/uapi/linux/hidraw.h - ioctl!(READ, hidiocgrdescsize, b'H', 0x01; ::libc::c_int); --ioctl!(READ, hidiocgrdesc, b'H', 0x02; /*struct*/ ReportDescriptor); -- --enum Data { -- UsagePage { data: u32 }, -- Usage { data: u32 }, --} -- --struct ReportDescriptorIterator { -- desc: ReportDescriptor, -- pos: usize, --} -- --impl ReportDescriptorIterator { -- fn new(desc: ReportDescriptor) -> Self { -- Self { desc, pos: 0 } -- } -- -- fn next_item(&mut self) -> Option { -- let item = get_hid_item(&self.desc.value[self.pos..]); -- if item.is_none() { -- self.pos = self.desc.size as usize; // Close, invalid data. -- return None; -- } -- -- let (tag_type, key_len, data) = item.unwrap(); -- -- // Advance if we have a valid item. -- self.pos += key_len + data.len(); -- -- // We only check short items. -- if key_len > 1 { -- return None; // Check next item. -- } -- -- // Short items have max. length of 4 bytes. -- assert!(data.len() <= mem::size_of::()); -- -- // Convert data bytes to a uint. -- let data = read_uint_le(data); -- -- match tag_type { -- HID_ITEM_TAGTYPE_USAGE_PAGE => Some(Data::UsagePage { data }), -- HID_ITEM_TAGTYPE_USAGE => Some(Data::Usage { data }), -- _ => None, -- } -- } --} -- --impl Iterator for ReportDescriptorIterator { -- type Item = Data; -- -- fn next(&mut self) -> Option { -- if self.pos >= self.desc.size as usize { -- return None; -- } -- -- self.next_item().or_else(|| self.next()) -- } --} -- --fn get_hid_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -- if (buf[0] & HID_MASK_LONG_ITEM_TAG) == HID_MASK_LONG_ITEM_TAG { -- get_hid_long_item(buf) -- } else { -- get_hid_short_item(buf) -- } --} -- --fn get_hid_long_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -- // A valid long item has at least three bytes. -- if buf.len() < 3 { -- return None; -- } -- -- let len = buf[1] as usize; -- -- // Ensure that there are enough bytes left in the buffer. -- if len > buf.len() - 3 { -- return None; -- } -- -- Some((buf[2], 3 /* key length */, &buf[3..])) --} -- --fn get_hid_short_item<'a>(buf: &'a [u8]) -> Option<(u8, usize, &'a [u8])> { -- // This is a short item. The bottom two bits of the key -- // contain the length of the data section (value) for this key. -- let len = match buf[0] & HID_MASK_SHORT_ITEM_SIZE { -- s @ 0...2 => s as usize, -- _ => 4, /* _ == 3 */ -- }; -- -- // Ensure that there are enough bytes left in the buffer. -- if len > buf.len() - 1 { -- return None; -- } -- -- Some(( -- buf[0] & HID_MASK_ITEM_TAGTYPE, -- 1, /* key length */ -- &buf[1..1 + len], -- )) --} -- --fn read_uint_le(buf: &[u8]) -> u32 { -- assert!(buf.len() <= 4); -- // Parse the number in little endian byte order. -- buf.iter().rev().fold(0, |num, b| (num << 8) | (*b as u32)) --} -+ioctl!(READ, hidiocgrdesc, b'H', 0x02; /*struct*/ LinuxReportDescriptor); - - pub fn is_u2f_device(fd: RawFd) -> bool { - match read_report_descriptor(fd) { -@@ -188,7 +61,7 @@ pub fn is_u2f_device(fd: RawFd) -> bool { - } - - fn read_report_descriptor(fd: RawFd) -> io::Result { -- let mut desc = ReportDescriptor { -+ let mut desc = LinuxReportDescriptor { - size: 0, - value: [0; HID_MAX_DESCRIPTOR_SIZE], - }; -@@ -199,24 +72,7 @@ fn read_report_descriptor(fd: RawFd) -> io::Result { - } - - let _ = unsafe { hidiocgrdesc(fd, &mut desc)? }; -- Ok(desc) --} -- --fn has_fido_usage(desc: ReportDescriptor) -> bool { -- let mut usage_page = None; -- let mut usage = None; -- -- for data in desc.iter() { -- match data { -- Data::UsagePage { data } => usage_page = Some(data), -- Data::Usage { data } => usage = Some(data), -- } -- -- // Check the values we found. -- if let (Some(usage_page), Some(usage)) = (usage_page, usage) { -- return usage_page == FIDO_USAGE_PAGE as u32 && usage == FIDO_USAGE_U2FHID as u32; -- } -- } -- -- false -+ let mut value = Vec::from(&desc.value[..]); -+ value.truncate(desc.size as usize); -+ Ok(ReportDescriptor { value }) - } -diff --git dom/webauthn/u2f-hid-rs/src/linux/monitor.rs dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -index 47c376ba9176..408ea4b7b9ad 100644 ---- dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -+++ dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -@@ -65,13 +65,11 @@ where - - // Start listening for new devices. - let mut socket = monitor.listen()?; -- let mut fds = vec![ -- ::libc::pollfd { -- fd: socket.as_raw_fd(), -- events: POLLIN, -- revents: 0, -- }, -- ]; -+ let mut fds = vec![::libc::pollfd { -+ fd: socket.as_raw_fd(), -+ events: POLLIN, -+ revents: 0, -+ }]; - - while alive() { - // Wait for new events, break on failure. -diff --git dom/webauthn/u2f-hid-rs/src/macos/iokit.rs dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -index 7e550af2a445..79e53599004e 100644 ---- dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -+++ dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -@@ -282,13 +282,13 @@ extern "C" { - - #[cfg(test)] - mod tests { -+ use super::*; - use core_foundation_sys::base::*; - use core_foundation_sys::runloop::*; - use libc::c_void; - use std::ptr; - use std::sync::mpsc::{channel, Sender}; - use std::thread; -- use super::*; - - extern "C" fn observe(_: CFRunLoopObserverRef, _: CFRunLoopActivity, context: *mut c_void) { - let tx: &Sender = unsafe { &*(context as *mut _) }; -diff --git dom/webauthn/u2f-hid-rs/src/macos/monitor.rs dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -index c346fe5eff57..b971ed885d18 100644 ---- dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -+++ dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -@@ -10,9 +10,9 @@ use core_foundation_sys::runloop::*; - use libc::c_void; - use platform::iokit::*; - use runloop::RunLoop; --use std::{io, slice}; - use std::collections::HashMap; - use std::sync::mpsc::{channel, Receiver, Sender}; -+use std::{io, slice}; - use util::io_err; - - struct DeviceData { -diff --git dom/webauthn/u2f-hid-rs/src/manager.rs dom/webauthn/u2f-hid-rs/src/manager.rs -index c9f92bdbfad5..ca8b80a9584a 100644 ---- dom/webauthn/u2f-hid-rs/src/manager.rs -+++ dom/webauthn/u2f-hid-rs/src/manager.rs -@@ -7,8 +7,8 @@ use std::sync::mpsc::{channel, RecvTimeoutError, Sender}; - use std::time::Duration; - - use consts::PARAMETER_SIZE; --use statemachine::StateMachine; - use runloop::RunLoop; -+use statemachine::StateMachine; - use util::OnceCallback; - - enum QueueAction { -diff --git dom/webauthn/u2f-hid-rs/src/statemachine.rs dom/webauthn/u2f-hid-rs/src/statemachine.rs -index 8e4abaa7cf02..55e7d36155a3 100644 ---- dom/webauthn/u2f-hid-rs/src/statemachine.rs -+++ dom/webauthn/u2f-hid-rs/src/statemachine.rs -@@ -7,8 +7,8 @@ use platform::device::Device; - use platform::transaction::Transaction; - use std::thread; - use std::time::Duration; --use util::OnceCallback; - use u2fprotocol::{u2f_init_device, u2f_is_keyhandle_valid, u2f_register, u2f_sign}; -+use util::OnceCallback; - - fn is_valid_transport(transports: ::AuthenticatorTransports) -> bool { - transports.is_empty() || transports.contains(::AuthenticatorTransports::USB) -diff --git dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -index 4d6737b1289e..0b984407d873 100644 ---- dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -+++ dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -@@ -5,9 +5,9 @@ - extern crate std; - - use rand::{thread_rng, Rng}; -+use std::ffi::CString; - use std::io; - use std::io::{Read, Write}; --use std::ffi::CString; - - use consts::*; - use u2ftypes::*; -diff --git dom/webauthn/u2f-hid-rs/src/util.rs dom/webauthn/u2f-hid-rs/src/util.rs -index 27db864e2fcd..770e166d57d2 100644 ---- dom/webauthn/u2f-hid-rs/src/util.rs -+++ dom/webauthn/u2f-hid-rs/src/util.rs -@@ -12,10 +12,12 @@ use boxfnonce::SendBoxFnOnce; - macro_rules! try_or { - ($val:expr, $or:expr) => { - match $val { -- Ok(v) => { v } -- Err(e) => { return $or(e); } -+ Ok(v) => v, -+ Err(e) => { -+ return $or(e); -+ } - } -- } -+ }; - } - - pub trait Signed { -@@ -44,6 +46,16 @@ pub fn from_unix_result(rv: T) -> io::Result { - } - } - -+#[cfg(any(target_os = "freebsd"))] -+pub fn from_unix_result(rv: T) -> io::Result { -+ if rv.is_negative() { -+ let errno = unsafe { *libc::__error() }; -+ Err(io::Error::from_raw_os_error(errno)) -+ } else { -+ Ok(rv) -+ } -+} -+ - pub fn io_err(msg: &str) -> io::Error { - io::Error::new(io::ErrorKind::Other, msg) - } -diff --git dom/webauthn/u2f-hid-rs/src/windows/device.rs dom/webauthn/u2f-hid-rs/src/windows/device.rs -index cbbe2811d672..5579cc052a6f 100644 ---- dom/webauthn/u2f-hid-rs/src/windows/device.rs -+++ dom/webauthn/u2f-hid-rs/src/windows/device.rs -@@ -7,8 +7,8 @@ use std::io; - use std::io::{Read, Write}; - use std::os::windows::io::AsRawHandle; - --use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE}; - use super::winapi::DeviceCapabilities; -+use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE}; - - use u2ftypes::U2FDevice; - -diff --git dom/webauthn/u2f-hid-rs/src/windows/winapi.rs dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -index 18c6898e86ee..bd8a7e58d06a 100644 ---- dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -+++ dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -@@ -60,7 +60,7 @@ extern "stdcall" { - macro_rules! offset_of { - ($ty:ty, $field:ident) => { - unsafe { &(*(0 as *const $ty)).$field as *const _ as usize } -- } -+ }; - } - - fn from_wide_ptr(ptr: *const u16, len: usize) -> String { -diff --git third_party/rust/devd-rs/.cargo-checksum.json third_party/rust/devd-rs/.cargo-checksum.json -new file mode 100644 -index 000000000000..7f8c6af3141e ---- /dev/null -+++ third_party/rust/devd-rs/.cargo-checksum.json -@@ -0,0 +1 @@ -+{"files":{".rustfmt.toml":"2af0439152afb5f592e67eb815db1a2711e3951d94d6ec2a3343ccf17cf7eb53","CODE_OF_CONDUCT.md":"62f073941a34756006851cef8d5d081f6332a986063e87deafeb621f3f6ff554","Cargo.toml":"82c3a9280afb5f4ac916fbca17ca4913b9f66f90c28eb48be1b66f5efe363e87","README.md":"27a78f684d46d92d64bdda18e8b55f132960836347a654d4024ede000e980bec","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","examples/main.rs":"734a87846b61d09d2aaca444c69dc61765f66df34602f3a4acf1255f95404226","src/data.rs":"677b52a636deb1f0ffc623dbdc5ed7acd78d915117825ced7031c6fa6f0c861e","src/lib.rs":"5e1539f2e197214f90cdcb5835c9b082773b0cd18f6c18e03067ebe04f18a6b7","src/parser.rs":"8459eed676eb9190f592b159d099d542bbcc447d6fb19b46f7a61c60a1ef8a8e","src/result.rs":"4088fc879652c115a13d8a6e6a71fab8571a7982e740af6a91115f3a82aef236"},"package":"e7c9ac481c38baf400d3b732e4a06850dfaa491d1b6379a249d9d40d14c2434c"} -\ No newline at end of file -diff --git third_party/rust/devd-rs/.rustfmt.toml third_party/rust/devd-rs/.rustfmt.toml -new file mode 100644 -index 000000000000..6be7cd87020f ---- /dev/null -+++ third_party/rust/devd-rs/.rustfmt.toml -@@ -0,0 +1,9 @@ -+max_width = 256 -+fn_call_width = 96 -+struct_lit_width = 64 -+struct_variant_width = 96 -+array_width = 256 -+newline_style = "Native" -+use_try_shorthand = true -+match_block_trailing_comma = true -+fn_call_style = "Block" -diff --git third_party/rust/devd-rs/CODE_OF_CONDUCT.md third_party/rust/devd-rs/CODE_OF_CONDUCT.md -new file mode 100644 -index 000000000000..a375db8308be ---- /dev/null -+++ third_party/rust/devd-rs/CODE_OF_CONDUCT.md -@@ -0,0 +1,74 @@ -+# Contributor Covenant Code of Conduct -+ -+## Our Pledge -+ -+In the interest of fostering an open and welcoming environment, we as -+contributors and maintainers pledge to making participation in our project and -+our community a harassment-free experience for everyone, regardless of age, body -+size, disability, ethnicity, gender identity and expression, level of experience, -+nationality, personal appearance, race, religion, or sexual identity and -+orientation. -+ -+## Our Standards -+ -+Examples of behavior that contributes to creating a positive environment -+include: -+ -+* Using welcoming and inclusive language -+* Being respectful of differing viewpoints and experiences -+* Gracefully accepting constructive criticism -+* Focusing on what is best for the community -+* Showing empathy towards other community members -+ -+Examples of unacceptable behavior by participants include: -+ -+* The use of sexualized language or imagery and unwelcome sexual attention or -+advances -+* Trolling, insulting/derogatory comments, and personal or political attacks -+* Public or private harassment -+* Publishing others' private information, such as a physical or electronic -+ address, without explicit permission -+* Other conduct which could reasonably be considered inappropriate in a -+ professional setting -+ -+## Our Responsibilities -+ -+Project maintainers are responsible for clarifying the standards of acceptable -+behavior and are expected to take appropriate and fair corrective action in -+response to any instances of unacceptable behavior. -+ -+Project maintainers have the right and responsibility to remove, edit, or -+reject comments, commits, code, wiki edits, issues, and other contributions -+that are not aligned to this Code of Conduct, or to ban temporarily or -+permanently any contributor for other behaviors that they deem inappropriate, -+threatening, offensive, or harmful. -+ -+## Scope -+ -+This Code of Conduct applies both within project spaces and in public spaces -+when an individual is representing the project or its community. Examples of -+representing a project or community include using an official project e-mail -+address, posting via an official social media account, or acting as an appointed -+representative at an online or offline event. Representation of a project may be -+further defined and clarified by project maintainers. -+ -+## Enforcement -+ -+Instances of abusive, harassing, or otherwise unacceptable behavior may be -+reported by contacting the project owner at greg@unrelenting.technology. All -+complaints will be reviewed and investigated and will result in a response that -+is deemed necessary and appropriate to the circumstances. The project owner is -+obligated to maintain confidentiality with regard to the reporter of an incident. -+Further details of specific enforcement policies may be posted separately. -+ -+Project maintainers who do not follow or enforce the Code of Conduct in good -+faith may face temporary or permanent repercussions as determined by other -+members of the project's leadership. -+ -+## Attribution -+ -+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -+available at [http://contributor-covenant.org/version/1/4][version] -+ -+[homepage]: http://contributor-covenant.org -+[version]: http://contributor-covenant.org/version/1/4/ -diff --git third_party/rust/devd-rs/Cargo.toml third_party/rust/devd-rs/Cargo.toml -new file mode 100644 -index 000000000000..9c6f1250697f ---- /dev/null -+++ third_party/rust/devd-rs/Cargo.toml -@@ -0,0 +1,28 @@ -+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -+# -+# When uploading crates to the registry Cargo will automatically -+# "normalize" Cargo.toml files for maximal compatibility -+# with all versions of Cargo and also rewrite `path` dependencies -+# to registry (e.g. crates.io) dependencies -+# -+# If you believe there's an error in this file please file an -+# issue against the rust-lang/cargo repository. If you're -+# editing this file be aware that the upstream Cargo.toml -+# will likely look very different (and much more reasonable) -+ -+[package] -+name = "devd-rs" -+version = "0.2.1" -+authors = ["Greg V "] -+description = "An interface to devd, the device hotplug daemon on FreeBSD and DragonFlyBSD" -+homepage = "https://github.com/myfreeweb/devd-rs" -+readme = "README.md" -+keywords = ["System", "FreeBSD", "DragonFlyBSD", "devd", "hotplug"] -+categories = ["os::unix-apis"] -+license = "Unlicense/MIT" -+repository = "https://github.com/myfreeweb/devd-rs" -+[dependencies.libc] -+version = "0" -+ -+[dependencies.nom] -+version = "3.2" -diff --git third_party/rust/devd-rs/README.md third_party/rust/devd-rs/README.md -new file mode 100644 -index 000000000000..c10c4081f189 ---- /dev/null -+++ third_party/rust/devd-rs/README.md -@@ -0,0 +1,25 @@ -+[![crates.io](https://img.shields.io/crates/v/systemstat.svg)](https://crates.io/crates/systemstat) -+[![unlicense](https://img.shields.io/badge/un-license-green.svg?style=flat)](http://unlicense.org) -+ -+# devd-rs -+ -+A Rust library for listening to FreeBSD (also DragonFlyBSD) [devd](https://www.freebsd.org/cgi/man.cgi?devd)'s device attach-detach notifications. -+ -+Listens on `/var/run/devd.seqpacket.pipe` and parses messages using [nom](https://github.com/Geal/nom). -+ -+## Usage -+ -+See [examples/main.rs](https://github.com/myfreeweb/devd-rs/blob/master/examples/main.rs). -+ -+## Contributing -+ -+Please feel free to submit pull requests! -+ -+By participating in this project you agree to follow the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/4/). -+ -+[The list of contributors is available on GitHub](https://github.com/myfreeweb/devd-rs/graphs/contributors). -+ -+## License -+ -+This is free and unencumbered software released into the public domain. -+For more information, please refer to the `UNLICENSE` file or [unlicense.org](http://unlicense.org). -diff --git third_party/rust/devd-rs/UNLICENSE third_party/rust/devd-rs/UNLICENSE -new file mode 100644 -index 000000000000..68a49daad8ff ---- /dev/null -+++ third_party/rust/devd-rs/UNLICENSE -@@ -0,0 +1,24 @@ -+This is free and unencumbered software released into the public domain. -+ -+Anyone is free to copy, modify, publish, use, compile, sell, or -+distribute this software, either in source code form or as a compiled -+binary, for any purpose, commercial or non-commercial, and by any -+means. -+ -+In jurisdictions that recognize copyright laws, the author or authors -+of this software dedicate any and all copyright interest in the -+software to the public domain. We make this dedication for the benefit -+of the public at large and to the detriment of our heirs and -+successors. We intend this dedication to be an overt act of -+relinquishment in perpetuity of all present and future rights to this -+software under copyright law. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+OTHER DEALINGS IN THE SOFTWARE. -+ -+For more information, please refer to -diff --git third_party/rust/devd-rs/examples/main.rs third_party/rust/devd-rs/examples/main.rs -new file mode 100644 -index 000000000000..fee8612f1e6b ---- /dev/null -+++ third_party/rust/devd-rs/examples/main.rs -@@ -0,0 +1,12 @@ -+extern crate devd_rs; -+ -+use devd_rs::*; -+ -+fn main() { -+ let mut ctx = Context::new().unwrap(); -+ loop { -+ if let Ok(ev) = ctx.wait_for_event(1000) { -+ println!("{:?}", ev); -+ } -+ } -+} -diff --git third_party/rust/devd-rs/src/data.rs third_party/rust/devd-rs/src/data.rs -new file mode 100644 -index 000000000000..52084362e537 ---- /dev/null -+++ third_party/rust/devd-rs/src/data.rs -@@ -0,0 +1,9 @@ -+pub use std::collections::BTreeMap; -+ -+#[derive(Debug, Clone, PartialEq)] -+pub enum Event { -+ Notify { system: String, subsystem: String, kind: String, data: BTreeMap }, -+ Attach { dev: String, parent: BTreeMap, location: String }, -+ Detach { dev: String, parent: BTreeMap, location: String }, -+ Nomatch { parent: BTreeMap, location: String }, -+} -diff --git third_party/rust/devd-rs/src/lib.rs third_party/rust/devd-rs/src/lib.rs -new file mode 100644 -index 000000000000..10e43a328c4d ---- /dev/null -+++ third_party/rust/devd-rs/src/lib.rs -@@ -0,0 +1,98 @@ -+extern crate libc; -+#[macro_use] -+extern crate nom; -+ -+pub mod result; -+pub mod data; -+pub mod parser; -+ -+use libc::{ -+ c_int, nfds_t, -+ poll, pollfd, POLLIN, -+ socket, connect, sockaddr_un, AF_UNIX, SOCK_SEQPACKET -+}; -+use std::os::unix::io::{FromRawFd, RawFd}; -+use std::os::unix::net::UnixStream; -+use std::{io, mem, ptr}; -+use io::{BufRead, BufReader}; -+ -+pub use result::*; -+pub use data::*; -+ -+const SOCKET_PATH: &'static str = "/var/run/devd.seqpacket.pipe"; -+ -+pub fn parse_devd_event(e: String) -> Result { -+ match parser::event(e.as_bytes()) { -+ parser::IResult::Done(_, x) => Ok(x), -+ _ => Err(Error::Parse), -+ } -+} -+ -+#[derive(Debug)] -+pub struct Context { -+ sock: BufReader, -+ sockfd: RawFd, -+} -+ -+impl Context { -+ pub fn new() -> Result { -+ unsafe { -+ let sockfd = socket(AF_UNIX, SOCK_SEQPACKET, 0); -+ if sockfd < 0 { -+ return Err(io::Error::last_os_error().into()); -+ } -+ let mut sockaddr = sockaddr_un { -+ sun_family: AF_UNIX as _, -+ .. mem::zeroed() -+ }; -+ ptr::copy_nonoverlapping( -+ SOCKET_PATH.as_ptr(), -+ sockaddr.sun_path.as_mut_ptr() as *mut u8, -+ SOCKET_PATH.len()); -+ if connect( -+ sockfd, -+ &sockaddr as *const sockaddr_un as *const _, -+ (mem::size_of_val(&AF_UNIX) + SOCKET_PATH.len()) as _) < 0 { -+ return Err(io::Error::last_os_error().into()); -+ } -+ Ok(Context { -+ sock: BufReader::new(UnixStream::from_raw_fd(sockfd)), -+ sockfd: sockfd, -+ }) -+ } -+ } -+ -+ /// Waits for an event using poll(), reads it but does not parse -+ pub fn wait_for_event_raw(&mut self, timeout_ms: usize) -> Result { -+ let mut fds = vec![pollfd { fd: self.sockfd, events: POLLIN, revents: 0 }]; -+ let x = unsafe { poll((&mut fds).as_mut_ptr(), fds.len() as nfds_t, timeout_ms as c_int) }; -+ if x < 0 { -+ Err(io::Error::last_os_error().into()) -+ } else if x == 0 { -+ Err(Error::Timeout) -+ } else { -+ let mut s = String::new(); -+ let _ = self.sock.read_line(&mut s); -+ Ok(s) -+ } -+ } -+ -+ /// Waits for an event using poll(), reads and parses it -+ pub fn wait_for_event<'a>(&mut self, timeout_ms: usize) -> Result { -+ self.wait_for_event_raw(timeout_ms) -+ .and_then(parse_devd_event) -+ } -+ -+ /// Returns the devd socket file descriptor in case you want to select/poll on it together with -+ /// other file descriptors -+ pub fn fd(&self) -> RawFd { -+ self.sockfd -+ } -+ -+ /// Reads an event and parses it. Use when polling on the raw fd by yourself -+ pub fn read_event(&mut self) -> Result { -+ let mut s = String::new(); -+ let _ = self.sock.read_line(&mut s); -+ parse_devd_event(s) -+ } -+} -diff --git third_party/rust/devd-rs/src/parser.rs third_party/rust/devd-rs/src/parser.rs -new file mode 100644 -index 000000000000..59e5a9ce60e3 ---- /dev/null -+++ third_party/rust/devd-rs/src/parser.rs -@@ -0,0 +1,164 @@ -+use std::str; -+use nom::{alphanumeric, multispace}; -+pub use nom::IResult; -+use data::*; -+ -+named!(key<&str>, map_res!(alphanumeric, str::from_utf8)); -+ -+named!( -+ val<&str>, -+ alt!(delimited!(char!('"'), map_res!(take_while!(call!(|c| c != '"' as u8)), str::from_utf8), char!('"')) | map_res!(take_while!(call!(|c| c != '\n' as u8 && c != ' ' as u8)), str::from_utf8)) -+); -+ -+named!(keyval <&[u8], (String, String)>, -+ do_parse!( -+ key: key -+ >> char!('=') -+ >> val: val -+ >> (key.to_owned(), val.to_owned()) -+ ) -+ ); -+ -+named!(keyvals <&[u8], BTreeMap >, -+ map!( -+ many0!(terminated!(keyval, opt!(multispace))), -+ |vec: Vec<_>| vec.into_iter().collect() -+ ) -+ ); -+ -+named!(pub event <&[u8], Event>, -+ alt!( -+ do_parse!( -+ tag!("!") >> -+ tag!("system=") >> -+ sys: val >> -+ multispace >> -+ tag!("subsystem=") >> -+ subsys: val >> -+ multispace >> -+ tag!("type=") >> -+ kind: val >> -+ multispace >> -+ data: keyvals >> -+ (Event::Notify { system: sys.to_owned(), subsystem: subsys.to_owned(), kind: kind.to_owned(), data: data }) -+ ) | -+ do_parse!( -+ tag!("+") >> -+ dev: key >> -+ multispace >> -+ tag!("at") >> -+ multispace >> -+ parent: keyvals >> -+ tag!("on") >> -+ multispace >> -+ loc: val >> -+ (Event::Attach { dev: dev.to_owned(), parent: parent, location: loc.to_owned() }) -+ ) | -+ do_parse!( -+ tag!("-") >> -+ dev: key >> -+ multispace >> -+ tag!("at") >> -+ multispace >> -+ parent: keyvals >> -+ tag!("on") >> -+ multispace >> -+ loc: val >> -+ (Event::Detach { dev: dev.to_owned(), parent: parent, location: loc.to_owned() }) -+ ) | -+ do_parse!( -+ tag!("?") >> -+ multispace >> -+ tag!("at") >> -+ multispace >> -+ parent: keyvals >> -+ tag!("on") >> -+ multispace >> -+ loc: val >> -+ (Event::Nomatch { parent: parent, location: loc.to_owned() }) -+ ) -+ -+ -+ -+ -+ ) -+ ); -+ -+#[cfg(test)] -+mod tests { -+ use super::*; -+ -+ #[test] -+ fn test_notify() { -+ let txt = b"!system=USB subsystem=INTERFACE type=ATTACH ugen=ugen0.2 vendor=0x1050 sernum=\"\" mode=host\n"; -+ let res = event(txt); -+ let mut data = BTreeMap::new(); -+ data.insert("ugen".to_owned(), "ugen0.2".to_owned()); -+ data.insert("vendor".to_owned(), "0x1050".to_owned()); -+ data.insert("sernum".to_owned(), "".to_owned()); -+ data.insert("mode".to_owned(), "host".to_owned()); -+ assert_eq!( -+ res, -+ IResult::Done( -+ &b""[..], -+ Event::Notify { -+ system: "USB".to_owned(), -+ subsystem: "INTERFACE".to_owned(), -+ kind: "ATTACH".to_owned(), -+ data: data, -+ } -+ ) -+ ) -+ } -+ -+ #[test] -+ fn test_attach() { -+ let txt = b"+uhid1 at bus=0 sernum=\"\" on uhub1"; -+ let res = event(txt); -+ let mut data = BTreeMap::new(); -+ data.insert("bus".to_owned(), "0".to_owned()); -+ data.insert("sernum".to_owned(), "".to_owned()); -+ assert_eq!( -+ res, -+ IResult::Done( -+ &b""[..], -+ Event::Attach { -+ dev: "uhid1".to_owned(), -+ parent: data, -+ location: "uhub1".to_owned(), -+ } -+ ) -+ ) -+ } -+ -+ #[test] -+ fn test_detach() { -+ let txt = b"-uhid1 at on uhub1"; -+ let res = event(txt); -+ let data = BTreeMap::new(); -+ assert_eq!( -+ res, -+ IResult::Done( -+ &b""[..], -+ Event::Detach { -+ dev: "uhid1".to_owned(), -+ parent: data.to_owned(), -+ location: "uhub1".to_owned(), -+ } -+ ) -+ ) -+ } -+ -+ #[test] -+ fn test_nomatch() { -+ let txt = b"? at bus=0 on uhub1"; -+ let res = event(txt); -+ let mut data = BTreeMap::new(); -+ data.insert("bus".to_owned(), "0".to_owned()); -+ assert_eq!( -+ res, -+ IResult::Done(&b""[..], Event::Nomatch { parent: data, location: "uhub1".to_owned() }) -+ ) -+ } -+ -+} -diff --git third_party/rust/devd-rs/src/result.rs third_party/rust/devd-rs/src/result.rs -new file mode 100644 -index 000000000000..481cd808ed93 ---- /dev/null -+++ third_party/rust/devd-rs/src/result.rs -@@ -0,0 +1,26 @@ -+use std::{io, result}; -+ -+#[derive(Debug)] -+pub enum Error { -+ IoError(io::Error), -+ Timeout, -+ Parse, -+} -+ -+impl Into for Error { -+ fn into(self) -> io::Error { -+ match self { -+ Error::IoError(e) => e, -+ Error::Timeout => io::Error::new(io::ErrorKind::Other, "devd poll timeout"), -+ Error::Parse => io::Error::new(io::ErrorKind::Other, "devd parse error"), -+ } -+ } -+} -+ -+impl From for Error { -+ fn from(err: io::Error) -> Error { -+ Error::IoError(err) -+ } -+} -+ -+pub type Result = result::Result; -diff --git third_party/rust/nom-1.2.4/.cargo-checksum.json third_party/rust/nom-1.2.4/.cargo-checksum.json -new file mode 100644 -index 000000000000..9d93bcc0afc2 ---- /dev/null -+++ third_party/rust/nom-1.2.4/.cargo-checksum.json -@@ -0,0 +1 @@ -+{"files":{".travis.yml":"6d4e81838b10c5e330749857c72c2f2b1a2e575e71abcd11c094f3b612347b2a","CHANGELOG.md":"d4722e028b2a5b88c466b0d759e463b90bdcfa1b79181a1c76cd313b0a27c615","Cargo.toml":"aebcb999933c3425db85012bea19f9ce78da8e7834dbab54d4a2966e8bc62149","LICENSE":"de730187d5563a81342a3c011d968f78dff37c934fac9b3701e8c762b6118a55","src/bits.rs":"97c9148f63e175489bb6199d039c594ddc56bdf0b7491b9f38b8d74e898bca80","src/bytes.rs":"8f29b976a5e8e6500eb618a9dead7f212688ba9eb06c7066a4016e2db99fed00","src/character.rs":"9ee081f56b508212231ff70d7455b1b85ae44722a39aa60223e8cd95c6570859","src/internal.rs":"ada499b9c178be2a7f9b56319ffb10a778f25fafcda39c78d26b364d89debd72","src/lib.rs":"34efb051214acfde2053e93a7ba718a4fd41b6e0d9edd65a1737605d99b994ab","src/macros.rs":"d39ce3a2cd2b1cb9dd57ce90c06a1ca84720a2dc75e6332cffebba6086cb75d3","src/methods.rs":"24bdbcb0e3570c8bf3fa270dd8d79dd6dfcb982276c82180a89a1e73c5e38019","src/nom.rs":"b0a9c7ce0d09388179bce8f8e23bf57df76b504d925815583c249ec3fc04baab","src/regexp.rs":"8fdae52b761dbad90179e6be87e0e66357fefa34d76af541fb0fcf550fd6ec08","src/str.rs":"198fa15d45c3636289d92c0a592002a07e5a04a431e8cfdf724266e44d484be2","src/stream.rs":"c1bd5b8e7a2061ff66eb2c954033146001f1d65a26d12efa06af8cf93ffa53e4","src/util.rs":"da40ebac865d3176567d3a37b01170234398a03e938553720ce30aa1f6005b6d","tests/arithmetic.rs":"b98936b7fa0228835ca022f6db5342b72a9c01cc3f16a4e05263bbe6424ba3e9","tests/arithmetic_ast.rs":"b18b9a46ba573ae13c40a31217425f6e8cf8fade09a75cdbbfa7146ec668f0b2","tests/cross_function_backtracking.rs":"b071d13031c1f12195473186e3775943991496b10f4590db3f36d511e9f98a1c","tests/ini.rs":"776f681542028564899e55f71533b3bcda5ed1bbb971f24b5b1b9578111ba0cb","tests/ini_str.rs":"315046d9b6dc38d6d306d3562d7ac6518c9ecce9aabcc58fb80c07577ad99789","tests/issues.rs":"2193c219397b7a417cc009b72c13adc42471e7a4917a2a4009aa0fca23c6ea8c","tests/mp4.rs":"b4bf0514fd645160851cc4da9ad6bf81d571cd14865bf134837c19578caaf6e6","tests/omnom.rs":"409d2349fa24f3503bd02e0079c1554a58ce3d40dd7eb0e5d4bb63b588afdae4","tests/test1.rs":"3e0c187bad91d822ebc113eb5cf30fc6585e53a961728304ac24e05ab2123d10"},"package":"a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"} -\ No newline at end of file -diff --git third_party/rust/nom-1.2.4/.travis.yml third_party/rust/nom-1.2.4/.travis.yml -new file mode 100644 -index 000000000000..1d1e36c593aa ---- /dev/null -+++ third_party/rust/nom-1.2.4/.travis.yml -@@ -0,0 +1,46 @@ -+language: rust -+ -+addons: -+ apt: -+ packages: -+ - libcurl4-openssl-dev -+ - libelf-dev -+ - libdw-dev -+ -+rust: -+ - nightly -+ - beta -+ - stable -+ - 1.2.0 -+ -+before_script: -+ - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH -+ -+script: -+ - | -+ travis-cargo --only 1.2 test -- --features regexp && -+ travis-cargo --only stable test -- --features "regexp regexp_macros" && -+ travis-cargo --only beta test -- --features "regexp regexp_macros" && -+ travis-cargo --only nightly build -- --features "nightly core regexp" && -+ travis-cargo --only nightly test -- --features "regexp" && -+ travis-cargo bench && -+ travis-cargo --only stable doc -- --features "regexp" -+ -+after_success: -+ - travis-cargo coveralls --no-sudo -+ -+notifications: -+ webhooks: -+ urls: -+ - https://webhooks.gitter.im/e/9c035a194ac4fd4cc061 -+ on_success: change -+ on_failure: always -+ on_start: false -+ -+ -+env: -+ global: -+ # override the default `--features unstable` used for the nightly branch (optional) -+ - TRAVIS_CARGO_NIGHTLY_FEATURE=nightly -+ -+sudo: false -diff --git third_party/rust/nom-1.2.4/CHANGELOG.md third_party/rust/nom-1.2.4/CHANGELOG.md -new file mode 100644 -index 000000000000..f1c331585779 ---- /dev/null -+++ third_party/rust/nom-1.2.4/CHANGELOG.md -@@ -0,0 +1,555 @@ -+# Change Log -+ -+## [Unreleased][unreleased] -+ -+### Changed -+ -+## 1.2.4 - 2016-07-20 -+ -+### Thanks -+- @Phlosioneer for documentation fixes -+- @sourrust for fixing offsets in `take_bits!` -+- @ChrisMacNaughton for the XFS crate -+- @pwoolcoc for `rest_s` -+- @fitzgen for more `IResult` methods -+- @gtors for the negative lookahead feature -+- @frk1 and @jeandudey for little endian float parsing -+- @jethrogb for fixing input usage in `many1` -+- @acatton for beating me at nom golf :D -+ -+### Added -+- the `rest_s` method on `IResult` returns the remaining `&str` input -+- `unwrap_err` and `unwrap_inc` methods on `IResult` -+- `not!` will peek at the input and return `Done` if the underlying parser returned `Error` or `Incomplete`, without consuming the input -+- `le_f32` and `le_f64` parse little endian floating point numbers (IEEE 754) -+- -+ -+### Fixed -+- documentation fixes -+- `take_bits!` is now more precise -+- `many1` inccorectly used the `len` function instead of `input_len` -+- the INI parser is simpler -+- `recognize!` had an early `return` taht is removed now -+ -+## 1.2.3 - 2016-05-10 -+ -+### Thanks -+- @lu-zero for the contribution guidelines -+- @GuillaumeGomez for fixes on `length_bytes` and some documentation -+- @Hywan for ducomentation and test fixes -+- @Xirdus for correct trait import issues -+- @mspiegel for the new AST example -+- @cholcombe973 for adding the `cond_with_error!` combinator -+- @tstorch for refactoring `many0!` -+- @panicbit for the folding combinators -+- @evestera for `separated_list!` fixes -+- @DanielKeep for correcting some enum imports -+ -+### Added -+- Regular expression combinators starting with `re_bytes_` work on byte slices -+- example parsing arithmetic expressions to an AST -+- `cond_with_error!` works like `cond!` but will return `None` if the condition is false, and `Some(value)` if the underlying parser succeeded -+- `fold_many0!`, `fold_many1!` and `fold_many_m_n!` will take a parser, an initial value and a combining function, and fold over the successful applications of the parser -+ -+### Fixed -+- `length_bytes!` converts the result of its child parser to usize -+- `take_till!` now imports `InputLength` instead of assuming it's in scope -+- `separated_list!` and `separated_nonempty_list!` will not consume the separator if there's no following successfully parsed value -+- no more warnings on build -+ -+### Changed -+- simpler implementation of `many0!` -+ -+## 1.2.2 - 2016-03-09 -+ -+### Thanks -+- @conradev for fixing take_until_s!` -+- @GuillaumeGomez for some documentation fixes -+- @frewsxcv for some documentation fixes -+- @tstorch for some test refactorings -+ -+### Added -+- `nom::Err` now implements `std::error::Error` -+ -+### Fixed -+- `hex_u32` does not parses more than 8 chars now -+- `take_while!` and `take_while1!` will not perturb the behaviour of `recognize!` anymore -+ -+## 1.2.1 - 2016-02-23 -+ -+### Thanks -+- @sourrust for adding methods to `IResult` -+- @tstorch for the test refactoring, and for adding methods to `IResult` and `Needed` -+- @joelself for fixing the method system -+ -+### Added -+ -+- mapping methods over `IResult` and `Needed` -+ -+### Changed -+ -+- `apply_rf` is renamed to `apply_m`. This will not warrant a major version, since it is part missing from the methods feture added in the 1.2.0 release -+- the `regexp_macros` feature that used `regex!` to precompile regular expressions has been replaced by the normal regex engine combined with `lazy_static` -+ -+### Fixed -+ -+- when a parser or combinator was returning an empty buffer as remaining part, it was generating one from a static empty string. This was messing with buffer offset calculation. Now, that empty slice is taken like this: `&input[input.len()..]`. -+- The `regexp_macros` and `no_std` feature build again and are now tested with Travis CI -+ -+## 1.2.0 - 2016-02-08 -+ -+### Thanks -+- @zentner-kyle for type inference fixes -+- @joelself for his work on `&str` parsing and method parsers -+- @GuillaumeGomez for implementing methods on `IResult` -+- @dirk for the `alt_complete!` combinator -+- @tstorch for a lot of refactoring work and unit tests additions -+- @jansegre for the hex digit parsers -+- @belgum for some documentation fixes -+- @lwandrebeck for some documentation fixes and code fixes in `hex_digit` -+ -+### Added -+- `take_until_and_consume_s!` for consumption of string data until a tag -+- more function patterns in `named!`. The error type can now be specified -+- `alt_complete!` works like the `alt!` combinator, but tries the next branch if the current one returned `Incomplete`, instead of returning directly -+- more unit tests for a lot of combinators -+- hexadecimal digit parsers -+- the `tuple!` combinator takes a list of parsers as argument, and applies them serially on the input. If all of them are successful, it willr eturn a tuple accumulating all the values. This combinator will (hopefully) replace most uses of `chain!` -+- parsers can now be implemented as a method for a struct thanks to the `method!`, `call_m!` and `apply_rf!` combinators -+ -+### Fixed -+- there were type inference issues in a few combinators. They will now be easier to compile -+- `peek!` compilation with bare functions -+- `&str` parsers were splitting data at the byte level, not at the char level, which can result in inconsistencies in parsing UTF-8 characters. They now use character indexes -+- some method implementations were missing on `ÃŒResult` (with specified error type instead of implicit) -+ -+## 1.1.0 - 2016-01-01 -+ -+This release adds a lot of features related to `&str` parsing. The previous versions -+were focused on `&[u8]` and bit streams parsing, but there's a need for more text -+parsing with nom. The parsing functions like `alpha`, `digit` and others will now -+accept either a `&[u8]` or a `&str`, so there is no breaking change on that part. -+ -+There are also a few performance improvements and documentation fixes. -+ -+### Thanks -+- @Binero for pushing the work on `&str` parsing -+- @meh for fixing `Option` and `Vec` imports -+- @hoodie for a documentation fix -+- @joelself for some documentation fixes -+- @vberger for his traits magic making `nom functions more generic -+ -+### Added -+ -+- string related parsers: `tag_s!`, `take_s!`, `is_a_s!`, `is_not_s!`, `take_while_s!`, `take_while1_s!`, `take_till_s! -+- `value!` is a combinator that always returns the same value. If a child parser is passed as second argument, that value is returned when the child parser succeeds -+ -+### Changed -+ -+- `tag!` will now compare even on partial input. If it expects "abcd" but receives "ef", it will now return an `Error` instead of `Incomplete` -+- `many0!` and others will preallocate a larger vector to avoid some copies and reallocations -+- `alpha`, `digit`, `alphanumeric`, `space` and `multispace` now accept as input a `&[u8]` or a `&str`. Additionally, they return an error if they receive an empty input -+- `take_while!`, `take_while1!`, `take_while_s!`, `take_while1_s!` wilreturn an error on empty input -+ -+### Fixed -+ -+- if the child parser of `many0!` or `many1!` returns `Incomplete`, it will return `Incomplete` too, possibly updating the needed size -+- `Option,` `Some`, `None` and `Vec` are now used with full path imports -+ -+## 1.0.1 - 2015-11-22 -+ -+This releases makes the 1.0 version compatible with Rust 1.2 and 1.3 -+ -+### Thanks -+- @steveklabnik for fixing lifetime issues in Producers and Consumers -+ -+## 1.0.0 - 2015-11-16 -+ -+Stable release for nom. A lot of new features, a few breaking changes -+ -+### Thanks -+- @ahenry for macro fixes -+- @bluss for fixing documentation -+- @sourrust for cleaning code and debugging the new streaming utilities -+- @meh for inline optimizations -+- @ccmtaylor for fixing function imports -+- @soro for improvements to the streaming utilities -+- @breard-r for catching my typos -+- @nelsonjchen for catching my typos too -+- @divarvel for hex string parsers -+- @mrordinaire for the `length_bytes!` combinator -+ -+### Breaking changes -+- `IResult::Error` can now use custom error types, and is generic over the input type -+- Producers and consumers have been replaced. The new implementation uses less memory and integrates more with parsers -+- `nom::ErrorCode` is now `nom::ErrorKind` -+- `filter!` has been renamed to `take_while!` -+- `chain!` will count how much data is consumed and use that number to calculate how much data is needed if a parser returned `Incomplete` -+- `alt!` returns `Incomplete` if a child parser returned `Incomplete`, instead of skipping to the next parser -+- `IResult` does not require a lifetime tag anymore, yay! -+ -+### Added -+ -+- `complete!` will return an error if the child parser returned `Incomplete` -+- `add_error!` will wrap an error, but allow backtracking -+- `hex_u32` parser -+ -+### Fixed -+- the behaviour around `Incomplete` is better for most parsers now -+ -+## 0.5.0 - 2015-10-16 -+ -+This release fixes a few issues and stabilizes the code. -+ -+### Thanks -+- @nox for documentation fixes -+- @daboross for linting fixes -+- @ahenry for fixing `tap!` and extending `dbg!` and `dbg_dmp!` -+- @bluss for tracking down and fixing issues with unsafe code -+- @meh for inlining parser functions -+- @ccmtaylor for fixing import of `str::from_utf8` -+ -+### Fixed -+- `tap!`, `dbg!` and `dbg_dmp!` now accept function parameters -+ -+### Changed -+- the type used in `count_fixed!` must be `Copy` -+- `chain!` calculates how much data is needed if one of the parsers returns `Incomplete -+- optional parsers in `chain!` can return `Incomplete` -+ -+## 0.4.0 - 2015-09-08 -+ -+Considering the number of changes since the last release, this version can contain breaking changes, so the version number becomes 0.4.0. A lot of new features and performance improvements! -+ -+### Thanks -+- @frewsxcv for documentation fixes -+- @ngrewe for his work on producers and consumers -+- @meh for fixes on `chain!` and for the `rest` parser -+- @daboross for refactoring `many0!` and `many1!` -+- @aleksander for the `switch!` combinator idea -+- @TechnoMancer for his help with bit level parsing -+- @sxeraverx for pointing out a bug in `is_a!` -+ -+### Fixed -+- `count_fixed!` must take an explicit type as argument to generate the fixed-size array -+- optional parsing behaviour in `chain!` -+- `count!` can take 0 elements -+- `is_a!` and `is_not!` can now consume the whole input -+ -+### Added -+- it is now possible to seek to the end of a `MemProducer` -+- `opt!` returns `Done(input, None)` if `the child parser returned `Incomplete` -+- `rest` will return the remaining input -+- consumers can now seek to and from the end of input -+- `switch!` applies a first parser then matches on its result to choose the next parser -+- bit-level parsers -+- character-level parsers -+- regular expression parsers -+- implementation of `take_till!`, `take_while!` and `take_while1!` -+ -+### Changed -+- `alt!` can return `Incomplete` -+- the error analysis functions will now take references to functions instead of moving them -+- performance improvements on producers -+- performance improvement for `filter!` -+- performance improvement for `count!`: a `Vec` of the right size is directly allocated -+ -+## 0.3.11 - 2015-08-04 -+ -+### Thanks -+- @bluss for remarking that the crate included random junk lying non commited in my local repository -+ -+### Fixed -+- cleanup of my local repository will ship less files in the crates, resulting in a smaller download -+ -+## 0.3.10 - 2015-08-03 -+ -+### Added -+ -+- `bits!` for bit level parsing. It indicates that all child parsers will take a `(&[u8], usize)`as input, with the second parameter indicating the bit offset in the first byte. This allows viewing a byte slice as a bit stream. Most combinators can be used directly under `bits!` -+- `take_bits!` takes an integer type and a number of bits, consumes that number of bits and updates the offset, possibly by crossing byte boundaries -+- bit level parsers are all written in `src/bits.rs` -+ -+### Changed -+ -+- Parsers that specifically handle bytes have been moved to src/bytes.rs`. This applies to `tag!`, `is_not!`, `is_a!`, `filter!`, `take!`, `take_str!`, `take_until_and_consume!`, `take_until!`, `take_until_either_and_consume!`, `take_until_either!` -+ -+## 0.3.9 - 2015-07-20 -+ -+### Thanks -+- @badboy for fixing `filter!` -+- @idmit for some documentation fixes -+ -+### Added -+- `opt_res!` applies a parser and transform its result in a Result. This parser never fails -+- `cond_reduce!` takes an expression as parameter, applies the parser if the expression is true, and returns an error if the expression is false -+- `tap!` pass the result of a parser to a block to manipulate it, but do not affect the parser's result -+- `AccReader` is a Read+BufRead that supports data accumulation and partial consumption. The `consume` method must be called afterwardsto indicate how much was consumed -+- Arithmetic expression evaluation and parsing example -+- `u16!`, `u32!`, `u64!`, `i16!`, `i32!`, `i64!` take an expression as parameter, if the expression is true, apply the big endian integer parser, if false, the little endian version -+- type information for combinators. This will make the documentation a bit easier to navigate -+ -+### Fixed -+- `map_opt!` and `map_res!` had issues with argument order due to bad macros -+- `delimited!` did not compile for certain combinations of arguments -+- `filter!` did not return a byte slice but a fixed array -+ -+## 0.3.8 - 2015-07-03 -+ -+### Added -+- code coverage is now calculated automatically on Travis CI -+- `Stepper`: wrap a `Producer`, and call the method `step` with a parser. This method will buffer data if there is not enough, apply the parser if there is, and keep the rest of the input in memory for the next call -+- `ReadProducer`: takes something implementing `Read`, and makes a `Producer` out of it -+ -+### Fixed -+- the combinators `separated_pair!` and `delimited!` did not work because an implementation macro was not exported -+- if a `MemProducer` reached its end, it should always return `Eof` -+- `map!` had issues with argument matching -+ -+## 0.3.7 - 2015-06-24 -+ -+### Added -+- `expr_res!` and `expr_opt!` evaluate an expression returning a Result or Opt and convert it to IResult -+- `AsBytes` is implemented for fixed size arrays. This allows `tag!([41u8, 42u8])` -+ -+### Fixed -+- `count_fixed!` argument parsing works again -+ -+## 0.3.6 - 2015-06-15 -+ -+### Added -+- documentation for a few functions -+- the consumer trait now requires the `failed(&self, error_code)` method in case of parsing error -+- `named!` now handles thge alternative `named!(pub fun_name, ...)` -+ -+### Fixed -+- `filter!` now returns the whole input if the filter function never returned false -+- `take!` casts its argument as usize, so it can accepts any integer type now -+ -+## 0.3.5 - 2015-06-10 -+ -+### Thanks -+- @cmr for some documentation fixes -+ -+### Added -+- `count_fixed!` returns a fixed array -+ -+### Fixed -+- `count!` is back to the previous behaviour, returning a `Vec` for sizes known at runtime -+ -+### Changed -+- functions and traits exported from `nom::util` are now directly in `nom::` -+ -+## 0.3.4 - 2015-06-09 -+ -+### Thanks -+- @andrew-d for fixes on `cond!` -+- @keruspe for features in `chain!` -+ -+### Added -+- `chain!` can now have mutable fields -+ -+### Fixed -+- `cond!` had an infinite macro recursion -+ -+### Changed -+- `chain!` generates less code now. No apprent compilation time improvement -+ -+## 0.3.3 - 2015-06-09 -+ -+### Thanks -+- @andrew-d for the little endian signed integer parsers -+- @keruspe for fixes on `count!` -+ -+### Added -+- `le_i8`, `le_i16`, `le_i32`, `le_i64`: little endian signed integer parsers -+ -+### Changed -+- the `alt!` parser compiles much faster, even with more than 8 branches -+- `count!` can now return a fixed size array instead of a growable vector -+ -+## 0.3.2 - 2015-05-31 -+ -+### Thanks -+- @keruspe for the `take_str` parser and the function application combinator -+ -+### Added -+- `take_str!`: takes the specified number of bytes and return a UTF-8 string -+- `apply!`: do partial application on the parameters of a function -+ -+### Changed -+- `Needed::Size` now contains a `usize` instead of a `u32` -+ -+## 0.3.1 - 2015-05-21 -+ -+### Thanks -+- @divarvel for the big endian signed integer parsers -+ -+### Added -+- `be_i8`, `be_i16`, `be_i32`, `be_i64`: big endian signed integer parsers -+- the `core` feature can be passed to cargo to build with `no_std` -+- colored hexdump can be generated from error chains -+ -+## 0.3.0 - 2015-05-07 -+ -+### Thanks -+- @filipegoncalves for some documentation and the new eof parser -+- @CrimsonVoid for putting fully qualified types in the macros -+- @lu_zero for some documentation fixes -+ -+### Added -+- new error types that can contain an error code, an input slice, and a list of following errors -+- `error!` will cut backtracking and return directly from the parser, with a specified error code -+- `eof` parser, successful if there is no more input -+- specific error codes for the parsers provided by nom -+ -+### Changed -+- fully qualified types in macros. A lot of imports are not needed anymore -+ -+### Removed -+- `FlatMap`, `FlatpMapOpt` and `Functor` traits (replaced by `map!`, `map_opt!` and `map_res!`) -+ -+## 0.2.2 - 2015-04-12 -+ -+### Thanks -+- @filipegoncalves and @thehydroimpulse for debugging an infinite loop in many0 and many1 -+- @thehydroimpulse for suggesting public named parsers -+- @skade for removing the dependency on the collections gate -+ -+### Added -+- `named!` can now declare public functions like this: `named!(pub tst, tag!("abcd"));` -+- `pair!(X,Y)` returns a tuple `(x, y)` -+- `separated_pair!(X, sep, Y)` returns a tuple `(x, y)` -+- `preceded!(opening, X)` returns `x` -+- `terminated!(X, closing)` returns `x` -+- `delimited(opening, X, closing)` returns `x` -+- `separated_list(sep, X)` returns a `Vec` -+- `separated_nonempty_list(sep, X)` returns a `Vec` of at list one element -+ -+### Changed -+- `many0!` and `many1!` forbid parsers that do not consume input -+- `is_a!`, `is_not!`, `alpha`, `digit`, `space`, `multispace` will now return an error if they do not consume at least one byte -+ -+## 0.2.1 - 2015-04-04 -+ -+### Thanks -+- @mtsr for catching the remaining debug println! -+- @jag426 who killed a lot of warnings -+- @skade for removing the dependency on the core feature gate -+ -+ -+### Added -+- little endian unsigned int parsers le_u8, le_u16, le_u32, le_u64 -+- `count!` to apply a parser a specified number of times -+- `cond!` applies a parser if the condition is met -+- more parser development tools in `util::*` -+ -+### Fixed -+- in one case, `opt!` would not compile -+ -+### Removed -+- most of the feature gates are now removed. The only one still needed is `collections` -+ -+## 0.2.0 - 2015-03-24 -+*works with `rustc 1.0.0-dev (81e2396c7 2015-03-19) (built 2015-03-19)`* -+ -+### Thanks -+- Ryman for the AsBytes implementation -+- jag426 and jaredly for documentation fixes -+- eternaleye on #rust IRC for his help on the new macro syntax -+ -+### Changed -+- the AsBytes trait improves readability, no more b"...", but "..." instead -+- Incomplete will now hold either Needed;;Unknown, or Needed::Size(u32). Matching on Incomplete without caring for the value is done with `Incomplete(_)`, but if more granularity is mandatory, `Needed` can be matched too -+- `alt!` can pass the result of the parser to a closure -+- the `take_*` macros changed behaviour, the default case is now not to consume the separator. The macros have been renamed as follows: `take_until!` -> `take_until_and_consume!`, `take_until_and_leave!` -> `take_until!`, `take_until_either_and_leave!` -> `take_until_either!`, `take_until_either!` -> `take_until_either_and_consume!` -+ -+### Added -+- `peek!` macro: matches the future input but does not consume it -+- `length_value!` macro: the first argument is a parser returning a `n` that can cast to usize, then applies the second parser `n` times. The macro has a variant with a third argument indicating the expected input size for the second parser -+- benchmarks are available at https://github.com/Geal/nom_benchmarks -+- more documentation -+- **Unnamed parser syntax**: warning, this is a breaking change. With this new syntax, the macro combinators do not generate functions anymore, they create blocks. That way, they can be nested, for better readability. The `named!` macro is provided to create functions from parsers. Please be aware that nesting parsers comes with a small cost of compilation time, negligible in most cases, but can quickly get to the minutes scale if not careful. If this happens, separate your parsers in multiple subfunctions. -+- `named!`, `closure!` and `call!` macros used to support the unnamed syntax -+- `map!`, `map_opt!` and `map_res!` to combine a parser with a normal function, transforming the input directly, or returning an `Option` or `Result` -+ -+### Fixed -+- `is_a!` is now working properly -+ -+### Removed -+- the `o!` macro does less than `chain!`, so it has been removed -+- the `fold0!` and `fold1!` macros were too complex and awkward to use, the `many*` combinators will be useful for most uses for now -+ -+## 0.1.6 - 2015-02-24 -+### Changed -+- consumers must have an end method that will be called after parsing -+ -+### Added -+- big endian unsigned int and float parsers: be_u8, be_u16, be_u32, be_u64, be_f32, be_f64 -+- producers can seek -+- function and macros documentation -+- README documentation -+### Fixed -+- lifetime declarations -+- tag! can return Incomplete -+ -+## 0.1.5 - 2015-02-17 -+### Changed -+- traits were renamed: FlatMapper -> FlatMap, Mapper -> FlatMapOpt, Mapper2 -> Functor -+ -+### Fixed -+- woeks with rustc f1bb6c2f4 -+ -+## 0.1.4 - 2015-02-17 -+### Changed -+- the chaining macro can take optional arguments with '?' -+ -+## 0.1.3 - 2015-02-16 -+### Changed -+- the chaining macro now takes the closure at the end of the argument list -+ -+## 0.1.2 - 2015-02-16 -+### Added -+- flat_map implementation for <&[u8], &[u8]> -+- chaining macro -+- partial MP4 parser example -+ -+ -+## 0.1.1 - 2015-02-06 -+### Fixed -+- closure syntax change -+ -+## Compare code -+ -+* [unreleased]: https://github.com/Geal/nom/compare/1.2.4...HEAD -+* [1.2.3]: https://github.com/Geal/nom/compare/1.2.3...1.2.4 -+* [1.2.3]: https://github.com/Geal/nom/compare/1.2.2...1.2.3 -+* [1.2.2]: https://github.com/Geal/nom/compare/1.2.1...1.2.2 -+* [1.2.1]: https://github.com/Geal/nom/compare/1.2.0...1.2.1 -+* [1.2.0]: https://github.com/Geal/nom/compare/1.1.0...1.2.0 -+* [1.1.0]: https://github.com/Geal/nom/compare/1.0.1...1.1.0 -+* [1.0.1]: https://github.com/Geal/nom/compare/1.0.0...1.0.1 -+* [1.0.0]: https://github.com/Geal/nom/compare/0.5.0...1.0.0 -+* [0.5.0]: https://github.com/geal/nom/compare/0.4.0...0.5.0 -+* [0.4.0]: https://github.com/geal/nom/compare/0.3.11...0.4.0 -+* [0.3.11]: https://github.com/geal/nom/compare/0.3.10...0.3.11 -+* [0.3.10]: https://github.com/geal/nom/compare/0.3.9...0.3.10 -+* [0.3.9]: https://github.com/geal/nom/compare/0.3.8...0.3.9 -+* [0.3.8]: https://github.com/Geal/nom/compare/0.3.7...0.3.8 -+* [0.3.7]: https://github.com/Geal/nom/compare/0.3.6...0.3.7 -+* [0.3.6]: https://github.com/Geal/nom/compare/0.3.5...0.3.6 -+* [0.3.5]: https://github.com/Geal/nom/compare/0.3.4...0.3.5 -+* [0.3.4]: https://github.com/Geal/nom/compare/0.3.3...0.3.4 -+* [0.3.3]: https://github.com/Geal/nom/compare/0.3.2...0.3.3 -+* [0.3.2]: https://github.com/Geal/nom/compare/0.3.1...0.3.2 -+* [0.3.1]: https://github.com/Geal/nom/compare/0.3.0...0.3.1 -+* [0.3.0]: https://github.com/Geal/nom/compare/0.2.2...0.3.0 -+* [0.2.2]: https://github.com/Geal/nom/compare/0.2.1...0.2.2 -+* [0.2.1]: https://github.com/Geal/nom/compare/0.2.0...0.2.1 -+* [0.2.0]: https://github.com/Geal/nom/compare/0.1.6...0.2.0 -+* [0.1.6]: https://github.com/Geal/nom/compare/0.1.5...0.1.6 -+* [0.1.5]: https://github.com/Geal/nom/compare/0.1.4...0.1.5 -+* [0.1.4]: https://github.com/Geal/nom/compare/0.1.3...0.1.4 -+* [0.1.3]: https://github.com/Geal/nom/compare/0.1.2...0.1.3 -+* [0.1.2]: https://github.com/Geal/nom/compare/0.1.1...0.1.2 -+* [0.1.1]: https://github.com/Geal/nom/compare/0.1.0...0.1.1 -diff --git third_party/rust/nom-1.2.4/Cargo.toml third_party/rust/nom-1.2.4/Cargo.toml -new file mode 100644 -index 000000000000..ae8045bf1135 ---- /dev/null -+++ third_party/rust/nom-1.2.4/Cargo.toml -@@ -0,0 +1,38 @@ -+[package] -+ -+name = "nom" -+version = "1.2.4" -+authors = [ "contact@geoffroycouprie.com" ] -+description = "A byte-oriented, zero-copy, parser combinators library" -+license = "MIT" -+repository = "https://github.com/Geal/nom" -+readme = "README.md" -+documentation = "http://rust.unhandledexpression.com/nom/" -+keywords = ["parser", "parser-combinators", "parsing", "streaming", "bit"] -+ -+include = [ -+ "CHANGELOG.md", -+ "LICENSE", -+ ".gitignore", -+ ".travis.yml", -+ "Cargo.toml", -+ "src/*.rs", -+ "tests/*.rs" -+] -+ -+[features] -+core = [] -+nightly = [] -+default = ["stream"] -+regexp = ["regex"] -+regexp_macros = ["regexp", "lazy_static"] -+stream = [] -+ -+[dependencies.regex] -+version = "^0.1.56" -+optional = true -+ -+[dependencies.lazy_static] -+version = "^0.2.1" -+optional = true -+ -diff --git third_party/rust/nom-1.2.4/LICENSE third_party/rust/nom-1.2.4/LICENSE -new file mode 100644 -index 000000000000..0bd6a1c33dc6 ---- /dev/null -+++ third_party/rust/nom-1.2.4/LICENSE -@@ -0,0 +1,20 @@ -+Copyright (c) 2015 Geoffroy Couprie -+ -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation the rights to use, copy, modify, merge, publish, -+distribute, sublicense, and/or sell copies of the Software, and to -+permit persons to whom the Software is furnished to do so, subject to -+the following conditions: -+ -+The above copyright notice and this permission notice shall be -+included in all copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -diff --git third_party/rust/nom-1.2.4/src/bits.rs third_party/rust/nom-1.2.4/src/bits.rs -new file mode 100644 -index 000000000000..a8bd8b24aa99 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/bits.rs -@@ -0,0 +1,220 @@ -+//! Bit level parsers and combinators -+//! -+//! Bit parsing is handled by tweaking the input in most macros. -+//! In byte level parsing, the input is generally a `&[u8]` passed from combinator -+//! to combinator until the slices are manipulated. -+//! -+//! Bit parsers take a `(&[u8], usize)` as input. The first part of the tuple is an byte slice, -+//! the second part is a bit offset in the first byte of the slice. -+//! -+//! By passing a pair like this, we can leverage most of the combinators, and avoid -+//! transforming the whole slice to a vector of booleans. This should make it easy -+//! to see a byte slice as a bit stream, and parse code points of arbitrary bit length. -+ -+ -+/// `bits!( parser ) => ( &[u8], (&[u8], usize) -> IResult<(&[u8], usize), T> ) -> IResult<&[u8], T>` -+/// transforms its byte slice input into a bit stream for the underlying parsers -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( take_3_bits, bits!( take_bits!( u8, 3 ) ) ); -+/// -+/// let input = vec![0b10101010, 0b11110000, 0b00110011]; -+/// let sl = &input[..]; -+/// -+/// assert_eq!(take_3_bits( sl ), Done(&sl[1..], 5) ); -+/// # } -+#[macro_export] -+macro_rules! bits ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ bits_impl!($i, $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr) => ( -+ bits_impl!($i, call!($f)); -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! bits_impl ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let input = ($i, 0usize); -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code(k) | $crate::Err::Node(k, _) => $crate::Err::Code(k), -+ $crate::Err::Position(k, (i,b)) | $crate::Err::NodePosition(k, (i,b), _) => { -+ $crate::Err::Position(k, &i[b/8..]) -+ } -+ }; -+ $crate::IResult::Error(err) -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ //println!("bits parser returned Needed::Size({})", i); -+ $crate::IResult::Incomplete($crate::Needed::Size(i / 8 + 1)) -+ }, -+ $crate::IResult::Done((i, bit_index), o) => { -+ let byte_index = bit_index / 8 + if bit_index % 8 == 0 { 0 } else { 1 } ; -+ //println!("bit index=={} => byte index=={}", bit_index, byte_index); -+ $crate::IResult::Done(&i[byte_index..], o) -+ } -+ } -+ } -+ ); -+); -+ -+/// `take_bits!(type, nb) => ( (&[T], usize), U, usize) -> IResult<(&[T], usize), U>` -+/// generates a parser consuming the specified number of bits. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( take_pair<(u8, u8)>, bits!( pair!( take_bits!( u8, 3 ), take_bits!(u8, 5) ) ) ); -+/// -+/// let input = vec![0b10101010, 0b11110000, 0b00110011]; -+/// let sl = &input[..]; -+/// -+/// assert_eq!(take_pair( sl ), Done(&sl[1..], (5, 10)) ); -+/// assert_eq!(take_pair( &sl[1..] ), Done(&sl[2..], (7, 16)) ); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take_bits ( -+ ($i:expr, $t:ty, $count:expr) => ( -+ { -+ use std::ops::Div; -+ //println!("taking {} bits from {:?}", $count, $i); -+ let (input, bit_offset) = $i; -+ let res : $crate::IResult<(&[u8],usize), $t> = if $count == 0 { -+ $crate::IResult::Done( (input, bit_offset), 0) -+ } else { -+ let cnt = ($count as usize + bit_offset).div(8); -+ if input.len() * 8 < $count as usize + bit_offset { -+ //println!("returning incomplete: {}", $count as usize + bit_offset); -+ $crate::IResult::Incomplete($crate::Needed::Size($count as usize)) -+ } else { -+ let mut acc:$t = 0; -+ let mut offset: usize = bit_offset; -+ let mut remaining: usize = $count; -+ let mut end_offset: usize = 0; -+ -+ for byte in input.iter().take(cnt + 1) { -+ if remaining == 0 { -+ break; -+ } -+ let val: $t = if offset == 0 { -+ *byte as $t -+ } else { -+ ((*byte << offset) as u8 >> offset) as $t -+ }; -+ -+ if remaining < 8 - offset { -+ acc += val >> (8 - offset - remaining); -+ end_offset = remaining + offset; -+ break; -+ } else { -+ acc += val << (remaining - (8 - offset)); -+ remaining -= 8 - offset; -+ offset = 0; -+ } -+ } -+ $crate::IResult::Done( (&input[cnt..], end_offset) , acc) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// matches an integer pattern to a bitstream. The number of bits of the input to compare must be specified -+#[macro_export] -+macro_rules! tag_bits ( -+ ($i:expr, $t:ty, $count:expr, $p: pat) => ( -+ { -+ match take_bits!($i, $t, $count) { -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ if let $p = o { -+ let res: $crate::IResult<(&[u8],usize),$t> = $crate::IResult::Done(i, o); -+ res -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagBits, $i)) -+ } -+ }, -+ _ => { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagBits, $i)) -+ } -+ } -+ } -+ ) -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::{IResult,Needed,Err}; -+ use ErrorKind; -+ -+ #[test] -+ fn take_bits() { -+ let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let sl = &input[..]; -+ -+ assert_eq!(take_bits!( (sl, 0), u8, 0 ), IResult::Done((sl, 0), 0)); -+ assert_eq!(take_bits!( (sl, 0), u8, 8 ), IResult::Done((&sl[1..], 0), 170)); -+ assert_eq!(take_bits!( (sl, 0), u8, 3 ), IResult::Done((&sl[0..], 3), 5)); -+ assert_eq!(take_bits!( (sl, 0), u8, 6 ), IResult::Done((&sl[0..], 6), 42)); -+ assert_eq!(take_bits!( (sl, 1), u8, 1 ), IResult::Done((&sl[0..], 2), 0)); -+ assert_eq!(take_bits!( (sl, 1), u8, 2 ), IResult::Done((&sl[0..], 3), 1)); -+ assert_eq!(take_bits!( (sl, 1), u8, 3 ), IResult::Done((&sl[0..], 4), 2)); -+ assert_eq!(take_bits!( (sl, 6), u8, 3 ), IResult::Done((&sl[1..], 1), 5)); -+ assert_eq!(take_bits!( (sl, 0), u16, 10 ), IResult::Done((&sl[1..], 2), 683)); -+ assert_eq!(take_bits!( (sl, 0), u16, 8 ), IResult::Done((&sl[1..], 0), 170)); -+ assert_eq!(take_bits!( (sl, 6), u16, 10 ), IResult::Done((&sl[2..], 0), 752)); -+ assert_eq!(take_bits!( (sl, 6), u16, 11 ), IResult::Done((&sl[2..], 1), 1504)); -+ assert_eq!(take_bits!( (sl, 0), u32, 20 ), IResult::Done((&sl[2..], 4), 700163)); -+ assert_eq!(take_bits!( (sl, 4), u32, 20 ), IResult::Done((&sl[3..], 0), 716851)); -+ assert_eq!(take_bits!( (sl, 4), u32, 22 ), IResult::Incomplete(Needed::Size(22))); -+ } -+ -+ #[test] -+ fn tag_bits() { -+ let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let sl = &input[..]; -+ -+ assert_eq!(tag_bits!( (sl, 0), u8, 3, 0b101), IResult::Done((&sl[0..], 3), 5)); -+ assert_eq!(tag_bits!( (sl, 0), u8, 4, 0b1010), IResult::Done((&sl[0..], 4), 10)); -+ } -+ -+ named!(ch<(&[u8],usize),(u8,u8)>, -+ chain!( -+ tag_bits!(u8, 3, 0b101) ~ -+ x: take_bits!(u8, 4) ~ -+ y: take_bits!(u8, 5) , -+ || { (x,y) } -+ ) -+ ); -+ -+ #[test] -+ fn chain_bits() { -+ let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let sl = &input[..]; -+ assert_eq!(ch((&input[..],0)), IResult::Done((&sl[1..], 4), (5,15))); -+ assert_eq!(ch((&input[..],4)), IResult::Done((&sl[2..], 0), (7,16))); -+ assert_eq!(ch((&input[..1],0)), IResult::Incomplete(Needed::Size(12))); -+ } -+ -+ named!(ch_bytes<(u8,u8)>, bits!(ch)); -+ #[test] -+ fn bits_to_bytes() { -+ let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ assert_eq!(ch_bytes(&input[..]), IResult::Done(&input[2..], (5,15))); -+ assert_eq!(ch_bytes(&input[..1]), IResult::Incomplete(Needed::Size(2))); -+ assert_eq!(ch_bytes(&input[1..]), IResult::Error(Err::Position(ErrorKind::TagBits, &input[1..]))); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/bytes.rs third_party/rust/nom-1.2.4/src/bytes.rs -new file mode 100644 -index 000000000000..3f31598dc344 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/bytes.rs -@@ -0,0 +1,1027 @@ -+//! Byte level parsers and combinators -+//! -+ -+/// `recognize!(&[T] -> IResult<&[T], O> ) => &[T] -> IResult<&[T], &[T]>` -+/// if the child parser was successful, return the consumed input as produced value -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(x, recognize!(delimited!(tag!("")))); -+/// let r = x(&b" aaa"[..]); -+/// assert_eq!(r, Done(&b" aaa"[..], &b""[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! recognize ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::HexDisplay; -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,_) => { -+ let index = ($i).offset(i); -+ $crate::IResult::Done(i, &($i)[..index]) -+ }, -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ recognize!($i, call!($f)) -+ ); -+); -+ -+/// `tag!(&[T]: nom::AsBytes) => &[T] -> IResult<&[T], &[T]>` -+/// declares a byte array as a suite to recognize -+/// -+/// consumes the recognized characters -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(x, tag!("abcd")); -+/// let r = x(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tag ( -+ ($i:expr, $inp: expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ -+ tag_bytes!($i,bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! tag_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ let len = $i.len(); -+ let blen = $bytes.len(); -+ let m = if len < blen { len } else { blen }; -+ let reduced = &$i[..m]; -+ let b = &$bytes[..m]; -+ -+ let res: $crate::IResult<_,_> = if reduced != b { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Tag, $i)) -+ } else if m < blen { -+ $crate::IResult::Incomplete($crate::Needed::Size(blen)) -+ } else { -+ $crate::IResult::Done(&$i[blen..], reduced) -+ }; -+ res -+ } -+ ); -+); -+ -+/// `is_not!(&[T:AsBytes]) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest list of bytes that do not appear in the provided array -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( not_space, is_not!( " \t\r\n" ) ); -+/// -+/// let r = not_space(&b"abcdefgh\nijkl"[..]); -+/// assert_eq!(r, Done(&b"\nijkl"[..], &b"abcdefgh"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! is_not( -+ ($input:expr, $arr:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $arr; -+ let bytes = as_bytes(&expected); -+ -+ is_not_bytes!($input, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! is_not_bytes ( -+ ($input:expr, $bytes:expr) => ( -+ { -+ use $crate::InputLength; -+ let res: $crate::IResult<_,_> = match $input.iter().position(|c| { -+ for &i in $bytes.iter() { -+ if *c == i { return true } -+ } -+ false -+ }) { -+ Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsNot,$input)), -+ Some(n) => { -+ let res = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ res -+ }, -+ None => { -+ $crate::IResult::Done(&$input[$input.input_len()..], $input) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `is_a!(&[T]) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest list of bytes that appear in the provided array -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(abcd, is_a!( "abcd" )); -+/// -+/// let r1 = abcd(&b"aaaaefgh"[..]); -+/// assert_eq!(r1, Done(&b"efgh"[..], &b"aaaa"[..])); -+/// -+/// let r2 = abcd(&b"dcbaefgh"[..]); -+/// assert_eq!(r2, Done(&b"efgh"[..], &b"dcba"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! is_a ( -+ ($input:expr, $arr:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $arr; -+ let bytes = as_bytes(&expected); -+ -+ is_a_bytes!($input, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! is_a_bytes ( -+ ($input:expr, $bytes:expr) => ( -+ { -+ use $crate::InputLength; -+ let res: $crate::IResult<_,_> = match $input.iter().position(|c| { -+ for &i in $bytes.iter() { -+ if *c == i { return false } -+ } -+ true -+ }) { -+ Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsA,$input)), -+ Some(n) => { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ res -+ }, -+ None => { -+ $crate::IResult::Done(&$input[($input).input_len()..], $input) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `escaped!(&[T] -> IResult<&[T], &[T]>, T, &[T] -> IResult<&[T], &[T]>) => &[T] -> IResult<&[T], &[T]>` -+/// matches a byte string with escaped characters. -+/// -+/// The first argument matches the normal characters (it must not accept the control character), the second argument is the control character (like `\` in most languages), -+/// the third argument matches the escaped characters -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::alpha; -+/// # fn main() { -+/// named!(esc, escaped!(call!(alpha), '\\', is_a_bytes!(&b"\"n\\"[..]))); -+/// assert_eq!(esc(&b"abcd"[..]), Done(&b""[..], &b"abcd"[..])); -+/// assert_eq!(esc(&b"ab\\\"cd"[..]), Done(&b""[..], &b"ab\\\"cd"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! escaped ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -+ { -+ escaped1!($i, $submac!($($args)*), $control_char, $($rest)*) -+ } -+ ); -+ -+ ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -+ escaped1!($i, call!($f), $control_char, $($rest)*) -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! escaped1 ( -+ ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -+ { -+ escaped_impl!($i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -+ } -+ ); -+ ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -+ escaped_impl!($i, $submac1!($($args)*), $control_char, call!($g)) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! escaped_impl ( -+ ($i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $escapable:ident!( $($args2:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ let cl = || { -+ use $crate::HexDisplay; -+ let mut index = 0; -+ -+ while index < $i.len() { -+ if let $crate::IResult::Done(i,_) = $normal!(&$i[index..], $($args)*) { -+ if i.is_empty() { -+ return $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ index = $i.offset(i); -+ } -+ } else if $i[index] == $control_char as u8 { -+ if index + 1 >= $i.len() { -+ return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Escaped,&$i[index..])); -+ } else { -+ match $escapable!(&$i[index+1..], $($args2)*) { -+ $crate::IResult::Done(i,_) => { -+ if i.is_empty() { -+ return $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ index = $i.offset(i); -+ } -+ }, -+ $crate::IResult::Incomplete(i) => return $crate::IResult::Incomplete(i), -+ $crate::IResult::Error(e) => return $crate::IResult::Error(e) -+ } -+ } -+ } else { -+ if index == 0 { -+ return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Escaped,&$i[index..])) -+ } else { -+ return $crate::IResult::Done(&$i[index..], &$i[..index]) -+ } -+ } -+ } -+ $crate::IResult::Done(&$i[index..], &$i[..index]) -+ }; -+ match cl() { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ return $crate::IResult::Error($crate::Err::NodePosition($crate::ErrorKind::Escaped, $i, Box::new(e))) -+ } -+ } -+ } -+ ); -+); -+ -+/// `escaped_transform!(&[T] -> IResult<&[T], &[T]>, T, &[T] -> IResult<&[T], &[T]>) => &[T] -> IResult<&[T], Vec>` -+/// matches a byte string with escaped characters. -+/// -+/// The first argument matches the normal characters (it must not match the control character), the second argument is the control character (like `\` in most languages), -+/// the third argument matches the escaped characters and trnasforms them. -+/// -+/// As an example, the chain `abc\tdef` could be `abc def` (it also consumes the control character) -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::alpha; -+/// # use std::str::from_utf8; -+/// # fn main() { -+/// fn to_s(i:Vec) -> String { -+/// String::from_utf8_lossy(&i).into_owned() -+/// } -+ -+/// named!(transform < String >, -+/// map!( -+/// escaped_transform!(call!(alpha), '\\', -+/// alt!( -+/// tag!("\\") => { |_| &b"\\"[..] } -+/// | tag!("\"") => { |_| &b"\""[..] } -+/// | tag!("n") => { |_| &b"\n"[..] } -+/// ) -+/// ), to_s -+/// ) -+/// ); -+/// assert_eq!(transform(&b"ab\\\"cd"[..]), Done(&b""[..], String::from("ab\"cd"))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! escaped_transform ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -+ { -+ escaped_transform1!($i, $submac!($($args)*), $control_char, $($rest)*) -+ } -+ ); -+ -+ ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -+ escaped_transform1!($i, call!($f), $control_char, $($rest)*) -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! escaped_transform1 ( -+ ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -+ { -+ escaped_transform_impl!($i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -+ } -+ ); -+ ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -+ escaped_transform_impl!($i, $submac1!($($args)*), $control_char, call!($g)) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! escaped_transform_impl ( -+ ($i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $transform:ident!( $($args2:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ let cl = || { -+ use $crate::HexDisplay; -+ let mut index = 0; -+ let mut res = Vec::new(); -+ -+ while index < $i.len() { -+ if let $crate::IResult::Done(i,o) = $normal!(&$i[index..], $($args)*) { -+ res.extend(o.iter().cloned()); -+ if i.is_empty() { -+ return $crate::IResult::Done(&$i[$i.input_len()..], res) -+ } else { -+ index = $i.offset(i); -+ } -+ } else if $i[index] == $control_char as u8 { -+ if index + 1 >= $i.len() { -+ return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::EscapedTransform,&$i[index..])); -+ } else { -+ match $transform!(&$i[index+1..], $($args2)*) { -+ $crate::IResult::Done(i,o) => { -+ res.extend(o.iter().cloned()); -+ if i.is_empty() { -+ return $crate::IResult::Done(&$i[$i.input_len()..], res) -+ } else { -+ index = $i.offset(i); -+ } -+ }, -+ $crate::IResult::Incomplete(i) => return $crate::IResult::Incomplete(i), -+ $crate::IResult::Error(e) => return $crate::IResult::Error(e) -+ } -+ } -+ } else { -+ if index == 0 { -+ return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::EscapedTransform,&$i[index..])) -+ } else { -+ return $crate::IResult::Done(&$i[index..], res) -+ } -+ } -+ } -+ $crate::IResult::Done(&$i[index..], res) -+ }; -+ match cl() { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ return $crate::IResult::Error($crate::Err::NodePosition($crate::ErrorKind::EscapedTransform, $i, Box::new(e))) -+ } -+ } -+ } -+ ) -+); -+ -+/// `take_while!(T -> bool) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest list of bytes until the provided function fails. -+/// -+/// The argument is either a function `T -> bool` or a macro returning a `bool`. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::is_alphanumeric; -+/// # fn main() { -+/// named!( alpha, take_while!( is_alphanumeric ) ); -+/// -+/// let r = alpha(&b"abcd\nefgh"[..]); -+/// assert_eq!(r, Done(&b"\nefgh"[..], &b"abcd"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take_while ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $input.iter().position(|c| !$submac!(*c, $($args)*)) { -+ Some(n) => { -+ let res:$crate::IResult<_,_> = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ res -+ }, -+ None => { -+ $crate::IResult::Done(&$input[($input).len()..], $input) -+ } -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_while!($input, call!($f)); -+ ); -+); -+ -+/// `take_while1!(&[T] -> bool) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest (non empty) list of bytes until the provided function fails. -+/// -+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool -+#[macro_export] -+macro_rules! take_while1 ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ if ($input).input_len() == 0 { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1,$input)) -+ } else { -+ match $input.iter().position(|c| !$submac!(*c, $($args)*)) { -+ Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1,$input)), -+ Some(n) => { -+ $crate::IResult::Done(&$input[n..], &$input[..n]) -+ }, -+ None => { -+ $crate::IResult::Done(&$input[($input).len()..], $input) -+ } -+ } -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_while1!($input, call!($f)); -+ ); -+); -+ -+/// `take_till!(T -> bool) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest list of bytes until the provided function succeeds -+/// -+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool -+#[macro_export] -+macro_rules! take_till ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ match $input.iter().position(|c| $submac!(c, $($args)*)) { -+ Some(n) => $crate::IResult::Done(&$input[n..], &$input[..n]), -+ None => $crate::IResult::Done(&$input[($input).input_len()..], $input) -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_till!($input, call!($f)); -+ ); -+); -+ -+/// `take!(nb) => &[T] -> IResult<&[T], &[T]>` -+/// generates a parser consuming the specified number of bytes -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// // Desmond parser -+/// named!(take5, take!( 5 ) ); -+/// -+/// let a = b"abcdefgh"; -+/// -+/// assert_eq!(take5(&a[..]), Done(&b"fgh"[..], &b"abcde"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take ( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res: $crate::IResult<_,_> = if $i.len() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take!(nb) => &[T] -> IResult<&[T], &str>` -+/// same as take! but returning a &str -+#[macro_export] -+macro_rules! take_str ( -+ ( $i:expr, $size:expr ) => ( map_res!($i, take!($size), ::std::str::from_utf8) ); -+); -+ -+/// `take_until_and_consume!(tag) => &[T] -> IResult<&[T], &[T]>` -+/// generates a parser consuming bytes until the specified byte sequence is found, and consumes it -+#[macro_export] -+macro_rules! take_until_and_consume( -+ ($i:expr, $inp:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ take_until_and_consume_bytes!($i, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! take_until_and_consume_bytes ( -+ ($i:expr, $bytes:expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if $bytes.len() > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($bytes.len())) -+ } else { -+ let mut index = 0; -+ let mut parsed = false; -+ -+ for idx in 0..$i.len() { -+ if idx + $bytes.len() > $i.len() { -+ index = idx; -+ break; -+ } -+ if &$i[idx..idx + $bytes.len()] == $bytes { -+ parsed = true; -+ index = idx; -+ break; -+ } -+ } -+ -+ if parsed { -+ $crate::IResult::Done(&$i[(index + $bytes.len())..], &$i[0..index]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilAndConsume,$i)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take_until!(tag) => &[T] -> IResult<&[T], &[T]>` -+/// consumes data until it finds the specified tag -+#[macro_export] -+macro_rules! take_until( -+ ($i:expr, $inp:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ take_until_bytes!($i, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! take_until_bytes( -+ ($i:expr, $bytes:expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if $bytes.len() > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($bytes.len())) -+ } else { -+ let mut index = 0; -+ let mut parsed = false; -+ -+ for idx in 0..$i.len() { -+ if idx + $bytes.len() > $i.len() { -+ index = idx; -+ break; -+ } -+ if &$i[idx..idx+$bytes.len()] == $bytes { -+ parsed = true; -+ index = idx; -+ break; -+ } -+ } -+ -+ if parsed { -+ $crate::IResult::Done(&$i[index..], &$i[0..index]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntil,$i)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take_until_either_and_consume!(tag) => &[T] -> IResult<&[T], &[T]>` -+/// consumes data until it finds any of the specified characters, and consume it -+#[macro_export] -+macro_rules! take_until_either_and_consume( -+ ($i:expr, $inp:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ take_until_either_and_consume_bytes!($i, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! take_until_either_and_consume_bytes( -+ ($i:expr, $bytes:expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if 1 > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size(1)) -+ } else { -+ let mut index = 0; -+ let mut parsed = false; -+ -+ for idx in 0..$i.len() { -+ if idx + 1 > $i.len() { -+ index = idx; -+ break; -+ } -+ for &t in $bytes.iter() { -+ if $i[idx] == t { -+ parsed = true; -+ index = idx; -+ break; -+ } -+ } -+ if parsed { break; } -+ } -+ -+ if parsed { -+ $crate::IResult::Done(&$i[(index+1)..], &$i[0..index]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilEitherAndConsume,$i)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take_until_either!(tag) => &[T] -> IResult<&[T], &[T]>` -+#[macro_export] -+macro_rules! take_until_either( -+ ($i:expr, $inp:expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ take_until_either_bytes!($i, bytes) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! take_until_either_bytes( -+ ($i:expr, $bytes:expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if 1 > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size(1)) -+ } else { -+ let mut index = 0; -+ let mut parsed = false; -+ -+ for idx in 0..$i.len() { -+ if idx + 1 > $i.len() { -+ index = idx; -+ break; -+ } -+ for &t in $bytes.iter() { -+ if $i[idx] == t { -+ parsed = true; -+ index = idx; -+ break; -+ } -+ } -+ if parsed { break; } -+ } -+ -+ if parsed { -+ $crate::IResult::Done(&$i[index..], &$i[0..index]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilEither,$i)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `length_bytes!(&[T] -> IResult<&[T], nb>) => &[T] -> IResult<&[T], &[T]> -+/// gets a number from the first parser, then extracts that many bytes from the -+/// remaining stream -+#[macro_export] -+macro_rules! length_bytes( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,nb) => { -+ let nb = nb as usize; -+ let length_remaining = i1.len(); -+ if length_remaining < nb { -+ $crate::IResult::Incomplete($crate::Needed::Size(nb - length_remaining)) -+ } else { -+ $crate::IResult::Done(&i1[nb..], &i1[..nb]) -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ length_bytes!($i, call!($f)) -+ ) -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::Needed; -+ use internal::IResult::*; -+ use internal::Err::*; -+ use util::ErrorKind; -+ use nom::{alpha, digit, hex_digit, oct_digit, alphanumeric, space, multispace}; -+ -+ #[test] -+ fn is_a() { -+ named!(a_or_b, is_a!(&b"ab"[..])); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(a_or_b(a), Done(&b"cd"[..], &b"ab"[..])); -+ -+ let b = &b"bcde"[..]; -+ assert_eq!(a_or_b(b), Done(&b"cde"[..], &b"b"[..])); -+ -+ let c = &b"cdef"[..]; -+ assert_eq!(a_or_b(c), Error(Position(ErrorKind::IsA,c))); -+ -+ let d = &b"bacdef"[..]; -+ assert_eq!(a_or_b(d), Done(&b"cdef"[..], &b"ba"[..])); -+ } -+ -+ #[test] -+ fn is_not() { -+ named!(a_or_b, is_not!(&b"ab"[..])); -+ -+ let a = &b"cdab"[..]; -+ assert_eq!(a_or_b(a), Done(&b"ab"[..], &b"cd"[..])); -+ -+ let b = &b"cbde"[..]; -+ assert_eq!(a_or_b(b), Done(&b"bde"[..], &b"c"[..])); -+ -+ let c = &b"abab"[..]; -+ assert_eq!(a_or_b(c), Error(Position(ErrorKind::IsNot,c))); -+ -+ let d = &b"cdefba"[..]; -+ assert_eq!(a_or_b(d), Done(&b"ba"[..], &b"cdef"[..])); -+ -+ let e = &b"e"[..]; -+ assert_eq!(a_or_b(e), Done(&b""[..], &b"e"[..])); -+ -+ let f = &b"fghi"[..]; -+ assert_eq!(a_or_b(f), Done(&b""[..], &b"fghi"[..])); -+ } -+ -+ #[test] -+ fn escaping() { -+ named!(esc, escaped!(call!(alpha), '\\', is_a_bytes!(&b"\"n\\"[..]))); -+ assert_eq!(esc(&b"abcd"[..]), Done(&b""[..], &b"abcd"[..])); -+ assert_eq!(esc(&b"ab\\\"cd"[..]), Done(&b""[..], &b"ab\\\"cd"[..])); -+ assert_eq!(esc(&b"\\\"abcd"[..]), Done(&b""[..], &b"\\\"abcd"[..])); -+ assert_eq!(esc(&b"\\n"[..]), Done(&b""[..], &b"\\n"[..])); -+ assert_eq!(esc(&b"ab\\\"12"[..]), Done(&b"12"[..], &b"ab\\\""[..])); -+ assert_eq!(esc(&b"AB\\"[..]), Error(NodePosition(ErrorKind::Escaped, &b"AB\\"[..], Box::new(Position(ErrorKind::Escaped, &b"\\"[..]))))); -+ assert_eq!(esc(&b"AB\\A"[..]), Error(NodePosition(ErrorKind::Escaped, &b"AB\\A"[..], Box::new(Position(ErrorKind::IsA, &b"A"[..]))))); -+ } -+ -+ fn to_s(i:Vec) -> String { -+ String::from_utf8_lossy(&i).into_owned() -+ } -+ -+ #[test] -+ fn escape_transform() { -+ use std::str; -+ -+ named!(esc< String >, map!(escaped_transform!(alpha, '\\', -+ alt!( -+ tag!("\\") => { |_| &b"\\"[..] } -+ | tag!("\"") => { |_| &b"\""[..] } -+ | tag!("n") => { |_| &b"\n"[..] } -+ )), to_s) -+ ); -+ -+ assert_eq!(esc(&b"abcd"[..]), Done(&b""[..], String::from("abcd"))); -+ assert_eq!(esc(&b"ab\\\"cd"[..]), Done(&b""[..], String::from("ab\"cd"))); -+ assert_eq!(esc(&b"\\\"abcd"[..]), Done(&b""[..], String::from("\"abcd"))); -+ assert_eq!(esc(&b"\\n"[..]), Done(&b""[..], String::from("\n"))); -+ assert_eq!(esc(&b"ab\\\"12"[..]), Done(&b"12"[..], String::from("ab\""))); -+ assert_eq!(esc(&b"AB\\"[..]), Error(NodePosition(ErrorKind::EscapedTransform, &b"AB\\"[..], Box::new(Position(ErrorKind::EscapedTransform, &b"\\"[..]))))); -+ assert_eq!(esc(&b"AB\\A"[..]), Error(NodePosition(ErrorKind::EscapedTransform, &b"AB\\A"[..], Box::new(Position(ErrorKind::Alt, &b"A"[..]))))); -+ -+ let e = "è"; -+ let a = "à"; -+ println!("è: {:?} | à: {:?}", str::as_bytes(e), str::as_bytes(a)); -+ named!(esc2< String >, map!(escaped_transform!(call!(alpha), '&', -+ alt!( -+ tag!("egrave;") => { |_| str::as_bytes("è") } -+ | tag!("agrave;") => { |_| str::as_bytes("à") } -+ )), to_s) -+ ); -+ assert_eq!(esc2(&b"abèDEF"[..]), Done(&b""[..], String::from("abèDEF"))); -+ assert_eq!(esc2(&b"abèDàEF"[..]), Done(&b""[..], String::from("abèDàEF"))); -+ } -+ -+ #[test] -+ fn issue_84() { -+ let r0 = is_a!(&b"aaaaefgh"[..], "abcd"); -+ assert_eq!(r0, Done(&b"efgh"[..], &b"aaaa"[..])); -+ let r1 = is_a!(&b"aaaa"[..], "abcd"); -+ assert_eq!(r1, Done(&b""[..], &b"aaaa"[..])); -+ let r2 = is_a!(&b"1"[..], "123456789"); -+ assert_eq!(r2, Done(&b""[..], &b"1"[..])); -+ } -+ -+ #[test] -+ fn take_str_test() { -+ let a = b"omnomnom"; -+ -+ assert_eq!(take_str!(&a[..], 5), Done(&b"nom"[..], "omnom")); -+ assert_eq!(take_str!(&a[..], 9), Incomplete(Needed::Size(9))); -+ } -+ -+ #[test] -+ fn take_until_test() { -+ named!(x, take_until_and_consume!("efgh")); -+ let r = x(&b"abcdabcdefghijkl"[..]); -+ assert_eq!(r, Done(&b"ijkl"[..], &b"abcdabcd"[..])); -+ -+ println!("Done 1\n"); -+ -+ let r2 = x(&b"abcdabcdefgh"[..]); -+ assert_eq!(r2, Done(&b""[..], &b"abcdabcd"[..])); -+ -+ println!("Done 2\n"); -+ let r3 = x(&b"abcefg"[..]); -+ assert_eq!(r3, Error(Position(ErrorKind::TakeUntilAndConsume, &b"abcefg"[..]))); -+ -+ assert_eq!( -+ x(&b"ab"[..]), -+ Incomplete(Needed::Size(4)) -+ ); -+ } -+ -+ #[test] -+ fn take_until_either_incomplete() { -+ named!(x, take_until_either!("!.")); -+ assert_eq!( -+ x(&b"123"[..]), -+ Error(Position(ErrorKind::TakeUntilEither, &b"123"[..])) -+ ); -+ } -+ -+ #[test] -+ fn take_until_incomplete() { -+ named!(y, take_until!("end")); -+ assert_eq!( -+ y(&b"nd"[..]), -+ Incomplete(Needed::Size(3)) -+ ); -+ assert_eq!( -+ y(&b"123"[..]), -+ Error(Position(ErrorKind::TakeUntil, &b"123"[..])) -+ ); -+ } -+ -+ #[test] -+ fn recognize() { -+ named!(x, recognize!(delimited!(tag!("")))); -+ let r = x(&b" aaa"[..]); -+ assert_eq!(r, Done(&b" aaa"[..], &b""[..])); -+ -+ let empty = &b""[..]; -+ -+ named!(ya, recognize!(alpha)); -+ let ra = ya(&b"abc"[..]); -+ assert_eq!(ra, Done(empty, &b"abc"[..])); -+ -+ named!(yd, recognize!(digit)); -+ let rd = yd(&b"123"[..]); -+ assert_eq!(rd, Done(empty, &b"123"[..])); -+ -+ named!(yhd, recognize!(hex_digit)); -+ let rhd = yhd(&b"123abcDEF"[..]); -+ assert_eq!(rhd, Done(empty, &b"123abcDEF"[..])); -+ -+ named!(yod, recognize!(oct_digit)); -+ let rod = yod(&b"1234567"[..]); -+ assert_eq!(rod, Done(empty, &b"1234567"[..])); -+ -+ named!(yan, recognize!(alphanumeric)); -+ let ran = yan(&b"123abc"[..]); -+ assert_eq!(ran, Done(empty, &b"123abc"[..])); -+ -+ named!(ys, recognize!(space)); -+ let rs = ys(&b" \t"[..]); -+ assert_eq!(rs, Done(empty, &b" \t"[..])); -+ -+ named!(yms, recognize!(multispace)); -+ let rms = yms(&b" \t\r\n"[..]); -+ assert_eq!(rms, Done(empty, &b" \t\r\n"[..])); -+ } -+ -+ #[test] -+ fn take_while() { -+ use nom::is_alphabetic; -+ named!(f, take_while!(is_alphabetic)); -+ let a = b""; -+ let b = b"abcd"; -+ let c = b"abcd123"; -+ let d = b"123"; -+ -+ assert_eq!(f(&a[..]), Done(&a[..], &a[..])); -+ assert_eq!(f(&b[..]), Done(&a[..], &b[..])); -+ assert_eq!(f(&c[..]), Done(&d[..], &b[..])); -+ assert_eq!(f(&d[..]), Done(&d[..], &a[..])); -+ } -+ -+ #[test] -+ fn take_while1() { -+ use nom::is_alphabetic; -+ named!(f, take_while1!(is_alphabetic)); -+ let a = b""; -+ let b = b"abcd"; -+ let c = b"abcd123"; -+ let d = b"123"; -+ -+ assert_eq!(f(&a[..]), Error(Position(ErrorKind::TakeWhile1, &b""[..]))); -+ assert_eq!(f(&b[..]), Done(&a[..], &b[..])); -+ assert_eq!(f(&c[..]), Done(&b"123"[..], &b[..])); -+ assert_eq!(f(&d[..]), Error(Position(ErrorKind::TakeWhile1, &d[..]))); -+ } -+ -+ #[cfg(feature = "nightly")] -+ use test::Bencher; -+ -+ #[cfg(feature = "nightly")] -+ #[bench] -+ fn take_while_bench(b: &mut Bencher) { -+ use nom::is_alphabetic; -+ named!(f, take_while!(is_alphabetic)); -+ b.iter(|| { -+ f(&b"abcdefghijklABCDEejfrfrjgro12aa"[..]) -+ }); -+ } -+ -+ #[test] -+ fn recognize_take_while() { -+ use nom::is_alphanumeric; -+ named!(x, take_while!(is_alphanumeric)); -+ named!(y, recognize!(x)); -+ assert_eq!(x(&b"ab"[..]), Done(&[][..], &b"ab"[..])); -+ println!("X: {:?}", x(&b"ab"[..])); -+ assert_eq!(y(&b"ab"[..]), Done(&[][..], &b"ab"[..])); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/character.rs third_party/rust/nom-1.2.4/src/character.rs -new file mode 100644 -index 000000000000..781065b35270 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/character.rs -@@ -0,0 +1,184 @@ -+/// Character level parsers -+ -+use internal::{IResult,Needed,Err}; -+use util::ErrorKind; -+ -+/// matches one of the provided characters -+#[macro_export] -+macro_rules! one_of ( -+ ($i:expr, $inp: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ one_of_bytes!($i, bytes) -+ } -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! one_of_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ let mut found = false; -+ -+ for &i in $bytes { -+ if i == $i[0] { -+ found = true; -+ break; -+ } -+ } -+ -+ if found { -+ $crate::IResult::Done(&$i[1..], $i[0] as char) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::OneOf, $i)) -+ } -+ } -+ } -+ ); -+); -+ -+/// matches anything but the provided characters -+#[macro_export] -+macro_rules! none_of ( -+ ($i:expr, $inp: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ none_of_bytes!($i, bytes) -+ } -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! none_of_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ let mut found = false; -+ -+ for &i in $bytes { -+ if i == $i[0] { -+ found = true; -+ break; -+ } -+ } -+ -+ if !found { -+ $crate::IResult::Done(&$i[1..], $i[0] as char) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::NoneOf, $i)) -+ } -+ } -+ } -+ ); -+); -+ -+/// matches one character: `char!(char) => &[u8] -> IResult<&[u8], char> -+#[macro_export] -+macro_rules! char ( -+ ($i:expr, $c: expr) => ( -+ { -+ if $i.is_empty() { -+ let res: $crate::IResult<&[u8], char> = $crate::IResult::Incomplete($crate::Needed::Size(1)); -+ res -+ } else { -+ if $i[0] == $c as u8 { -+ $crate::IResult::Done(&$i[1..], $i[0] as char) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Char, $i)) -+ } -+ } -+ } -+ ); -+); -+ -+named!(pub newline, char!('\n')); -+ -+pub fn crlf(input:&[u8]) -> IResult<&[u8], char> { -+ if input.len() < 2 { -+ IResult::Incomplete(Needed::Size(2)) -+ } else { -+ if &input[0..2] == &b"\r\n"[..] { -+ IResult::Done(&input[2..], '\n') -+ } else { -+ IResult::Error(Err::Position(ErrorKind::CrLf, input)) -+ } -+ } -+} -+ -+named!(pub eol, alt!(crlf | newline)); -+named!(pub tab, char!('\t')); -+ -+pub fn anychar(input:&[u8]) -> IResult<&[u8], char> { -+ if input.is_empty() { -+ IResult::Incomplete(Needed::Size(1)) -+ } else { -+ IResult::Done(&input[1..], input[0] as char) -+ } -+} -+ -+#[cfg(test)] -+mod tests { -+ use internal::IResult::*; -+ use internal::Err::*; -+ use util::ErrorKind; -+ -+ #[test] -+ fn one_of() { -+ named!(f, one_of!("ab")); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(f(a), Done(&b"bcd"[..], 'a')); -+ -+ let b = &b"cde"[..]; -+ assert_eq!(f(b), Error(Position(ErrorKind::OneOf, b))); -+ } -+ -+ #[test] -+ fn none_of() { -+ named!(f, none_of!("ab")); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(f(a), Error(Position(ErrorKind::NoneOf, a))); -+ -+ let b = &b"cde"[..]; -+ assert_eq!(f(b), Done(&b"de"[..], 'c')); -+ } -+ -+ #[test] -+ fn char() { -+ named!(f, char!('c')); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(f(a), Error(Position(ErrorKind::Char, a))); -+ -+ let b = &b"cde"[..]; -+ assert_eq!(f(b), Done(&b"de"[..], 'c')); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/internal.rs third_party/rust/nom-1.2.4/src/internal.rs -new file mode 100644 -index 000000000000..deb39a86654d ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/internal.rs -@@ -0,0 +1,347 @@ -+//! Basic types to build the parsers -+ -+use self::IResult::*; -+use self::Needed::*; -+use util::ErrorKind; -+ -+#[cfg(feature = "core")] -+use std::prelude::v1::*; -+use std::boxed::Box; -+ -+/// Contains the error that a parser can return -+/// -+/// It can represent a linked list of errors, indicating the path taken in the parsing tree, with corresponding position in the input data. -+/// It depends on P, the input position (for a &[u8] parser, it would be a &[u8]), and E, the custom error type (by default, u32) -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum Err{ -+ /// An error code, represented by an ErrorKind, which can contain a custom error code represented by E -+ Code(ErrorKind), -+ /// An error code, and the next error -+ Node(ErrorKind, Box>), -+ /// An error code, and the input position -+ Position(ErrorKind, P), -+ /// An error code, the input position and the next error -+ NodePosition(ErrorKind, P, Box>) -+} -+ -+/// Contains information on needed data if a parser returned `Incomplete` -+#[derive(Debug,PartialEq,Eq,Clone,Copy)] -+pub enum Needed { -+ /// needs more data, but we do not know how much -+ Unknown, -+ /// contains the required data size -+ Size(usize) -+} -+ -+impl Needed { -+ pub fn is_known(&self) -> bool { -+ *self != Unknown -+ } -+ -+ /// Maps a `Needed` to `Needed` by appling a function to a contained `Size` value. -+ #[inline] -+ pub fn map usize>(self, f: F) -> Needed { -+ match self { -+ Unknown => Unknown, -+ Size(n) => Size(f(n)), -+ } -+ } -+} -+ -+/// Holds the result of parsing functions -+/// -+/// It depends on I, the input type, O, the output type, and E, the error type (by default u32) -+/// -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum IResult { -+ /// indicates a correct parsing, the first field containing the rest of the unparsed data, the second field contains the parsed data -+ Done(I,O), -+ /// contains a Err, an enum that can indicate an error code, a position in the input, and a pointer to another error, making a list of errors in the parsing tree -+ Error(Err), -+ /// Incomplete contains a Needed, an enum than can represent a known quantity of input data, or unknown -+ Incomplete(Needed) -+} -+ -+impl IResult { -+ pub fn is_done(&self) -> bool { -+ match *self { -+ Done(_,_) => true, -+ _ => false -+ } -+ } -+ -+ pub fn is_err(&self) -> bool { -+ match *self { -+ Error(_) => true, -+ _ => false -+ } -+ } -+ -+ pub fn is_incomplete(&self) -> bool { -+ match *self { -+ Incomplete(_) => true, -+ _ => false -+ } -+ } -+ -+ /// Maps a `IResult` to `IResult` by appling a function -+ /// to a contained `Done` value, leaving `Error` and `Incomplete` value -+ /// untouched. -+ #[inline] -+ pub fn map N>(self, f: F) -> IResult { -+ match self { -+ Done(i, o) => Done(i, f(o)), -+ Error(e) => Error(e), -+ Incomplete(n) => Incomplete(n), -+ } -+ } -+ -+ /// Maps a `IResult` to `IResult` by appling a function -+ /// to a contained `Incomplete` value, leaving `Done` and `Error` value -+ /// untouched. -+ #[inline] -+ pub fn map_inc(self, f: F) -> IResult -+ where F: FnOnce(Needed) -> Needed { -+ match self { -+ Error(e) => Error(e), -+ Incomplete(n) => Incomplete(f(n)), -+ Done(i, o) => Done(i, o), -+ } -+ } -+ -+ /// Maps a `IResult` to `IResult` by appling a function -+ /// to a contained `Error` value, leaving `Done` and `Incomplete` value -+ /// untouched. -+ #[inline] -+ pub fn map_err(self, f: F) -> IResult -+ where F: FnOnce(Err) -> Err { -+ match self { -+ Error(e) => Error(f(e)), -+ Incomplete(n) => Incomplete(n), -+ Done(i, o) => Done(i, o), -+ } -+ } -+ -+ /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not -+ /// `Done`. -+ pub fn unwrap(self) -> (I, O) { -+ match self { -+ Done(i, o) => (i, o), -+ Incomplete(_) => panic!("unwrap() called on an IResult that is Incomplete"), -+ Error(_) => panic!("unwrap() called on an IResult that is Error") -+ } -+ } -+ -+ /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not -+ /// `Done`. -+ pub fn unwrap_inc(self) -> Needed { -+ match self { -+ Incomplete(n) => n, -+ Done(_, _) => panic!("unwrap_inc() called on an IResult that is Done"), -+ Error(_) => panic!("unwrap_inc() called on an IResult that is Error") -+ } -+ } -+ -+ /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not -+ /// `Done`. -+ pub fn unwrap_err(self) -> Err { -+ match self { -+ Error(e) => e, -+ Done(_, _) => panic!("unwrap_err() called on an IResult that is Done"), -+ Incomplete(_) => panic!("unwrap_err() called on an IResult that is Incomplete"), -+ } -+ } -+} -+ -+pub trait GetInput { -+ fn remaining_input(&self) -> Option; -+} -+ -+pub trait GetOutput { -+ fn output(&self) -> Option; -+} -+ -+impl<'a,I,O,E> GetInput<&'a[I]> for IResult<&'a[I],O,E> { -+ fn remaining_input(&self) -> Option<&'a[I]> { -+ match *self { -+ Done(ref i,_) => Some(*i), -+ _ => None -+ } -+ } -+} -+ -+impl GetInput<()> for IResult<(),O,E> { -+ fn remaining_input(&self) -> Option<()> { -+ match *self { -+ Done((),_) => Some(()), -+ _ => None -+ } -+ } -+} -+ -+impl<'a,O,E> GetInput<&'a str> for IResult<&'a str,O,E> { -+ fn remaining_input(&self) -> Option<&'a str> { -+ match *self { -+ Done(ref i,_) => Some(*i), -+ _ => None -+ } -+ } -+} -+ -+impl<'a,I,O,E> GetOutput<&'a[O]> for IResult { -+ fn output(&self) -> Option<&'a[O]> { -+ match *self { -+ Done(_, ref o) => Some(*o), -+ _ => None -+ } -+ } -+} -+ -+impl GetOutput<()> for IResult { -+ fn output(&self) -> Option<()> { -+ match *self { -+ Done(_,()) => Some(()), -+ _ => None -+ } -+ } -+} -+ -+impl<'a,I,E> GetOutput<&'a str> for IResult { -+ fn output(&self) -> Option<&'a str> { -+ match *self { -+ Done(_,ref o) => Some(*o), -+ _ => None -+ } -+ } -+} -+ -+#[cfg(not(feature = "core"))] -+use std::any::Any; -+#[cfg(not(feature = "core"))] -+use std::{error,fmt}; -+#[cfg(not(feature = "core"))] -+use std::fmt::Debug; -+#[cfg(not(feature = "core"))] -+impl error::Error for Err { -+ fn description(&self) -> &str { -+ let kind = match *self { -+ Err::Code(ref e) | Err::Node(ref e, _) | Err::Position(ref e, _) | Err::NodePosition(ref e, _, _) => e -+ }; -+ kind.description() -+ } -+} -+ -+#[cfg(not(feature = "core"))] -+impl fmt::Display for Err { -+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -+ match *self { -+ Err::Code(ref e) | Err::Node(ref e, _) => { -+ write!(f, "{:?}", e) -+ }, -+ Err::Position(ref e, ref p) | Err::NodePosition(ref e, ref p, _) => { -+ write!(f, "{:?}:{:?}", p, e) -+ } -+ } -+ } -+} -+ -+#[cfg(test)] -+mod tests { -+ use super::*; -+ use util::ErrorKind; -+ -+ const REST: [u8; 0] = []; -+ const DONE: IResult<&'static [u8], u32> = IResult::Done(&REST, 5); -+ const ERROR: IResult<&'static [u8], u32> = IResult::Error(Err::Code(ErrorKind::Tag)); -+ const INCOMPLETE: IResult<&'static [u8], u32> = IResult::Incomplete(Needed::Unknown); -+ -+ #[test] -+ fn needed_map() { -+ let unknown = Needed::Unknown; -+ let size = Needed::Size(5); -+ -+ assert_eq!(size.map(|x| x * 2), Needed::Size(10)); -+ assert_eq!(unknown.map(|x| x * 2), Needed::Unknown); -+ } -+ -+ #[test] -+ fn iresult_map() { -+ assert_eq!(DONE.map(|x| x * 2), IResult::Done(&b""[..], 10)); -+ assert_eq!(ERROR.map(|x| x * 2), IResult::Error(Err::Code(ErrorKind::Tag))); -+ assert_eq!(INCOMPLETE.map(|x| x * 2), IResult::Incomplete(Needed::Unknown)); -+ } -+ -+ #[test] -+ fn iresult_map_inc() { -+ let inc_unknown: IResult<&[u8], u32> = IResult::Incomplete(Needed::Unknown); -+ let inc_size: IResult<&[u8], u32> = IResult::Incomplete(Needed::Size(5)); -+ -+ assert_eq!(DONE.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Done(&b""[..], 5)); -+ assert_eq!(ERROR.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Error(Err::Code(ErrorKind::Tag))); -+ assert_eq!(inc_unknown.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Incomplete(Needed::Unknown)); -+ assert_eq!(inc_size.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Incomplete(Needed::Size(6))); -+ } -+ -+ #[test] -+ fn iresult_map_err() { -+ #[derive(Clone, Copy, Debug, PartialEq, Eq)] -+ struct Error(u32); -+ -+ let error_kind = Err::Code(ErrorKind::Custom(Error(5))); -+ -+ assert_eq!(DONE.map_err(|_| error_kind.clone()), IResult::Done(&b""[..], 5)); -+ assert_eq!(ERROR.map_err(|x| {println!("err: {:?}", x); error_kind.clone()}), IResult::Error(error_kind.clone())); -+ assert_eq!(INCOMPLETE.map_err(|x| {println!("err: {:?}", x); error_kind.clone()}), IResult::Incomplete(Needed::Unknown)); -+ } -+ -+ #[test] -+ fn iresult_unwrap_on_done() { -+ assert_eq!(DONE.unwrap(), (&b""[..], 5)); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_on_err() { -+ ERROR.unwrap(); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_on_inc() { -+ INCOMPLETE.unwrap(); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_err_on_done() { -+ DONE.unwrap_err(); -+ } -+ -+ #[test] -+ fn iresult_unwrap_err_on_err() { -+ assert_eq!(ERROR.unwrap_err(), Err::Code(ErrorKind::Tag)); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_err_on_inc() { -+ INCOMPLETE.unwrap_err(); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_inc_on_done() { -+ DONE.unwrap_inc(); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_unwrap_inc_on_err() { -+ ERROR.unwrap_inc(); -+ } -+ -+ #[test] -+ fn iresult_unwrap_inc_on_inc() { -+ assert_eq!(INCOMPLETE.unwrap_inc(), Needed::Unknown); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/lib.rs third_party/rust/nom-1.2.4/src/lib.rs -new file mode 100644 -index 000000000000..11b475d59517 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/lib.rs -@@ -0,0 +1,151 @@ -+//! nom, eating data byte by byte -+//! -+//! nom is a parser combinator library with a focus on safe parsing, -+//! streaming patterns, and as much as possible zero copy. -+//! -+//! The code is available on [Github](https://github.com/Geal/nom) -+//! -+//! # Example -+//! -+//! ``` -+//! #[macro_use] -+//! extern crate nom; -+//! -+//! use nom::{IResult,digit}; -+//! use nom::IResult::*; -+//! -+//! // Parser definition -+//! -+//! use std::str; -+//! use std::str::FromStr; -+//! -+//! named!(parens, delimited!( -+//! char!('('), -+//! expr, -+//! char!(')') -+//! ) -+//! ); -+//! -+//! named!(i64_digit, -+//! map_res!( -+//! map_res!( -+//! digit, -+//! str::from_utf8 -+//! ), -+//! FromStr::from_str -+//! ) -+//! ); -+//! -+//! // We transform an integer string into a i64 -+//! // we look for a digit suite, and try to convert it. -+//! // if either str::from_utf8 or FromStr::from_str fail, -+//! // the parser will fail -+//! named!(factor, -+//! alt!( -+//! i64_digit -+//! | parens -+//! ) -+//! ); -+//! -+//! // we define acc as mutable to update its value whenever a new term is found -+//! named!(term , -+//! chain!( -+//! mut acc: factor ~ -+//! many0!( -+//! alt!( -+//! tap!(mul: preceded!(tag!("*"), factor) => acc = acc * mul) | -+//! tap!(div: preceded!(tag!("/"), factor) => acc = acc / div) -+//! ) -+//! ), -+//! || { return acc } -+//! ) -+//! ); -+//! -+//! named!(expr , -+//! chain!( -+//! mut acc: term ~ -+//! many0!( -+//! alt!( -+//! tap!(add: preceded!(tag!("+"), term) => acc = acc + add) | -+//! tap!(sub: preceded!(tag!("-"), term) => acc = acc - sub) -+//! ) -+//! ), -+//! || { return acc } -+//! ) -+//! ); -+//! -+//! fn main() { -+//! assert_eq!(expr(b"1+2"), IResult::Done(&b""[..], 3)); -+//! assert_eq!(expr(b"12+6-4+3"), IResult::Done(&b""[..], 17)); -+//! assert_eq!(expr(b"1+2*3+4"), IResult::Done(&b""[..], 11)); -+//! -+//! assert_eq!(expr(b"(2)"), IResult::Done(&b""[..], 2)); -+//! assert_eq!(expr(b"2*(3+4)"), IResult::Done(&b""[..], 14)); -+//! assert_eq!(expr(b"2*2/(5-1)+3"), IResult::Done(&b""[..], 4)); -+//! } -+//! ``` -+#![cfg_attr(feature = "core", feature(no_std))] -+#![cfg_attr(feature = "core", feature(collections))] -+#![cfg_attr(feature = "core", no_std)] -+#![cfg_attr(feature = "nightly", feature(test))] -+#![cfg_attr(feature = "nightly", feature(const_fn))] -+ -+#[cfg(feature = "core")] -+extern crate collections; -+#[cfg(feature = "regexp")] -+extern crate regex; -+#[cfg(feature = "regexp_macros")] -+#[macro_use] extern crate lazy_static; -+#[cfg(feature = "nightly")] -+extern crate test; -+ -+#[cfg(feature = "core")] -+mod std { -+#[macro_use] -+ pub use core::{fmt, iter, option, ops, slice, mem}; -+ pub use collections::{boxed, vec, string}; -+ pub mod prelude { -+ pub use core::prelude as v1; -+ } -+} -+ -+pub use self::util::*; -+pub use self::internal::*; -+pub use self::macros::*; -+pub use self::methods::*; -+pub use self::bytes::*; -+pub use self::bits::*; -+ -+pub use self::nom::*; -+pub use self::character::*; -+ -+#[cfg(feature = "regexp")] -+pub use self::regexp::*; -+ -+#[cfg(not(feature = "core"))] -+#[cfg(feature = "stream")] -+pub use self::stream::*; -+ -+#[cfg(not(feature = "core"))] -+pub use self::str::*; -+ -+#[macro_use] mod util; -+mod internal; -+#[macro_use] mod macros; -+#[macro_use] mod methods; -+#[macro_use] mod bytes; -+#[macro_use] mod bits; -+ -+#[macro_use] mod nom; -+#[macro_use] mod character; -+ -+#[cfg(feature = "regexp")] -+#[macro_use] mod regexp; -+ -+#[macro_use] -+#[cfg(not(feature = "core"))] -+#[cfg(feature = "stream")] -+mod stream; -+ -+#[cfg(not(feature = "core"))] -+mod str; -diff --git third_party/rust/nom-1.2.4/src/macros.rs third_party/rust/nom-1.2.4/src/macros.rs -new file mode 100644 -index 000000000000..3e346a94f522 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/macros.rs -@@ -0,0 +1,3561 @@ -+//! Macro combinators -+//! -+//! Macros are used to make combination easier, -+//! since they often do not depend on the type -+//! of the data they manipulate or return. -+//! -+//! There is a trick to make them easier to assemble, -+//! combinators are defined like this: -+//! -+//! ```ignore -+//! macro_rules! tag ( -+//! ($i:expr, $inp: expr) => ( -+//! { -+//! ... -+//! } -+//! ); -+//! ); -+//! ``` -+//! -+//! But when used in other combinators, are Used -+//! like this: -+//! -+//! ```ignore -+//! named!(my_function, tag!("abcd")); -+//! ``` -+//! -+//! Internally, other combinators will rewrite -+//! that call to pass the input as first argument: -+//! -+//! ```ignore -+//! macro_rules! named ( -+//! ($name:ident, $submac:ident!( $($args:tt)* )) => ( -+//! fn $name<'a>( i: &'a [u8] ) -> $crate::IResult<'a,&[u8], &[u8]> { -+//! $submac!(i, $($args)*) -+//! } -+//! ); -+//! ); -+//! ``` -+//! -+//! If you want to call a combinator directly, you can -+//! do it like this: -+//! -+//! ```ignore -+//! let res = { tag!(input, "abcd"); } -+//! ``` -+//! -+//! Combinators must have a specific variant for -+//! non-macro arguments. Example: passing a function -+//! to take_while! instead of another combinator. -+//! -+//! ```ignore -+//! macro_rules! take_while( -+//! ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+//! { -+//! ... -+//! } -+//! ); -+//! -+//! // wrap the function in a macro to pass it to the main implementation -+//! ($input:expr, $f:expr) => ( -+//! take_while!($input, call!($f)); -+//! ); -+//! ); -+//! -+ -+/// Wraps a parser in a closure -+#[macro_export] -+macro_rules! closure ( -+ ($ty:ty, $submac:ident!( $($args:tt)* )) => ( -+ |i: $ty| { $submac!(i, $($args)*) } -+ ); -+ ($submac:ident!( $($args:tt)* )) => ( -+ |i| { $submac!(i, $($args)*) } -+ ); -+); -+ -+/// Makes a function from a parser combination -+/// -+/// The type can be set up if the compiler needs -+/// more information -+/// -+/// ```ignore -+/// named!(my_function( &[u8] ) -> &[u8], tag!("abcd")); -+/// // first type parameter is input, second is output -+/// named!(my_function<&[u8], &[u8]>, tag!("abcd")); -+/// // will have &[u8] as input type, &[u8] as output type -+/// named!(my_function, tag!("abcd")); -+/// // will use &[u8] as input type (use this if the compiler -+/// // complains about lifetime issues -+/// named!(my_function<&[u8]>, tag!("abcd")); -+/// //prefix them with 'pub' to make the functions public -+/// named!(pub my_function, tag!("abcd")); -+/// ``` -+#[macro_export] -+macro_rules! named ( -+ ($name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> $crate::IResult<$i,$o,u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( i: &'a[u8] ) -> $crate::IResult<&'a [u8], $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($name:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: &[u8] ) -> $crate::IResult<&[u8], &[u8], u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ (pub $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> $crate::IResult<$i,$o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ (pub $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ (pub $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ (pub $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: &[u8] ) -> $crate::IResult<&[u8], $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ (pub $name:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name<'a>( i: &'a [u8] ) -> $crate::IResult<&[u8], &[u8], u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+); -+ -+/// Used to wrap common expressions and function as macros -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult; -+/// # fn main() { -+/// fn take_wrapper(input: &[u8], i: u8) -> IResult<&[u8],&[u8]> { take!(input, i * 10) } -+/// -+/// // will make a parser taking 20 bytes -+/// named!(parser, apply!(take_wrapper, 2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! call ( -+ ($i:expr, $fun:expr) => ( $fun( $i ) ); -+ ($i:expr, $fun:expr, $($args:expr),* ) => ( $fun( $i, $($args),* ) ); -+); -+ -+/// emulate function currying: `apply!(my_function, arg1, arg2, ...)` becomes `my_function(input, arg1, arg2, ...)` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult; -+/// # fn main() { -+/// fn take_wrapper(input: &[u8], i: u8) -> IResult<&[u8],&[u8]> { take!(input, i * 10) } -+/// -+/// // will make a parser taking 20 bytes -+/// named!(parser, apply!(take_wrapper, 2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! apply ( -+ ($i:expr, $fun:expr, $($args:expr),* ) => ( $fun( $i, $($args),* ) ); -+); -+ -+/// Prevents backtracking if the child parser fails -+/// -+/// This parser will do an early return instead of sending -+/// its result to the parent parser. -+/// -+/// If another `error!` combinator is present in the parent -+/// chain, the error will be wrapped and another early -+/// return will be made. -+/// -+/// This makes it easy to build report on which parser failed, -+/// where it failed in the input, and the chain of parsers -+/// that led it there. -+/// -+/// Additionally, the error chain contains number identifiers -+/// that can be matched to provide useful error messages. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::Err::{Position,NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(err_test, alt!( -+/// tag!("abcd") | -+/// preceded!(tag!("efgh"), error!(ErrorKind::Custom(42), -+/// chain!( -+/// tag!("ijkl") ~ -+/// res: error!(ErrorKind::Custom(128), tag!("mnop")) , -+/// || { res } -+/// ) -+/// ) -+/// ) -+/// )); -+/// let a = &b"efghblah"[..]; -+/// let b = &b"efghijklblah"[..]; -+/// let c = &b"efghijklmnop"[..]; -+/// -+/// let blah = &b"blah"[..]; -+/// -+/// let res_a = err_test(a); -+/// let res_b = err_test(b); -+/// let res_c = err_test(c); -+/// assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); -+/// assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], -+/// Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah)))))) -+/// ); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! error ( -+ ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let cl = || { -+ $submac!($i, $($args)*) -+ }; -+ -+ match cl() { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ return $crate::IResult::Error($crate::Err::NodePosition($code, $i, Box::new(e))) -+ } -+ } -+ } -+ ); -+ ($i:expr, $code:expr, $f:expr) => ( -+ error!($i, $code, call!($f)); -+ ); -+); -+ -+/// Add an error if the child parser fails -+/// -+/// While error! does an early return and avoids backtracking, -+/// add_error! backtracks normally. It just provides more context -+/// for an error -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::Err::{Position,NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(err_test, add_error!(ErrorKind::Custom(42), tag!("abcd"))); -+/// -+/// let a = &b"efghblah"[..]; -+/// let res_a = err_test(a); -+/// assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), a, Box::new(Position(ErrorKind::Tag, a))))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! add_error ( -+ ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ $crate::IResult::Error($crate::Err::NodePosition($code, $i, Box::new(e))) -+ } -+ } -+ } -+ ); -+ ($i:expr, $code:expr, $f:expr) => ( -+ add_error!($i, $code, call!($f)); -+ ); -+); -+ -+ -+/// translate parser result from IResult to IResult with a custom type -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::Err::{Position,NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// // will add a Custom(42) error to the error chain -+/// named!(err_test, add_error!(ErrorKind::Custom(42), tag!("abcd"))); -+/// // Convert to IREsult<&[u8], &[u8], &str> -+/// named!(parser<&[u8], &[u8], &str>, add_error!(ErrorKind::Custom("custom error message"), fix_error!(&str, err_test))); -+/// -+/// let a = &b"efghblah"[..]; -+/// let res_a = parser(a); -+/// assert_eq!(res_a, Error(NodePosition( ErrorKind::Custom("custom error message"), a, Box::new(Position(ErrorKind::Fix, a))))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fix_error ( -+ ($i:expr, $t:ty, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code($crate::ErrorKind::Custom(_)) | -+ $crate::Err::Node($crate::ErrorKind::Custom(_), _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Code(e) -+ }, -+ $crate::Err::Position($crate::ErrorKind::Custom(_), p) | -+ $crate::Err::NodePosition($crate::ErrorKind::Custom(_), p, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Position(e, p) -+ }, -+ $crate::Err::Code(_) | -+ $crate::Err::Node(_, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Code(e) -+ }, -+ $crate::Err::Position(_, p) | -+ $crate::Err::NodePosition(_, p, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Position(e, p) -+ }, -+ }; -+ $crate::IResult::Error(err) -+ } -+ } -+ } -+ ); -+ ($i:expr, $t:ty, $f:expr) => ( -+ fix_error!($i, $t, call!($f)); -+ ); -+); -+ -+/// replaces a `Incomplete` returned by the child parser -+/// with an `Error` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::Err::{Position,NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(take_5, complete!(take!(5))); -+/// -+/// let a = &b"abcd"[..]; -+/// let res_a = take_5(a); -+/// assert_eq!(res_a, Error(Position(ErrorKind::Complete, a))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! complete ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(_) => { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Complete, $i)) -+ }, -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ complete!($i, call!($f)); -+ ); -+); -+ -+/// A bit like `std::try!`, this macro will return the remaining input and parsed value if the child parser returned `Done`, -+/// and will do an early return for `Error` and `Incomplete` -+/// this can provide more flexibility than `chain!` if needed -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::{be_u8,ErrorKind}; -+/// -+/// fn take_add(input:&[u8], size: u8) -> IResult<&[u8],&[u8]> { -+/// let (i1, sz) = try_parse!(input, be_u8); -+/// let (i2, length) = try_parse!(i1, expr_opt!(size.checked_add(sz))); -+/// let (i3, data) = try_parse!(i2, take!(length)); -+/// return Done(i3, data); -+/// } -+/// # fn main() { -+/// let arr1 = [1, 2, 3, 4, 5]; -+/// let r1 = take_add(&arr1[..], 1); -+/// assert_eq!(r1, Done(&[4,5][..], &[2,3][..])); -+/// -+/// let arr2 = [0xFE, 2, 3, 4, 5]; -+/// // size is overflowing -+/// let r1 = take_add(&arr2[..], 42); -+/// assert_eq!(r1, Error(Position(ErrorKind::ExprOpt,&[2,3,4,5][..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! try_parse ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => (i,o), -+ $crate::IResult::Error(e) => return $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => return $crate::IResult::Incomplete(i) -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ try_parse!($i, call!($f)) -+ ); -+); -+ -+/// `flat_map!(R -> IResult, S -> IResult) => R -> IResult` -+/// -+/// combines a parser R -> IResult and -+/// a parser S -> IResult to return another -+/// parser R -> IResult -+#[macro_export] -+macro_rules! flat_map( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code(k) | $crate::Err::Node(k, _) | $crate::Err::Position(k, _) | $crate::Err::NodePosition(k, _, _) => { -+ $crate::Err::Position(k, $i) -+ } -+ }; -+ $crate::IResult::Error(err) -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(ref i2)) => $crate::IResult::Incomplete($crate::Needed::Size(*i2)), -+ $crate::IResult::Done(_, o2) => $crate::IResult::Done(i, o2) -+ } -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ flat_map!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ flat_map!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ flat_map!($i, call!($f), $submac!($($args)*)); -+ ); -+); -+ -+/// `map!(I -> IResult, O -> P) => I -> IResult` -+/// maps a function on the result of a parser -+#[macro_export] -+macro_rules! map( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ map_impl!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ map_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ map_impl!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ map_impl!($i, call!($f), $submac!($($args)*)); -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! map_impl( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, $submac2!(o, $($args2)*)) -+ } -+ } -+ ); -+); -+ -+/// `map_res!(I -> IResult, O -> Result

) => I -> IResult` -+/// maps a function returning a Result on the output of a parser -+#[macro_export] -+macro_rules! map_res ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ map_res_impl!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ map_res_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ map_res_impl!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ map_res_impl!($i, call!($f), $submac!($($args)*)); -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! map_res_impl ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ Ok(output) => $crate::IResult::Done(i, output), -+ Err(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::MapRes, $i)) -+ } -+ } -+ } -+ ); -+); -+ -+ -+/// `map_opt!(I -> IResult, O -> Option

) => I -> IResult` -+/// maps a function returning an Option on the output of a parser -+#[macro_export] -+macro_rules! map_opt ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ map_opt_impl!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ map_opt_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ map_opt_impl!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ map_opt_impl!($i, call!($f), $submac!($($args)*)); -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! map_opt_impl ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ ::std::option::Option::Some(output) => $crate::IResult::Done(i, output), -+ ::std::option::Option::None => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::MapOpt, $i)) -+ } -+ } -+ } -+ ); -+); -+ -+/// `value!(T, R -> IResult ) => R -> IResult` -+/// -+/// or `value!(T) => R -> IResult` -+/// -+/// If the child parser was successful, return the value. -+/// If no child parser is provided, always return the value -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(x, value!(42, delimited!(tag!("")))); -+/// named!(y, delimited!(tag!(""))); -+/// let r = x(&b" aaa"[..]); -+/// assert_eq!(r, Done(&b" aaa"[..], 42)); -+/// -+/// let r2 = y(&b" aaa"[..]); -+/// assert_eq!(r2, Done(&b" aaa"[..], 42)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! value ( -+ ($i:expr, $res:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,_) => { -+ $crate::IResult::Done(i, $res) -+ }, -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $res:expr, $f:expr) => ( -+ value!($i, $res, call!($f)) -+ ); -+ ($i:expr, $res:expr) => ( -+ $crate::IResult::Done($i, $res) -+ ); -+); -+ -+/// `expr_res!(Result) => I -> IResult` -+/// evaluate an expression that returns a Result and returns a IResult::Done(I,T) if Ok -+/// -+/// See expr_opt for an example -+#[macro_export] -+macro_rules! expr_res ( -+ ($i:expr, $e:expr) => ( -+ { -+ match $e { -+ Ok(output) => $crate::IResult::Done($i, output), -+ Err(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ExprRes, $i)) -+ } -+ } -+ ); -+); -+ -+/// `expr_opt!(Option) => I -> IResult` -+/// evaluate an expression that returns a Option and returns a IResult::Done(I,T) if Some -+/// -+/// Useful when doing computations in a chain -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::{be_u8,ErrorKind}; -+/// -+/// fn take_add(input:&[u8], size: u8) -> IResult<&[u8],&[u8]> { -+/// chain!(input, -+/// sz: be_u8 ~ -+/// length: expr_opt!(size.checked_add(sz)) ~ // checking for integer overflow (returns an Option) -+/// data: take!(length) , -+/// ||{ data } -+/// ) -+/// } -+/// # fn main() { -+/// let arr1 = [1, 2, 3, 4, 5]; -+/// let r1 = take_add(&arr1[..], 1); -+/// assert_eq!(r1, Done(&[4,5][..], &[2,3][..])); -+/// -+/// let arr2 = [0xFE, 2, 3, 4, 5]; -+/// // size is overflowing -+/// let r1 = take_add(&arr2[..], 42); -+/// assert_eq!(r1, Error(Position(ErrorKind::ExprOpt,&[2,3,4,5][..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! expr_opt ( -+ ($i:expr, $e:expr) => ( -+ { -+ match $e { -+ ::std::option::Option::Some(output) => $crate::IResult::Done($i, output), -+ ::std::option::Option::None => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ExprOpt, $i)) -+ } -+ } -+ ); -+); -+ -+/// `chain!(I->IResult ~ I->IResult ~ ... I->IResult , || { return O } ) => I -> IResult` -+/// chains parsers and assemble the results through a closure -+/// -+/// The input type `I` must implement `nom::InputLength`. -+/// -+/// This combinator will count how much data is consumed by every child parser and take it into account if -+/// there is not enough data -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// #[derive(PartialEq,Eq,Debug)] -+/// struct B { -+/// a: u8, -+/// b: Option -+/// } -+/// -+/// named!(y, tag!("efgh")); -+/// -+/// fn ret_int(i:&[u8]) -> IResult<&[u8], u8> { Done(i, 1) } -+/// named!(ret_y<&[u8], u8>, map!(y, |_| 1)); // return 1 if the "efgh" tag is found -+/// -+/// named!(z<&[u8], B>, -+/// chain!( -+/// tag!("abcd") ~ // the '~' character is used as separator -+/// aa: ret_int ~ // the result of that parser will be used in the closure -+/// tag!("abcd")? ~ // this parser is optional -+/// bb: ret_y? , // the result of that parser is an option -+/// // the last parser in the chain is followed by a ',' -+/// ||{B{a: aa, b: bb}} -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// // the first "abcd" tag is not present, we have an error -+/// let r1 = z(&b"efgh"[..]); -+/// assert_eq!(r1, Error(Position(ErrorKind::Tag,&b"efgh"[..]))); -+/// -+/// // everything is present, everything is parsed -+/// let r2 = z(&b"abcdabcdefgh"[..]); -+/// assert_eq!(r2, Done(&b""[..], B{a: 1, b: Some(1)})); -+/// -+/// // the second "abcd" tag is optional -+/// let r3 = z(&b"abcdefgh"[..]); -+/// assert_eq!(r3, Done(&b""[..], B{a: 1, b: Some(1)})); -+/// -+/// // the result of ret_y is optional, as seen in the B structure -+/// let r4 = z(&b"abcdabcdwxyz"[..]); -+/// assert_eq!(r4, Done(&b"wxyz"[..], B{a: 1, b: None})); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! chain ( -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ chaining_parser!($i, 0usize, $($rest)*) -+ } -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! chaining_parser ( -+ ($i:expr, $consumed:expr, $e:ident ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, call!($e) ~ $($rest)*); -+ ); -+ ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,_) => { -+ chaining_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), $($rest)*) -+ } -+ } -+ } -+); -+ -+ ($i:expr, $consumed:expr, $e:ident ? ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, call!($e) ? ~ $($rest)*); -+ ); -+ -+ ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -+ { -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let input = if let $crate::IResult::Done(i,_) = res { -+ i -+ } else { -+ $i -+ }; -+ chaining_parser!(input, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input)), $($rest)*) -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $e:ident ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, $field: call!($e) ~ $($rest)*); -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ chaining_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), $($rest)*) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $e:ident ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, mut $field: call!($e) ~ $($rest)*); -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let mut $field = o; -+ chaining_parser!(i, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i), $($rest)*) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $e:ident ? ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, $field : call!($e) ? ~ $($rest)*); -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -+ { -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let ($field,input) = if let $crate::IResult::Done(i,o) = res { -+ (::std::option::Option::Some(o),i) -+ } else { -+ (::std::option::Option::None,$i) -+ }; -+ chaining_parser!(input, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input), $($rest)*) -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $e:ident ? ~ $($rest:tt)*) => ( -+ chaining_parser!($i, $consumed, mut $field : call!($e) ? ~ $($rest)*); -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -+ { -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let (mut $field,input) = if let $crate::IResult::Done(i,o) = res { -+ (::std::option::Option::Some(o),i) -+ } else { -+ (::std::option::Option::None,$i) -+ }; -+ chaining_parser!(input, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input), $($rest)*) -+ } -+ } -+ ); -+ -+ // ending the chain -+ ($i:expr, $consumed:expr, $e:ident, $assemble:expr) => ( -+ chaining_parser!($i, $consumed, call!($e), $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,_) => { -+ $crate::IResult::Done(i, $assemble()) -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, $e:ident ?, $assemble:expr) => ( -+ chaining_parser!($i, $consumed, call!($e) ?, $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ?, $assemble:expr) => ({ -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let input = if let $crate::IResult::Done(i,_) = res { -+ i -+ } else { -+ $i -+ }; -+ $crate::IResult::Done(input, $assemble()) -+ } -+ }); -+ -+ ($i:expr, $consumed:expr, $field:ident : $e:ident, $assemble:expr) => ( -+ chaining_parser!($i, $consumed, $field: call!($e), $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ $crate::IResult::Done(i, $assemble()) -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $e:ident, $assemble:expr) => ( -+ chaining_parser!($i, $consumed, mut $field: call!($e), $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let mut $field = o; -+ $crate::IResult::Done(i, $assemble()) -+ } -+ } -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $e:ident ? , $assemble:expr) => ( -+ chaining_parser!($i, $consumed, $field : call!($e) ? , $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ? , $assemble:expr) => ({ -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let ($field,input) = if let $crate::IResult::Done(i,o) = res { -+ (::std::option::Option::Some(o), i) -+ } else { -+ (::std::option::Option::None, $i) -+ }; -+ $crate::IResult::Done(input, $assemble()) -+ } -+ }); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $e:ident ? , $assemble:expr) => ( -+ chaining_parser!($i, $consumed, $field : call!($e) ? , $assemble); -+ ); -+ -+ ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ? , $assemble:expr) => ({ -+ let res = $submac!($i, $($args)*); -+ if let $crate::IResult::Incomplete(inc) = res { -+ match inc { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ } -+ } else { -+ let (mut $field,input) = if let $crate::IResult::Done(i,o) = res { -+ (::std::option::Option::Some(o), i) -+ } else { -+ (::std::option::Option::None, $i) -+ }; -+ $crate::IResult::Done(input, $assemble()) -+ } -+ }); -+ -+ ($i:expr, $consumed:expr, $assemble:expr) => ( -+ $crate::IResult::Done($i, $assemble()) -+ ) -+); -+ -+ -+/// `tuple!(I->IResult, I->IResult, ... I->IResult) => I -> IResult` -+/// chains parsers and assemble the sub results in a tuple. -+/// -+/// The input type `I` must implement `nom::InputLength`. -+/// -+/// This combinator will count how much data is consumed by every child parser and take it into account if -+/// there is not enough data -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # use nom::be_u16; -+/// // the return type depends of the children parsers -+/// named!(parser<&[u8], (u16, &[u8], &[u8]) >, -+/// tuple!( -+/// be_u16 , -+/// take!(3), -+/// tag!("fg") -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// assert_eq!( -+/// parser(&b"abcdefgh"[..]), -+/// Done( -+/// &b"h"[..], -+/// (0x6162u16, &b"cde"[..], &b"fg"[..]) -+/// ) -+/// ); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tuple ( -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ tuple_parser!($i, 0usize, (), $($rest)*) -+ } -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! tuple_parser ( -+ ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => ( -+ tuple_parser!($i, $consumed, ($($parsed),*), call!($e), $($rest)*); -+ ); -+ ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ tuple_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), (o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ tuple_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), ($($parsed)* , o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident) => ( -+ tuple_parser!($i, $consumed, ($($parsed),*), call!($e)); -+ ); -+ ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, (o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, ($($parsed),* , o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:expr),*)) => ( -+ { -+ $crate::IResult::Done($i, ($($parsed),*)) -+ } -+ ); -+); -+/// `alt!(I -> IResult | I -> IResult | ... | I -> IResult ) => I -> IResult` -+/// try a list of parsers, return the result of the first successful one -+/// -+/// If one of the parser returns Incomplete, alt will return Incomplete, to retry -+/// once you get more input. Note that it is better for performance to know the -+/// minimum size of data you need before you get into alt. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( test, alt!( tag!( "abcd" ) | tag!( "efgh" ) ) ); -+/// let r1 = test(b"abcdefgh"); -+/// assert_eq!(r1, Done(&b"efgh"[..], &b"abcd"[..])); -+/// let r2 = test(&b"efghijkl"[..]); -+/// assert_eq!(r2, Done(&b"ijkl"[..], &b"efgh"[..])); -+/// # } -+/// ``` -+/// -+/// There is another syntax for alt allowing a block to manipulate the result: -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// #[derive(Debug,PartialEq,Eq)] -+/// enum Tagged { -+/// Abcd, -+/// Efgh, -+/// Took(usize) -+/// } -+/// named!(test, alt!( -+/// tag!("abcd") => { |_| Tagged::Abcd } -+/// | tag!("efgh") => { |_| Tagged::Efgh } -+/// | take!(5) => { |res: &[u8]| Tagged::Took(res.len()) } // the closure takes the result as argument if the parser is successful -+/// )); -+/// let r1 = test(b"abcdefgh"); -+/// assert_eq!(r1, Done(&b"efgh"[..], Tagged::Abcd)); -+/// let r2 = test(&b"efghijkl"[..]); -+/// assert_eq!(r2, Done(&b"ijkl"[..], Tagged::Efgh)); -+/// let r3 = test(&b"mnopqrst"[..]); -+/// assert_eq!(r3, Done(&b"rst"[..], Tagged::Took(5))); -+/// # } -+/// ``` -+/// -+/// **BE CAREFUL** there is a case where the behaviour of `alt!` can be confusing: -+/// -+/// when the alternatives have different lengths, like this case: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "abcd" ) | tag!( "ef" ) | tag!( "ghi" ) | tag!( "kl" ) ) ); -+/// ``` -+/// -+/// With this parser, if you pass `"abcd"` as input, the first alternative parses it correctly, -+/// but if you pass `"efg"`, the first alternative will return `Incomplete`, since it needs an input -+/// of 4 bytes. This behaviour of `alt!` is expected: if you get a partial input that isn't matched -+/// by the first alternative, but would match if the input was complete, you want `alt!` to indicate -+/// that it cannot decide with limited information. -+/// -+/// There are two ways to fix this behaviour. The first one consists in ordering the alternatives -+/// by size, like this: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "ef" ) | tag!( "kl") | tag!( "ghi" ) | tag!( "abcd" ) ) ); -+/// ``` -+/// -+/// With this solution, the largest alternative will be tested last. -+/// -+/// The other solution uses the `complete!` combinator, which transforms an `Incomplete` in an -+/// `Error`. If one of the alternatives returns `Incomplete` but is wrapped by `complete!`, -+/// `alt!` will try the next alternative. This is useful when you know that -+/// you will not get partial input: -+/// -+/// ```ignore -+/// named!( test, -+/// alt!( -+/// complete!( tag!( "abcd" ) ) | -+/// complete!( tag!( "ef" ) ) | -+/// complete!( tag!( "ghi" ) ) | -+/// complete!( tag!( "kl" ) ) -+/// ) -+/// ); -+/// ``` -+/// -+/// If you want the `complete!` combinator to be applied to all rules then use the convenience -+/// `alt_complete!` macro (see below). -+/// -+/// This behaviour of `alt!` can get especially confusing if multiple alternatives have different -+/// sizes but a common prefix, like this: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "abcd" ) | tag!( "ab" ) | tag!( "ef" ) ) ); -+/// ``` -+/// -+/// in that case, if you order by size, passing `"abcd"` as input will always be matched by the -+/// smallest parser, so the solution using `complete!` is better suited. -+/// -+/// You can also nest multiple `alt!`, like this: -+/// -+/// ```ignore -+/// named!( test, -+/// alt!( -+/// preceded!( -+/// tag!("ab"), -+/// alt!( -+/// tag!( "cd" ) | -+/// eof -+/// ) -+/// ) -+/// | tag!( "ef" ) -+/// ) -+/// ); -+/// ``` -+/// -+/// `preceded!` will first parse `"ab"` then, if successful, try the alternatives "cd", -+/// or empty input (End Of File). If none of them work, `preceded!` will fail and -+/// "ef" will be tested. -+/// -+#[macro_export] -+macro_rules! alt ( -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ alt_parser!($i, $($rest)*) -+ } -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! alt_parser ( -+ ($i:expr, $e:ident | $($rest:tt)*) => ( -+ alt_parser!($i, call!($e) | $($rest)*); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let res = $subrule!($i, $($args)*); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ $crate::IResult::Incomplete(_) => res, -+ _ => alt_parser!($i, $($rest)*) -+ } -+ } -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -+ { -+ match $subrule!( $i, $($args)* ) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ alt_parser!($i, $($rest)*) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt_parser!($i, call!($e) => { $gen } | $($rest)*); -+ ); -+ -+ ($i:expr, $e:ident => { $gen:expr }) => ( -+ alt_parser!($i, call!($e) => { $gen }); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -+ { -+ match $subrule!( $i, $($args)* ) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ alt_parser!($i) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $e:ident) => ( -+ alt_parser!($i, call!($e)); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*)) => ( -+ { -+ match $subrule!( $i, $($args)* ) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,o), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ alt_parser!($i) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr) => ( -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Alt,$i)) -+ ); -+); -+ -+/// This is a combination of the `alt!` and `complete!` combinators. Rather -+/// than returning `Incomplete` on partial input, `alt_complete!` will try the -+/// next alternative in the chain. You should use this only if you know you -+/// will not receive partial input for the rules you're trying to match (this -+/// is almost always the case for parsing programming languages). -+#[macro_export] -+macro_rules! alt_complete ( -+ // Recursive rules (must include `complete!` around the head) -+ -+ ($i:expr, $e:ident | $($rest:tt)*) => ( -+ alt_complete!($i, complete!(call!($e)) | $($rest)*); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let res = complete!($i, $subrule!($($args)*)); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ _ => alt_complete!($i, $($rest)*), -+ } -+ } -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -+ { -+ match complete!($i, $subrule!($($args)*)) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ _ => alt_complete!($i, $($rest)*), -+ } -+ } -+ ); -+ -+ ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt_complete!($i, complete!(call!($e)) => { $gen } | $($rest)*); -+ ); -+ -+ // Tail (non-recursive) rules -+ -+ ($i:expr, $e:ident => { $gen:expr }) => ( -+ alt_complete!($i, call!($e) => { $gen }); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -+ alt_parser!($i, $subrule!($($args)*) => { $gen }) -+ ); -+ -+ ($i:expr, $e:ident) => ( -+ alt_complete!($i, call!($e)); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*)) => ( -+ alt_parser!($i, $subrule!($($args)*)) -+ ); -+); -+ -+/// `switch!(I -> IResult, P => I -> IResult | ... | P => I -> IResult ) => I -> IResult` -+/// choose the next parser depending on the result of the first one, if successful, -+/// and returns the result of the second parser -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # use nom::Err::{Position, NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => tag!("XYZ") | -+/// b"efgh" => tag!("123") -+/// ) -+/// ); -+/// -+/// let a = b"abcdXYZ123"; -+/// let b = b"abcdef"; -+/// let c = b"efgh123"; -+/// let d = b"blah"; -+/// -+/// assert_eq!(sw(&a[..]), Done(&b"123"[..], &b"XYZ"[..])); -+/// assert_eq!(sw(&b[..]), Error(NodePosition(ErrorKind::Switch, &b"abcdef"[..], Box::new(Position(ErrorKind::Tag, &b"ef"[..]))))); -+/// assert_eq!(sw(&c[..]), Done(&b""[..], &b"123"[..])); -+/// assert_eq!(sw(&d[..]), Error(Position(ErrorKind::Switch, &b"blah"[..]))); -+/// # } -+/// ``` -+/// -+/// Due to limitations in Rust macros, it is not possible to have simple functions on the right hand -+/// side of pattern, like this: -+/// -+/// ```ignore -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => tag!("XYZ") | -+/// b"efgh" => tag!("123") -+/// ) -+/// ); -+/// ``` -+/// -+/// If you want to pass your own functions instead, you can use the `call!` combinator as follows: -+/// -+/// ```ignore -+/// named!(xyz, tag!("XYZ")); -+/// named!(num, tag!("123")); -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => call!(xyz) | -+/// b"efgh" => call!(num) -+/// ) -+/// ); -+/// ``` -+/// -+#[macro_export] -+macro_rules! switch ( -+ ($i:expr, $submac:ident!( $($args:tt)*), $($rest:tt)*) => ( -+ { -+ switch_impl!($i, $submac!($($args)*), $($rest)*) -+ } -+ ); -+ ($i:expr, $e:ident, $($rest:tt)*) => ( -+ { -+ switch_impl!($i, call!($e), $($rest)*) -+ } -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! switch_impl ( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error($crate::Err::NodePosition( -+ $crate::ErrorKind::Switch, $i, ::std::boxed::Box::new(e) -+ )), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match o { -+ $($p => match $subrule!(i, $($args2)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error($crate::Err::NodePosition( -+ $crate::ErrorKind::Switch, $i, ::std::boxed::Box::new(e) -+ )), -+ a => a, -+ }),*, -+ _ => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Switch,$i)) -+ } -+ } -+ } -+ } -+ ); -+); -+/// `opt!(I -> IResult) => I -> IResult>` -+/// make the underlying parser optional -+/// -+/// returns an Option of the returned type. This parser returns `Some(result)` if the child parser -+/// succeeds,`None` if it fails, and `Incomplete` if it did not have enough data to decide -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( o<&[u8], Option<&[u8]> >, opt!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdef"; -+/// let b = b"bcdefg"; -+/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], None)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! opt( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Error(_) => $crate::IResult::Done($i, ::std::option::Option::None), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ opt!($i, call!($f)); -+ ); -+); -+ -+/// `opt_res!(I -> IResult) => I -> IResult>` -+/// make the underlying parser optional -+/// -+/// returns a Result, with Err containing the parsing error -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!( o<&[u8], Result<&[u8], nom::Err<&[u8]> > >, opt_res!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdef"; -+/// let b = b"bcdefg"; -+/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Ok(&b"abcd"[..]))); -+/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], Err(Position(ErrorKind::Tag, &b[..])))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! opt_res ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, Ok(o)), -+ $crate::IResult::Error(e) => $crate::IResult::Done($i, Err(e)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ opt_res!($i, call!($f)); -+ ); -+); -+ -+/// `cond_with_error!(bool, I -> IResult) => I -> IResult>` -+/// Conditional combinator -+/// -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an Option of the return type of the child -+/// parser. -+/// -+/// This is especially useful if a parser depends -+/// on the value return by a preceding parser in -+/// a `chain!`. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::IResult; -+/// # fn main() { -+/// let b = true; -+/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b, tag!("abcd") )) -+/// ); -+/// -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+/// -+/// let b2 = false; -+/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b2, tag!("abcd") )) -+/// ); -+/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! cond_with_error( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ if $cond { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } else { -+ $crate::IResult::Done($i, ::std::option::Option::None) -+ } -+ } -+ ); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond!($i, $cond, call!($f)); -+ ); -+); -+ -+/// `cond!(bool, I -> IResult) => I -> IResult>` -+/// Conditional combinator -+/// -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an Option of the return type of the child -+/// parser. -+/// -+/// This is especially useful if a parser depends -+/// on the value return by a preceding parser in -+/// a `chain!`. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::IResult; -+/// # fn main() { -+/// let b = true; -+/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b, tag!("abcd") )) -+/// ); -+/// -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+/// -+/// let b2 = false; -+/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b2, tag!("abcd") )) -+/// ); -+/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! cond( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ if $cond { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Error(_) => $crate::IResult::Done($i, ::std::option::Option::None), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } else { -+ $crate::IResult::Done($i, ::std::option::Option::None) -+ } -+ } -+ ); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond!($i, $cond, call!($f)); -+ ); -+); -+ -+/// `cond_reduce!(bool, I -> IResult) => I -> IResult` -+/// Conditional combinator with error -+/// -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an error if the condition is false -+/// -+/// This is especially useful if a parser depends -+/// on the value return by a preceding parser in -+/// a `chain!`. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # use nom::{Err,ErrorKind}; -+/// # fn main() { -+/// let b = true; -+/// let f = closure!(&'static[u8], -+/// cond_reduce!( b, tag!("abcd") ) -+/// ); -+/// -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], &b"abcd"[..])); -+/// -+/// let b2 = false; -+/// let f2 = closure!(&'static[u8], -+/// cond_reduce!( b2, tag!("abcd") ) -+/// ); -+/// assert_eq!(f2(&a[..]), Error(Err::Position(ErrorKind::CondReduce, &a[..]))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! cond_reduce( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ if $cond { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::CondReduce, $i)) -+ } -+ } -+ ); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond_reduce!($i, $cond, call!($f)); -+ ); -+); -+ -+/// `peek!(I -> IResult) => I -> IResult` -+/// returns a result without consuming the input -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(ptag, peek!( tag!( "abcd" ) ) ); -+/// -+/// let r = ptag(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"abcdefgh"[..], &b"abcd"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! peek( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(_,o) => $crate::IResult::Done($i, o), -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ peek!($i, call!($f)); -+ ); -+); -+ -+/// `not!(I -> IResult) => I -> IResult` -+/// returns a result only if the embedded parser returns Error or Incomplete -+/// does not consume the input -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # use nom::Err::{Position}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(not_e, chain!( -+/// res: tag!("abc") ~ -+/// not!(char!('e')), -+/// || { res })); -+/// -+/// let r = not_e(&b"abcd"[..]); -+/// assert_eq!(r, Done(&b"d"[..], &b"abc"[..])); -+/// -+/// let r2 = not_e(&b"abce"[..]); -+/// assert_eq!(r2, Error(Position(ErrorKind::Not, &b"e"[..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! not( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(_, _) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Not, $i)), -+ $crate::IResult::Error(_) => $crate::IResult::Done($i, &($i)[..0]), -+ $crate::IResult::Incomplete(_) => $crate::IResult::Done($i, &($i)[..0]) -+ } -+ } -+ ); -+); -+ -+/// `tap!(name: I -> IResult => { block }) => I -> IResult` -+/// allows access to the parser's result without affecting it -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use std::str; -+/// # fn main() { -+/// named!(ptag, tap!(res: tag!( "abcd" ) => { println!("recognized {}", str::from_utf8(res).unwrap()) } ) ); -+/// -+/// let r = ptag(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tap ( -+ ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ let $name = o; -+ $e; -+ $crate::IResult::Done(i, $name) -+ }, -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -+ } -+ } -+ ); -+ ($i:expr, $name: ident: $f:expr => $e:expr) => ( -+ tap!($i, $name: call!($f) => $e); -+ ); -+); -+ -+/// `pair!(I -> IResult, I -> IResult) => I -> IResult` -+/// pair(X,Y), returns (x,y) -+/// -+#[macro_export] -+macro_rules! pair( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ pair!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ pair!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ pair!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `separated_pair!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` -+/// separated_pair(X,sep,Y) returns (x,y) -+#[macro_export] -+macro_rules! separated_pair( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -+ { -+ match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1, (o1, _, o2)) => { -+ $crate::IResult::Done(i1, (o1, o2)) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $f:expr, $($rest:tt)+) => ( -+ separated_pair!($i, call!($f), $($rest)*); -+ ); -+); -+ -+/// `preceded!(I -> IResult, I -> IResult) => I -> IResult` -+/// preceded(opening, X) returns X -+#[macro_export] -+macro_rules! preceded( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (_,o)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ preceded!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ preceded!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ preceded!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `terminated!(I -> IResult, I -> IResult) => I -> IResult` -+/// terminated(X, closing) returns X -+#[macro_export] -+macro_rules! terminated( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (o,_)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ terminated!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ terminated!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ terminated!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `delimited!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` -+/// delimited(opening, X, closing) returns X -+#[macro_export] -+macro_rules! delimited( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -+ { -+ match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1, (_, o, _)) => { -+ $crate::IResult::Done(i1, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $f:expr, $($rest:tt)+) => ( -+ delimited!($i, call!($f), $($rest)*); -+ ); -+); -+ -+/// `separated_list!(I -> IResult, I -> IResult) => I -> IResult>` -+/// separated_list(sep, X) returns Vec -+#[macro_export] -+macro_rules! separated_list( -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -+ { -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i; -+ -+ // get the first element -+ match $submac!(input, $($args2)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Done(input, ::std::vec::Vec::new()), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i,o) => { -+ if i.len() == input.len() { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::SeparatedList,input)) -+ } else { -+ res.push(o); -+ input = i; -+ -+ loop { -+ // get the separator first -+ if let $crate::IResult::Done(i2,_) = $sep!(input, $($args)*) { -+ if i2.len() == input.len() { -+ break; -+ } -+ -+ // get the element next -+ if let $crate::IResult::Done(i3,o3) = $submac!(i2, $($args2)*) { -+ if i3.len() == i2.len() { -+ break; -+ } -+ res.push(o3); -+ input = i3; -+ } else { -+ break; -+ } -+ } else { -+ break; -+ } -+ } -+ $crate::IResult::Done(input, res) -+ } -+ }, -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_list!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_list!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_list!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `separated_nonempty_list!(I -> IResult, I -> IResult) => I -> IResult>` -+/// separated_nonempty_list(sep, X) returns Vec -+#[macro_export] -+macro_rules! separated_nonempty_list( -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -+ { -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i; -+ -+ // get the first element -+ match $submac!(input, $($args2)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i,o) => { -+ if i.len() == input.len() { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::SeparatedNonEmptyList,input)) -+ } else { -+ res.push(o); -+ input = i; -+ -+ loop { -+ if let $crate::IResult::Done(i2,_) = $sep!(input, $($args)*) { -+ if i2.len() == input.len() { -+ break; -+ } -+ -+ if let $crate::IResult::Done(i3,o3) = $submac!(i2, $($args2)*) { -+ if i3.len() == i2.len() { -+ break; -+ } -+ res.push(o3); -+ input = i3; -+ } else { -+ break; -+ } -+ } else { -+ break; -+ } -+ } -+ $crate::IResult::Done(input, res) -+ } -+ }, -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_nonempty_list!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_nonempty_list!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_nonempty_list!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `many0!(I -> IResult) => I -> IResult>` -+/// Applies the parser 0 or more times and returns the list of results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many0!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); -+/// # } -+/// ``` -+/// 0 or more -+#[macro_export] -+macro_rules! many0( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ -+ let ret; -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i; -+ -+ loop { -+ if input.input_len() == 0 { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let size = i + ($i).input_len() - input.input_len(); -+ ret = $crate::IResult::Incomplete($crate::Needed::Size(size)); break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ // loop trip must always consume (otherwise infinite loops) -+ if i == input { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many0,input)); break; -+ } -+ -+ res.push(o); -+ input = i; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ many0!($i, call!($f)); -+ ); -+); -+ -+/// `many1!(I -> IResult) => I -> IResult>` -+/// Applies the parser 1 or more times and returns the list of results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many1!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Error(Position(ErrorKind::Many1,&b[..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! many1( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many1,$i)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,o1) => { -+ if i1.input_len() == 0 { -+ $crate::IResult::Done(i1,vec![o1]) -+ } else { -+ -+ let mut res = ::std::vec::Vec::with_capacity(4); -+ res.push(o1); -+ let mut input = i1; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if input.input_len() == 0 { -+ break; -+ } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ res.push(o); -+ input = i; -+ } -+ } -+ } -+ -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, res) -+ } -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ many1!($i, call!($f)); -+ ); -+); -+ -+/// `many_m_n!(usize, usize, I -> IResult) => I -> IResult>` -+/// Applies the parser between m and n times (n included) and returns the list of results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdefgh"; -+/// let b = b"abcdabcdefgh"; -+/// let c = b"abcdabcdabcdabcdabcdefgh"; -+/// -+/// assert_eq!(multi(&a[..]),Error(Position(ErrorKind::ManyMN,&a[..]))); -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); -+/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! many_m_n( -+ ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ let mut res = ::std::vec::Vec::with_capacity($m); -+ let mut input = $i; -+ let mut count: usize = 0; -+ let mut err = false; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if count == $n { break } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i, o) => { -+ // do not allow parsers that do not consume input (causes infinite loops) -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ res.push(o); -+ input = i; -+ count += 1; -+ } -+ $crate::IResult::Error(_) => { -+ err = true; -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -+ break; -+ }, -+ } -+ if input.input_len() == 0 { -+ break; -+ } -+ } -+ -+ if count < $m { -+ if err { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ManyMN,$i)) -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } -+ } -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, res) -+ } -+ } -+ } -+ ); -+ ($i:expr, $m:expr, $n: expr, $f:expr) => ( -+ many_m_n!($i, $m, $n, call!($f)); -+ ); -+); -+ -+/// `count!(I -> IResult, nb) => I -> IResult>` -+/// Applies the child parser a specified number of times -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(counter< Vec<&[u8]> >, count!( tag!( "abcd" ), 2 ) ); -+/// -+/// let a = b"abcdabcdabcdef"; -+/// let b = b"abcdefgh"; -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// -+/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); -+/// assert_eq!(counter(&b[..]), Error(Position(ErrorKind::Count, &b[..]))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! count( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $count: expr) => ( -+ { -+ let ret; -+ let mut input = $i; -+ let mut res = ::std::vec::Vec::with_capacity($count); -+ -+ loop { -+ if res.len() == $count { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ res.push(o); -+ input = i; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Count,$i)); break; -+ }, -+ $crate::IResult::Incomplete(_) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr, $count: expr) => ( -+ count!($i, call!($f), $count); -+ ); -+); -+ -+/// `count_fixed!(O, I -> IResult, nb) => I -> IResult` -+/// Applies the child parser a fixed number of times and returns a fixed size array -+/// The type must be specified and it must be `Copy` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(counter< [&[u8]; 2] >, count_fixed!( &[u8], tag!( "abcd" ), 2 ) ); -+/// // can omit the type specifier if returning slices -+/// // named!(counter< [&[u8]; 2] >, count_fixed!( tag!( "abcd" ), 2 ) ); -+/// -+/// let a = b"abcdabcdabcdef"; -+/// let b = b"abcdefgh"; -+/// let res = [&b"abcd"[..], &b"abcd"[..]]; -+/// -+/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); -+/// assert_eq!(counter(&b[..]), Error(Position(ErrorKind::Count, &b[..]))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! count_fixed ( -+ ($i:expr, $typ:ty, $submac:ident!( $($args:tt)* ), $count: expr) => ( -+ { -+ let ret; -+ let mut input = $i; -+ // `$typ` must be Copy, and thus having no destructor, this is panic safe -+ let mut res: [$typ; $count] = unsafe{[::std::mem::uninitialized(); $count as usize]}; -+ let mut cnt: usize = 0; -+ -+ loop { -+ if cnt == $count { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ res[cnt] = o; -+ cnt += 1; -+ input = i; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Count,$i)); break; -+ }, -+ $crate::IResult::Incomplete(_) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $typ: ty, $f:ident, $count: expr) => ( -+ count_fixed!($i, $typ, call!($f), $count); -+ ); -+); -+ -+/// `length_value!(I -> IResult, I -> IResult) => I -> IResult>` -+/// gets a number from the first parser, then applies the second parser that many times -+#[macro_export] -+macro_rules! length_value( -+ ($i:expr, $f:expr, $g:expr) => ( -+ { -+ match $f($i) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(inum, onum) => { -+ let ret; -+ let length_token = $i.len() - inum.len(); -+ let mut input = inum; -+ let mut res = ::std::vec::Vec::new(); -+ -+ loop { -+ if res.len() == onum as usize { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $g(input) { -+ $crate::IResult::Done(iparse, oparse) => { -+ res.push(oparse); -+ input = iparse; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::LengthValue,$i)); break; -+ }, -+ $crate::IResult::Incomplete(a) => { -+ ret = match a { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(length) => $crate::IResult::Incomplete($crate::Needed::Size(length_token + onum as usize * length)) -+ }; -+ break; -+ } -+ } -+ } -+ -+ ret -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr, $g:expr, $length:expr) => ( -+ { -+ match $f($i) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(inum, onum) => { -+ let ret; -+ let length_token = $i.len() - inum.len(); -+ let mut input = inum; -+ let mut res = ::std::vec::Vec::new(); -+ -+ loop { -+ if res.len() == onum as usize { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $g(input) { -+ $crate::IResult::Done(iparse, oparse) => { -+ res.push(oparse); -+ input = iparse; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::LengthValue,$i)); break; -+ }, -+ $crate::IResult::Incomplete(a) => { -+ ret = match a { -+ $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::Needed::Size(_) => $crate::IResult::Incomplete($crate::Needed::Size(length_token + onum as usize * $length)) -+ }; -+ break; -+ } -+ } -+ } -+ -+ ret -+ } -+ } -+ } -+ ); -+); -+ -+/// `fold_many0!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser 0 or more times and folds the list of return values -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, fold_many0!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); -+/// # } -+/// ``` -+/// 0 or more -+#[macro_export] -+macro_rules! fold_many0( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ let ret; -+ let f = $f; -+ let mut res = $init; -+ let mut input = $i; -+ -+ loop { -+ if input.input_len() == 0 { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let size = i + ($i).input_len() - input.input_len(); -+ ret = $crate::IResult::Incomplete($crate::Needed::Size(size)); break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ // loop trip must always consume (otherwise infinite loops) -+ if i == input { -+ ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many0,input)); break; -+ } -+ -+ res = f(res, o); -+ input = i; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many0!($i, call!($f), $init, $fold_f); -+ ); -+); -+ -+/// `fold_many1!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser 1 or more times and folds the list of return values -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, fold_many1!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Error(Position(ErrorKind::Many1,&b[..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fold_many1( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many1,$i)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,o1) => { -+ let acc = $init; -+ let f = $f; -+ if i1.len() == 0 { -+ let acc = f(acc, o1); -+ $crate::IResult::Done(i1,acc) -+ } else { -+ let mut acc = f(acc, o1); -+ let mut input = i1; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if input.input_len() == 0 { -+ break; -+ } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ acc = f(acc, o); -+ input = i; -+ } -+ } -+ } -+ -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, acc) -+ } -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many1!($i, call!($f), $init, $fold_f); -+ ); -+); -+ -+/// `fold_many_m_n!(usize, usize, I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser between m and n times (n included) and folds the list of return value -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdefgh"; -+/// let b = b"abcdabcdefgh"; -+/// let c = b"abcdabcdabcdabcdabcdefgh"; -+/// -+/// assert_eq!(multi(&a[..]),Error(Position(ErrorKind::ManyMN,&a[..]))); -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); -+/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fold_many_m_n( -+ ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ let mut acc = $init; -+ let f = $f; -+ let mut input = $i; -+ let mut count: usize = 0; -+ let mut err = false; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if count == $n { break } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i, o) => { -+ // do not allow parsers that do not consume input (causes infinite loops) -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ acc = f(acc, o); -+ input = i; -+ count += 1; -+ } -+ $crate::IResult::Error(_) => { -+ err = true; -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -+ break; -+ }, -+ } -+ if input.input_len() == 0 { -+ break; -+ } -+ } -+ -+ if count < $m { -+ if err { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ManyMN,$i)) -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } -+ } -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, acc) -+ } -+ } -+ } -+ ); -+ ($i:expr, $m:expr, $n: expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many_m_n!($i, $m, $n, call!($f), $init, $fold_f); -+ ); -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::{Needed,IResult,Err}; -+ use internal::IResult::*; -+ use internal::Err::*; -+ use util::ErrorKind; -+ -+ // reproduce the tag and take macros, because of module import order -+ macro_rules! tag ( -+ ($i:expr, $inp: expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ -+ tag_bytes!($i,bytes) -+ } -+ ); -+ ); -+ -+ macro_rules! tag_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ use std::cmp::min; -+ let len = $i.len(); -+ let blen = $bytes.len(); -+ let m = min(len, blen); -+ let reduced = &$i[..m]; -+ let b = &$bytes[..m]; -+ -+ let res: $crate::IResult<_,_> = if reduced != b { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Tag, $i)) -+ } else if m < blen { -+ $crate::IResult::Incomplete($crate::Needed::Size(blen)) -+ } else { -+ $crate::IResult::Done(&$i[blen..], reduced) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ macro_rules! take( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res:$crate::IResult<&[u8],&[u8]> = if $i.len() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ -+ mod pub_named_mod { -+ named!(pub tst, tag!("abcd")); -+ } -+ -+ #[test] -+ fn pub_named_test() { -+ let a = &b"abcd"[..]; -+ let res = pub_named_mod::tst(a); -+ assert_eq!(res, Done(&b""[..], a)); -+ } -+ -+ #[test] -+ fn apply_test() { -+ fn sum2(a:u8, b:u8) -> u8 { a + b } -+ fn sum3(a:u8, b:u8, c:u8) -> u8 { a + b + c } -+ let a = apply!(1, sum2, 2); -+ let b = apply!(1, sum3, 2, 3); -+ -+ assert_eq!(a, 3); -+ assert_eq!(b, 6); -+ } -+ -+ #[derive(PartialEq,Eq,Debug)] -+ struct B { -+ a: u8, -+ b: u8 -+ } -+ -+ #[test] -+ fn chain2() { -+ fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -+ fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -+ -+ named!(chain_parser<&[u8],B>, -+ chain!( -+ tag!("abcd") ~ -+ tag!("abcd")? ~ -+ aa: ret_int1 ~ -+ tag!("efgh") ~ -+ bb: ret_int2 ~ -+ tag!("efgh") , -+ ||{B{a: aa, b: bb}} -+ ) -+ ); -+ -+ assert_eq!(chain_parser(&b"abcdabcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -+ assert_eq!(chain_parser(&b"abcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -+ assert_eq!(chain_parser(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(chain_parser(&b"abcdefghef"[..]), Incomplete(Needed::Size(12))); -+ } -+ -+ #[test] -+ fn nested_chain() { -+ fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -+ fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -+ -+ named!(chain_parser<&[u8],B>, -+ chain!( -+ chain!( -+ tag!("abcd") ~ -+ tag!("abcd")? , -+ || {} -+ ) ~ -+ aa: ret_int1 ~ -+ tag!("efgh") ~ -+ bb: ret_int2 ~ -+ tag!("efgh") , -+ ||{B{a: aa, b: bb}} -+ ) -+ ); -+ -+ assert_eq!(chain_parser(&b"abcdabcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -+ assert_eq!(chain_parser(&b"abcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -+ assert_eq!(chain_parser(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(chain_parser(&b"abcdefghef"[..]), Incomplete(Needed::Size(12))); -+ } -+ -+ #[derive(PartialEq,Eq,Debug)] -+ struct C { -+ a: u8, -+ b: Option -+ } -+ -+ #[test] -+ fn chain_mut() { -+ fn ret_b1_2(i:&[u8]) -> IResult<&[u8], B> { Done(i,B{a:1,b:2}) }; -+ named!(f<&[u8],B>, -+ chain!( -+ tag!("abcd") ~ -+ tag!("abcd")? ~ -+ tag!("efgh") ~ -+ mut bb: ret_b1_2 ~ -+ tag!("efgh") , -+ ||{ -+ bb.b = 3; -+ bb -+ } -+ ) -+ ); -+ -+ let r = f(&b"abcdabcdefghefghX"[..]); -+ assert_eq!(r, Done(&b"X"[..], B{a: 1, b: 3})); -+ } -+ -+ #[test] -+ fn chain_opt() { -+ named!(y, tag!("efgh")); -+ fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -+ named!(ret_y<&[u8], u8>, map!(y, |_| 2)); -+ -+ named!(chain_parser<&[u8],C>, -+ chain!( -+ tag!("abcd") ~ -+ aa: ret_int1 ~ -+ bb: ret_y? , -+ ||{C{a: aa, b: bb}} -+ ) -+ ); -+ -+ assert_eq!(chain_parser(&b"abcdefghX"[..]), Done(&b"X"[..], C{a: 1, b: Some(2)})); -+ assert_eq!(chain_parser(&b"abcdWXYZ"[..]), Done(&b"WXYZ"[..], C{a: 1, b: None})); -+ assert_eq!(chain_parser(&b"abcdX"[..]), Done(&b"X"[..], C{ a: 1, b: None })); -+ assert_eq!(chain_parser(&b"abcdef"[..]), Incomplete(Needed::Size(8))); -+ } -+ -+ use util::{error_to_list, add_error_pattern, print_error}; -+ -+ fn error_to_string

(e: &Err

) -> &'static str { -+ let v:Vec = error_to_list(e); -+ // do it this way if you can use slice patterns -+ /* -+ match &v[..] { -+ [ErrorKind::Custom(42), ErrorKind::Tag] => "missing `ijkl` tag", -+ [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] => "missing `mnop` tag after `ijkl`", -+ _ => "unrecognized error" -+ } -+ */ -+ if &v[..] == [ErrorKind::Custom(42),ErrorKind::Tag] { -+ "missing `ijkl` tag" -+ } else if &v[..] == [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] { -+ "missing `mnop` tag after `ijkl`" -+ } else { -+ "unrecognized error" -+ } -+ } -+ -+ // do it this way if you can use box patterns -+ /*use std::str; -+ fn error_to_string(e:Err) -> String -+ match e { -+ NodePosition(ErrorKind::Custom(42), i1, box Position(ErrorKind::Tag, i2)) => { -+ format!("missing `ijkl` tag, found '{}' instead", str::from_utf8(i2).unwrap()) -+ }, -+ NodePosition(ErrorKind::Custom(42), i1, box NodePosition(ErrorKind::Custom(128), i2, box Position(ErrorKind::Tag, i3))) => { -+ format!("missing `mnop` tag after `ijkl`, found '{}' instead", str::from_utf8(i3).unwrap()) -+ }, -+ _ => "unrecognized error".to_string() -+ } -+ }*/ -+ use std::collections; -+ #[test] -+ fn err() { -+ named!(err_test, alt!( -+ tag!("abcd") | -+ preceded!(tag!("efgh"), error!(ErrorKind::Custom(42), -+ chain!( -+ tag!("ijkl") ~ -+ res: error!(ErrorKind::Custom(128), tag!("mnop")) , -+ || { res } -+ ) -+ ) -+ ) -+ )); -+ let a = &b"efghblah"[..]; -+ let b = &b"efghijklblah"[..]; -+ let c = &b"efghijklmnop"[..]; -+ -+ let blah = &b"blah"[..]; -+ -+ let res_a = err_test(a); -+ let res_b = err_test(b); -+ let res_c = err_test(c); -+ assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); -+ assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah))))))); -+ assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -+ -+ // Merr-like error matching -+ let mut err_map = collections::HashMap::new(); -+ assert!(add_error_pattern(&mut err_map, err_test(&b"efghpouet"[..]), "missing `ijkl` tag")); -+ assert!(add_error_pattern(&mut err_map, err_test(&b"efghijklpouet"[..]), "missing `mnop` tag after `ijkl`")); -+ -+ let res_a2 = res_a.clone(); -+ match res_a { -+ Error(e) => { -+ assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Tag]); -+ assert_eq!(error_to_string(&e), "missing `ijkl` tag"); -+ assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `ijkl` tag")); -+ }, -+ _ => panic!() -+ }; -+ -+ let res_b2 = res_b.clone(); -+ match res_b { -+ Error(e) => { -+ assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag]); -+ assert_eq!(error_to_string(&e), "missing `mnop` tag after `ijkl`"); -+ assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `mnop` tag after `ijkl`")); -+ }, -+ _ => panic!() -+ }; -+ -+ print_error(a, res_a2); -+ print_error(b, res_b2); -+ } -+ -+ #[test] -+ fn add_err() { -+ named!(err_test, -+ preceded!(tag!("efgh"), add_error!(ErrorKind::Custom(42), -+ chain!( -+ tag!("ijkl") ~ -+ res: add_error!(ErrorKind::Custom(128), tag!("mnop")) , -+ || { res } -+ ) -+ ) -+ )); -+ let a = &b"efghblah"[..]; -+ let b = &b"efghijklblah"[..]; -+ let c = &b"efghijklmnop"[..]; -+ -+ let blah = &b"blah"[..]; -+ -+ let res_a = err_test(a); -+ let res_b = err_test(b); -+ let res_c = err_test(c); -+ assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); -+ assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah))))))); -+ assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -+ } -+ -+ #[test] -+ fn complete() { -+ named!(err_test, -+ chain!( -+ tag!("ijkl") ~ -+ res: complete!(tag!("mnop")) , -+ || { res } -+ ) -+ ); -+ let a = &b"ijklmn"[..]; -+ -+ let res_a = err_test(a); -+ assert_eq!(res_a, Error(Position(ErrorKind::Complete, &b"mn"[..]))); -+ } -+ #[test] -+ fn alt() { -+ fn work(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(&b""[..], input) -+ } -+ -+ #[allow(unused_variables)] -+ fn dont_work(input: &[u8]) -> IResult<&[u8],&[u8],&'static str> { -+ Error(Code(ErrorKind::Custom("abcd"))) -+ } -+ -+ fn work2(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(input, &b""[..]) -+ } -+ -+ fn alt1(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work) -+ } -+ fn alt2(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | work) -+ } -+ fn alt3(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work | work2 | dont_work) -+ } -+ //named!(alt1, alt!(dont_work | dont_work)); -+ //named!(alt2, alt!(dont_work | work)); -+ //named!(alt3, alt!(dont_work | dont_work | work2 | dont_work)); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(alt1(a), Error(Position(ErrorKind::Alt, a))); -+ assert_eq!(alt2(a), Done(&b""[..], a)); -+ assert_eq!(alt3(a), Done(a, &b""[..])); -+ -+ named!(alt4, alt!(tag!("abcd") | tag!("efgh"))); -+ let b = &b"efgh"[..]; -+ assert_eq!(alt4(a), Done(&b""[..], a)); -+ assert_eq!(alt4(b), Done(&b""[..], b)); -+ -+ // test the alternative syntax -+ named!(alt5, alt!(tag!("abcd") => { |_| false } | tag!("efgh") => { |_| true })); -+ assert_eq!(alt5(a), Done(&b""[..], false)); -+ assert_eq!(alt5(b), Done(&b""[..], true)); -+ -+ } -+ -+ #[test] -+ fn alt_incomplete() { -+ named!(alt1, alt!(tag!("a") | tag!("bc") | tag!("def"))); -+ -+ let a = &b""[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(1))); -+ let a = &b"b"[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(2))); -+ let a = &b"bcd"[..]; -+ assert_eq!(alt1(a), Done(&b"d"[..], &b"bc"[..])); -+ let a = &b"cde"[..]; -+ assert_eq!(alt1(a), Error(Position(ErrorKind::Alt, a))); -+ let a = &b"de"[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(3))); -+ let a = &b"defg"[..]; -+ assert_eq!(alt1(a), Done(&b"g"[..], &b"def"[..])); -+ } -+ -+ #[test] -+ fn alt_complete() { -+ named!(ac<&[u8], &[u8]>, -+ alt_complete!(tag!("abcd") | tag!("ef") | tag!("ghi") | tag!("kl")) -+ ); -+ -+ let a = &b""[..]; -+ assert_eq!(ac(a), Incomplete(Needed::Size(2))); -+ let a = &b"ef"[..]; -+ assert_eq!(ac(a), Done(&b""[..], &b"ef"[..])); -+ let a = &b"cde"[..]; -+ assert_eq!(ac(a), Error(Position(ErrorKind::Alt, a))); -+ } -+ -+ #[test] -+ fn switch() { -+ named!(sw, -+ switch!(take!(4), -+ b"abcd" => take!(2) | -+ b"efgh" => take!(4) -+ ) -+ ); -+ -+ let a = &b"abcdefgh"[..]; -+ assert_eq!(sw(a), Done(&b"gh"[..], &b"ef"[..])); -+ -+ let b = &b"efghijkl"[..]; -+ assert_eq!(sw(b), Done(&b""[..], &b"ijkl"[..])); -+ let c = &b"afghijkl"[..]; -+ assert_eq!(sw(c), Error(Position(ErrorKind::Switch, &b"afghijkl"[..]))); -+ } -+ -+ #[test] -+ fn opt() { -+ named!(opt_abcd<&[u8],Option<&[u8]> >, opt!(tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"bcdefg"[..]; -+ let c = &b"ab"[..]; -+ assert_eq!(opt_abcd(a), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+ assert_eq!(opt_abcd(b), Done(&b"bcdefg"[..], None)); -+ assert_eq!(opt_abcd(c), Incomplete(Needed::Size(4))); -+ } -+ -+ #[test] -+ fn opt_res() { -+ named!(opt_res_abcd<&[u8], Result<&[u8], Err<&[u8]>> >, opt_res!(tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"bcdefg"[..]; -+ let c = &b"ab"[..]; -+ assert_eq!(opt_res_abcd(a), Done(&b"ef"[..], Ok(&b"abcd"[..]))); -+ assert_eq!(opt_res_abcd(b), Done(&b"bcdefg"[..], Err(Position(ErrorKind::Tag, b)))); -+ assert_eq!(opt_res_abcd(c), Incomplete(Needed::Size(4))); -+ } -+ -+ #[test] -+ fn cond() { -+ let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( true, tag!("abcd") ) )); -+ let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( false, tag!("abcd") ) )); -+ //let f_false = closure!(&'static [u8], cond!( false, tag!("abcd") ) ); -+ -+ assert_eq!(f_true(&b"abcdef"[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+ assert_eq!(f_true(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(f_true(&b"xxx"[..]), Done(&b"xxx"[..], None)); -+ -+ assert_eq!(f_false(&b"abcdef"[..]), Done(&b"abcdef"[..], None)); -+ assert_eq!(f_false(&b"ab"[..]), Done(&b"ab"[..], None)); -+ assert_eq!(f_false(&b"xxx"[..]), Done(&b"xxx"[..], None)); -+ } -+ -+ #[test] -+ fn cond_wrapping() { -+ // Test that cond!() will wrap a given identifier in the call!() macro. -+ named!( tag_abcd, tag!("abcd") ); -+ let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( true, tag_abcd ) )); -+ let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( false, tag_abcd ) )); -+ //let f_false = closure!(&'static [u8], cond!( b2, tag!("abcd") ) ); -+ -+ assert_eq!(f_true(&b"abcdef"[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+ assert_eq!(f_true(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(f_true(&b"xxx"[..]), Done(&b"xxx"[..], None)); -+ -+ assert_eq!(f_false(&b"abcdef"[..]), Done(&b"abcdef"[..], None)); -+ assert_eq!(f_false(&b"ab"[..]), Done(&b"ab"[..], None)); -+ assert_eq!(f_false(&b"xxx"[..]), Done(&b"xxx"[..], None)); -+ } -+ -+ #[test] -+ fn peek() { -+ named!(peek_tag<&[u8],&[u8]>, peek!(tag!("abcd"))); -+ -+ assert_eq!(peek_tag(&b"abcdef"[..]), Done(&b"abcdef"[..], &b"abcd"[..])); -+ assert_eq!(peek_tag(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(peek_tag(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn pair() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( pair_abc_def<&[u8],(&[u8], &[u8])>, pair!(tag_abc, tag_def) ); -+ -+ assert_eq!(pair_abc_def(&b"abcdefghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -+ assert_eq!(pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(pair_abc_def(&b"abcd"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(pair_abc_def(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(pair_abc_def(&b"xxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxdef"[..]))); -+ assert_eq!(pair_abc_def(&b"abcxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn separated_pair() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( tag_separator, tag!(",") ); -+ named!( sep_pair_abc_def<&[u8],(&[u8], &[u8])>, separated_pair!(tag_abc, tag_separator, tag_def) ); -+ -+ assert_eq!(sep_pair_abc_def(&b"abc,defghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(sep_pair_abc_def(&b"abc,d"[..]), Incomplete(Needed::Size(7))); -+ assert_eq!(sep_pair_abc_def(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"xxx,def"[..]), Error(Position(ErrorKind::Tag, &b"xxx,def"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"abc,xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn preceded() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_efgh, tag!("efgh") ); -+ named!( preceded_abcd_efgh<&[u8], &[u8]>, preceded!(tag_abcd, tag_efgh) ); -+ -+ assert_eq!(preceded_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"efgh"[..])); -+ assert_eq!(preceded_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(preceded_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(preceded_abcd_efgh(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(preceded_abcd_efgh(&b"xxxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxxdef"[..]))); -+ assert_eq!(preceded_abcd_efgh(&b"abcdxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn terminated() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_efgh, tag!("efgh") ); -+ named!( terminated_abcd_efgh<&[u8], &[u8]>, terminated!(tag_abcd, tag_efgh) ); -+ -+ assert_eq!(terminated_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"abcd"[..])); -+ assert_eq!(terminated_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(terminated_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(terminated_abcd_efgh(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(terminated_abcd_efgh(&b"xxxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxxdef"[..]))); -+ assert_eq!(terminated_abcd_efgh(&b"abcdxxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxxx"[..]))); -+ } -+ -+ #[test] -+ fn delimited() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( tag_ghi, tag!("ghi") ); -+ named!( delimited_abc_def_ghi<&[u8], &[u8]>, delimited!(tag_abc, tag_def, tag_ghi) ); -+ -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefghijkl"[..]), Done(&b"jkl"[..], &b"def"[..])); -+ assert_eq!(delimited_abc_def_ghi(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcde"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefgh"[..]), Incomplete(Needed::Size(9))); -+ assert_eq!(delimited_abc_def_ghi(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"xxxdefghi"[..]), Error(Position(ErrorKind::Tag, &b"xxxdefghi"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcxxxghi"[..]), Error(Position(ErrorKind::Tag, &b"xxxghi"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn separated_list() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!("abcd"))); -+ named!(multi_empty<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!(""))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b",,abc"[..]; -+ let e = &b"abcd,abcd,ef"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"ef"[..], res2)); -+ assert_eq!(multi(c), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi_empty(d), Error(Position(ErrorKind::SeparatedList, d))); -+ //let res3 = vec![&b""[..], &b""[..], &b""[..]]; -+ //assert_eq!(multi_empty(d), Done(&b"abc"[..], res3)); -+ let res4 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(e), Done(&b",ef"[..], res4)); -+ } -+ -+ #[test] -+ fn separated_nonempty_list() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_nonempty_list!(tag!(","), tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcd,abcd,ef"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"ef"[..], res2)); -+ assert_eq!(multi(c), Error(Position(ErrorKind::Tag,c))); -+ let res3 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(d), Done(&b",ef"[..], res3)); -+ } -+ -+ #[test] -+ fn many0() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_empty, tag!("") ); -+ named!( multi<&[u8],Vec<&[u8]> >, many0!(tag_abcd) ); -+ named!( multi_empty<&[u8],Vec<&[u8]> >, many0!(tag_empty) ); -+ -+ assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -+ assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -+ assert_eq!(multi_empty(&b"abcdef"[..]), Error(Position(ErrorKind::Many0, &b"abcdef"[..]))); -+ } -+ -+ #[cfg(feature = "nightly")] -+ use test::Bencher; -+ -+ #[cfg(feature = "nightly")] -+ #[bench] -+ fn many0_bench(b: &mut Bencher) { -+ named!(multi<&[u8],Vec<&[u8]> >, many0!(tag!("abcd"))); -+ b.iter(|| { -+ multi(&b"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"[..]) -+ }); -+ } -+ -+ #[test] -+ fn many1() { -+ named!(multi<&[u8],Vec<&[u8]> >, many1!(tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcdabcdefgh"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcdab"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -+ assert_eq!(multi(c), Error(Position(ErrorKind::Many1,c))); -+ assert_eq!(multi(d), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ fn infinite_many() { -+ fn tst(input: &[u8]) -> IResult<&[u8], &[u8]> { -+ println!("input: {:?}", input); -+ Error(Position(ErrorKind::Custom(0),input)) -+ } -+ -+ // should not go into an infinite loop -+ named!(multi0<&[u8],Vec<&[u8]> >, many0!(tst)); -+ let a = &b"abcdef"[..]; -+ assert_eq!(multi0(a), Done(a, Vec::new())); -+ -+ named!(multi1<&[u8],Vec<&[u8]> >, many1!(tst)); -+ let a = &b"abcdef"[..]; -+ assert_eq!(multi1(a), Error(Position(ErrorKind::Many1,a))); -+ } -+ -+ #[test] -+ fn many_m_n() { -+ named!(multi<&[u8],Vec<&[u8]> >, many_m_n!(2, 4, tag!("Abcd"))); -+ -+ let a = &b"Abcdef"[..]; -+ let b = &b"AbcdAbcdefgh"[..]; -+ let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -+ let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -+ let e = &b"AbcdAb"[..]; -+ -+ assert_eq!(multi(a), Error(Err::Position(ErrorKind::ManyMN,a))); -+ let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -+ let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -+ let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -+ assert_eq!(multi(e), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ fn count() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( cnt_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -+ -+ assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]])); -+ assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Unknown)); -+ assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Unknown)); -+ assert_eq!(cnt_2(&b"xxx"[..]), Error(Position(ErrorKind::Count, &b"xxx"[..]))); -+ assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(Position(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -+ assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(Position(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -+ } -+ -+ #[test] -+ fn count_zero() { -+ const TIMES: usize = 0; -+ named!( tag_abc, tag!("abc") ); -+ named!( counter_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -+ -+ let done = &b"abcabcabcdef"[..]; -+ let parsed_done = Vec::new(); -+ let rest = done; -+ let incomplete_1 = &b"ab"[..]; -+ let parsed_incompl_1 = Vec::new(); -+ let incomplete_2 = &b"abcab"[..]; -+ let parsed_incompl_2 = Vec::new(); -+ let error = &b"xxx"[..]; -+ let error_remain = &b"xxx"[..]; -+ let parsed_err = Vec::new(); -+ let error_1 = &b"xxxabcabcdef"[..]; -+ let parsed_err_1 = Vec::new(); -+ let error_1_remain = &b"xxxabcabcdef"[..]; -+ let error_2 = &b"abcxxxabcdef"[..]; -+ let parsed_err_2 = Vec::new(); -+ let error_2_remain = &b"abcxxxabcdef"[..]; -+ -+ assert_eq!(counter_2(done), Done(rest, parsed_done)); -+ assert_eq!(counter_2(incomplete_1), Done(incomplete_1, parsed_incompl_1)); -+ assert_eq!(counter_2(incomplete_2), Done(incomplete_2, parsed_incompl_2)); -+ assert_eq!(counter_2(error), Done(error_remain, parsed_err)); -+ assert_eq!(counter_2(error_1), Done(error_1_remain, parsed_err_1)); -+ assert_eq!(counter_2(error_2), Done(error_2_remain, parsed_err_2)); -+ } -+ -+ #[test] -+ fn count_fixed() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( cnt_2<&[u8], [&[u8]; TIMES] >, count_fixed!(&[u8], tag_abc, TIMES ) ); -+ -+ assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], [&b"abc"[..], &b"abc"[..]])); -+ assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Unknown)); -+ assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Unknown)); -+ assert_eq!(cnt_2(&b"xxx"[..]), Error(Position(ErrorKind::Count, &b"xxx"[..]))); -+ assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(Position(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -+ assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(Position(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -+ } -+ -+ use nom::{le_u16,eof}; -+ #[allow(dead_code)] -+ pub fn compile_count_fixed(input: &[u8]) -> IResult<&[u8], ()> { -+ chain!(input, -+ tag!("abcd") ~ -+ count_fixed!( u16, le_u16, 4 ) ~ -+ eof , -+ || { () } -+ ) -+ } -+ -+ #[test] -+ fn count_fixed_no_type() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( counter_2<&[u8], [&[u8]; TIMES], () >, count_fixed!(&[u8], tag_abc, TIMES ) ); -+ -+ let done = &b"abcabcabcdef"[..]; -+ let parsed_main = [&b"abc"[..], &b"abc"[..]]; -+ let rest = &b"abcdef"[..]; -+ let incomplete_1 = &b"ab"[..]; -+ let incomplete_2 = &b"abcab"[..]; -+ let error = &b"xxx"[..]; -+ let error_1 = &b"xxxabcabcdef"[..]; -+ let error_1_remain = &b"xxxabcabcdef"[..]; -+ let error_2 = &b"abcxxxabcdef"[..]; -+ let error_2_remain = &b"abcxxxabcdef"[..]; -+ -+ assert_eq!(counter_2(done), Done(rest, parsed_main)); -+ assert_eq!(counter_2(incomplete_1), Incomplete(Needed::Unknown)); -+ assert_eq!(counter_2(incomplete_2), Incomplete(Needed::Unknown)); -+ assert_eq!(counter_2(error), Error(Position(ErrorKind::Count, error))); -+ assert_eq!(counter_2(error_1), Error(Position(ErrorKind::Count, error_1_remain))); -+ assert_eq!(counter_2(error_2), Error(Position(ErrorKind::Count, error_2_remain))); -+ } -+ -+ use nom::{be_u8,be_u16}; -+ #[test] -+ fn length_value_test() { -+ named!(length_value_1<&[u8], Vec >, length_value!(be_u8, be_u16)); -+ named!(length_value_2<&[u8], Vec >, length_value!(be_u8, be_u16, 2)); -+ -+ let i1 = vec![0, 5, 6]; -+ assert_eq!(length_value_1(&i1), IResult::Done(&i1[1..], vec![])); -+ assert_eq!(length_value_2(&i1), IResult::Done(&i1[1..], vec![])); -+ -+ let i2 = vec![1, 5, 6, 3]; -+ assert_eq!(length_value_1(&i2), IResult::Done(&i2[3..], vec![1286])); -+ assert_eq!(length_value_2(&i2), IResult::Done(&i2[3..], vec![1286])); -+ -+ let i3 = vec![2, 5, 6, 3, 4, 5, 7]; -+ assert_eq!(length_value_1(&i3), IResult::Done(&i3[5..], vec![1286, 772])); -+ assert_eq!(length_value_2(&i3), IResult::Done(&i3[5..], vec![1286, 772])); -+ -+ let i4 = vec![2, 5, 6, 3]; -+ assert_eq!(length_value_1(&i4), IResult::Incomplete(Needed::Size(5))); -+ assert_eq!(length_value_2(&i4), IResult::Incomplete(Needed::Size(5))); -+ -+ let i5 = vec![3, 5, 6, 3, 4, 5]; -+ assert_eq!(length_value_1(&i5), IResult::Incomplete(Needed::Size(7))); -+ assert_eq!(length_value_2(&i5), IResult::Incomplete(Needed::Size(7))); -+ } -+ -+ #[test] -+ fn fold_many0() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_empty, tag!("") ); -+ named!( multi<&[u8],Vec<&[u8]> >, fold_many0!(tag_abcd, Vec::new(), fold_into_vec) ); -+ named!( multi_empty<&[u8],Vec<&[u8]> >, fold_many0!(tag_empty, Vec::new(), fold_into_vec) ); -+ -+ assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -+ assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -+ assert_eq!(multi_empty(&b"abcdef"[..]), Error(Position(ErrorKind::Many0, &b"abcdef"[..]))); -+ } -+ -+ #[test] -+ fn fold_many1() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!(multi<&[u8],Vec<&[u8]> >, fold_many1!(tag!("abcd"), Vec::new(), fold_into_vec)); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcdabcdefgh"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcdab"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -+ assert_eq!(multi(c), Error(Position(ErrorKind::Many1,c))); -+ assert_eq!(multi(d), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ fn fold_many_m_n() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!(multi<&[u8],Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!("Abcd"), Vec::new(), fold_into_vec)); -+ -+ let a = &b"Abcdef"[..]; -+ let b = &b"AbcdAbcdefgh"[..]; -+ let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -+ let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -+ let e = &b"AbcdAb"[..]; -+ -+ assert_eq!(multi(a), Error(Err::Position(ErrorKind::ManyMN,a))); -+ let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -+ let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -+ let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -+ assert_eq!(multi(e), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ fn chain_incomplete() { -+ let res = chain!(&b"abcdefgh"[..], -+ a: take!(4) ~ -+ b: take!(8), -+ ||{(a,b )} -+ ); -+ -+ assert_eq!(res, IResult::Incomplete(Needed::Size(12))); -+ } -+ -+ #[test] -+ fn tuple_test() { -+ named!(tuple_3<&[u8], (u16, &[u8], &[u8]) >, -+ tuple!( be_u16 , take!(3), tag!("fg") ) ); -+ -+ assert_eq!(tuple_3(&b"abcdefgh"[..]), Done(&b"h"[..], (0x6162u16, &b"cde"[..], &b"fg"[..]))); -+ assert_eq!(tuple_3(&b"abcd"[..]), Incomplete(Needed::Size(5))); -+ assert_eq!(tuple_3(&b"abcde"[..]), Incomplete(Needed::Size(7))); -+ assert_eq!(tuple_3(&b"abcdejk"[..]), Error(Position(ErrorKind::Tag, &b"jk"[..]))); -+ } -+ -+ #[test] -+ fn not() { -+ named!(not_aaa, not!(tag!("aaa"))); -+ assert_eq!(not_aaa(&b"aaa"[..]), Error(Position(ErrorKind::Not, &b"aaa"[..]))); -+ assert_eq!(not_aaa(&b"aa"[..]), Done(&b"aa"[..], &b""[..])); -+ assert_eq!(not_aaa(&b"abcd"[..]), Done(&b"abcd"[..], &b""[..])); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/methods.rs third_party/rust/nom-1.2.4/src/methods.rs -new file mode 100644 -index 000000000000..22868541a96c ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/methods.rs -@@ -0,0 +1,480 @@ -+//! Method macro combinators -+//! -+//! These macros make parsers as methods of structs -+//! and that can take methods of structs to call -+//! as parsers. -+//! -+//! There is a trick to make them easier to assemble, -+//! combinators are defined like this: -+//! -+//! ```ignore -+//! macro_rules! tag ( -+//! ($i:expr, $inp: expr) => ( -+//! { -+//! ... -+//! } -+//! ); -+//! ); -+//! ``` -+//! -+//! But when used as methods in other combinators, are used -+//! like this: -+//! -+//! ```ignore -+//! method!(my_function >, self, tag!("abcd")); -+//! ``` -+//! -+//! Internally, other combinators will rewrite -+//! that call to pass the input as second argument: -+//! -+//! ```ignore -+//! macro_rules! method ( -+//! ($name:ident<$a:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+//! fn $name( $self_: $a, i: &[u8] ) -> $crate::IResult<&[u8], &[u8]> { -+//! $submac!(i, $($args)*) -+//! } -+//! ); -+//! ); -+//! ``` -+//! -+//! The `method!` macro is similar to the `named!` macro in the macros module. -+//! While `named!` will create a parser function, `method!` will create a parser -+//! method on the struct it is defined in. -+//! -+//! Compared to the `named!` macro there are a few differences in how they are -+//! invoked. A `method!` invocation always has to have the type of `self` -+//! declared and it can't be a reference due to Rust's borrow lifetime -+//! restrictions: -+//! ```ignore -+//! // -`self`'s type- -+//! method!(method_name< Parser<'a> >, ...); -+//! ``` -+//! `self`'s type always comes first. -+//! The next difference is you have to input the self struct. Due to Rust's -+//! macro hygiene the macro can't declare it on it's own. -+//! ```ignore -+//! // -self- -+//! method!(method_name, &'a str, &'a str>, self, ...); -+//! ``` -+//! When making a parsing struct with parsing methods, due to the static borrow -+//! checker,calling any parsing methods on self (or any other parsing struct) -+//! will cause self to be moved for the rest of the method.To get around this -+//! restriction all self is moved into the called method and then the called -+//! method will return self to the caller. -+//! -+//! To call a method on self you need to use the `call_m!` macro. For example: -+//! ```ignore -+//! struct<'a> Parser<'a> { -+//! parsed: &'a str, -+//! } -+//! impl<'a> Parser<'a> { -+//! // Constructor omitted for brevity -+//! method!(take4, &'a str, &'a str>, self, take!(4)); -+//! method!(caller, &'a str, &'a str>, self, call_m!(self.take4)); -+//! } -+//! ``` -+//! More complicated combinations still mostly look the same as their `named!` -+//! counterparts: -+//! ```ignore -+//! method!(pub simple_chain<&mut Parser<'a>, &'a str, &'a str>, self, -+//! chain!( -+//! call_m!(self.tag_abc) ~ -+//! call_m!(self.tag_def) ~ -+//! call_m!(self.tag_ghi) ~ -+//! last: call_m!(self.simple_peek) , -+//! ||{sb.parsed = last; last} -+//! ) -+//! ); -+//! ``` -+//! The three additions to method definitions to remember are: -+//! 1. Specify `self`'s type -+//! 2. Pass `self` to the macro -+//! 4. Call parser methods using the `call_m!` macro. -+ -+/// Makes a method from a parser combination -+/// -+/// The must be set up because the compiler needs -+/// the information -+/// -+/// ```ignore -+/// method!(my_function >( &[u8] ) -> &[u8], tag!("abcd")); -+/// // first type parameter is `self`'s type, second is input, third is output -+/// method!(my_function, &[u8], &[u8]>, tag!("abcd")); -+/// //prefix them with 'pub' to make the methods public -+/// method!(pub my_function,&[u8], &[u8]>, tag!("abcd")); -+/// ``` -+#[macro_export] -+macro_rules! method ( -+ // Non-public immutable self -+ ($name:ident<$a:ty>( $i:ty ) -> $o:ty, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$i:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ // Public immutable self -+ (pub $name:ident<$a:ty>( $i:ty ) -> $o:ty, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$i:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( $self_: $a,i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name<'a>( $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ // Non-public mutable self -+ ($name:ident<$a:ty>( $i:ty ) -> $o:ty, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$i:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( mut $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ ($name:ident<$a:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ // Public mutable self -+ (pub $name:ident<$a:ty>( $i:ty ) -> $o:ty, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$i:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( mut $self_: $a,i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name<'a>( mut $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+ (pub $name:ident<$a:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { -+ let result = $submac!(i, $($args)*); -+ ($self_, result) -+ } -+ ); -+); -+ -+/// Used to called methods then move self back into self -+#[macro_export] -+macro_rules! call_m ( -+ ($i:expr, $self_:ident.$method:ident) => ( -+ { -+ let (tmp, res) = $self_.$method($i); -+ $self_ = tmp; -+ res -+ } -+ ); -+ ($i:expr, $self_:ident.$method:ident, $($args:expr),* ) => ( -+ { -+ let (tmp, res) = $self_.$method($i, $($args),*); -+ $self_ = tmp; -+ res -+ } -+ ); -+); -+ -+ -+/// emulate function currying for method calls on structs -+/// `apply!(self.my_function, arg1, arg2, ...)` becomes `self.my_function(input, arg1, arg2, ...)` -+/// -+/// Supports up to 6 arguments -+#[macro_export] -+macro_rules! apply_m ( -+ ($i:expr, $self_:ident.$method:ident, $($args:expr),* ) => ( { let (tmp, res) = $self_.$method( $i, $($args),* ); $self_ = tmp; res } ); -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::IResult::*; -+ -+ // reproduce the tag_s and take_s macros, because of module import order -+ macro_rules! tag_s ( -+ ($i:expr, $tag: expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if $tag.len() > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($tag.len())) -+ //} else if &$i[0..$tag.len()] == $tag { -+ } else if ($i).starts_with($tag) { -+ $crate::IResult::Done(&$i[$tag.len()..], &$i[0..$tag.len()]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagStr, $i)) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ macro_rules! take_s ( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res: $crate::IResult<_,_> = if $i.chars().count() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ let mut offset = $i.len(); -+ let mut count = 0; -+ for (o, _) in $i.char_indices() { -+ if count == cnt { -+ offset = o; -+ break; -+ } -+ count += 1; -+ } -+ $crate::IResult::Done(&$i[offset..], &$i[..offset]) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ struct Parser<'a> { -+ bcd: &'a str, -+ } -+ -+ impl<'a> Parser<'a> { -+ pub fn new() -> Parser<'a> { -+ Parser{bcd: ""} -+ } -+ -+ method!(tag_abc, &'a str, &'a str>, self, tag_s!("áβç")); -+ method!(tag_bcd >(&'a str) -> &'a str, self, tag_s!("βçδ")); -+ method!(pub tag_hij >(&'a str) -> &'a str, self, tag_s!("λïJ")); -+ method!(pub tag_ijk, &'a str, &'a str>, self, tag_s!("ïJƙ")); -+ method!(take3, &'a str, &'a str>, self, take_s!(3)); -+ method!(pub simple_call, &'a str, &'a str>, mut self, -+ call_m!(self.tag_abc) -+ ); -+ method!(pub simple_peek, &'a str, &'a str>, mut self, -+ peek!(call_m!(self.take3)) -+ ); -+ method!(pub simple_chain, &'a str, &'a str>, mut self, -+ chain!( -+ bcd: call_m!(self.tag_bcd) ~ -+ last: call_m!(self.simple_peek) , -+ ||{self.bcd = bcd; last} -+ ) -+ ); -+ fn tag_stuff(mut self: Parser<'a>, input: &'a str, something: &'a str) -> (Parser<'a>, ::IResult<&'a str, &'a str>) { -+ self.bcd = something; -+ let(tmp, res) = self.tag_abc(input); -+ self = tmp; -+ (self, res) -+ } -+ method!(use_apply, &'a str, &'a str>, mut self, apply_m!(self.tag_stuff, "βçδ")); -+ } -+ -+ #[test] -+ fn test_method_call_abc() { -+ let p = Parser::new(); -+ let input: &str = "áβçδèƒϱλïJƙ"; -+ let consumed: &str = "áβç"; -+ let leftover: &str = "δèƒϱλïJƙ"; -+ let(_, res) = p.tag_abc(input); -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.tag_abc` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.tag_abc` doesnt return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.tag_abc` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_method_call_bcd() { -+ let p = Parser::new(); -+ let input: &str = "βçδèƒϱλïJƙ"; -+ let consumed: &str = "βçδ"; -+ let leftover: &str = "èƒϱλïJƙ"; -+ let(_, res) = p.tag_bcd(input); -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.tag_bcd` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.tag_bcd` doesn't return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.tag_bcd` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_method_call_hij() { -+ let p = Parser::new(); -+ let input: &str = "λïJƙℓ₥ñôƥ9řƨ"; -+ let consumed: &str = "λïJ"; -+ let leftover: &str = "ƙℓ₥ñôƥ9řƨ"; -+ let(_, res) = p.tag_hij(input); -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.tag_hij` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.tag_hij` doesn't return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.tag_hij` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_method_call_ijk() { -+ let p = Parser::new(); -+ let input: &str = "ïJƙℓ₥ñôƥ9řƨ"; -+ let consumed: &str = "ïJƙ"; -+ let leftover: &str = "ℓ₥ñôƥ9řƨ"; -+ let(_, res) = p.tag_ijk(input); -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.tag_ijk` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.tag_ijk` doesn't return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.tag_ijk` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ #[test] -+ fn test_method_simple_call() { -+ let p = Parser::new(); -+ let input: &str = "áβçδèƒϱλïJƙ"; -+ let consumed: &str = "áβç"; -+ let leftover: &str = "δèƒϱλïJƙ"; -+ let(_, res) = p.simple_call(input); -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.simple_call` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.simple_call` doesn't return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.simple_call` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_apply_m() { -+ let mut p = Parser::new(); -+ let input: &str = "áβçδèƒϱλïJƙ"; -+ let consumed: &str = "áβç"; -+ let leftover: &str = "δèƒϱλïJƙ"; -+ let(tmp, res) = p.use_apply(input); -+ p = tmp; -+ match res { -+ Done(extra, output) => { assert!(extra == leftover, "`Parser.use_apply` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.use_apply` doesn't return the string it was supposed to \ -+ on success. Expected `{}`, got `{}`.", leftover, output); -+ assert!(p.bcd == "βçδ", "Parser.use_apply didn't modify the parser field correctly: {}", p.bcd); -+ }, -+ other => panic!("`Parser.use_apply` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_method_call_peek() { -+ let p = Parser::new(); -+ let input: &str = "ж¥ƺáβçδèƒϱλïJƙ"; -+ let consumed: &str = "ж¥ƺ"; -+ let(_, res) = p.simple_peek(input); -+ match res { -+ Done(extra, output) => { assert!(extra == input, "`Parser.simple_peek` consumed leftover input. leftover: {}", extra); -+ assert!(output == consumed, "`Parser.simple_peek` doesn't return the string it consumed \ -+ on success. Expected `{}`, got `{}`.", consumed, output); -+ }, -+ other => panic!("`Parser.simple_peek` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ #[test] -+ fn test_method_call_chain() { -+ let mut p = Parser::new(); -+ let input : &str = "βçδδèƒϱλïJƙℓ"; -+ let leftover : &str = "δèƒϱλïJƙℓ"; -+ let output : &str = "δèƒ"; -+ let(tmp, res) = p.simple_chain(input); -+ p = tmp; -+ match res { -+ Done(extra, out) => { assert!(extra == leftover, "`Parser.simple_chain` consumed leftover input. leftover: {}", extra); -+ assert!(out == output, "`Parser.simple_chain` doesn't return the string it was supposed to \ -+ on success. Expected `{}`, got `{}`.", output, out); -+ assert!(p.bcd == "βçδ", "Parser.simple_chain didn't modify the parser field correctly: {}", p.bcd); -+ }, -+ other => panic!("`Parser.simple_chain` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/nom.rs third_party/rust/nom-1.2.4/src/nom.rs -new file mode 100644 -index 000000000000..74bac5bfb0c4 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/nom.rs -@@ -0,0 +1,950 @@ -+//! Useful parser combinators -+//! -+//! A number of useful parser combinators have already been implemented. -+//! Some of them use macros, other are implemented through functions. -+//! Hopefully, the syntax will converge to onely one way in the future, -+//! but the macros system makes no promises. -+//! -+ -+#[cfg(feature = "core")] -+use std::prelude::v1::*; -+use std::boxed::Box; -+ -+use std::fmt::Debug; -+use internal::*; -+use internal::IResult::*; -+use internal::Err::*; -+use util::{ErrorKind,IterIndices,AsChar,InputLength}; -+use std::mem::transmute; -+ -+#[inline] -+pub fn tag_cl<'a,'b>(rec:&'a[u8]) -> Box IResult<&'b[u8], &'b[u8]> + 'a> { -+ Box::new(move |i: &'b[u8]| -> IResult<&'b[u8], &'b[u8]> { -+ if i.len() >= rec.len() && &i[0..rec.len()] == rec { -+ Done(&i[rec.len()..], &i[0..rec.len()]) -+ } else { -+ Error(Position(ErrorKind::TagClosure, i)) -+ } -+ }) -+} -+ -+#[cfg(not(feature = "core"))] -+#[inline] -+pub fn print(input: T) -> IResult { -+ println!("{:?}", input); -+ Done(input, ()) -+} -+ -+#[inline] -+pub fn begin(input: &[u8]) -> IResult<(), &[u8]> { -+ Done((), input) -+} -+ -+// FIXME: when rust-lang/rust#17436 is fixed, macros will be able to export -+// public methods -+//pub is_not!(line_ending b"\r\n") -+pub fn not_line_ending(input:&[u8]) -> IResult<&[u8], &[u8]> { -+ for (idx, item) in input.iter().enumerate() { -+ for &i in b"\r\n".iter() { -+ if *item == i { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input.len()..], input) -+} -+ -+named!(tag_ln, tag!("\n")); -+ -+/// Recognizes a line feed -+#[inline] -+pub fn line_ending(input:&[u8]) -> IResult<&[u8], &[u8]> { -+ tag_ln(input) -+} -+ -+#[inline] -+pub fn is_alphabetic(chr:u8) -> bool { -+ (chr >= 0x41 && chr <= 0x5A) || (chr >= 0x61 && chr <= 0x7A) -+} -+ -+#[inline] -+pub fn is_digit(chr: u8) -> bool { -+ chr >= 0x30 && chr <= 0x39 -+} -+ -+#[inline] -+pub fn is_hex_digit(chr: u8) -> bool { -+ (chr >= 0x30 && chr <= 0x39) || -+ (chr >= 0x41 && chr <= 0x46) || -+ (chr >= 0x61 && chr <= 0x66) -+} -+ -+#[inline] -+pub fn is_oct_digit(chr: u8) -> bool { -+ chr >= 0x30 && chr <= 0x37 -+} -+ -+#[inline] -+pub fn is_alphanumeric(chr: u8) -> bool { -+ is_alphabetic(chr) || is_digit(chr) -+} -+ -+#[inline] -+pub fn is_space(chr:u8) -> bool { -+ chr == ' ' as u8 || chr == '\t' as u8 -+} -+ -+// FIXME: when rust-lang/rust#17436 is fixed, macros will be able to export -+//pub filter!(alpha is_alphabetic) -+//pub filter!(digit is_digit) -+//pub filter!(hex_digit is_hex_digit) -+//pub filter!(oct_digit is_oct_digit) -+//pub filter!(alphanumeric is_alphanumeric) -+ -+use std::ops::{Index,Range,RangeFrom}; -+/// Recognizes lowercase and uppercase alphabetic characters: a-zA-Z -+pub fn alpha<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::Alpha, input)) -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ if ! item.is_alpha() { -+ if idx == 0 { -+ return Error(Position(ErrorKind::Alpha, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes numerical characters: 0-9 -+pub fn digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::Digit, input)) -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ if ! item.is_0_to_9() { -+ if idx == 0 { -+ return Error(Position(ErrorKind::Digit, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes hexadecimal numerical characters: 0-9, A-F, a-f -+pub fn hex_digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::HexDigit, input)) -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ if ! item.is_hex_digit() { -+ if idx == 0 { -+ return Error(Position(ErrorKind::HexDigit, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes octal characters: 0-7 -+pub fn oct_digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::OctDigit, input)) -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ if ! item.is_oct_digit() { -+ if idx == 0 { -+ return Error(Position(ErrorKind::OctDigit, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes numerical and alphabetic characters: 0-9a-zA-Z -+pub fn alphanumeric<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::AlphaNumeric, input)); -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ if ! item.is_alphanum() { -+ if idx == 0 { -+ return Error(Position(ErrorKind::AlphaNumeric, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes spaces and tabs -+pub fn space<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::Space, input)); -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ let chr = item.as_char(); -+ if ! (chr == ' ' || chr == '\t') { -+ if idx == 0 { -+ return Error(Position(ErrorKind::Space, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+/// Recognizes spaces, tabs, carriage returns and line feeds -+pub fn multispace<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: IterIndices+InputLength { -+ let input_length = input.input_len(); -+ if input_length == 0 { -+ return Error(Position(ErrorKind::MultiSpace, input)); -+ } -+ -+ for (idx, item) in input.iter_indices() { -+ let chr = item.as_char(); -+ if ! (chr == ' ' || chr == '\t' || chr == '\r' || chr == '\n') { -+ if idx == 0 { -+ return Error(Position(ErrorKind::MultiSpace, input)) -+ } else { -+ return Done(&input[idx..], &input[0..idx]) -+ } -+ } -+ } -+ Done(&input[input_length..], input) -+} -+ -+pub fn sized_buffer(input:&[u8]) -> IResult<&[u8], &[u8]> { -+ if input.is_empty() { -+ return Incomplete(Needed::Unknown) -+ } -+ -+ let len = input[0] as usize; -+ -+ if input.len() >= len + 1 { -+ Done(&input[len+1..], &input[1..len+1]) -+ } else { -+ Incomplete(Needed::Size(1 + len)) -+ } -+} -+ -+pub fn length_value(input:&[u8]) -> IResult<&[u8], &[u8]> { -+ let input_len = input.len(); -+ if input_len == 0 { -+ return Error(Position(ErrorKind::LengthValueFn, input)) -+ } -+ -+ let len = input[0] as usize; -+ if input_len - 1 >= len { -+ IResult::Done(&input[len+1..], &input[1..len+1]) -+ } else { -+ IResult::Incomplete(Needed::Size(1+len)) -+ } -+} -+ -+/// Recognizes an unsigned 1 byte integer (equivalent to take!(1) -+#[inline] -+pub fn be_u8(i: &[u8]) -> IResult<&[u8], u8> { -+ if i.len() < 1 { -+ Incomplete(Needed::Size(1)) -+ } else { -+ Done(&i[1..], i[0]) -+ } -+} -+ -+/// Recognizes big endian unsigned 2 bytes integer -+#[inline] -+pub fn be_u16(i: &[u8]) -> IResult<&[u8], u16> { -+ if i.len() < 2 { -+ Incomplete(Needed::Size(2)) -+ } else { -+ let res = ((i[0] as u16) << 8) + i[1] as u16; -+ Done(&i[2..], res) -+ } -+} -+ -+/// Recognizes big endian unsigned 4 bytes integer -+#[inline] -+pub fn be_u32(i: &[u8]) -> IResult<&[u8], u32> { -+ if i.len() < 4 { -+ Incomplete(Needed::Size(4)) -+ } else { -+ let res = ((i[0] as u32) << 24) + ((i[1] as u32) << 16) + ((i[2] as u32) << 8) + i[3] as u32; -+ Done(&i[4..], res) -+ } -+} -+ -+/// Recognizes big endian unsigned 8 bytes integer -+#[inline] -+pub fn be_u64(i: &[u8]) -> IResult<&[u8], u64> { -+ if i.len() < 8 { -+ Incomplete(Needed::Size(8)) -+ } else { -+ let res = ((i[0] as u64) << 56) + ((i[1] as u64) << 48) + ((i[2] as u64) << 40) + ((i[3] as u64) << 32) + -+ ((i[4] as u64) << 24) + ((i[5] as u64) << 16) + ((i[6] as u64) << 8) + i[7] as u64; -+ Done(&i[8..], res) -+ } -+} -+ -+/// Recognizes a signed 1 byte integer (equivalent to take!(1) -+#[inline] -+pub fn be_i8(i:&[u8]) -> IResult<&[u8], i8> { -+ map!(i, be_u8, | x | { x as i8 }) -+} -+ -+/// Recognizes big endian signed 2 bytes integer -+#[inline] -+pub fn be_i16(i:&[u8]) -> IResult<&[u8], i16> { -+ map!(i, be_u16, | x | { x as i16 }) -+} -+ -+/// Recognizes big endian signed 4 bytes integer -+#[inline] -+pub fn be_i32(i:&[u8]) -> IResult<&[u8], i32> { -+ map!(i, be_u32, | x | { x as i32 }) -+} -+ -+/// Recognizes big endian signed 8 bytes integer -+#[inline] -+pub fn be_i64(i:&[u8]) -> IResult<&[u8], i64> { -+ map!(i, be_u64, | x | { x as i64 }) -+} -+ -+/// Recognizes an unsigned 1 byte integer (equivalent to take!(1) -+#[inline] -+pub fn le_u8(i: &[u8]) -> IResult<&[u8], u8> { -+ if i.len() < 1 { -+ Incomplete(Needed::Size(1)) -+ } else { -+ Done(&i[1..], i[0]) -+ } -+} -+ -+/// Recognizes little endian unsigned 2 bytes integer -+#[inline] -+pub fn le_u16(i: &[u8]) -> IResult<&[u8], u16> { -+ if i.len() < 2 { -+ Incomplete(Needed::Size(2)) -+ } else { -+ let res = ((i[1] as u16) << 8) + i[0] as u16; -+ Done(&i[2..], res) -+ } -+} -+ -+/// Recognizes little endian unsigned 4 bytes integer -+#[inline] -+pub fn le_u32(i: &[u8]) -> IResult<&[u8], u32> { -+ if i.len() < 4 { -+ Incomplete(Needed::Size(4)) -+ } else { -+ let res = ((i[3] as u32) << 24) + ((i[2] as u32) << 16) + ((i[1] as u32) << 8) + i[0] as u32; -+ Done(&i[4..], res) -+ } -+} -+ -+/// Recognizes little endian unsigned 8 bytes integer -+#[inline] -+pub fn le_u64(i: &[u8]) -> IResult<&[u8], u64> { -+ if i.len() < 8 { -+ Incomplete(Needed::Size(8)) -+ } else { -+ let res = ((i[7] as u64) << 56) + ((i[6] as u64) << 48) + ((i[5] as u64) << 40) + ((i[4] as u64) << 32) + -+ ((i[3] as u64) << 24) + ((i[2] as u64) << 16) + ((i[1] as u64) << 8) + i[0] as u64; -+ Done(&i[8..], res) -+ } -+} -+ -+/// Recognizes a signed 1 byte integer (equivalent to take!(1) -+#[inline] -+pub fn le_i8(i:&[u8]) -> IResult<&[u8], i8> { -+ map!(i, le_u8, | x | { x as i8 }) -+} -+ -+/// Recognizes little endian signed 2 bytes integer -+#[inline] -+pub fn le_i16(i:&[u8]) -> IResult<&[u8], i16> { -+ map!(i, le_u16, | x | { x as i16 }) -+} -+ -+/// Recognizes little endian signed 4 bytes integer -+#[inline] -+pub fn le_i32(i:&[u8]) -> IResult<&[u8], i32> { -+ map!(i, le_u32, | x | { x as i32 }) -+} -+ -+/// Recognizes little endian signed 8 bytes integer -+#[inline] -+pub fn le_i64(i:&[u8]) -> IResult<&[u8], i64> { -+ map!(i, le_u64, | x | { x as i64 }) -+} -+ -+/// if parameter is true, parse a big endian u16 integer, -+/// otherwise a little endian u16 integer -+#[macro_export] -+macro_rules! u16 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u16($i) } else { $crate::le_u16($i) } } );); -+/// if parameter is true, parse a big endian u32 integer, -+/// otherwise a little endian u32 integer -+#[macro_export] -+macro_rules! u32 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u32($i) } else { $crate::le_u32($i) } } );); -+/// if parameter is true, parse a big endian u64 integer, -+/// otherwise a little endian u64 integer -+#[macro_export] -+macro_rules! u64 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u64($i) } else { $crate::le_u64($i) } } );); -+ -+/// if parameter is true, parse a big endian i16 integer, -+/// otherwise a little endian i16 integer -+#[macro_export] -+macro_rules! i16 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i16($i) } else { $crate::le_i16($i) } } );); -+/// if parameter is true, parse a big endian i32 integer, -+/// otherwise a little endian i32 integer -+#[macro_export] -+macro_rules! i32 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i32($i) } else { $crate::le_i32($i) } } );); -+/// if parameter is true, parse a big endian i64 integer, -+/// otherwise a little endian i64 integer -+#[macro_export] -+macro_rules! i64 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i64($i) } else { $crate::le_i64($i) } } );); -+ -+/// Recognizes big endian 4 bytes floating point number -+#[inline] -+pub fn be_f32(input: &[u8]) -> IResult<&[u8], f32> { -+ match be_u32(input) { -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e), -+ Done(i,o) => { -+ unsafe { -+ Done(i, transmute::(o)) -+ } -+ } -+ } -+} -+ -+/// Recognizes big endian 8 bytes floating point number -+#[inline] -+pub fn be_f64(input: &[u8]) -> IResult<&[u8], f64> { -+ match be_u64(input) { -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e), -+ Done(i,o) => { -+ unsafe { -+ Done(i, transmute::(o)) -+ } -+ } -+ } -+} -+ -+/// Recognizes little endian 4 bytes floating point number -+#[inline] -+pub fn le_f32(input: &[u8]) -> IResult<&[u8], f32> { -+ match le_u32(input) { -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e), -+ Done(i,o) => { -+ unsafe { -+ Done(i, transmute::(o)) -+ } -+ } -+ } -+} -+ -+/// Recognizes little endian 8 bytes floating point number -+#[inline] -+pub fn le_f64(input: &[u8]) -> IResult<&[u8], f64> { -+ match le_u64(input) { -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e), -+ Done(i,o) => { -+ unsafe { -+ Done(i, transmute::(o)) -+ } -+ } -+ } -+} -+ -+/// Recognizes a hex-encoded integer -+#[inline] -+pub fn hex_u32(input: &[u8]) -> IResult<&[u8], u32> { -+ match is_a!(input, &b"0123456789abcdef"[..]) { -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e), -+ Done(i,o) => { -+ let mut res = 0u32; -+ -+ // Do not parse more than 8 characters for a u32 -+ let mut remaining = i; -+ let mut parsed = o; -+ if o.len() > 8 { -+ remaining = &input[8..]; -+ parsed = &input[..8]; -+ } -+ -+ for &e in parsed { -+ let digit = e as char; -+ let value = digit.to_digit(16).unwrap_or(0); -+ res = value + (res << 4); -+ } -+ Done(remaining, res) -+ } -+ } -+} -+ -+/// Recognizes empty input buffers -+/// -+/// useful to verify that the previous parsers used all of the input -+#[inline] -+//pub fn eof(input:&[u8]) -> IResult<&[u8], &[u8]> { -+pub fn eof<'a, T:?Sized>(input: &'a T) -> IResult<&'a T,&'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: InputLength { -+ if input.input_len() == 0 { -+ Done(input, input) -+ } else { -+ Error(Position(ErrorKind::Eof, input)) -+ } -+} -+ -+/// Recognizes non empty buffers -+#[inline] -+pub fn non_empty<'a, T:?Sized>(input: &'a T) -> IResult<&'a T,&'a T> where -+ T:Index, Output=T>+Index, Output=T>, -+ &'a T: InputLength { -+ if input.input_len() == 0 { -+ Error(Position(ErrorKind::NonEmpty, input)) -+ } else { -+ Done(&input[input.input_len()..], input) -+ } -+} -+ -+/// Return the remaining input. -+#[inline] -+pub fn rest(input: &[u8]) -> IResult<&[u8], &[u8]> { -+ IResult::Done(&input[input.len()..], input) -+} -+ -+/// Return the remaining input, for strings. -+#[inline] -+pub fn rest_s(input: &str) -> IResult<&str, &str> { -+ IResult::Done(&input[input.len()..], input) -+} -+ -+#[cfg(test)] -+mod tests { -+ use super::*; -+ use internal::{Needed,IResult}; -+ use internal::IResult::*; -+ use internal::Err::*; -+ use util::ErrorKind; -+ -+ #[test] -+ fn tag_closure() { -+ let x = tag_cl(&b"abcd"[..]); -+ let r = x(&b"abcdabcdefgh"[..]); -+ assert_eq!(r, Done(&b"abcdefgh"[..], &b"abcd"[..])); -+ -+ let r2 = x(&b"abcefgh"[..]); -+ assert_eq!(r2, Error(Position(ErrorKind::TagClosure, &b"abcefgh"[..]))); -+ } -+ -+ #[test] -+ fn character() { -+ let empty: &[u8] = b""; -+ let a: &[u8] = b"abcd"; -+ let b: &[u8] = b"1234"; -+ let c: &[u8] = b"a123"; -+ let d: &[u8] = "azé12".as_bytes(); -+ let e: &[u8] = b" "; -+ assert_eq!(alpha(a), Done(empty, a)); -+ assert_eq!(alpha(b), Error(Position(ErrorKind::Alpha,b))); -+ assert_eq!(alpha(c), Done(&c[1..], &b"a"[..])); -+ assert_eq!(alpha(d), Done("é12".as_bytes(), &b"az"[..])); -+ assert_eq!(digit(a), Error(Position(ErrorKind::Digit,a))); -+ assert_eq!(digit(b), Done(empty, b)); -+ assert_eq!(digit(c), Error(Position(ErrorKind::Digit,c))); -+ assert_eq!(digit(d), Error(Position(ErrorKind::Digit,d))); -+ assert_eq!(hex_digit(a), Done(empty, a)); -+ assert_eq!(hex_digit(b), Done(empty, b)); -+ assert_eq!(hex_digit(c), Done(empty, c)); -+ assert_eq!(hex_digit(d), Done("zé12".as_bytes(), &b"a"[..])); -+ assert_eq!(hex_digit(e), Error(Position(ErrorKind::HexDigit,e))); -+ assert_eq!(oct_digit(a), Error(Position(ErrorKind::OctDigit,a))); -+ assert_eq!(oct_digit(b), Done(empty, b)); -+ assert_eq!(oct_digit(c), Error(Position(ErrorKind::OctDigit,c))); -+ assert_eq!(oct_digit(d), Error(Position(ErrorKind::OctDigit,d))); -+ assert_eq!(alphanumeric(a), Done(empty, a)); -+ assert_eq!(fix_error!(b,(), alphanumeric), Done(empty, b)); -+ assert_eq!(alphanumeric(c), Done(empty, c)); -+ assert_eq!(alphanumeric(d), Done("é12".as_bytes(), &b"az"[..])); -+ assert_eq!(space(e), Done(&b""[..], &b" "[..])); -+ } -+ -+ #[test] -+ fn character_s() { -+ let empty = ""; -+ let a = "abcd"; -+ let b = "1234"; -+ let c = "a123"; -+ let d = "azé12"; -+ let e = " "; -+ assert_eq!(alpha(a), Done(empty, a)); -+ assert_eq!(alpha(b), Error(Position(ErrorKind::Alpha,b))); -+ assert_eq!(alpha(c), Done(&c[1..], &"a"[..])); -+ assert_eq!(alpha(d), Done("12", &"azé"[..])); -+ assert_eq!(digit(a), Error(Position(ErrorKind::Digit,a))); -+ assert_eq!(digit(b), Done(empty, b)); -+ assert_eq!(digit(c), Error(Position(ErrorKind::Digit,c))); -+ assert_eq!(digit(d), Error(Position(ErrorKind::Digit,d))); -+ assert_eq!(hex_digit(a), Done(empty, a)); -+ assert_eq!(hex_digit(b), Done(empty, b)); -+ assert_eq!(hex_digit(c), Done(empty, c)); -+ assert_eq!(hex_digit(d), Done("zé12", &"a"[..])); -+ assert_eq!(hex_digit(e), Error(Position(ErrorKind::HexDigit,e))); -+ assert_eq!(oct_digit(a), Error(Position(ErrorKind::OctDigit,a))); -+ assert_eq!(oct_digit(b), Done(empty, b)); -+ assert_eq!(oct_digit(c), Error(Position(ErrorKind::OctDigit,c))); -+ assert_eq!(oct_digit(d), Error(Position(ErrorKind::OctDigit,d))); -+ assert_eq!(alphanumeric(a), Done(empty, a)); -+ assert_eq!(fix_error!(b,(), alphanumeric), Done(empty, b)); -+ assert_eq!(alphanumeric(c), Done(empty, c)); -+ assert_eq!(alphanumeric(d), Done("", &"azé12"[..])); -+ assert_eq!(space(e), Done(&""[..], &" "[..])); -+ } -+ -+ use util::HexDisplay; -+ #[test] -+ fn offset() { -+ let a = &b"abcd"[..]; -+ let b = &b"1234"[..]; -+ let c = &b"a123"[..]; -+ let d = &b" \t"[..]; -+ let e = &b" \t\r\n"[..]; -+ let f = &b"123abcDEF"[..]; -+ -+ match alpha(a) { -+ Done(i, _) => { assert_eq!(a.offset(i) + i.len(), a.len()); } -+ _ => { panic!("wrong return type in offset test for alpha") } -+ } -+ match digit(b) { -+ Done(i, _) => { assert_eq!(b.offset(i) + i.len(), b.len()); } -+ _ => { panic!("wrong return type in offset test for digit") } -+ } -+ match alphanumeric(c) { -+ Done(i, _) => { assert_eq!(c.offset(i) + i.len(), c.len()); } -+ _ => { panic!("wrong return type in offset test for alphanumeric") } -+ } -+ match space(d) { -+ Done(i, _) => { assert_eq!(d.offset(i) + i.len(), d.len()); } -+ _ => { panic!("wrong return type in offset test for space") } -+ } -+ match multispace(e) { -+ Done(i, _) => { assert_eq!(e.offset(i) + i.len(), e.len()); } -+ _ => { panic!("wrong return type in offset test for multispace") } -+ } -+ match hex_digit(f) { -+ Done(i, _) => { assert_eq!(f.offset(i) + i.len(), f.len()); } -+ _ => { panic!("wrong return type in offset test for hex_digit") } -+ } -+ match oct_digit(f) { -+ Done(i, _) => { assert_eq!(f.offset(i) + i.len(), f.len()); } -+ _ => { panic!("wrong return type in offset test for oct_digit") } -+ } -+ } -+ -+ #[test] -+ fn is_not() { -+ let a: &[u8] = b"ab12cd\nefgh"; -+ assert_eq!(not_line_ending(a), Done(&b"\nefgh"[..], &b"ab12cd"[..])); -+ -+ let b: &[u8] = b"ab12cd\nefgh\nijkl"; -+ assert_eq!(not_line_ending(b), Done(&b"\nefgh\nijkl"[..], &b"ab12cd"[..])); -+ -+ let c: &[u8] = b"ab12cd"; -+ assert_eq!(not_line_ending(c), Done(&b""[..], c)); -+ } -+ -+ #[test] -+ fn buffer_with_size() { -+ let i:Vec = vec![7,8]; -+ let o:Vec = vec![4,5,6]; -+ //let arr:[u8; 6usize] = [3, 4, 5, 6, 7, 8]; -+ let arr:[u8; 6usize] = [3, 4, 5, 6, 7, 8]; -+ let res = sized_buffer(&arr[..]); -+ assert_eq!(res, Done(&i[..], &o[..])) -+ } -+ -+ /*#[test] -+ fn t1() { -+ let v1:Vec = vec![1,2,3]; -+ let v2:Vec = vec![4,5,6]; -+ let d = Done(&v1[..], &v2[..]); -+ let res = d.flat_map(print); -+ assert_eq!(res, Done(&v2[..], ())); -+ }*/ -+ -+ #[test] -+ fn length_value_test() { -+ let i1 = vec![7,8]; -+ let o1 = vec![4, 5, 6]; -+ let arr1:[u8; 6usize] = [3, 4, 5, 6, 7, 8]; -+ let res1 = length_value(&arr1); -+ assert_eq!(Done(&i1[..], &o1[..]), res1); -+ -+ let i2:Vec = vec![4,5,6,7,8]; -+ let o2: &[u8] = b""; -+ let arr2:[u8; 6usize] = [0, 4, 5, 6, 7, 8]; -+ let res2 = length_value(&arr2); -+ assert_eq!(Done(&i2[..], o2), res2); -+ -+ let arr3:[u8; 7usize] = [8, 4, 5, 6, 7, 8, 9]; -+ let res3 = length_value(&arr3); -+ //FIXME: should be incomplete -+ assert_eq!(Incomplete(Needed::Size(9)), res3); -+ } -+ -+ #[test] -+ fn i8_tests() { -+ assert_eq!(be_i8(&[0x00]), Done(&b""[..], 0)); -+ assert_eq!(be_i8(&[0x7f]), Done(&b""[..], 127)); -+ assert_eq!(be_i8(&[0xff]), Done(&b""[..], -1)); -+ assert_eq!(be_i8(&[0x80]), Done(&b""[..], -128)); -+ } -+ -+ #[test] -+ fn i16_tests() { -+ assert_eq!(be_i16(&[0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(be_i16(&[0x7f, 0xff]), Done(&b""[..], 32767_i16)); -+ assert_eq!(be_i16(&[0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(be_i16(&[0x80, 0x00]), Done(&b""[..], -32768_i16)); -+ } -+ -+ #[test] -+ fn i32_tests() { -+ assert_eq!(be_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(be_i32(&[0x7f, 0xff, 0xff, 0xff]), Done(&b""[..], 2147483647_i32)); -+ assert_eq!(be_i32(&[0xff, 0xff, 0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(be_i32(&[0x80, 0x00, 0x00, 0x00]), Done(&b""[..], -2147483648_i32)); -+ } -+ -+ #[test] -+ fn i64_tests() { -+ assert_eq!(be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(be_i64(&[0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]), Done(&b""[..], 9223372036854775807_i64)); -+ assert_eq!(be_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(be_i64(&[0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), Done(&b""[..], -9223372036854775808_i64)); -+ } -+ -+ #[test] -+ fn le_i8_tests() { -+ assert_eq!(le_i8(&[0x00]), Done(&b""[..], 0)); -+ assert_eq!(le_i8(&[0x7f]), Done(&b""[..], 127)); -+ assert_eq!(le_i8(&[0xff]), Done(&b""[..], -1)); -+ assert_eq!(le_i8(&[0x80]), Done(&b""[..], -128)); -+ } -+ -+ #[test] -+ fn le_i16_tests() { -+ assert_eq!(le_i16(&[0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(le_i16(&[0xff, 0x7f]), Done(&b""[..], 32767_i16)); -+ assert_eq!(le_i16(&[0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(le_i16(&[0x00, 0x80]), Done(&b""[..], -32768_i16)); -+ } -+ -+ #[test] -+ fn le_i32_tests() { -+ assert_eq!(le_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(le_i32(&[0xff, 0xff, 0xff, 0x7f]), Done(&b""[..], 2147483647_i32)); -+ assert_eq!(le_i32(&[0xff, 0xff, 0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(le_i32(&[0x00, 0x00, 0x00, 0x80]), Done(&b""[..], -2147483648_i32)); -+ } -+ -+ #[test] -+ fn le_i64_tests() { -+ assert_eq!(le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f]), Done(&b""[..], 9223372036854775807_i64)); -+ assert_eq!(le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]), Done(&b""[..], -1)); -+ assert_eq!(le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80]), Done(&b""[..], -9223372036854775808_i64)); -+ } -+ -+ #[test] -+ fn be_f32_tests() { -+ assert_eq!(be_f32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0_f32)); -+ assert_eq!(be_f32(&[0x4d, 0x31, 0x1f, 0xd8]), Done(&b""[..], 185728392_f32)); -+ } -+ -+ #[test] -+ fn be_f64_tests() { -+ assert_eq!(be_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0_f64)); -+ assert_eq!(be_f64(&[0x41, 0xa6, 0x23, 0xfb, 0x10, 0x00, 0x00, 0x00]), Done(&b""[..], 185728392_f64)); -+ } -+ -+ #[test] -+ fn le_f32_tests() { -+ assert_eq!(le_f32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0_f32)); -+ assert_eq!(le_f32(&[0xd8, 0x1f, 0x31, 0x4d]), Done(&b""[..], 185728392_f32)); -+ } -+ -+ #[test] -+ fn le_f64_tests() { -+ assert_eq!(le_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0_f64)); -+ assert_eq!(le_f64(&[0x00, 0x00, 0x00, 0x10, 0xfb, 0x23, 0xa6, 0x41]), Done(&b""[..], 185728392_f64)); -+ } -+ -+ #[test] -+ fn hex_u32_tests() { -+ assert_eq!(hex_u32(&b""[..]), Done(&b""[..], 0)); -+ assert_eq!(hex_u32(&b"ff"[..]), Done(&b""[..], 255)); -+ assert_eq!(hex_u32(&b"1be2"[..]), Done(&b""[..], 7138)); -+ assert_eq!(hex_u32(&b"c5a31be2"[..]), Done(&b""[..], 3315801058)); -+ assert_eq!(hex_u32(&b"00c5a31be2"[..]), Done(&b"e2"[..], 12952347)); -+ assert_eq!(hex_u32(&b"c5a31be201"[..]), Done(&b"01"[..], 3315801058)); -+ assert_eq!(hex_u32(&b"ffffffff"[..]), Done(&b""[..], 4294967295)); -+ assert_eq!(hex_u32(&b"0x1be2"[..]), Done(&b"x1be2"[..], 0)); -+ } -+ -+ #[test] -+ fn end_of_input() { -+ let not_over = &b"Hello, world!"[..]; -+ let is_over = &b""[..]; -+ -+ let res_not_over = eof(not_over); -+ assert_eq!(res_not_over, Error(Position(ErrorKind::Eof, not_over))); -+ -+ let res_over = eof(is_over); -+ assert_eq!(res_over, Done(is_over, is_over)); -+ } -+ -+ #[test] -+ fn configurable_endianness() { -+ named!(be_tst16, u16!(true)); -+ named!(le_tst16, u16!(false)); -+ assert_eq!(be_tst16(&[0x80, 0x00]), Done(&b""[..], 32768_u16)); -+ assert_eq!(le_tst16(&[0x80, 0x00]), Done(&b""[..], 128_u16)); -+ -+ named!(be_tst32, u32!(true)); -+ named!(le_tst32, u32!(false)); -+ assert_eq!(be_tst32(&[0x12, 0x00, 0x60, 0x00]), Done(&b""[..], 302014464_u32)); -+ assert_eq!(le_tst32(&[0x12, 0x00, 0x60, 0x00]), Done(&b""[..], 6291474_u32)); -+ -+ named!(be_tst64, u64!(true)); -+ named!(le_tst64, u64!(false)); -+ assert_eq!(be_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 1297142246100992000_u64)); -+ assert_eq!(le_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 36028874334666770_u64)); -+ -+ named!(be_tsti16, i16!(true)); -+ named!(le_tsti16, i16!(false)); -+ assert_eq!(be_tsti16(&[0x00, 0x80]), Done(&b""[..], 128_i16)); -+ assert_eq!(le_tsti16(&[0x00, 0x80]), Done(&b""[..], -32768_i16)); -+ -+ named!(be_tsti32, i32!(true)); -+ named!(le_tsti32, i32!(false)); -+ assert_eq!(be_tsti32(&[0x00, 0x12, 0x60, 0x00]), Done(&b""[..], 1204224_i32)); -+ assert_eq!(le_tsti32(&[0x00, 0x12, 0x60, 0x00]), Done(&b""[..], 6296064_i32)); -+ -+ named!(be_tsti64, i64!(true)); -+ named!(le_tsti64, i64!(false)); -+ assert_eq!(be_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 71881672479506432_i64)); -+ assert_eq!(le_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 36028874334732032_i64)); -+ -+ } -+ -+ #[test] -+ fn manual_configurable_endianness_test() { -+ let x = 1; -+ let int_parse: Box IResult<&[u8], u16> > = if x == 2 { -+ Box::new(be_u16) -+ } else { -+ Box::new(le_u16) -+ }; -+ println!("{:?}", int_parse(&b"3"[..])); -+ assert_eq!(int_parse(&[0x80, 0x00]), Done(&b""[..], 128_u16)); -+ } -+ -+ #[allow(dead_code)] -+ fn custom_error(input: &[u8]) -> IResult<&[u8], &[u8], ()> { -+ fix_error!(input, (), alphanumeric) -+ } -+ -+ #[test] -+ fn hex_digit_test() { -+ let empty = &b""[..]; -+ -+ let i = &b"0123456789abcdefABCDEF"[..]; -+ assert_eq!(hex_digit(i), Done(empty, i)); -+ -+ let i = &b"g"[..]; -+ assert_eq!(hex_digit(i), Error(Position(ErrorKind::HexDigit,i))); -+ -+ let i = &b"G"[..]; -+ assert_eq!(hex_digit(i), Error(Position(ErrorKind::HexDigit,i))); -+ -+ assert!(is_hex_digit(b'0')); -+ assert!(is_hex_digit(b'9')); -+ assert!(is_hex_digit(b'a')); -+ assert!(is_hex_digit(b'f')); -+ assert!(is_hex_digit(b'A')); -+ assert!(is_hex_digit(b'F')); -+ assert!(!is_hex_digit(b'g')); -+ assert!(!is_hex_digit(b'G')); -+ assert!(!is_hex_digit(b'/')); -+ assert!(!is_hex_digit(b':')); -+ assert!(!is_hex_digit(b'@')); -+ assert!(!is_hex_digit(b'\x60')); -+ } -+ -+ #[test] -+ fn oct_digit_test() { -+ let empty = &b""[..]; -+ -+ let i = &b"01234567"[..]; -+ assert_eq!(oct_digit(i), Done(empty, i)); -+ -+ let i = &b"8"[..]; -+ assert_eq!(oct_digit(i), Error(Position(ErrorKind::OctDigit,i))); -+ -+ assert!(is_oct_digit(b'0')); -+ assert!(is_oct_digit(b'7')); -+ assert!(!is_oct_digit(b'8')); -+ assert!(!is_oct_digit(b'9')); -+ assert!(!is_oct_digit(b'a')); -+ assert!(!is_oct_digit(b'A')); -+ assert!(!is_oct_digit(b'/')); -+ assert!(!is_oct_digit(b':')); -+ assert!(!is_oct_digit(b'@')); -+ assert!(!is_oct_digit(b'\x60')); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/regexp.rs third_party/rust/nom-1.2.4/src/regexp.rs -new file mode 100644 -index 000000000000..17f8ede1a3f7 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/regexp.rs -@@ -0,0 +1,644 @@ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! regex ( -+ ($re: ident, $s:expr) => ( -+ lazy_static! { -+ static ref $re: ::regex::Regex = ::regex::Regex::new($s).unwrap(); -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! regex_bytes ( -+ ($re: ident, $s:expr) => ( -+ lazy_static! { -+ static ref $re: ::regex::bytes::Regex = ::regex::bytes::Regex::new($s).unwrap(); -+ } -+ ); -+); -+ -+ -+/// `re_match!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the whole input if a match is found -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_match ( -+ ($i:expr, $re:expr) => ( -+ { -+ use $crate::InputLength; -+ let re = ::regex::Regex::new($re).unwrap(); -+ if re.is_match($i) { -+ $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_match_static!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the whole input if a match is found. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_match_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ use $crate::InputLength; -+ regex!(RE, $re); -+ if RE.is_match($i) { -+ $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ } -+ } -+ ) -+); -+ -+/// `re_bytes_match!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the whole input if a match is found -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_bytes_match ( -+ ($i:expr, $re:expr) => ( -+ { -+ use $crate::InputLength; -+ let re = ::regex::bytes::Regex::new($re).unwrap(); -+ if re.is_match($i) { -+ $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_bytes_match_static!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the whole input if a match is found. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_bytes_match_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ use $crate::InputLength; -+ regex_bytes!(RE, $re); -+ if RE.is_match($i) { -+ $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ } -+ } -+ ) -+); -+ -+/// `re_find!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the first match -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_find ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::Regex::new($re).unwrap(); -+ if let Some((begin, end)) = re.find($i) { -+ $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_find_static!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the first match. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_find_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex!(RE, $re); -+ if let Some((begin, end)) = RE.find($i) { -+ $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ } -+ } -+ -+ ) -+); -+ -+/// `re_bytes_find!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the first match -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_bytes_find ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::bytes::Regex::new($re).unwrap(); -+ if let Some((begin, end)) = re.find($i) { -+ $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_bytes_find!(regexp) => &[T] -> IResult<&[T], &[T]>` -+/// Returns the first match. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_bytes_find_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex_bytes!(RE, $re); -+ if let Some((begin, end)) = RE.find($i) { -+ $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ } -+ } -+ -+ ) -+); -+ -+/// `re_matches!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns all the matched parts -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_matches ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::Regex::new($re).unwrap(); -+ let v: Vec<&str> = re.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_matches_static!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns all the matched parts. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_matches_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex!(RE, $re); -+ let v: Vec<&str> = RE.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ } -+ } -+ ) -+); -+ -+/// `re_bytes_matches!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns all the matched parts -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_bytes_matches ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::bytes::Regex::new($re).unwrap(); -+ let v: Vec<&[u8]> = re.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_bytes_matches_static!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns all the matched parts. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_bytes_matches_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex_bytes!(RE, $re); -+ let v: Vec<&[u8]> = RE.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ } -+ } -+ ) -+); -+ -+/// `re_capture!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns the first capture group -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_capture ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::Regex::new($re).unwrap(); -+ if let Some(c) = re.captures($i) { -+ let v:Vec<&str> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_capture_static!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns the first capture group. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_capture_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex!(RE, $re); -+ if let Some(c) = RE.captures($i) { -+ let v:Vec<&str> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+/// `re_bytes_capture!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns the first capture group -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_bytes_capture ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::bytes::Regex::new($re).unwrap(); -+ if let Some(c) = re.captures($i) { -+ let v:Vec<&[u8]> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_bytes_capture_static!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>` -+/// Returns the first capture group. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_bytes_capture_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex_bytes!(RE, $re); -+ if let Some(c) = RE.captures($i) { -+ let v:Vec<&[u8]> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let offset = { -+ let end = v.last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+/// `re_captures!(regexp) => &[T] -> IResult<&[T], Vec>>` -+/// Returns all the capture groups -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_captures ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::Regex::new($re).unwrap(); -+ let v:Vec> = re.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap().last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_captures_static!(regexp) => &[T] -> IResult<&[T], Vec>>` -+/// Returns all the capture groups. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_captures_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex!(RE, $re); -+ let v:Vec> = RE.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap().last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+/// `re_bytes_captures!(regexp) => &[T] -> IResult<&[T], Vec>>` -+/// Returns all the capture groups -+/// -+/// requires the `regexp` feature -+#[macro_export] -+macro_rules! re_bytes_captures ( -+ ($i:expr, $re:expr) => ( -+ { -+ let re = ::regex::bytes::Regex::new($re).unwrap(); -+ let v:Vec> = re.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap().last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+ -+#[cfg(feature = "regexp_macros")] -+/// `re_bytes_captures_static!(regexp) => &[T] -> IResult<&[T], Vec>>` -+/// Returns all the capture groups. Regular expression calculated at compile time -+/// -+/// requires the `regexp_macros` feature -+#[macro_export] -+macro_rules! re_bytes_captures_static ( -+ ($i:expr, $re:expr) => ( -+ { -+ regex_bytes!(RE, $re); -+ let v:Vec> = RE.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ if v.len() != 0 { -+ let offset = { -+ let end = v.last().unwrap().last().unwrap(); -+ end.as_ptr() as usize + end.len() - $i.as_ptr() as usize -+ }; -+ $crate::IResult::Done(&$i[offset..], v) -+ } else { -+ $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ } -+ } -+ ) -+); -+#[cfg(test)] -+mod tests { -+ use internal::IResult::*; -+ use internal::Err::*; -+ use util::ErrorKind; -+ -+ #[test] -+ fn re_match() { -+ named!(rm<&str,&str>, re_match!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm("2015-09-07blah"), Done("", "2015-09-07blah")); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_match_static() { -+ named!(rm<&str,&str>, re_match_static!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm("2015-09-07blah"), Done("", "2015-09-07blah")); -+ } -+ -+ #[test] -+ fn re_find() { -+ named!(rm<&str,&str>, re_find!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm("2015-09-07blah"), Done("blah", "2015-09-07")); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_find_static() { -+ named!(rm<&str,&str>, re_find_static!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm("2015-09-07blah"), Done("blah", "2015-09-07")); -+ } -+ -+ #[test] -+ fn re_matches() { -+ named!(rm< &str,Vec<&str> >, re_matches!(r"\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", vec!["2015-09-07"])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm("aaa2015-09-07blah2015-09-09pouet"), Done("pouet", vec!["2015-09-07", "2015-09-09"])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_matches_static() { -+ named!(rm< &str,Vec<&str> >, re_matches_static!(r"\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm("2015-09-07"), Done("", vec!["2015-09-07"])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm("aaa2015-09-07blah2015-09-09pouet"), Done("pouet", vec!["2015-09-07", "2015-09-09"])); -+ } -+ -+ #[test] -+ fn re_capture() { -+ named!(rm< &str,Vec<&str> >, re_capture!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41"), Done(" world regex 0.1.41", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_capture_static() { -+ named!(rm< &str,Vec<&str> >, re_capture_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41"), Done(" world regex 0.1.41", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -+ } -+ -+ #[test] -+ fn re_captures() { -+ named!(rm< &str,Vec> >, re_captures!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41 aaa"), Done(" aaa", vec![ -+ vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"], -+ vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"], -+ ])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_captures_static() { -+ named!(rm< &str,Vec> >, re_captures_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]])); -+ assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41 aaa"), Done(" aaa", vec![ -+ vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"], -+ vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"], -+ ])); -+ } -+ -+ #[test] -+ fn re_bytes_match() { -+ named!(rm, re_bytes_match!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b""[..], &b"2015-09-07blah"[..])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_bytes_match_static() { -+ named!(rm, re_bytes_match_static!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b""[..], &b"2015-09-07blah"[..])); -+ } -+ -+ #[test] -+ fn re_bytes_find() { -+ named!(rm, re_bytes_find!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b"blah"[..], &b"2015-09-07"[..])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_bytes_find_static() { -+ named!(rm, re_bytes_find_static!(r"^\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b"blah"[..], &b"2015-09-07"[..])); -+ } -+ -+ #[test] -+ fn re_bytes_matches() { -+ named!(rm >, re_bytes_matches!(r"\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], vec![&b"2015-09-07"[..]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]), Done(&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_bytes_matches_static() { -+ named!(rm >, re_bytes_matches_static!(r"\d{4}-\d{2}-\d{2}")); -+ assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], vec![&b"2015-09-07"[..]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]), Done(&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]])); -+ } -+ -+ #[test] -+ fn re_bytes_capture() { -+ named!(rm >, re_bytes_capture!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]), Done(&b" world regex 0.1.41"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_bytes_capture_static() { -+ named!(rm< Vec<&[u8]> >, re_bytes_capture_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]), Done(&b" world regex 0.1.41"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -+ } -+ -+ #[test] -+ fn re_bytes_captures() { -+ named!(rm< Vec> >, re_bytes_captures!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]), Done(&b" aaa"[..], vec![ -+ vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]], -+ vec![&b"regex 0.1.41"[..], &b"regex"[..], &b"0.1.41"[..], &b"0"[..], &b"1"[..], &b"41"[..]], -+ ])); -+ } -+ -+ #[cfg(feature = "regexp_macros")] -+ #[test] -+ fn re_bytes_captures_static() { -+ named!(rm< Vec> >, re_bytes_captures_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]]])); -+ assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]), Done(&b" aaa"[..], vec![ -+ vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]], -+ vec![&b"regex 0.1.41"[..], &b"regex"[..], &b"0.1.41"[..], &b"0"[..], &b"1"[..], &b"41"[..]], -+ ])); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/str.rs third_party/rust/nom-1.2.4/src/str.rs -new file mode 100644 -index 000000000000..768786edaba1 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/str.rs -@@ -0,0 +1,734 @@ -+//! Parsers and helper functions operating on strings, especially useful when writing parsers for -+//! text-based formats. -+ -+/// `tag_s!(&str) => &str -> IResult<&str, &str>` -+/// declares a string as a suite to recognize -+/// -+/// consumes the recognized characters -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self,Done}; -+/// # fn main() { -+/// fn test(input: &str) -> IResult<&str, &str> { -+/// tag_s!(input, "abcd") -+/// } -+/// let r = test("abcdefgh"); -+/// assert_eq!(r, Done("efgh", "abcd")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tag_s ( -+ ($i:expr, $tag: expr) => ( -+ { -+ let res: $crate::IResult<_,_> = if $tag.len() > $i.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($tag.len())) -+ //} else if &$i[0..$tag.len()] == $tag { -+ } else if ($i).starts_with($tag) { -+ $crate::IResult::Done(&$i[$tag.len()..], &$i[0..$tag.len()]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagStr, $i)) -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take_s!(nb) => &str -> IResult<&str, &str>` -+/// generates a parser consuming the specified number of characters -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// // Desmond parser -+/// named!(take5<&str,&str>, take_s!( 5 ) ); -+/// -+/// let a = "abcdefgh"; -+/// -+/// assert_eq!(take5(a), Done("fgh", "abcde")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take_s ( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res: $crate::IResult<_,_> = if $i.chars().count() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ let mut offset = $i.len(); -+ let mut count = 0; -+ for (o, _) in $i.char_indices() { -+ if count == cnt { -+ offset = o; -+ break; -+ } -+ count += 1; -+ } -+ $crate::IResult::Done(&$i[offset..], &$i[..offset]) -+ }; -+ res -+ } -+ ); -+); -+ -+ -+/// `is_not_s!(&str) => &str -> IResult<&str, &str>` -+/// returns the longest list of characters that do not appear in the provided array -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!( not_space<&str,&str>, is_not_s!( " \t\r\n" ) ); -+/// -+/// let r = not_space("abcdefgh\nijkl"); -+/// assert_eq!(r, Done("\nijkl", "abcdefgh")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! is_not_s ( -+ ($input:expr, $arr:expr) => ( -+ { -+ use std::collections::HashSet; -+ let set: HashSet = $arr.chars().collect(); -+ let mut offset = $input.len(); -+ for (o, c) in $input.char_indices() { -+ if set.contains(&c) { -+ offset = o; -+ break; -+ } -+ } -+ if offset == 0 { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsAStr,$input)) -+ } else if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } -+ ); -+); -+ -+/// `is_a_s!(&str) => &str -> IResult<&str, &str>` -+/// returns the longest list of characters that appear in the provided array -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(abcd<&str, &str>, is_a_s!( "abcd" )); -+/// -+/// let r1 = abcd("aaaaefgh"); -+/// assert_eq!(r1, Done("efgh", "aaaa")); -+/// -+/// let r2 = abcd("dcbaefgh"); -+/// assert_eq!(r2, Done("efgh", "dcba")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! is_a_s ( -+ ($input:expr, $arr:expr) => ( -+ { -+ use std::collections::HashSet; -+ let set: HashSet = $arr.chars().collect(); -+ let mut offset = $input.len(); -+ for (o, c) in $input.char_indices() { -+ if !set.contains(&c) { -+ offset = o; -+ break; -+ } -+ } -+ if offset == 0 { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsAStr,$input)) -+ } else if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } -+ ); -+); -+ -+ -+/// `take_while_s!(char -> bool) => &str -> IResult<&str, &str>` -+/// returns the longest list of characters until the provided function fails. -+/// -+/// The argument is either a function `char -> bool` or a macro returning a `bool -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::is_alphanumeric; -+/// # fn main() { -+/// fn alphabetic(chr: char) -> bool { (chr >= 0x41 as char && chr <= 0x5A as char) || (chr >= 0x61 as char && chr <= 0x7A as char) } -+/// named!( alpha<&str,&str>, take_while_s!( alphabetic ) ); -+/// -+/// let r = alpha("abcd\nefgh"); -+/// assert_eq!(r, Done("\nefgh", "abcd")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take_while_s ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let mut offset = $input.len(); -+ for (o, c) in $input.char_indices() { -+ if !$submac!(c, $($args)*) { -+ offset = o; -+ break; -+ } -+ } -+ if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_while_s!($input, call!($f)); -+ ); -+); -+ -+/// `take_while1_s!(char -> bool) => &str -> IResult<&str, &str>` -+/// returns the longest (non empty) list of characters until the provided function fails. -+/// -+/// The argument is either a function `char -> bool` or a macro returning a `bool` -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::is_alphanumeric; -+/// # fn main() { -+/// fn alphabetic(chr: char) -> bool { (chr >= 0x41 as char && chr <= 0x5A as char) || (chr >= 0x61 as char && chr <= 0x7A as char) } -+/// named!( alpha<&str,&str>, take_while1_s!( alphabetic ) ); -+/// -+/// let r = alpha("abcd\nefgh"); -+/// assert_eq!(r, Done("\nefgh", "abcd")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! take_while1_s ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let mut offset = $input.len(); -+ for (o, c) in $input.char_indices() { -+ if !$submac!(c, $($args)*) { -+ offset = o; -+ break; -+ } -+ } -+ if offset == 0 { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1Str,$input)) -+ } else if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_while1_s!($input, call!($f)); -+ ); -+); -+ -+ -+/// `take_till_s!(&str -> bool) => &str -> IResult<&str, &str>` -+/// returns the longest list of characters until the provided function succeeds -+/// -+/// The argument is either a function `char -> bool` or a macro returning a `bool -+#[macro_export] -+macro_rules! take_till_s ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ -+ { -+ let mut offset = $input.len(); -+ for (o, c) in $input.char_indices() { -+ if $submac!(c, $($args)*) { -+ offset = o; -+ break; -+ } -+ } -+ if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_till_s!($input, call!($f)); -+ ); -+); -+ -+/// `take_until_and_consume_s!(&str) => &str -> IResult<&str, &str>` -+/// generates a parser consuming all chars until the specified string is found and consumes it -+#[macro_export] -+macro_rules! take_until_and_consume_s ( -+ ($input:expr, $substr:expr) => ( -+ { -+ #[inline(always)] -+ fn shift_window_and_cmp(window: & mut ::std::vec::Vec, c: char, substr_vec: & ::std::vec::Vec) -> bool { -+ window.push(c); -+ if window.len() > substr_vec.len() { -+ window.remove(0); -+ } -+ window == substr_vec -+ } -+ let res: $crate::IResult<_, _> = if $substr.len() > $input.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.len())) -+ } else { -+ let substr_vec: ::std::vec::Vec = $substr.chars().collect(); -+ let mut window: ::std::vec::Vec = vec![]; -+ let mut offset = $input.len(); -+ let mut parsed = false; -+ for (o, c) in $input.char_indices() { -+ if parsed { -+ // The easiest way to get the byte offset of the char after the found string -+ offset = o; -+ break; -+ } -+ if shift_window_and_cmp(& mut window, c, &substr_vec) { -+ parsed = true; -+ } -+ } -+ if parsed { -+ if offset < $input.len() { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Done("", $input) -+ } -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilAndConsumeStr,$input)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+/// `take_until_s!(&str) => &str -> IResult<&str, &str>` -+/// generates a parser consuming all chars until the specified string is found and leaves it in the remaining input -+#[macro_export] -+macro_rules! take_until_s ( -+ ($input:expr, $substr:expr) => ( -+ { -+ #[inline(always)] -+ fn shift_window_and_cmp(window: & mut Vec, c: char, substr_vec: &Vec) -> bool { -+ window.push(c); -+ if window.len() > substr_vec.len() { -+ window.remove(0); -+ } -+ window == substr_vec -+ } -+ let res: $crate::IResult<&str, &str> = if $substr.len() > $input.len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.len())) -+ } else { -+ let substr_vec: Vec = $substr.chars().collect(); -+ let mut window: Vec = vec![]; -+ let mut offset = $input.len(); -+ let mut parsed = false; -+ for (o, c) in $input.char_indices() { -+ if shift_window_and_cmp(& mut window, c, &substr_vec) { -+ parsed = true; -+ window.pop(); -+ let window_len: usize = window.iter() -+ .map(|x| x.len_utf8()) -+ .fold(0, |x, y| x + y); -+ offset = o - window_len; -+ break; -+ } -+ } -+ if parsed { -+ $crate::IResult::Done(&$input[offset..], &$input[..offset]) -+ } else { -+ $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilStr,$input)) -+ } -+ }; -+ res -+ } -+ ); -+); -+ -+#[cfg(test)] -+mod test { -+ use ::IResult; -+ -+ #[test] -+ fn tag_str_succeed() { -+ const INPUT: &'static str = "Hello World!"; -+ const TAG: &'static str = "Hello"; -+ fn test(input: &str) -> IResult<&str, &str> { -+ tag_s!(input, TAG) -+ } -+ -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == " World!", "Parser `tag_s` consumed leftover input."); -+ assert!(output == TAG, -+ "Parser `tag_s` doesn't return the tag it matched on success. \ -+ Expected `{}`, got `{}`.", TAG, output); -+ }, -+ other => panic!("Parser `tag_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn tag_str_incomplete() { -+ const INPUT: &'static str = "Hello"; -+ const TAG: &'static str = "Hello World!"; -+ -+ match tag_s!(INPUT, TAG) { -+ IResult::Incomplete(_) => (), -+ other => { -+ panic!("Parser `tag_s` didn't require more input when it should have. \ -+ Got `{:?}`.", other); -+ } -+ }; -+ } -+ -+ #[test] -+ fn tag_str_error() { -+ const INPUT: &'static str = "Hello World!"; -+ const TAG: &'static str = "Random"; // TAG must be closer than INPUT. -+ -+ match tag_s!(INPUT, TAG) { -+ IResult::Error(_) => (), -+ other => { -+ panic!("Parser `tag_s` didn't fail when it should have. Got `{:?}`.`", other); -+ }, -+ }; -+ } -+ -+ #[test] -+ fn take_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ -+ match take_s!(INPUT, 9) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_s` consumed leftover input. Leftover `{}`.", extra); -+ assert!(output == CONSUMED, -+ "Parser `take_s` doens't return the string it consumed on success. Expected `{}`, got `{}`.", -+ CONSUMED, output); -+ }, -+ other => panic!("Parser `take_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇ∂áƒƭèř"; -+ const FIND: &'static str = "ÂßÇ∂"; -+ const CONSUMED: &'static str = "βèƒôřè"; -+ const LEFTOVER: &'static str = "ÂßÇ∂áƒƭèř"; -+ -+ match take_until_s!(INPUT, FIND) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_until_s`\ -+ consumed leftover input. Leftover `{}`.", extra); -+ assert!(output == CONSUMED, "Parser `take_until_s`\ -+ doens't return the string it consumed on success. Expected `{}`, got `{}`.", -+ CONSUMED, output); -+ } -+ other => panic!("Parser `take_until_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_s_incomplete() { -+ const INPUT: &'static str = "βèƒôřèÂßÇá"; -+ -+ match take_s!(INPUT, 13) { -+ IResult::Incomplete(_) => (), -+ other => panic!("Parser `take_s` didn't require more input when it should have. \ -+ Got `{:?}`.", other), -+ } -+ } -+ -+ use internal::IResult::{Done, Error}; -+ use internal::Err::Position; -+ use util::ErrorKind; -+ -+ pub fn is_alphabetic(c:char) -> bool { -+ (c as u8 >= 0x41 && c as u8 <= 0x5A) || (c as u8 >= 0x61 && c as u8 <= 0x7A) -+ } -+ #[test] -+ fn take_while_s() { -+ named!(f<&str,&str>, take_while_s!(is_alphabetic)); -+ let a = ""; -+ let b = "abcd"; -+ let c = "abcd123"; -+ let d = "123"; -+ -+ assert_eq!(f(&a[..]), Done(&a[..], &a[..])); -+ assert_eq!(f(&b[..]), Done(&a[..], &b[..])); -+ assert_eq!(f(&c[..]), Done(&d[..], &b[..])); -+ assert_eq!(f(&d[..]), Done(&d[..], &a[..])); -+ } -+ -+ #[test] -+ fn take_while1_s() { -+ named!(f<&str,&str>, take_while1_s!(is_alphabetic)); -+ let a = ""; -+ let b = "abcd"; -+ let c = "abcd123"; -+ let d = "123"; -+ -+ assert_eq!(f(&a[..]), Error(Position(ErrorKind::TakeWhile1Str, &""[..]))); -+ assert_eq!(f(&b[..]), Done(&a[..], &b[..])); -+ assert_eq!(f(&c[..]), Done(&"123"[..], &b[..])); -+ assert_eq!(f(&d[..]), Error(Position(ErrorKind::TakeWhile1Str, &d[..]))); -+ } -+ -+ #[test] -+ fn take_till_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ fn till_s(c: char) -> bool { -+ c == 'á' -+ } -+ fn test(input: &str) -> IResult<&str, &str> { -+ take_till_s!(input, till_s) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_till_s` consumed leftover input."); -+ assert!(output == CONSUMED, -+ "Parser `take_till_s` doesn't return the string it consumed on success. \ -+ Expected `{}`, got `{}`.", CONSUMED, output); -+ }, -+ other => panic!("Parser `take_till_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_while_s_succeed_none() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const CONSUMED: &'static str = ""; -+ const LEFTOVER: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ fn while_s(c: char) -> bool { -+ c == '9' -+ } -+ fn test(input: &str) -> IResult<&str, &str> { -+ take_while_s!(input, while_s) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_while_s` consumed leftover input."); -+ assert!(output == CONSUMED, -+ "Parser `take_while_s` doesn't return the string it consumed on success. \ -+ Expected `{}`, got `{}`.", CONSUMED, output); -+ }, -+ other => panic!("Parser `take_while_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn is_not_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const AVOID: &'static str = "£úçƙ¥á"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ fn test(input: &str) -> IResult<&str, &str> { -+ is_not_s!(input, AVOID) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `is_not_s` consumed leftover input. Leftover `{}`.", extra); -+ assert!(output == CONSUMED, -+ "Parser `is_not_s` doens't return the string it consumed on success. Expected `{}`, got `{}`.", -+ CONSUMED, output); -+ }, -+ other => panic!("Parser `is_not_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_and_consume_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const FIND: &'static str = "ÂßÇ"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ -+ match take_until_and_consume_s!(INPUT, FIND) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_until_and_consume_s`\ -+ consumed leftover input. Leftover `{}`.", extra); -+ assert!(output == CONSUMED, "Parser `take_until_and_consume_s`\ -+ doens't return the string it consumed on success. Expected `{}`, got `{}`.", -+ CONSUMED, output); -+ } -+ other => panic!("Parser `take_until_and_consume_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_while_s_succeed_some() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ fn while_s(c: char) -> bool { -+ c == 'β' || c == 'è' || c == 'ƒ' || c == 'ô' || c == 'ř' || -+ c == 'è' || c == 'Â' || c == 'ß' || c == 'Ç' -+ } -+ fn test(input: &str) -> IResult<&str, &str> { -+ take_while_s!(input, while_s) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_while_s` consumed leftover input."); -+ assert!(output == CONSUMED, -+ "Parser `take_while_s` doesn't return the string it consumed on success. \ -+ Expected `{}`, got `{}`.", CONSUMED, output); -+ }, -+ other => panic!("Parser `take_while_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn is_not_s_fail() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const AVOID: &'static str = "βúçƙ¥"; -+ fn test(input: &str) -> IResult<&str, &str> { -+ is_not_s!(input, AVOID) -+ } -+ match test(INPUT) { -+ IResult::Error(_) => (), -+ other => panic!("Parser `is_not_s` didn't fail when it should have. Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_while1_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ fn while1_s(c: char) -> bool { -+ c == 'β' || c == 'è' || c == 'ƒ' || c == 'ô' || c == 'ř' || -+ c == 'è' || c == 'Â' || c == 'ß' || c == 'Ç' -+ } -+ fn test(input: &str) -> IResult<&str, &str> { -+ take_while1_s!(input, while1_s) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `take_while1_s` consumed leftover input."); -+ assert!(output == CONSUMED, -+ "Parser `take_while1_s` doesn't return the string it consumed on success. \ -+ Expected `{}`, got `{}`.", CONSUMED, output); -+ }, -+ other => panic!("Parser `take_while1_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_and_consume_s_incomplete() { -+ const INPUT: &'static str = "βèƒôřè"; -+ const FIND: &'static str = "βèƒôřèÂßÇ"; -+ -+ match take_until_and_consume_s!(INPUT, FIND) { -+ IResult::Incomplete(_) => (), -+ other => panic!("Parser `take_until_and_consume_s` didn't require more input when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_s_incomplete() { -+ const INPUT: &'static str = "βèƒôřè"; -+ const FIND: &'static str = "βèƒôřèÂßÇ"; -+ -+ match take_until_s!(INPUT, FIND) { -+ IResult::Incomplete(_) => (), -+ other => panic!("Parser `take_until_s` didn't require more input when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn is_a_s_succeed() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const MATCH: &'static str = "βèƒôřèÂßÇ"; -+ const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const LEFTOVER: &'static str = "áƒƭèř"; -+ fn test(input: &str) -> IResult<&str, &str> { -+ is_a_s!(input, MATCH) -+ } -+ match test(INPUT) { -+ IResult::Done(extra, output) => { -+ assert!(extra == LEFTOVER, "Parser `is_a_s` consumed leftover input. Leftover `{}`.", extra); -+ assert!(output == CONSUMED, -+ "Parser `is_a_s` doens't return the string it consumed on success. Expected `{}`, got `{}`.", -+ CONSUMED, output); -+ }, -+ other => panic!("Parser `is_a_s` didn't succeed when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_while1_s_fail() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ fn while1_s(c: char) -> bool { -+ c == '9' -+ } -+ fn test(input: &str) -> IResult<&str, &str> { -+ take_while1_s!(input, while1_s) -+ } -+ match test(INPUT) { -+ IResult::Error(_) => (), -+ other => panic!("Parser `take_while1_s` didn't fail when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn is_a_s_fail() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const MATCH: &'static str = "Ûñℓúçƙ¥"; -+ fn test(input: &str) -> IResult<&str, &str> { -+ is_a_s!(input, MATCH) -+ } -+ match test(INPUT) { -+ IResult::Error(_) => (), -+ other => panic!("Parser `is_a_s` didn't fail when it should have. Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_and_consume_s_error() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const FIND: &'static str = "Ráñδô₥"; -+ -+ match take_until_and_consume_s!(INPUT, FIND) { -+ IResult::Error(_) => (), -+ other => panic!("Parser `take_until_and_consume_s` didn't fail when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+ -+ #[test] -+ fn take_until_s_error() { -+ const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; -+ const FIND: &'static str = "Ráñδô₥"; -+ -+ match take_until_s!(INPUT, FIND) { -+ IResult::Error(_) => (), -+ other => panic!("Parser `take_until_and_consume_s` didn't fail when it should have. \ -+ Got `{:?}`.", other), -+ }; -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/stream.rs third_party/rust/nom-1.2.4/src/stream.rs -new file mode 100644 -index 000000000000..38d5c870c938 ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/stream.rs -@@ -0,0 +1,1031 @@ -+/// Context: -+/// * Rust does not have tail call optimization, so we cannot recurse wildly -+/// * data lifetimes makes sure that the result of a function applied to a producer cannot live longer than the producer's data (unless there is cloning) -+/// * previous implementation of Producer and Consumer spent its time copying buffers -+/// * the old Consumer was handling everything and buffering data. The new design has the producer handle data, but the consumer makes seeking decision -+use std::io::{self,Read,Write,Seek,SeekFrom}; -+use std::fs::File; -+use std::path::Path; -+use std::ptr; -+use std::iter::repeat; -+use internal::Needed; -+ -+//pub type Computation = Box) -> (I,Consumer)>; -+ -+#[derive(Debug,Clone)] -+pub enum Input { -+ Element(I), -+ Empty, -+ Eof(Option) -+} -+ -+/// Stores a consumer's current computation state -+#[derive(Debug,Clone)] -+pub enum ConsumerState { -+ /// A value of type O has been produced -+ Done(M,O), -+ /// An error of type E has been encountered -+ Error(E), -+ /// Continue applying, and pass a message of type M to the data source -+ Continue(M) -+} -+ -+impl ConsumerState { -+ pub fn map(&self, f: F) -> ConsumerState where F: FnOnce(O) -> P { -+ match *self { -+ ConsumerState::Error(e) => ConsumerState::Error(e), -+ ConsumerState::Continue(m) => ConsumerState::Continue(m), -+ ConsumerState::Done(m, ref o) => ConsumerState::Done(m, f(o.clone())) -+ } -+ } -+ pub fn flat_map(&self, f: F) -> ConsumerState where F: FnOnce(M, O) -> ConsumerState { -+ match *self { -+ ConsumerState::Error(e) => ConsumerState::Error(e), -+ ConsumerState::Continue(m) => ConsumerState::Continue(m), -+ ConsumerState::Done(m, ref o) => f(m, o.clone()) -+ } -+ } -+} -+/// The Consumer trait wraps a computation and its state -+/// -+/// it depends on the input type I, the produced value's type O, the error type E, and the message type M -+pub trait Consumer { -+ -+ /// implement handle for the current computation, returning the new state of the consumer -+ fn handle(&mut self, input: Input) -> &ConsumerState; -+ /// returns the current state -+ fn state(&self) -> &ConsumerState; -+ -+} -+ -+/// The producer wraps a data source, like file or network, and applies a consumer on it -+/// -+/// it handles buffer copying and reallocation, to provide streaming patterns. -+/// it depends on the input type I, and the message type M. -+/// the consumer can change the way data is produced (for example, to seek in the source) by sending a message of type M. -+pub trait Producer<'b,I,M: 'b> { -+ /// Applies a consumer once on the produced data, and return the consumer's state -+ /// -+ /// a new producer has to implement this method. -+ /// -+ /// WARNING: if the `ConsumerState` generated by your consumer has a reference -+ /// to the input, it will generate borrow checking errors such as -+ /// `error: cannot borrow `producer` as mutable more than once at a time [E0499]`. -+ /// -+ /// It is caused by the producer's ability to refill the input at will, so it can modify -+ /// the input slice the `ConsumerState` is referring to. -+ /// -+ /// To avoid that kind of issue, try to do all the computations on input slices inside the -+ /// `Consumer` chain -+ fn apply<'a, O,E>(&'b mut self, consumer: &'a mut Consumer) -> &'a ConsumerState; -+ -+ /// Applies a consumer once on the produced data, and returns the generated value if there is one -+ fn run<'a: 'b,O,E: 'b>(&'b mut self, consumer: &'a mut Consumer) -> Option<&O> { -+ if let &ConsumerState::Done(_,ref o) = self.apply(consumer) { -+ Some(o) -+ } else { -+ None -+ } -+ } -+ // fn fromFile, FromSocket, fromRead -+} -+ -+/// ProducerRepeat takes a single value, and generates it at each step -+pub struct ProducerRepeat { -+ value: I -+} -+ -+impl<'b,I:Copy,M: 'b> Producer<'b,I,M> for ProducerRepeat { -+ fn apply<'a,O,E>(&'b mut self, consumer: &'a mut Consumer) -> &'a ConsumerState { -+ if { -+ if let &ConsumerState::Continue(_) = consumer.state() { -+ true -+ } else { -+ false -+ } -+ } -+ { -+ consumer.handle(Input::Element(self.value)) -+ } else { -+ consumer.state() -+ } -+ } -+} -+ -+/// A MemProducer generates values from an in memory byte buffer -+/// -+/// it generates data by chunks, and keeps track of how much was consumed. -+/// It can receive messages of type `Move` to handle consumption and seeking -+pub struct MemProducer<'x> { -+ buffer: &'x [u8], -+ chunk_size: usize, -+ length: usize, -+ index: usize -+} -+ -+impl<'x> MemProducer<'x> { -+ pub fn new(buffer: &'x[u8], chunk_size: usize) -> MemProducer { -+ MemProducer { -+ buffer: buffer, -+ chunk_size: chunk_size, -+ length: buffer.len(), -+ index: 0 -+ } -+ } -+} -+ -+#[derive(Debug,Clone,Copy,PartialEq,Eq)] -+pub enum Move { -+ /// indcates how much data was consumed -+ Consume(usize), -+ /// indicates where in the input the consumer must seek -+ Seek(SeekFrom), -+ /// indicates more data is needed -+ Await(Needed) -+} -+ -+impl<'x,'b> Producer<'b,&'x[u8],Move> for MemProducer<'x> { -+ fn apply<'a,O,E>(&'b mut self, consumer: &'a mut Consumer<&'x[u8],O,E,Move>) -> &'a ConsumerState { -+ if { -+ if let &ConsumerState::Continue(ref m) = consumer.state() { -+ match *m { -+ Move::Consume(s) => { -+ if self.length - self.index >= s { -+ self.index += s -+ } else { -+ panic!("cannot consume past the end of the buffer"); -+ } -+ }, -+ Move::Await(a) => { -+ panic!("not handled for now: await({:?}", a); -+ } -+ Move::Seek(SeekFrom::Start(position)) => { -+ if position as usize > self.length { -+ self.index = self.length -+ } else { -+ self.index = position as usize -+ } -+ }, -+ Move::Seek(SeekFrom::Current(offset)) => { -+ let next = if offset >= 0 { -+ (self.index as u64).checked_add(offset as u64) -+ } else { -+ (self.index as u64).checked_sub(-offset as u64) -+ }; -+ match next { -+ None => None, -+ Some(u) => { -+ if u as usize > self.length { -+ self.index = self.length -+ } else { -+ self.index = u as usize -+ } -+ Some(self.index as u64) -+ } -+ }; -+ }, -+ Move::Seek(SeekFrom::End(i)) => { -+ let next = if i < 0 { -+ (self.length as u64).checked_sub(-i as u64) -+ } else { -+ // std::io::SeekFrom documentation explicitly allows -+ // seeking beyond the end of the stream, so we seek -+ // to the end of the content if the offset is 0 or -+ // greater. -+ Some(self.length as u64) -+ }; -+ match next { -+ // std::io:SeekFrom documentation states that it `is an -+ // error to seek before byte 0.' So it's the sensible -+ // thing to refuse to seek on underflow. -+ None => None, -+ Some(u) => { -+ self.index = u as usize; -+ Some(u) -+ } -+ }; -+ } -+ } -+ true -+ } else { -+ false -+ } -+ } -+ { -+ use std::cmp; -+ let end = cmp::min(self.index + self.chunk_size, self.length); -+ consumer.handle(Input::Element(&self.buffer[self.index..end])) -+ } else { -+ consumer.state() -+ } -+ } -+} -+ -+#[derive(Debug,Copy,Clone,PartialEq,Eq)] -+pub enum FileProducerState { -+ Normal, -+ Error, -+ Eof -+} -+ -+#[derive(Debug)] -+pub struct FileProducer { -+ size: usize, -+ file: File, -+ position: usize, -+ v: Vec, -+ start: usize, -+ end: usize, -+ state: FileProducerState, -+} -+ -+impl FileProducer { -+ pub fn new(filename: &str, buffer_size: usize) -> io::Result { -+ File::open(&Path::new(filename)).and_then(|mut f| { -+ f.seek(SeekFrom::Start(0)).map(|_| { -+ let mut v = Vec::with_capacity(buffer_size); -+ v.extend(repeat(0).take(buffer_size)); -+ FileProducer {size: buffer_size, file: f, position: 0, v: v, start: 0, end: 0, state: FileProducerState::Normal } -+ }) -+ }) -+ } -+ -+ pub fn state(&self) -> FileProducerState { -+ self.state -+ } -+ -+ // FIXME: should handle refill until a certain size is obtained -+ pub fn refill(&mut self) -> Option { -+ shift(&mut self.v, self.start, self.end); -+ self.end = self.end - self.start; -+ self.start = 0; -+ match self.file.read(&mut self.v[self.end..]) { -+ Err(_) => { -+ self.state = FileProducerState::Error; -+ None -+ }, -+ Ok(n) => { -+ //println!("read: {} bytes\ndata:\n{:?}", n, &self.v); -+ if n == 0 { -+ self.state = FileProducerState::Eof; -+ } -+ self.end += n; -+ Some(0) -+ } -+ } -+ } -+ -+ /// Resize the internal buffer, copy the data to the new one and returned how much data was copied -+ /// -+ /// If the new buffer is smaller, the prefix will be copied, and the rest of the data will be dropped -+ pub fn resize(&mut self, s: usize) -> usize { -+ let mut v = vec![0; s]; -+ let length = self.end - self.start; -+ -+ let size = if length <= s { length } else { s }; -+ -+ // Use `Write` for `&mut [u8]` -+ (&mut v[..]).write(&self.v[self.start..self.start + size]).unwrap(); -+ -+ self.v = v; -+ self.start = 0; -+ self.end = size; -+ -+ size -+ } -+} -+ -+pub fn shift(s: &mut[u8], start: usize, end: usize) { -+ if start > 0 { -+ unsafe { -+ let length = end - start; -+ ptr::copy( (&s[start..end]).as_ptr(), (&mut s[..length]).as_mut_ptr(), length); -+ } -+ } -+} -+ -+ -+impl<'x> Producer<'x,&'x [u8],Move> for FileProducer { -+ -+ fn apply<'a,O,E>(&'x mut self, consumer: &'a mut Consumer<&'x[u8],O,E,Move>) -> &'a ConsumerState { -+ //consumer.handle(Input::Element(&self.v[self.start..self.end])) -+ //self.my_apply(consumer) -+ if { -+ if let &ConsumerState::Continue(ref m) = consumer.state() { -+ match *m { -+ Move::Consume(s) => { -+ //println!("start: {}, end: {}, consumed: {}", self.start, self.end, s); -+ if self.end - self.start >= s { -+ self.start = self.start + s; -+ self.position = self.position + s; -+ } else { -+ panic!("cannot consume past the end of the buffer"); -+ } -+ if self.start == self.end { -+ self.refill(); -+ } -+ }, -+ Move::Await(_) => { -+ self.refill(); -+ }, -+ -+ // FIXME: naive seeking for now -+ Move::Seek(position) => { -+ let pos = match position { -+ // take into account data in the buffer -+ SeekFrom::Current(c) => SeekFrom::Current(c - (self.end - self.start) as i64), -+ default => default -+ }; -+ match self.file.seek(pos) { -+ Ok(pos) => { -+ //println!("file got seek to position {:?}. New position is {:?}", position, next); -+ self.position = pos as usize; -+ self.start = 0; -+ self.end = 0; -+ self.refill(); -+ }, -+ Err(_) => { -+ self.state = FileProducerState::Error; -+ } -+ } -+ } -+ } -+ true -+ } else { -+ false -+ } -+ } -+ { -+ //println!("producer state: {:?}", self.state); -+ match self.state { -+ FileProducerState::Normal => consumer.handle(Input::Element(&self.v[self.start..self.end])), -+ FileProducerState::Eof => { -+ let slice = &self.v[self.start..self.end]; -+ -+ if slice.is_empty() { -+ consumer.handle(Input::Eof(None)) -+ } else { -+ consumer.handle(Input::Eof(Some(slice))) -+ } -+ } -+ // is it right? -+ FileProducerState::Error => consumer.state() -+ } -+ } else { -+ consumer.state() -+ } -+ } -+} -+ -+ -+use std::marker::PhantomData; -+ -+/// MapConsumer takes a function S -> T and applies it on a consumer producing values of type S -+pub struct MapConsumer<'a, C:'a,R,S,T,E,M,F> { -+ state: ConsumerState, -+ consumer: &'a mut C, -+ f: F, -+ consumer_input_type: PhantomData, -+ f_input_type: PhantomData, -+ f_output_type: PhantomData -+} -+ -+impl<'a,R,S:Clone,T,E:Clone,M:Clone,F:Fn(S) -> T,C:Consumer> MapConsumer<'a,C,R,S,T,E,M,F> { -+ pub fn new(c: &'a mut C, f: F) -> MapConsumer<'a,C,R,S,T,E,M,F> { -+ //let state = c.state(); -+ let initial = match *c.state() { -+ ConsumerState::Done(ref m, ref o) => ConsumerState::Done(m.clone(), f(o.clone())), -+ ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ ConsumerState::Continue(ref m) => ConsumerState::Continue(m.clone()) -+ }; -+ -+ MapConsumer { -+ state: initial, -+ consumer: c, -+ f: f, -+ consumer_input_type: PhantomData, -+ f_input_type: PhantomData, -+ f_output_type: PhantomData -+ } -+ } -+} -+ -+impl<'a,R,S:Clone,T,E:Clone,M:Clone,F:Fn(S) -> T,C:Consumer> Consumer for MapConsumer<'a,C,R,S,T,E,M,F> { -+ fn handle(&mut self, input: Input) -> &ConsumerState { -+ let res:&ConsumerState = self.consumer.handle(input); -+ self.state = match res { -+ &ConsumerState::Done(ref m, ref o) => ConsumerState::Done(m.clone(), (self.f)(o.clone())), -+ &ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ &ConsumerState::Continue(ref m) => ConsumerState::Continue(m.clone()) -+ }; -+ &self.state -+ } -+ -+ fn state(&self) -> &ConsumerState { -+ &self.state -+ } -+} -+ -+/// ChainConsumer takes a consumer C1 R -> S, and a consumer C2 S -> T, and makes a consumer R -> T by applying C2 on C1's result -+pub struct ChainConsumer<'a,'b, C1:'a,C2:'b,R,S,T,E,M> { -+ state: ConsumerState, -+ consumer1: &'a mut C1, -+ consumer2: &'b mut C2, -+ input_type: PhantomData, -+ temp_type: PhantomData -+} -+ -+impl<'a,'b,R,S:Clone,T:Clone,E:Clone,M:Clone,C1:Consumer, C2:Consumer> ChainConsumer<'a,'b,C1,C2,R,S,T,E,M> { -+ pub fn new(c1: &'a mut C1, c2: &'b mut C2) -> ChainConsumer<'a,'b,C1,C2,R,S,T,E,M> { -+ let initial = match *c1.state() { -+ ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ ConsumerState::Continue(ref m) => ConsumerState::Continue(m.clone()), -+ ConsumerState::Done(ref m, ref o) => match *c2.handle(Input::Element(o.clone())) { -+ ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ ConsumerState::Continue(ref m2) => ConsumerState::Continue(m2.clone()), -+ ConsumerState::Done(_,ref o2) => ConsumerState::Done(m.clone(), o2.clone()) -+ } -+ }; -+ -+ ChainConsumer { -+ state: initial, -+ consumer1: c1, -+ consumer2: c2, -+ input_type: PhantomData, -+ temp_type: PhantomData -+ } -+ } -+} -+ -+impl<'a,'b,R,S:Clone,T:Clone,E:Clone,M:Clone,C1:Consumer, C2:Consumer> Consumer for ChainConsumer<'a,'b,C1,C2,R,S,T,E,M> { -+ fn handle(&mut self, input: Input) -> &ConsumerState { -+ let res:&ConsumerState = self.consumer1.handle(input); -+ self.state = match *res { -+ ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ ConsumerState::Continue(ref m) => ConsumerState::Continue(m.clone()), -+ ConsumerState::Done(ref m, ref o) => match *self.consumer2.handle(Input::Element(o.clone())) { -+ ConsumerState::Error(ref e) => ConsumerState::Error(e.clone()), -+ ConsumerState::Continue(ref m) => ConsumerState::Continue(m.clone()), -+ ConsumerState::Done(_, ref o2) => ConsumerState::Done(m.clone(), o2.clone()) -+ } -+ }; -+ &self.state -+ } -+ -+ fn state(&self) -> &ConsumerState { -+ &self.state -+ } -+} -+ -+#[macro_export] -+macro_rules! consumer_from_parser ( -+ //FIXME: should specify the error and move type -+ ($name:ident<$input:ty, $output:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[derive(Debug)] -+ struct $name { -+ state: $crate::ConsumerState<$output, (), $crate::Move> -+ } -+ -+ impl $name { -+ fn new() -> $name { -+ $name { state: $crate::ConsumerState::Continue($crate::Move::Consume(0)) } -+ } -+ } -+ -+ impl $crate::Consumer<$input, $output, (), $crate::Move> for $name { -+ fn handle(&mut self, input: $crate::Input<$input>) -> & $crate::ConsumerState<$output, (), $crate::Move> { -+ use $crate::HexDisplay; -+ match input { -+ $crate::Input::Empty | $crate::Input::Eof(None) => &self.state, -+ $crate::Input::Element(sl) | $crate::Input::Eof(Some(sl)) => { -+ self.state = match $submac!(sl, $($args)*) { -+ $crate::IResult::Incomplete(n) => { -+ $crate::ConsumerState::Continue($crate::Move::Await(n)) -+ }, -+ $crate::IResult::Error(_) => { -+ $crate::ConsumerState::Error(()) -+ }, -+ $crate::IResult::Done(i,o) => { -+ $crate::ConsumerState::Done($crate::Move::Consume(sl.offset(i)), o) -+ } -+ }; -+ -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &$crate::ConsumerState<$output, (), $crate::Move> { -+ &self.state -+ } -+ } -+ ); -+ ($name:ident<$output:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[derive(Debug)] -+ struct $name { -+ state: $crate::ConsumerState<$output, (), $crate::Move> -+ } -+ -+ impl $name { -+ // Allow this to go unused, because code in the defining scope can create the struct directly. -+ #[allow(dead_code)] -+ fn new() -> $name { -+ $name { state: $crate::ConsumerState::Continue($crate::Move::Consume(0)) } -+ } -+ } -+ -+ impl<'a> $crate::Consumer<&'a[u8], $output, (), $crate::Move> for $name { -+ fn handle(&mut self, input: $crate::Input<&'a[u8]>) -> & $crate::ConsumerState<$output, (), $crate::Move> { -+ use $crate::HexDisplay; -+ match input { -+ $crate::Input::Empty | $crate::Input::Eof(None) => &self.state, -+ $crate::Input::Element(sl) | $crate::Input::Eof(Some(sl)) => { -+ self.state = match $submac!(sl, $($args)*) { -+ $crate::IResult::Incomplete(n) => { -+ $crate::ConsumerState::Continue($crate::Move::Await(n)) -+ }, -+ $crate::IResult::Error(_) => { -+ $crate::ConsumerState::Error(()) -+ }, -+ $crate::IResult::Done(i,o) => { -+ $crate::ConsumerState::Done($crate::Move::Consume(sl.offset(i)), o) -+ } -+ }; -+ -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &$crate::ConsumerState<$output, (), $crate::Move> { -+ &self.state -+ } -+ } -+ ); -+ ($name:ident<$input:ty, $output:ty>, $f:expr) => ( -+ consumer_from_parser!($name<$input, $output>, call!($f)); -+ ); -+ ($name:ident<$output:ty>, $f:expr) => ( -+ consumer_from_parser!($name<$output>, call!($f)); -+ ); -+ -+); -+ -+#[cfg(test)] -+mod tests { -+ use super::*; -+ use internal::IResult; -+ use util::HexDisplay; -+ use std::str::from_utf8; -+ use std::io::SeekFrom; -+ -+ #[derive(Debug)] -+ struct AbcdConsumer<'a> { -+ state: ConsumerState<&'a [u8], (), Move> -+ } -+ -+ named!(abcd, tag!("abcd")); -+ impl<'a> Consumer<&'a [u8], &'a [u8], (), Move> for AbcdConsumer<'a> { -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState<&'a [u8],(),Move> { -+ match input { -+ Input::Empty | Input::Eof(None) => &self.state, -+ Input::Element(sl) => { -+ match abcd(sl) { -+ IResult::Error(_) => { -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.state = ConsumerState::Continue(Move::Consume(0)) -+ }, -+ IResult::Done(i,o) => { -+ self.state = ConsumerState::Done(Move::Consume(sl.offset(i)),o) -+ } -+ }; -+ &self.state -+ } -+ Input::Eof(Some(sl)) => { -+ match abcd(sl) { -+ IResult::Error(_) => { -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ // we cannot return incomplete on Eof -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Done(i,o) => { -+ self.state = ConsumerState::Done(Move::Consume(sl.offset(i)), o) -+ } -+ }; -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &ConsumerState<&'a [u8], (), Move> { -+ &self.state -+ } -+ } -+ -+ #[test] -+ fn mem() { -+ let mut m = MemProducer::new(&b"abcdabcdabcdabcdabcd"[..], 8); -+ -+ let mut a = AbcdConsumer { state: ConsumerState::Continue(Move::Consume(0)) }; -+ -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ //assert!(false); -+ } -+ -+ named!(efgh, tag!("efgh")); -+ named!(ijkl, tag!("ijkl")); -+ #[derive(Debug)] -+ enum State { -+ Initial, -+ A, -+ B, -+ End, -+ Error -+ } -+ #[derive(Debug)] -+ struct StateConsumer<'a> { -+ state: ConsumerState<&'a [u8], (), Move>, -+ parsing_state: State -+ } -+ -+ impl<'a> Consumer<&'a [u8], &'a [u8], (), Move> for StateConsumer<'a> { -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState<&'a [u8], (), Move> { -+ match input { -+ Input::Empty | Input::Eof(None) => &self.state, -+ Input::Element(sl) => { -+ match self.parsing_state { -+ State::Initial => match abcd(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.state = ConsumerState::Continue(Move::Consume(0)) -+ }, -+ IResult::Done(i,_) => { -+ self.parsing_state = State::A; -+ self.state = ConsumerState::Continue(Move::Consume(sl.offset(i))) -+ } -+ }, -+ State::A => match efgh(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.state = ConsumerState::Continue(Move::Consume(0)) -+ }, -+ IResult::Done(i,_) => { -+ self.parsing_state = State::B; -+ self.state = ConsumerState::Continue(Move::Consume(sl.offset(i))) -+ } -+ }, -+ State::B => match ijkl(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.state = ConsumerState::Continue(Move::Consume(0)) -+ }, -+ IResult::Done(i,o) => { -+ self.parsing_state = State::End; -+ self.state = ConsumerState::Done(Move::Consume(sl.offset(i)),o) -+ } -+ }, -+ _ => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ } -+ } -+ &self.state -+ } -+ Input::Eof(Some(sl)) => { -+ match self.parsing_state { -+ State::Initial => match abcd(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Done(_,_) => { -+ self.parsing_state = State::A; -+ self.state = ConsumerState::Error(()) -+ } -+ }, -+ State::A => match efgh(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Done(_,_) => { -+ self.parsing_state = State::B; -+ self.state = ConsumerState::Error(()) -+ } -+ }, -+ State::B => match ijkl(sl) { -+ IResult::Error(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Incomplete(_) => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ }, -+ IResult::Done(i,o) => { -+ self.parsing_state = State::End; -+ self.state = ConsumerState::Done(Move::Consume(sl.offset(i)), o) -+ } -+ }, -+ _ => { -+ self.parsing_state = State::Error; -+ self.state = ConsumerState::Error(()) -+ } -+ } -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &ConsumerState<&'a [u8], (), Move> { -+ &self.state -+ } -+ } -+ impl<'a> StateConsumer<'a> { -+ fn parsing(&self) -> &State { -+ &self.parsing_state -+ } -+ } -+ -+ #[test] -+ fn mem2() { -+ let mut m = MemProducer::new(&b"abcdefghijklabcdabcd"[..], 8); -+ -+ let mut a = StateConsumer { state: ConsumerState::Continue(Move::Consume(0)), parsing_state: State::Initial }; -+ -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("state {:?}", a.parsing()); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("state {:?}", a.parsing()); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("state {:?}", a.parsing()); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("state {:?}", a.parsing()); -+ //assert!(false); -+ } -+ -+ -+ #[test] -+ fn map() { -+ let mut m = MemProducer::new(&b"abcdefghijklabcdabcd"[..], 8); -+ -+ let mut s = StateConsumer { state: ConsumerState::Continue(Move::Consume(0)), parsing_state: State::Initial }; -+ let mut a = MapConsumer::new(&mut s, from_utf8); -+ -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ //assert!(false); -+ } -+ -+ #[derive(Debug)] -+ struct StrConsumer<'a> { -+ state: ConsumerState<&'a str, (), Move> -+ } -+ -+ impl<'a> Consumer<&'a [u8], &'a str, (), Move> for StrConsumer<'a> { -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState<&'a str, (), Move> { -+ match input { -+ Input::Empty | Input::Eof(None) => &self.state, -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ self.state = ConsumerState::Done(Move::Consume(sl.len()), from_utf8(sl).unwrap()); -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &ConsumerState<&'a str, (), Move> { -+ &self.state -+ } -+ } -+ -+ -+ #[test] -+ fn chain() { -+ let mut m = MemProducer::new(&b"abcdefghijklabcdabcd"[..], 8); -+ -+ let mut s1 = StateConsumer { state: ConsumerState::Continue(Move::Consume(0)), parsing_state: State::Initial }; -+ let mut s2 = StrConsumer { state: ConsumerState::Continue(Move::Consume(0)) }; -+ let mut a = ChainConsumer::new(&mut s1, &mut s2); -+ -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ println!("apply {:?}", m.apply(&mut a)); -+ //assert!(false); -+ // -+ //let x = [0, 1, 2, 3, 4]; -+ //let b = [1, 2, 3]; -+ //assert_eq!(&x[1..3], &b[..]); -+ } -+ -+ #[test] -+ fn shift_test() { -+ let mut v = vec![0,1,2,3,4,5]; -+ shift(&mut v, 1, 3); -+ assert_eq!(&v[..2], &[1,2][..]); -+ let mut v2 = vec![0,1,2,3,4,5]; -+ shift(&mut v2, 2, 6); -+ assert_eq!(&v2[..4], &[2,3,4,5][..]); -+ } -+ -+ /*#[derive(Debug)] -+ struct LineConsumer { -+ state: ConsumerState -+ } -+ impl<'a> Consumer<&'a [u8], String, (), Move> for LineConsumer { -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState { -+ match input { -+ Input::Empty | Input::Eof(None) => &self.state, -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ //println!("got slice: {:?}", sl); -+ self.state = match line(sl) { -+ IResult::Incomplete(n) => { -+ println!("line not complete, continue (line was \"{}\")", from_utf8(sl).unwrap()); -+ ConsumerState::Continue(Move::Await(n)) -+ }, -+ IResult::Error(e) => { -+ println!("LineConsumer parsing error: {:?}", e); -+ ConsumerState::Error(()) -+ }, -+ IResult::Done(i,o) => { -+ let res = String::from(from_utf8(o).unwrap()); -+ println!("found: {}", res); -+ //println!("sl: {:?}\ni:{:?}\noffset:{}", sl, i, sl.offset(i)); -+ ConsumerState::Done(Move::Consume(sl.offset(i)), res) -+ } -+ }; -+ -+ &self.state -+ } -+ } -+ -+ } -+ -+ fn state(&self) -> &ConsumerState { -+ &self.state -+ } -+ }*/ -+ -+ fn lf(i:& u8) -> bool { -+ *i == '\n' as u8 -+ } -+ fn to_utf8_string(input:&[u8]) -> String { -+ String::from(from_utf8(input).unwrap()) -+ } -+ -+ //named!(line<&[u8]>, terminated!(take_till!(lf), tag!("\n"))); -+ -+ consumer_from_parser!(LineConsumer, map!(terminated!(take_till!(lf), tag!("\n")), to_utf8_string)); -+ -+ fn get_line(producer: &mut FileProducer, mv: Move) -> Option<(Move,String)> { -+ let mut a = LineConsumer { state: ConsumerState::Continue(mv) }; -+ while let &ConsumerState::Continue(_) = producer.apply(&mut a) { -+ println!("continue"); -+ } -+ -+ if let &ConsumerState::Done(ref m, ref s) = a.state() { -+ Some((m.clone(), s.clone())) -+ } else { -+ None -+ } -+ } -+ -+ #[test] -+ fn file() { -+ let mut f = FileProducer::new("LICENSE", 200).unwrap(); -+ f.refill(); -+ -+ let mut mv = Move::Consume(0); -+ for i in 1..10 { -+ if let Some((m,s)) = get_line(&mut f, mv.clone()) { -+ println!("got line[{}]: {}", i, s); -+ mv = m; -+ } else { -+ assert!(false, "LineConsumer should not have failed"); -+ } -+ } -+ //assert!(false); -+ } -+ -+ #[derive(Debug,Clone,Copy,PartialEq,Eq)] -+ enum SeekState { -+ Begin, -+ SeekedToEnd, -+ ShouldEof, -+ IsEof -+ } -+ -+ #[derive(Debug)] -+ struct SeekingConsumer { -+ state: ConsumerState<(), u8, Move>, -+ position: SeekState -+ } -+ -+ impl SeekingConsumer { -+ fn position(&self) -> SeekState { -+ self.position -+ } -+ } -+ -+ impl<'a> Consumer<&'a [u8], (), u8, Move> for SeekingConsumer { -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState<(), u8, Move> { -+ println!("input: {:?}", input); -+ match self.position { -+ SeekState::Begin => { -+ self.state = ConsumerState::Continue(Move::Seek(SeekFrom::End(-4))); -+ self.position = SeekState::SeekedToEnd; -+ }, -+ SeekState::SeekedToEnd => match input { -+ Input::Element(sl) => { -+ if sl.len() == 4 { -+ self.state = ConsumerState::Continue(Move::Consume(4)); -+ self.position = SeekState::ShouldEof; -+ } else { -+ self.state = ConsumerState::Error(0); -+ } -+ }, -+ Input::Eof(Some(sl)) => { -+ if sl.len() == 4 { -+ self.state = ConsumerState::Done(Move::Consume(4), ()); -+ self.position = SeekState::IsEof; -+ } else { -+ self.state = ConsumerState::Error(1); -+ } -+ }, -+ _ => self.state = ConsumerState::Error(2) -+ }, -+ SeekState::ShouldEof => match input { -+ Input::Eof(Some(sl)) => { -+ if sl.len() == 0 { -+ self.state = ConsumerState::Done(Move::Consume(0), ()); -+ self.position = SeekState::IsEof; -+ } else { -+ self.state = ConsumerState::Error(3); -+ } -+ }, -+ Input::Eof(None) => { -+ self.state = ConsumerState::Done(Move::Consume(0), ()); -+ self.position = SeekState::IsEof; -+ }, -+ _ => self.state = ConsumerState::Error(4) -+ }, -+ _ => self.state = ConsumerState::Error(5) -+ }; -+ &self.state -+ } -+ -+ fn state(&self) -> &ConsumerState<(), u8, Move> { -+ &self.state -+ } -+ } -+ -+ #[test] -+ fn seeking_consumer() { -+ let mut f = FileProducer::new("assets/testfile.txt", 200).unwrap(); -+ f.refill(); -+ -+ let mut a = SeekingConsumer { state: ConsumerState::Continue(Move::Consume(0)), position: SeekState::Begin }; -+ for _ in 1..4 { -+ println!("file apply {:?}", f.apply(&mut a)); -+ } -+ println!("consumer is now: {:?}", a); -+ if let &ConsumerState::Done(Move::Consume(0), ()) = a.state() { -+ println!("end"); -+ } else { -+ println!("invalid state is {:?}", a.state()); -+ assert!(false, "consumer is not at EOF"); -+ } -+ assert_eq!(a.position(), SeekState::IsEof); -+ } -+} -diff --git third_party/rust/nom-1.2.4/src/util.rs third_party/rust/nom-1.2.4/src/util.rs -new file mode 100644 -index 000000000000..e2428ead0a4d ---- /dev/null -+++ third_party/rust/nom-1.2.4/src/util.rs -@@ -0,0 +1,769 @@ -+use internal::{IResult,Err}; -+ -+#[cfg(not(feature = "core"))] -+use std::collections::HashMap; -+ -+#[cfg(feature = "core")] -+use std::prelude::v1::*; -+use std::vec::Vec; -+use std::string::ToString; -+ -+/// useful functions to calculate the offset between slices and show a hexdump of a slice -+#[cfg(not(feature = "core"))] -+pub trait HexDisplay { -+ /// offset between the first byte of self and the first byte of the argument -+ fn offset(&self, second:&[u8]) -> usize;// OFFSET SHOULD GO TO ITS OWN TRAIT -+ -+ /// Converts the value of `self` to a hex dump, returning the owned -+ /// string. -+ fn to_hex(&self, chunk_size: usize) -> String; -+ -+ /// Converts the value of `self` to a hex dump beginning at `from` address, returning the owned -+ /// string. -+ fn to_hex_from(&self, chunk_size: usize, from: usize) -> String; -+} -+ -+pub trait InputLength { -+ #[inline] -+ fn input_len(&self) -> usize; -+} -+ -+impl<'a, T> InputLength for &'a[T] { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+} -+ -+impl<'a> InputLength for &'a str { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+} -+ -+impl<'a> InputLength for (&'a [u8], usize) { -+ #[inline] -+ fn input_len(&self) -> usize { -+ //println!("bit input length for ({:?}, {}):", self.0, self.1); -+ let res = self.0.len() * 8 - self.1; -+ //println!("-> {}", res); -+ res -+ } -+} -+ -+use std::iter::Enumerate; -+#[cfg(not(feature = "core"))] -+use std::str::CharIndices; -+ -+pub trait AsChar { -+ #[inline] -+ fn as_char(self) -> char; -+ #[inline] -+ fn is_alpha(self) -> bool; -+ #[inline] -+ fn is_alphanum(self) -> bool; -+ #[inline] -+ fn is_0_to_9(self) -> bool; -+ #[inline] -+ fn is_hex_digit(self) -> bool; -+ #[inline] -+ fn is_oct_digit(self) -> bool; -+} -+ -+impl<'a> AsChar for &'a u8 { -+ #[inline] -+ fn as_char(self) -> char { *self as char } -+ #[inline] -+ fn is_alpha(self) -> bool { -+ (*self >= 0x41 && *self <= 0x5A) || (*self >= 0x61 && *self <= 0x7A) -+ } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_0_to_9() } -+ #[inline] -+ fn is_0_to_9(self) -> bool { -+ *self >= 0x30 && *self <= 0x39 -+ } -+ #[inline] -+ fn is_hex_digit(self) -> bool { -+ (*self >= 0x30 && *self <= 0x39) || -+ (*self >= 0x41 && *self <= 0x46) || -+ (*self >= 0x61 && *self <= 0x66) -+ } -+ #[inline] -+ fn is_oct_digit(self) -> bool { -+ *self >= 0x30 && *self <= 0x37 -+ } -+} -+ -+impl AsChar for char { -+ #[inline] -+ fn as_char(self) -> char { self } -+ #[inline] -+ fn is_alpha(self) -> bool { self.is_alphabetic() } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_0_to_9() } -+ #[inline] -+ fn is_0_to_9(self) -> bool { self.is_digit(10) } -+ #[inline] -+ fn is_hex_digit(self) -> bool { self.is_digit(16) } -+ #[inline] -+ fn is_oct_digit(self) -> bool { self.is_digit(8) } -+} -+ -+pub trait IterIndices { -+ type Item: AsChar; -+ type Iter : Iterator; -+ fn iter_indices(self) -> Self::Iter; -+} -+ -+impl<'a> IterIndices for &'a [u8] { -+ type Item = &'a u8; -+ type Iter = Enumerate<::std::slice::Iter<'a, u8>>; -+ #[inline] -+ fn iter_indices(self) -> Enumerate<::std::slice::Iter<'a, u8>> { -+ self.iter().enumerate() -+ } -+} -+ -+#[cfg(not(feature = "core"))] -+impl<'a> IterIndices for &'a str { -+ type Item = char; -+ type Iter = CharIndices<'a>; -+ #[inline] -+ fn iter_indices(self) -> CharIndices<'a> { -+ self.char_indices() -+ } -+} -+ -+static CHARS: &'static[u8] = b"0123456789abcdef"; -+ -+#[cfg(not(feature = "core"))] -+impl HexDisplay for [u8] { -+ fn offset(&self, second:&[u8]) -> usize { -+ let fst = self.as_ptr(); -+ let snd = second.as_ptr(); -+ -+ snd as usize - fst as usize -+ } -+ -+ #[allow(unused_variables)] -+ fn to_hex(&self, chunk_size: usize) -> String { -+ self.to_hex_from(chunk_size, 0) -+ } -+ -+ #[allow(unused_variables)] -+ fn to_hex_from(&self, chunk_size: usize, from: usize) -> String { -+ let mut v = Vec::with_capacity(self.len() * 3); -+ let mut i = from; -+ for chunk in self.chunks(chunk_size) { -+ let s = format!("{:08x}", i); -+ for &ch in s.as_bytes().iter() { -+ v.push(ch); -+ } -+ v.push('\t' as u8); -+ -+ i = i + chunk_size; -+ -+ for &byte in chunk { -+ v.push(CHARS[(byte >> 4) as usize]); -+ v.push(CHARS[(byte & 0xf) as usize]); -+ v.push(' ' as u8); -+ } -+ if chunk_size > chunk.len() { -+ for j in 0..(chunk_size - chunk.len()) { -+ v.push(' ' as u8); -+ v.push(' ' as u8); -+ v.push(' ' as u8); -+ } -+ } -+ v.push('\t' as u8); -+ -+ for &byte in chunk { -+ if (byte >=32 && byte <= 126) || byte >= 128 { -+ v.push(byte); -+ } else { -+ v.push('.' as u8); -+ } -+ } -+ v.push('\n' as u8); -+ } -+ -+ String::from_utf8_lossy(&v[..]).into_owned() -+ } -+} -+ -+/// Prints a message if the parser fails -+/// -+/// The message prints the `Error` or `Incomplete` -+/// and the parser's calling code -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # fn main() { -+/// named!(f, dbg!( tag!( "abcd" ) ) ); -+/// -+/// let a = &b"efgh"[..]; -+/// -+/// // Will print the following message: -+/// // Error(Position(0, [101, 102, 103, 104])) at l.5 by ' tag ! ( "abcd" ) ' -+/// f(a); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! dbg ( -+ ($i: expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let l = line!(); -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(a) => { -+ println!("Error({:?}) at l.{} by ' {} '", a, l, stringify!($submac!($($args)*))); -+ $crate::IResult::Error(a) -+ }, -+ $crate::IResult::Incomplete(a) => { -+ println!("Incomplete({:?}) at {} by ' {} '", a, l, stringify!($submac!($($args)*))); -+ $crate::IResult::Incomplete(a) -+ }, -+ a => a -+ } -+ } -+ ); -+ -+ ($i:expr, $f:ident) => ( -+ dbg!($i, call!($f)); -+ ); -+); -+ -+/// Prints a message and the input if the parser fails -+/// -+/// The message prints the `Error` or `Incomplete` -+/// and the parser's calling code. -+/// -+/// It also displays the input in hexdump format -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # fn main() { -+/// named!(f, dbg_dmp!( tag!( "abcd" ) ) ); -+/// -+/// let a = &b"efghijkl"[..]; -+/// -+/// // Will print the following message: -+/// // Error(Position(0, [101, 102, 103, 104, 105, 106, 107, 108])) at l.5 by ' tag ! ( "abcd" ) ' -+/// // 00000000 65 66 67 68 69 6a 6b 6c efghijkl -+/// f(a); -+/// # } -+#[macro_export] -+macro_rules! dbg_dmp ( -+ ($i: expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::HexDisplay; -+ let l = line!(); -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(a) => { -+ println!("Error({:?}) at l.{} by ' {} '\n{}", a, l, stringify!($submac!($($args)*)), $i.to_hex(8)); -+ $crate::IResult::Error(a) -+ }, -+ $crate::IResult::Incomplete(a) => { -+ println!("Incomplete({:?}) at {} by ' {} '\n{}", a, l, stringify!($submac!($($args)*)), $i.to_hex(8)); -+ $crate::IResult::Incomplete(a) -+ }, -+ a => a -+ } -+ } -+ ); -+ -+ ($i:expr, $f:ident) => ( -+ dbg_dmp!($i, call!($f)); -+ ); -+); -+ -+pub fn error_to_list(e:&Err) -> Vec> { -+ let mut v:Vec> = Vec::new(); -+ let mut err = e; -+ loop { -+ match *err { -+ Err::Code(ref i) | Err::Position(ref i,_) => { -+ v.push(i.clone()); -+ return v; -+ }, -+ Err::Node(ref i, ref next) | Err::NodePosition(ref i, _, ref next) => { -+ v.push(i.clone()); -+ err = &*next; -+ } -+ } -+ } -+} -+ -+pub fn compare_error_paths(e1:&Err, e2:&Err) -> bool { -+ error_to_list(e1) == error_to_list(e2) -+} -+ -+ -+#[cfg(not(feature = "core"))] -+use std::hash::Hash; -+ -+#[cfg(not(feature = "core"))] -+pub fn add_error_pattern<'a,I,O,E: Clone+Hash+Eq>(h: &mut HashMap>, &'a str>, res: IResult, message: &'a str) -> bool { -+ if let IResult::Error(e) = res { -+ h.insert(error_to_list(&e), message); -+ true -+ } else { -+ false -+ } -+} -+ -+pub fn slice_to_offsets(input: &[u8], s: &[u8]) -> (usize, usize) { -+ let start = input.as_ptr(); -+ let off1 = s.as_ptr() as usize - start as usize; -+ let off2 = off1 + s.len(); -+ (off1, off2) -+} -+ -+#[cfg(not(feature = "core"))] -+pub fn prepare_errors(input: &[u8], res: IResult<&[u8],O,E>) -> Option, usize, usize)> > { -+ if let IResult::Error(e) = res { -+ let mut v:Vec<(ErrorKind, usize, usize)> = Vec::new(); -+ let mut err = e.clone(); -+ loop { -+ match err { -+ Err::Position(i,s) => { -+ let (o1, o2) = slice_to_offsets(input, s); -+ v.push((i, o1, o2)); -+ //println!("v is: {:?}", v); -+ break; -+ }, -+ Err::NodePosition(i, s, next) => { -+ let (o1, o2) = slice_to_offsets(input, s); -+ v.push((i, o1, o2)); -+ err = *next; -+ }, -+ Err::Node(_, next) => { -+ err = *next; -+ }, -+ Err::Code(_) => { -+ break; -+ } -+ } -+ } -+ v.sort_by(|a, b| a.1.cmp(&b.1)); -+ Some(v) -+ } else { -+ None -+ } -+} -+ -+#[cfg(not(feature = "core"))] -+pub fn print_error(input: &[u8], res: IResult<&[u8],O,E>) { -+ if let Some(v) = prepare_errors(input, res) { -+ let colors = generate_colors(&v); -+ println!("parser codes: {}", print_codes(colors, HashMap::new())); -+ println!("{}", print_offsets(input, 0, &v)); -+ -+ } else { -+ println!("not an error"); -+ } -+} -+ -+#[cfg(not(feature = "core"))] -+pub fn generate_colors(v: &[(ErrorKind, usize, usize)]) -> HashMap { -+ let mut h: HashMap = HashMap::new(); -+ let mut color = 0; -+ -+ for &(ref c,_,_) in v.iter() { -+ h.insert(error_to_u32(c), color + 31); -+ color = color + 1 % 7; -+ } -+ -+ h -+} -+ -+pub fn code_from_offset(v: &[(ErrorKind, usize, usize)], offset: usize) -> Option { -+ let mut acc: Option<(u32, usize, usize)> = None; -+ for &(ref ek, s, e) in v.iter() { -+ let c = error_to_u32(ek); -+ if s <= offset && offset <=e { -+ if let Some((_, start, end)) = acc { -+ if start <= s && e <= end { -+ acc = Some((c, s, e)); -+ } -+ } else { -+ acc = Some((c, s, e)); -+ } -+ } -+ } -+ if let Some((code, _, _)) = acc { -+ return Some(code); -+ } else { -+ return None; -+ } -+} -+ -+pub fn reset_color(v: &mut Vec) { -+ v.push(0x1B); -+ v.push('[' as u8); -+ v.push(0); -+ v.push('m' as u8); -+} -+ -+pub fn write_color(v: &mut Vec, color: u8) { -+ v.push(0x1B); -+ v.push('[' as u8); -+ v.push(1); -+ v.push(';' as u8); -+ let s = color.to_string(); -+ let bytes = s.as_bytes(); -+ v.extend(bytes.iter().cloned()); -+ v.push('m' as u8); -+} -+ -+#[cfg(not(feature = "core"))] -+pub fn print_codes(colors: HashMap, names: HashMap) -> String { -+ let mut v = Vec::new(); -+ for (code, &color) in &colors { -+ if let Some(&s) = names.get(&code) { -+ let bytes = s.as_bytes(); -+ write_color(&mut v, color); -+ v.extend(bytes.iter().cloned()); -+ } else { -+ let s = code.to_string(); -+ let bytes = s.as_bytes(); -+ write_color(&mut v, color); -+ v.extend(bytes.iter().cloned()); -+ } -+ reset_color(&mut v); -+ v.push(' ' as u8); -+ } -+ reset_color(&mut v); -+ -+ String::from_utf8_lossy(&v[..]).into_owned() -+} -+ -+#[cfg(not(feature = "core"))] -+pub fn print_offsets(input: &[u8], from: usize, offsets: &[(ErrorKind, usize, usize)]) -> String { -+ let mut v = Vec::with_capacity(input.len() * 3); -+ let mut i = from; -+ let chunk_size = 8; -+ let mut current_code: Option = None; -+ let mut current_code2: Option = None; -+ -+ let colors = generate_colors(&offsets); -+ -+ for chunk in input.chunks(chunk_size) { -+ let s = format!("{:08x}", i); -+ for &ch in s.as_bytes().iter() { -+ v.push(ch); -+ } -+ v.push('\t' as u8); -+ -+ let mut k = i; -+ let mut l = i; -+ for &byte in chunk { -+ if let Some(code) = code_from_offset(&offsets, k) { -+ if let Some(current) = current_code { -+ if current != code { -+ reset_color(&mut v); -+ current_code = Some(code); -+ if let Some(&color) = colors.get(&code) { -+ write_color(&mut v, color); -+ } -+ } -+ } else { -+ current_code = Some(code); -+ if let Some(&color) = colors.get(&code) { -+ write_color(&mut v, color); -+ } -+ } -+ } -+ v.push(CHARS[(byte >> 4) as usize]); -+ v.push(CHARS[(byte & 0xf) as usize]); -+ v.push(' ' as u8); -+ k = k + 1; -+ } -+ -+ reset_color(&mut v); -+ -+ if chunk_size > chunk.len() { -+ for _ in 0..(chunk_size - chunk.len()) { -+ v.push(' ' as u8); -+ v.push(' ' as u8); -+ v.push(' ' as u8); -+ } -+ } -+ v.push('\t' as u8); -+ -+ for &byte in chunk { -+ if let Some(code) = code_from_offset(&offsets, l) { -+ if let Some(current) = current_code2 { -+ if current != code { -+ reset_color(&mut v); -+ current_code2 = Some(code); -+ if let Some(&color) = colors.get(&code) { -+ write_color(&mut v, color); -+ } -+ } -+ } else { -+ current_code2 = Some(code); -+ if let Some(&color) = colors.get(&code) { -+ write_color(&mut v, color); -+ } -+ } -+ } -+ if (byte >=32 && byte <= 126) || byte >= 128 { -+ v.push(byte); -+ } else { -+ v.push('.' as u8); -+ } -+ l = l + 1; -+ } -+ reset_color(&mut v); -+ -+ v.push('\n' as u8); -+ i = i + chunk_size; -+ } -+ -+ String::from_utf8_lossy(&v[..]).into_owned() -+} -+ -+pub trait AsBytes { -+ fn as_bytes(&self) -> &[u8]; -+} -+ -+impl<'a> AsBytes for &'a str { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ str::as_bytes(self) -+ } -+} -+ -+impl AsBytes for str { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ str::as_bytes(self) -+ } -+} -+ -+impl<'a> AsBytes for &'a [u8] { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ *self -+ } -+} -+ -+impl AsBytes for [u8] { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ self -+ } -+} -+ -+macro_rules! array_impls { -+ ($($N:expr)+) => { -+ $( -+ impl<'a> AsBytes for &'a [u8; $N] { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ *self -+ } -+ } -+ -+ impl AsBytes for [u8; $N] { -+ #[inline(always)] -+ fn as_bytes(&self) -> &[u8] { -+ self -+ } -+ } -+ )+ -+ }; -+} -+ -+ -+array_impls! { -+ 0 1 2 3 4 5 6 7 8 9 -+ 10 11 12 13 14 15 16 17 18 19 -+ 20 21 22 23 24 25 26 27 28 29 -+ 30 31 32 -+} -+ -+/// indicates which parser returned an error -+#[derive(Debug,PartialEq,Eq,Hash,Clone)] -+pub enum ErrorKind { -+ Custom(E), -+ Tag, -+ MapRes, -+ MapOpt, -+ Alt, -+ IsNot, -+ IsA, -+ SeparatedList, -+ SeparatedNonEmptyList, -+ Many0, -+ Many1, -+ Count, -+ TakeUntilAndConsume, -+ TakeUntil, -+ TakeUntilEitherAndConsume, -+ TakeUntilEither, -+ LengthValue, -+ TagClosure, -+ Alpha, -+ Digit, -+ HexDigit, -+ OctDigit, -+ AlphaNumeric, -+ Space, -+ MultiSpace, -+ LengthValueFn, -+ Eof, -+ ExprOpt, -+ ExprRes, -+ CondReduce, -+ Switch, -+ TagBits, -+ OneOf, -+ NoneOf, -+ Char, -+ CrLf, -+ RegexpMatch, -+ RegexpMatches, -+ RegexpFind, -+ RegexpCapture, -+ RegexpCaptures, -+ TakeWhile1, -+ Complete, -+ Fix, -+ Escaped, -+ EscapedTransform, -+ TagStr, -+ IsNotStr, -+ IsAStr, -+ TakeWhile1Str, -+ NonEmpty, -+ ManyMN, -+ TakeUntilAndConsumeStr, -+ TakeUntilStr, -+ Not -+} -+ -+pub fn error_to_u32(e: &ErrorKind) -> u32 { -+ match *e { -+ ErrorKind::Custom(_) => 0, -+ ErrorKind::Tag => 1, -+ ErrorKind::MapRes => 2, -+ ErrorKind::MapOpt => 3, -+ ErrorKind::Alt => 4, -+ ErrorKind::IsNot => 5, -+ ErrorKind::IsA => 6, -+ ErrorKind::SeparatedList => 7, -+ ErrorKind::SeparatedNonEmptyList => 8, -+ ErrorKind::Many1 => 9, -+ ErrorKind::Count => 10, -+ ErrorKind::TakeUntilAndConsume => 11, -+ ErrorKind::TakeUntil => 12, -+ ErrorKind::TakeUntilEitherAndConsume => 13, -+ ErrorKind::TakeUntilEither => 14, -+ ErrorKind::LengthValue => 15, -+ ErrorKind::TagClosure => 16, -+ ErrorKind::Alpha => 17, -+ ErrorKind::Digit => 18, -+ ErrorKind::AlphaNumeric => 19, -+ ErrorKind::Space => 20, -+ ErrorKind::MultiSpace => 21, -+ ErrorKind::LengthValueFn => 22, -+ ErrorKind::Eof => 23, -+ ErrorKind::ExprOpt => 24, -+ ErrorKind::ExprRes => 25, -+ ErrorKind::CondReduce => 26, -+ ErrorKind::Switch => 27, -+ ErrorKind::TagBits => 28, -+ ErrorKind::OneOf => 29, -+ ErrorKind::NoneOf => 30, -+ ErrorKind::Char => 40, -+ ErrorKind::CrLf => 41, -+ ErrorKind::RegexpMatch => 42, -+ ErrorKind::RegexpMatches => 43, -+ ErrorKind::RegexpFind => 44, -+ ErrorKind::RegexpCapture => 45, -+ ErrorKind::RegexpCaptures => 46, -+ ErrorKind::TakeWhile1 => 47, -+ ErrorKind::Complete => 48, -+ ErrorKind::Fix => 49, -+ ErrorKind::Escaped => 50, -+ ErrorKind::EscapedTransform => 51, -+ ErrorKind::TagStr => 52, -+ ErrorKind::IsNotStr => 53, -+ ErrorKind::IsAStr => 54, -+ ErrorKind::TakeWhile1Str => 55, -+ ErrorKind::NonEmpty => 56, -+ ErrorKind::ManyMN => 57, -+ ErrorKind::TakeUntilAndConsumeStr => 58, -+ ErrorKind::HexDigit => 59, -+ ErrorKind::TakeUntilStr => 60, -+ ErrorKind::OctDigit => 61, -+ ErrorKind::Many0 => 62, -+ ErrorKind::Not => 63, -+ } -+} -+ -+ impl ErrorKind { -+ pub fn description(&self) -> &str { -+ match *self { -+ ErrorKind::Custom(_) => "Custom error", -+ ErrorKind::Tag => "Tag", -+ ErrorKind::MapRes => "Map on Result", -+ ErrorKind::MapOpt => "Map on Option", -+ ErrorKind::Alt => "Alternative", -+ ErrorKind::IsNot => "IsNot", -+ ErrorKind::IsA => "IsA", -+ ErrorKind::SeparatedList => "Separated list", -+ ErrorKind::SeparatedNonEmptyList => "Separated non empty list", -+ ErrorKind::Many0 => "Many0", -+ ErrorKind::Many1 => "Many1", -+ ErrorKind::Count => "Count", -+ ErrorKind::TakeUntilAndConsume => "Take until and consume", -+ ErrorKind::TakeUntil => "Take until", -+ ErrorKind::TakeUntilEitherAndConsume => "Take until either and consume", -+ ErrorKind::TakeUntilEither => "Take until either", -+ ErrorKind::LengthValue => "Length followed by value", -+ ErrorKind::TagClosure => "Tag closure", -+ ErrorKind::Alpha => "Alphabetic", -+ ErrorKind::Digit => "Digit", -+ ErrorKind::AlphaNumeric => "AlphaNumeric", -+ ErrorKind::Space => "Space", -+ ErrorKind::MultiSpace => "Multiple spaces", -+ ErrorKind::LengthValueFn => "LengthValueFn", -+ ErrorKind::Eof => "End of file", -+ ErrorKind::ExprOpt => "Evaluate Option", -+ ErrorKind::ExprRes => "Evaluate Result", -+ ErrorKind::CondReduce => "Condition reduce", -+ ErrorKind::Switch => "Switch", -+ ErrorKind::TagBits => "Tag on bitstream", -+ ErrorKind::OneOf => "OneOf", -+ ErrorKind::NoneOf => "NoneOf", -+ ErrorKind::Char => "Char", -+ ErrorKind::CrLf => "CrLf", -+ ErrorKind::RegexpMatch => "RegexpMatch", -+ ErrorKind::RegexpMatches => "RegexpMatches", -+ ErrorKind::RegexpFind => "RegexpFind", -+ ErrorKind::RegexpCapture => "RegexpCapture", -+ ErrorKind::RegexpCaptures => "RegexpCaptures", -+ ErrorKind::TakeWhile1 => "TakeWhile1", -+ ErrorKind::Complete => "Complete", -+ ErrorKind::Fix => "Fix", -+ ErrorKind::Escaped => "Escaped", -+ ErrorKind::EscapedTransform => "EscapedTransform", -+ ErrorKind::TagStr => "Tag on strings", -+ ErrorKind::IsNotStr => "IsNot on strings", -+ ErrorKind::IsAStr => "IsA on strings", -+ ErrorKind::TakeWhile1Str => "TakeWhile1 on strings", -+ ErrorKind::NonEmpty => "NonEmpty", -+ ErrorKind::ManyMN => "Many(m, n)", -+ ErrorKind::TakeUntilAndConsumeStr => "Take until and consume on strings", -+ ErrorKind::HexDigit => "Hexadecimal Digit", -+ ErrorKind::TakeUntilStr => "Take until on strings", -+ ErrorKind::OctDigit => "Octal digit", -+ ErrorKind::Not => "Negation", -+ } -+ -+ } -+ } -diff --git third_party/rust/nom-1.2.4/tests/arithmetic.rs third_party/rust/nom-1.2.4/tests/arithmetic.rs -new file mode 100644 -index 000000000000..eea990fb07cf ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/arithmetic.rs -@@ -0,0 +1,80 @@ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,digit, multispace}; -+ -+use std::str; -+use std::str::FromStr; -+ -+named!(parens, delimited!( -+ delimited!(opt!(multispace), tag!("("), opt!(multispace)), -+ expr, -+ delimited!(opt!(multispace), tag!(")"), opt!(multispace)) -+ ) -+); -+ -+named!(factor, alt!( -+ map_res!( -+ map_res!( -+ delimited!(opt!(multispace), digit, opt!(multispace)), -+ str::from_utf8 -+ ), -+ FromStr::from_str -+ ) -+ | parens -+ ) -+); -+ -+named!(term , chain!( -+ mut acc: factor ~ -+ many0!( -+ alt!( -+ tap!(mul: preceded!(tag!("*"), factor) => acc = acc * mul) | -+ tap!(div: preceded!(tag!("/"), factor) => acc = acc / div) -+ ) -+ ), -+ || { return acc } -+ ) -+); -+ -+named!(expr , chain!( -+ mut acc: term ~ -+ many0!( -+ alt!( -+ tap!(add: preceded!(tag!("+"), term) => acc = acc + add) | -+ tap!(sub: preceded!(tag!("-"), term) => acc = acc - sub) -+ ) -+ ), -+ || { return acc } -+ ) -+); -+ -+#[test] -+fn factor_test() { -+ assert_eq!(factor(&b"3"[..]), IResult::Done(&b""[..], 3)); -+ assert_eq!(factor(&b" 12"[..]), IResult::Done(&b""[..], 12)); -+ assert_eq!(factor(&b"537 "[..]), IResult::Done(&b""[..], 537)); -+ assert_eq!(factor(&b" 24 "[..]), IResult::Done(&b""[..], 24)); -+} -+ -+ -+#[test] -+fn term_test() { -+ assert_eq!(term(&b" 12 *2 / 3"[..]), IResult::Done(&b""[..], 8)); -+ assert_eq!(term(&b" 2* 3 *2 *2 / 3"[..]), IResult::Done(&b""[..], 8)); -+ assert_eq!(term(&b" 48 / 3/2"[..]), IResult::Done(&b""[..], 8)); -+} -+ -+#[test] -+fn expr_test() { -+ assert_eq!(expr(&b" 1 + 2 "[..]), IResult::Done(&b""[..], 3)); -+ assert_eq!(expr(&b" 12 + 6 - 4+ 3"[..]), IResult::Done(&b""[..], 17)); -+ assert_eq!(expr(&b" 1 + 2*3 + 4"[..]), IResult::Done(&b""[..], 11)); -+} -+ -+#[test] -+fn parens_test() { -+ assert_eq!(expr(&b" ( 2 )"[..]), IResult::Done(&b""[..], 2)); -+ assert_eq!(expr(&b" 2* ( 3 + 4 ) "[..]), IResult::Done(&b""[..], 14)); -+ assert_eq!(expr(&b" 2*2 / ( 5 - 1) + 3"[..]), IResult::Done(&b""[..], 4)); -+} -diff --git third_party/rust/nom-1.2.4/tests/arithmetic_ast.rs third_party/rust/nom-1.2.4/tests/arithmetic_ast.rs -new file mode 100644 -index 000000000000..9a8956936ff8 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/arithmetic_ast.rs -@@ -0,0 +1,137 @@ -+#[macro_use] -+extern crate nom; -+ -+use std::fmt; -+use std::fmt::{Display, Debug, Formatter}; -+ -+use std::str; -+use std::str::FromStr; -+ -+use nom::{IResult, digit, multispace}; -+ -+pub enum Expr { -+ Value(i64), -+ Add(Box, Box), -+ Sub(Box, Box), -+ Mul(Box, Box), -+ Div(Box, Box), -+ Paren(Box), -+} -+ -+pub enum Oper { -+ Add, -+ Sub, -+ Mul, -+ Div, -+} -+ -+impl Display for Expr { -+ fn fmt(&self, format: &mut Formatter) -> fmt::Result { -+ use self::Expr::*; -+ match *self { -+ Value(val) => write!(format, "{}", val), -+ Add(ref left, ref right) => write!(format, "{} + {}", left, right), -+ Sub(ref left, ref right) => write!(format, "{} - {}", left, right), -+ Mul(ref left, ref right) => write!(format, "{} * {}", left, right), -+ Div(ref left, ref right) => write!(format, "{} / {}", left, right), -+ Paren(ref expr) => write!(format, "({})", expr), -+ } -+ } -+} -+ -+impl Debug for Expr { -+ fn fmt(&self, format: &mut Formatter) -> fmt::Result { -+ use self::Expr::*; -+ match *self { -+ Value(val) => write!(format, "{}", val), -+ Add(ref left, ref right) => write!(format, "({:?} + {:?})", left, right), -+ Sub(ref left, ref right) => write!(format, "({:?} - {:?})", left, right), -+ Mul(ref left, ref right) => write!(format, "({:?} * {:?})", left, right), -+ Div(ref left, ref right) => write!(format, "({:?} / {:?})", left, right), -+ Paren(ref expr) => write!(format, "[{:?}]", expr), -+ } -+ } -+} -+ -+named!(parens< Expr >, delimited!( -+ delimited!(opt!(multispace), tag!("("), opt!(multispace)), -+ map!(map!(expr, Box::new), Expr::Paren), -+ delimited!(opt!(multispace), tag!(")"), opt!(multispace)) -+ ) -+); -+ -+named!(factor< Expr >, alt_complete!( -+ map!( -+ map_res!( -+ map_res!( -+ delimited!(opt!(multispace), digit, opt!(multispace)), -+ str::from_utf8 -+ ), -+ FromStr::from_str -+ ), -+ Expr::Value) -+ | parens -+ ) -+); -+ -+fn fold_exprs(initial: Expr, remainder: Vec<(Oper, Expr)>) -> Expr { -+ remainder.into_iter().fold(initial, |acc, pair| { -+ let (oper, expr) = pair; -+ match oper { -+ Oper::Add => Expr::Add(Box::new(acc), Box::new(expr)), -+ Oper::Sub => Expr::Sub(Box::new(acc), Box::new(expr)), -+ Oper::Mul => Expr::Mul(Box::new(acc), Box::new(expr)), -+ Oper::Div => Expr::Div(Box::new(acc), Box::new(expr)), -+ } -+ }) -+} -+ -+named!(term< Expr >, chain!( -+ initial: factor ~ -+ remainder: many0!( -+ alt!( -+ chain!(tag!("*") ~ mul: factor, || { (Oper::Mul, mul) }) | -+ chain!(tag!("/") ~ div: factor, || { (Oper::Div, div) }) -+ ) -+ ), -+ || fold_exprs(initial, remainder)) -+); -+ -+named!(expr< Expr >, chain!( -+ initial: term ~ -+ remainder: many0!( -+ alt!( -+ chain!(tag!("+") ~ add: term, || { (Oper::Add, add) }) | -+ chain!(tag!("-") ~ sub: term, || { (Oper::Sub, sub) }) -+ ) -+ ), -+ || fold_exprs(initial, remainder)) -+); -+ -+#[test] -+fn factor_test() { -+ assert_eq!(factor(&b" 3 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("3"))); -+} -+ -+#[test] -+fn term_test() { -+ assert_eq!(term(&b" 3 * 5 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("(3 * 5)"))); -+} -+ -+#[test] -+fn expr_test() { -+ assert_eq!(expr(&b" 1 + 2 * 3 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("(1 + (2 * 3))"))); -+ assert_eq!(expr(&b" 1 + 2 * 3 / 4 - 5 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("((1 + ((2 * 3) / 4)) - 5)"))); -+ assert_eq!(expr(&b" 72 / 2 / 3 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("((72 / 2) / 3)"))); -+} -+ -+#[test] -+fn parens_test() { -+ assert_eq!(expr(&b" ( 1 + 2 ) * 3 "[..]).map(|x| format!("{:?}", x)), -+ IResult::Done(&b""[..], String::from("([(1 + 2)] * 3)"))); -+} -diff --git third_party/rust/nom-1.2.4/tests/cross_function_backtracking.rs third_party/rust/nom-1.2.4/tests/cross_function_backtracking.rs -new file mode 100644 -index 000000000000..592670c43999 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/cross_function_backtracking.rs -@@ -0,0 +1,140 @@ -+/// this file tests a different backtracking behaviour. With the current -+/// `error!` macro, an early return is done in the current function, but -+/// backtracking continues normally outside of that function. -+/// -+/// The solution here wraps `IResult` in a `Result`: a `Ok` indicates usual -+/// backtracking, `Err` indicates that we must "cut". -+ -+#[macro_use] -+extern crate nom; -+ -+macro_rules! n ( -+ ($name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> std::result::Result, nom::Err<$i, u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ ($name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> std::result::Result, nom::Err<$i, $e>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ ($name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: $i ) -> std::result::Result, nom::Err<$i, u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ ($name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( i: &'a[u8] ) -> std::result::Result, nom::Err<&'a [u8], u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ ($name:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name( i: &[u8] ) -> std::result::Result, nom::Err<&[u8], u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ (pub $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> std::result::Result, nom::Err<$i, u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ (pub $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> std::result::Result, nom::Err<$i, $e>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ (pub $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: $i ) -> std::result::Result, nom::Err<$i, u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ (pub $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name( i: &[u8] ) -> std::result::Result, nom::Err<&[u8], u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+ (pub $name:ident, $submac:ident!( $($args:tt)* )) => ( -+ pub fn $name<'a>( i: &'a [u8] ) -> std::result::Result, nom::Err<&[u8], u32>> { -+ std::result::Result::Ok($submac!(i, $($args)*)) -+ } -+ ); -+); -+ -+macro_rules! cut ( -+ ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let cl = || { -+ Ok($submac!($i, $($args)*)) -+ }; -+ -+ match cl() { -+ std::result::Result::Ok(nom::IResult::Incomplete(x)) => nom::IResult::Incomplete(x), -+ std::result::Result::Ok(nom::IResult::Done(i, o)) => nom::IResult::Done(i, o), -+ std::result::Result::Ok(nom::IResult::Error(e)) | std::result::Result::Err(e) => { -+ return std::result::Result::Err(nom::Err::NodePosition($code, $i, Box::new(e))) -+ } -+ } -+ } -+ ); -+ ($i:expr, $code:expr, $f:expr) => ( -+ cut!($i, $code, call!($f)); -+ ); -+); -+ -+macro_rules! c ( -+ ($i:expr, $f:expr) => ( -+ { -+ match $f($i) { -+ std::result::Result::Ok(nom::IResult::Incomplete(x)) => nom::IResult::Incomplete(x), -+ std::result::Result::Ok(nom::IResult::Done(i, o)) => nom::IResult::Done(i, o), -+ std::result::Result::Ok(nom::IResult::Error(e)) => nom::IResult::Error(e), -+ std::result::Result::Err(e) => { -+ return std::result::Result::Err(e) -+ } -+ } -+ } -+ ); -+); -+ -+n!(pub foo< bool >, -+ chain!( -+ tag!("a") ~ -+ cut!(nom::ErrorKind::Custom(42),dbg_dmp!(tag!("b"))) , -+ || { true } -+ ) -+); -+ -+n!(pub foos< Vec >, -+ delimited!( -+ tag!("("), -+ many0!(c!(foo)), -+ tag!(")") -+ ) -+); -+ -+#[test] -+fn test_ok() { -+ let r = foos(b"(abab)"); -+ println!("result: {:?}", r); -+ match r { -+ Ok(nom::IResult::Done(_,result)) => assert_eq!(result,vec![true,true]), -+ res => panic!("Oops {:?}.",res) -+ } -+} -+ -+#[test] -+fn test_err() { -+ let input = b"(ac)"; -+ let r = foos(&input[..]); -+ println!("result: {:?}", r); -+ match r { -+ //Ok(nom::IResult::Error(nom::Err::Position(kind,_))) => assert_eq!(kind,nom::ErrorKind::Custom(42)), -+ Err(nom::Err::NodePosition(kind, position, _)) => { -+ assert_eq!(kind, nom::ErrorKind::Custom(42)); -+ assert_eq!(position, &input[2..]); -+ } -+ res => panic!("Oops, {:?}",res) -+ } -+} -+ -diff --git third_party/rust/nom-1.2.4/tests/ini.rs third_party/rust/nom-1.2.4/tests/ini.rs -new file mode 100644 -index 000000000000..a3a33431bf02 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/ini.rs -@@ -0,0 +1,234 @@ -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,not_line_ending, space, alphanumeric, multispace}; -+ -+use std::str; -+use std::collections::HashMap; -+ -+named!(category<&str>, map_res!( -+ terminated!( -+ delimited!(tag!("["), take_until!("]"), tag!("]")), -+ opt!(multispace) -+ ), -+ str::from_utf8 -+)); -+ -+named!(key_value <&[u8],(&str,&str)>, -+ chain!( -+ key: map_res!(alphanumeric, std::str::from_utf8) ~ -+ space? ~ -+ tag!("=") ~ -+ space? ~ -+ val: map_res!( -+ take_until_either!("\n;"), -+ str::from_utf8 -+ ) ~ -+ space? ~ -+ chain!( -+ tag!(";") ~ -+ not_line_ending , -+ ||{} -+ ) ? ~ -+ multispace? , -+ ||{(key, val)} -+ ) -+); -+ -+ -+named!(keys_and_values_aggregator<&[u8], Vec<(&str,&str)> >, many0!(key_value)); -+ -+fn keys_and_values(input:&[u8]) -> IResult<&[u8], HashMap<&str, &str> > { -+ let mut h: HashMap<&str, &str> = HashMap::new(); -+ -+ match keys_and_values_aggregator(input) { -+ IResult::Done(i,tuple_vec) => { -+ for &(k,v) in &tuple_vec { -+ h.insert(k, v); -+ } -+ IResult::Done(i, h) -+ }, -+ IResult::Incomplete(a) => IResult::Incomplete(a), -+ IResult::Error(a) => IResult::Error(a) -+ } -+} -+ -+named!(category_and_keys<&[u8],(&str,HashMap<&str,&str>)>, -+ chain!( -+ category: category ~ -+ keys: keys_and_values , -+ move ||{(category, keys)} -+ ) -+); -+ -+named!(categories_aggregator<&[u8], Vec<(&str, HashMap<&str,&str>)> >, many0!(category_and_keys)); -+ -+fn categories(input: &[u8]) -> IResult<&[u8], HashMap<&str, HashMap<&str, &str> > > { -+ let mut h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -+ -+ match categories_aggregator(input) { -+ IResult::Done(i,tuple_vec) => { -+ for &(k,ref v) in &tuple_vec { -+ h.insert(k, v.clone()); -+ } -+ IResult::Done(i, h) -+ }, -+ IResult::Incomplete(a) => IResult::Incomplete(a), -+ IResult::Error(a) => IResult::Error(a) -+ } -+} -+ -+#[test] -+fn parse_category_test() { -+ let ini_file = &b"[category] -+ -+parameter=value -+key = value2"[..]; -+ -+ let ini_without_category = &b"parameter=value -+key = value2"[..]; -+ -+ let res = category(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, o) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_category, "category")); -+} -+ -+#[test] -+fn parse_key_value_test() { -+ let ini_file = &b"parameter=value -+key = value2"[..]; -+ -+ let ini_without_key_value = &b"key = value2"[..]; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+ -+#[test] -+fn parse_key_value_with_space_test() { -+ let ini_file = &b"parameter = value -+key = value2"[..]; -+ -+ let ini_without_key_value = &b"key = value2"[..]; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+#[test] -+fn parse_key_value_with_comment_test() { -+ let ini_file = &b"parameter=value;abc -+key = value2"[..]; -+ -+ let ini_without_key_value = &b"key = value2"[..]; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+#[test] -+fn parse_multiple_keys_and_values_test() { -+ let ini_file = &b"parameter=value;abc -+ -+key = value2 -+ -+[category]"[..]; -+ -+ let ini_without_key_value = &b"[category]"[..]; -+ -+ let res = keys_and_values(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o), -+ _ => println!("error") -+ } -+ -+ let mut expected: HashMap<&str, &str> = HashMap::new(); -+ expected.insert("parameter", "value"); -+ expected.insert("key", "value2"); -+ assert_eq!(res, IResult::Done(ini_without_key_value, expected)); -+} -+ -+#[test] -+fn parse_category_then_multiple_keys_and_values_test() { -+ //FIXME: there can be an empty line or a comment line after a category -+ let ini_file = &b"[abcd] -+parameter=value;abc -+ -+key = value2 -+ -+[category]"[..]; -+ -+ let ini_after_parser = &b"[category]"[..]; -+ -+ let res = category_and_keys(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o), -+ _ => println!("error") -+ } -+ -+ let mut expected_h: HashMap<&str, &str> = HashMap::new(); -+ expected_h.insert("parameter", "value"); -+ expected_h.insert("key", "value2"); -+ assert_eq!(res, IResult::Done(ini_after_parser, ("abcd", expected_h))); -+} -+ -+#[test] -+fn parse_multiple_categories_test() { -+ let ini_file = &b"[abcd] -+ -+parameter=value;abc -+ -+key = value2 -+ -+[category] -+parameter3=value3 -+key4 = value4 -+"[..]; -+ -+ let ini_after_parser = &b""[..]; -+ -+ let res = categories(ini_file); -+ //println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o), -+ _ => println!("error") -+ } -+ -+ let mut expected_1: HashMap<&str, &str> = HashMap::new(); -+ expected_1.insert("parameter", "value"); -+ expected_1.insert("key", "value2"); -+ let mut expected_2: HashMap<&str, &str> = HashMap::new(); -+ expected_2.insert("parameter3", "value3"); -+ expected_2.insert("key4", "value4"); -+ let mut expected_h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -+ expected_h.insert("abcd", expected_1); -+ expected_h.insert("category", expected_2); -+ assert_eq!(res, IResult::Done(ini_after_parser, expected_h)); -+} -diff --git third_party/rust/nom-1.2.4/tests/ini_str.rs third_party/rust/nom-1.2.4/tests/ini_str.rs -new file mode 100644 -index 000000000000..c69756dc2aca ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/ini_str.rs -@@ -0,0 +1,251 @@ -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::IResult; -+ -+use std::collections::HashMap; -+ -+fn is_alphabetic(chr:char) -> bool { -+ (chr as u8 >= 0x41 && chr as u8 <= 0x5A) || (chr as u8 >= 0x61 && chr as u8 <= 0x7A) -+} -+ -+fn is_digit(chr: char) -> bool { -+ chr as u8 >= 0x30 && chr as u8 <= 0x39 -+} -+ -+fn is_alphanumeric(chr: char) -> bool { -+ is_alphabetic(chr) || is_digit(chr) -+} -+ -+fn is_space(chr:char) -> bool { -+ chr == ' ' || chr == '\t' -+} -+ -+fn is_line_ending_or_comment(chr:char) -> bool { -+ chr == ';' || chr == '\n' -+} -+ -+named!(alphanumeric<&str,&str>, take_while_s!(is_alphanumeric)); -+named!(not_line_ending<&str,&str>, is_not_s!("\r\n")); -+named!(space<&str,&str>, take_while_s!(is_space)); -+named!(space_or_line_ending<&str,&str>, is_a_s!(" \r\n")); -+ -+fn right_bracket(c:char) -> bool { -+ c == ']' -+} -+ -+named!(category <&str, &str>, -+ chain!( -+ tag_s!("[") ~ -+ name: take_till_s!(right_bracket) ~ -+ tag_s!("]") ~ -+ space_or_line_ending? , -+ ||{ name } -+ ) -+); -+ -+named!(key_value <&str,(&str,&str)>, -+ chain!( -+ key: alphanumeric ~ -+ space? ~ -+ tag_s!("=") ~ -+ space? ~ -+ val: take_till_s!(is_line_ending_or_comment) ~ -+ space? ~ -+ pair!(tag_s!(";"), not_line_ending)? ~ -+ space_or_line_ending? , -+ ||{(key, val)} -+ ) -+); -+ -+named!(keys_and_values_aggregator<&str, Vec<(&str,&str)> >, many0!(key_value)); -+ -+fn keys_and_values(input:&str) -> IResult<&str, HashMap<&str, &str> > { -+ let mut h: HashMap<&str, &str> = HashMap::new(); -+ -+ match keys_and_values_aggregator(input) { -+ IResult::Done(i,tuple_vec) => { -+ for &(k,v) in &tuple_vec { -+ h.insert(k, v); -+ } -+ IResult::Done(i, h) -+ }, -+ IResult::Incomplete(a) => IResult::Incomplete(a), -+ IResult::Error(a) => IResult::Error(a) -+ } -+} -+ -+ -+named!(category_and_keys<&str,(&str,HashMap<&str,&str>)>, -+ pair!(category, keys_and_values) -+); -+ -+named!(categories_aggregator<&str, Vec<(&str, HashMap<&str,&str>)> >, many0!(category_and_keys)); -+ -+fn categories(input: &str) -> IResult<&str, HashMap<&str, HashMap<&str, &str> > > { -+ let mut h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -+ -+ match categories_aggregator(input) { -+ IResult::Done(i,tuple_vec) => { -+ for &(k,ref v) in &tuple_vec { -+ h.insert(k, v.clone()); -+ } -+ IResult::Done(i, h) -+ }, -+ IResult::Incomplete(a) => IResult::Incomplete(a), -+ IResult::Error(a) => IResult::Error(a) -+ } -+} -+ -+ -+#[test] -+fn parse_category_test() { -+ let ini_file = "[category] -+ -+parameter=value -+key = value2"; -+ -+ let ini_without_category = "parameter=value -+key = value2"; -+ -+ let res = category(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, o) => println!("i: {} | o: {:?}", i, o), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_category, "category")); -+} -+ -+#[test] -+fn parse_key_value_test() { -+ let ini_file = "parameter=value -+key = value2"; -+ -+ let ini_without_key_value = "key = value2"; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {} | o: ({:?},{:?})", i, o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+#[test] -+fn parse_key_value_with_space_test() { -+ let ini_file = "parameter = value -+key = value2"; -+ -+ let ini_without_key_value = "key = value2"; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {} | o: ({:?},{:?})", i, o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+#[test] -+fn parse_key_value_with_comment_test() { -+ let ini_file = "parameter=value;abc -+key = value2"; -+ -+ let ini_without_key_value = "key = value2"; -+ -+ let res = key_value(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, (o1, o2)) => println!("i: {} | o: ({:?},{:?})", i, o1, o2), -+ _ => println!("error") -+ } -+ -+ assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value"))); -+} -+ -+#[test] -+fn parse_multiple_keys_and_values_test() { -+ let ini_file = "parameter=value;abc -+ -+key = value2 -+ -+[category]"; -+ -+ let ini_without_key_value = "[category]"; -+ -+ let res = keys_and_values(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {} | o: {:?}", i, o), -+ _ => println!("error") -+ } -+ -+ let mut expected: HashMap<&str, &str> = HashMap::new(); -+ expected.insert("parameter", "value"); -+ expected.insert("key", "value2"); -+ assert_eq!(res, IResult::Done(ini_without_key_value, expected)); -+} -+ -+#[test] -+fn parse_category_then_multiple_keys_and_values_test() { -+ //FIXME: there can be an empty line or a comment line after a category -+ let ini_file = "[abcd] -+parameter=value;abc -+ -+key = value2 -+ -+[category]"; -+ -+ let ini_after_parser = "[category]"; -+ -+ let res = category_and_keys(ini_file); -+ println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {} | o: {:?}", i, o), -+ _ => println!("error") -+ } -+ -+ let mut expected_h: HashMap<&str, &str> = HashMap::new(); -+ expected_h.insert("parameter", "value"); -+ expected_h.insert("key", "value2"); -+ assert_eq!(res, IResult::Done(ini_after_parser, ("abcd", expected_h))); -+} -+ -+#[test] -+fn parse_multiple_categories_test() { -+ let ini_file = "[abcd] -+ -+parameter=value;abc -+ -+key = value2 -+ -+[category] -+parameter3=value3 -+key4 = value4 -+"; -+ -+ let res = categories(ini_file); -+ //println!("{:?}", res); -+ match res { -+ IResult::Done(i, ref o) => println!("i: {} | o: {:?}", i, o), -+ _ => println!("error") -+ } -+ -+ let mut expected_1: HashMap<&str, &str> = HashMap::new(); -+ expected_1.insert("parameter", "value"); -+ expected_1.insert("key", "value2"); -+ let mut expected_2: HashMap<&str, &str> = HashMap::new(); -+ expected_2.insert("parameter3", "value3"); -+ expected_2.insert("key4", "value4"); -+ let mut expected_h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -+ expected_h.insert("abcd", expected_1); -+ expected_h.insert("category", expected_2); -+ assert_eq!(res, IResult::Done("", expected_h)); -+} -diff --git third_party/rust/nom-1.2.4/tests/issues.rs third_party/rust/nom-1.2.4/tests/issues.rs -new file mode 100644 -index 000000000000..6466d7f2e069 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/issues.rs -@@ -0,0 +1,131 @@ -+//#![feature(trace_macros)] -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,Needed,HexDisplay,space,digit,be_u16}; -+use std::str; -+ -+#[allow(dead_code)] -+struct Range { -+ start: char, -+ end: char -+} -+ -+pub fn take_char(input: &[u8]) -> IResult<&[u8], char> { -+ if input.len() > 0 { -+ IResult::Done(&input[1..], input[0] as char) -+ } else { -+ IResult::Incomplete(Needed::Size(1)) -+ } -+} -+ -+//trace_macros!(true); -+ -+#[allow(dead_code)] -+named!(range<&[u8], Range>, -+ alt!( -+ chain!( -+ start: take_char ~ -+ tag!("-") ~ -+ end: take_char, -+ || { -+ Range { -+ start: start, -+ end: end, -+ } -+ } -+ ) | -+ map!( -+ take_char, -+ |c| { -+ Range { -+ start: c, -+ end: c, -+ } -+ } -+ ) -+ ) -+); -+ -+ -+#[allow(dead_code)] -+named!(literal<&[u8], Vec >, -+ map!( -+ many1!(take_char), -+ |cs| { -+ cs -+ } -+ ) -+); -+ -+#[test] -+fn issue_58() { -+ range(&b"abcd"[..]); -+ literal(&b"abcd"[..]); -+} -+ -+//trace_macros!(false); -+ -+named!(parse_ints< Vec >, many0!(spaces_or_int)); -+ -+fn spaces_or_int(input: &[u8]) -> IResult<&[u8], i32>{ -+ println!("{}", input.to_hex(8)); -+ chain!(input, -+ opt!(space) ~ -+ x: digit, -+ || { -+ println!("x: {:?}", x); -+ let result = str::from_utf8(x).unwrap(); -+ println!("Result: {}", result); -+ println!("int is empty?: {}", x.is_empty()); -+ match result.parse(){ -+ Ok(i) => i, -+ Err(_) => panic!("UH OH! NOT A DIGIT!") -+ } -+ } -+ ) -+} -+ -+#[test] -+fn issue_142(){ -+ let subject = parse_ints(&b"12 34 5689"[..]); -+ let expected = IResult::Done(&b""[..], vec![12, 34, 5689]); -+ assert_eq!(subject, expected); -+ -+ let subject = parse_ints(&b"12 34 5689 "[..]); -+ let expected = IResult::Done(&b" "[..], vec![12, 34, 5689]); -+ assert_eq!(subject, expected) -+} -+ -+#[test] -+fn usize_length_bytes_issue(){ -+ length_bytes!(b"012346", be_u16); -+} -+ -+/* -+ DOES NOT COMPILE -+#[test] -+fn issue_152() { -+ named!(take4, take!(4)); -+ named!(xyz, tag!("XYZ")); -+ named!(abc, tag!("abc")); -+ -+ -+ named!(sw, -+ switch!(take4, -+ b"abcd" => xyz | -+ b"efgh" => abc -+ ) -+ ); -+} -+*/ -+ -+#[test] -+fn take_till_issue() { -+ named!(nothing, -+ take_till!(call!(|_| true)) -+ ); -+ -+ assert_eq!(nothing(b""), IResult::Done(&b""[..], &b""[..])); -+ assert_eq!(nothing(b"abc"), IResult::Done(&b"abc"[..], &b""[..])); -+} -diff --git third_party/rust/nom-1.2.4/tests/mp4.rs third_party/rust/nom-1.2.4/tests/mp4.rs -new file mode 100644 -index 000000000000..8c128f57a928 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/mp4.rs -@@ -0,0 +1,531 @@ -+#![cfg(feature = "stream")] -+#![allow(dead_code)] -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::{HexDisplay,Needed,IResult,be_u16,be_u32,be_u64,be_f32,ErrorKind}; -+use nom::{Consumer,ConsumerState,Move,Input,Producer,FileProducer,FileProducerState}; -+use nom::IResult::*; -+use nom::Err::*; -+ -+use std::str; -+use std::io::SeekFrom; -+ -+fn mp4_box(input:&[u8]) -> IResult<&[u8], &[u8]> { -+ match be_u32(input) { -+ Done(i, offset) => { -+ let sz: usize = offset as usize; -+ if i.len() >= sz - 4 { -+ Done(&i[(sz-4)..], &i[0..(sz-4)]) -+ } else { -+ Incomplete(Needed::Size(offset as usize + 4)) -+ } -+ } -+ Error(e) => Error(e), -+ Incomplete(e) => Incomplete(e) -+ } -+} -+ -+#[derive(PartialEq,Eq,Debug)] -+struct FileType<'a> { -+ major_brand: &'a str, -+ major_brand_version: &'a [u8], -+ compatible_brands: Vec<&'a str> -+} -+ -+#[allow(non_snake_case)] -+#[derive(Debug,Clone)] -+pub struct Mvhd32 { -+ version_flags: u32, // actually: -+ // version: u8, -+ // flags: u24 // 3 bytes -+ created_date: u32, -+ modified_date: u32, -+ scale: u32, -+ duration: u32, -+ speed: f32, -+ volume: u16, // actually a 2 bytes decimal -+ /* 10 bytes reserved */ -+ scaleA: f32, -+ rotateB: f32, -+ angleU: f32, -+ rotateC: f32, -+ scaleD: f32, -+ angleV: f32, -+ positionX: f32, -+ positionY: f32, -+ scaleW: f32, -+ preview: u64, -+ poster: u32, -+ selection: u64, -+ current_time: u32, -+ track_id: u32 -+} -+ -+#[allow(non_snake_case)] -+#[derive(Debug,Clone)] -+pub struct Mvhd64 { -+ version_flags: u32, // actually: -+ // version: u8, -+ // flags: u24 // 3 bytes -+ created_date: u64, -+ modified_date: u64, -+ scale: u32, -+ duration: u64, -+ speed: f32, -+ volume: u16, // actually a 2 bytes decimal -+ /* 10 bytes reserved */ -+ scaleA: f32, -+ rotateB: f32, -+ angleU: f32, -+ rotateC: f32, -+ scaleD: f32, -+ angleV: f32, -+ positionX: f32, -+ positionY: f32, -+ scaleW: f32, -+ preview: u64, -+ poster: u32, -+ selection: u64, -+ current_time: u32, -+ track_id: u32 -+} -+ -+#[allow(non_snake_case)] -+named!(mvhd32 <&[u8], MvhdBox>, -+ chain!( -+ version_flags: be_u32 ~ -+ created_date: be_u32 ~ -+ modified_date: be_u32 ~ -+ scale: be_u32 ~ -+ duration: be_u32 ~ -+ speed: be_f32 ~ -+ volume: be_u16 ~ // actually a 2 bytes decimal -+ take!(10) ~ -+ scale_a: be_f32 ~ -+ rotate_b: be_f32 ~ -+ angle_u: be_f32 ~ -+ rotate_c: be_f32 ~ -+ scale_d: be_f32 ~ -+ angle_v: be_f32 ~ -+ position_x: be_f32 ~ -+ position_y: be_f32 ~ -+ scale_w: be_f32 ~ -+ preview: be_u64 ~ -+ poster: be_u32 ~ -+ selection: be_u64 ~ -+ current_time: be_u32 ~ -+ track_id: be_u32, -+ ||{ -+ MvhdBox::M32(Mvhd32 { -+ version_flags: version_flags, -+ created_date: created_date, -+ modified_date: modified_date, -+ scale: scale, -+ duration: duration, -+ speed: speed, -+ volume: volume, -+ scaleA: scale_a, -+ rotateB: rotate_b, -+ angleU: angle_u, -+ rotateC: rotate_c, -+ scaleD: scale_d, -+ angleV: angle_v, -+ positionX: position_x, -+ positionY: position_y, -+ scaleW: scale_w, -+ preview: preview, -+ poster: poster, -+ selection: selection, -+ current_time: current_time, -+ track_id: track_id -+ }) -+ } -+ ) -+); -+ -+#[allow(non_snake_case)] -+named!(mvhd64 <&[u8], MvhdBox>, -+ chain!( -+ version_flags: be_u32 ~ -+ created_date: be_u64 ~ -+ modified_date: be_u64 ~ -+ scale: be_u32 ~ -+ duration: be_u64 ~ -+ speed: be_f32 ~ -+ volume: be_u16 ~ // actually a 2 bytes decimal -+ take!(10) ~ -+ scale_a: be_f32 ~ -+ rotate_b: be_f32 ~ -+ angle_u: be_f32 ~ -+ rotate_c: be_f32 ~ -+ scale_d: be_f32 ~ -+ angle_v: be_f32 ~ -+ position_x: be_f32 ~ -+ position_y: be_f32 ~ -+ scale_w: be_f32 ~ -+ preview: be_u64 ~ -+ poster: be_u32 ~ -+ selection: be_u64 ~ -+ current_time: be_u32 ~ -+ track_id: be_u32, -+ ||{ -+ MvhdBox::M64(Mvhd64 { -+ version_flags: version_flags, -+ created_date: created_date, -+ modified_date: modified_date, -+ scale: scale, -+ duration: duration, -+ speed: speed, -+ volume: volume, -+ scaleA: scale_a, -+ rotateB: rotate_b, -+ angleU: angle_u, -+ rotateC: rotate_c, -+ scaleD: scale_d, -+ angleV: angle_v, -+ positionX: position_x, -+ positionY: position_y, -+ scaleW: scale_w, -+ preview: preview, -+ poster: poster, -+ selection: selection, -+ current_time: current_time, -+ track_id: track_id -+ }) -+ } -+ ) -+); -+ -+#[derive(Debug,Clone)] -+pub enum MvhdBox { -+ M32(Mvhd32), -+ M64(Mvhd64) -+} -+ -+#[derive(Debug,Clone)] -+pub enum MoovBox { -+ Mdra, -+ Dref, -+ Cmov, -+ Rmra, -+ Iods, -+ Mvhd(MvhdBox), -+ Clip, -+ Trak, -+ Udta -+} -+ -+#[derive(Debug)] -+enum MP4BoxType { -+ Ftyp, -+ Moov, -+ Mdat, -+ Free, -+ Skip, -+ Wide, -+ Mdra, -+ Dref, -+ Cmov, -+ Rmra, -+ Iods, -+ Mvhd, -+ Clip, -+ Trak, -+ Udta, -+ Unknown -+} -+ -+#[derive(Debug)] -+struct MP4BoxHeader { -+ length: u32, -+ tag: MP4BoxType -+} -+ -+named!(brand_name<&[u8],&str>, map_res!(take!(4), str::from_utf8)); -+ -+named!(filetype_parser<&[u8], FileType>, -+ chain!( -+ m: brand_name ~ -+ v: take!(4) ~ -+ c: many0!(brand_name) , -+ ||{ FileType{ major_brand: m, major_brand_version:v, compatible_brands: c } } -+ ) -+); -+ -+fn mvhd_box(input:&[u8]) -> IResult<&[u8],MvhdBox> { -+ let res = if input.len() < 100 { -+ Incomplete(Needed::Size(100)) -+ } else if input.len() == 100 { -+ mvhd32(input) -+ } else if input.len() == 112 { -+ mvhd64(input) -+ } else { -+ Error(Position(ErrorKind::Custom(32),input)) -+ }; -+ println!("res: {:?}", res); -+ res -+} -+ -+fn unknown_box_type(input:&[u8]) -> IResult<&[u8], MP4BoxType> { -+ Done(input, MP4BoxType::Unknown) -+} -+ -+//named!(box_type<&[u8], MP4BoxType>, -+fn box_type(input: &[u8]) -> IResult<&[u8], MP4BoxType, u32> { -+ alt!(input, -+ tag!("ftyp") => { |_| MP4BoxType::Ftyp } | -+ tag!("moov") => { |_| MP4BoxType::Moov } | -+ tag!("mdat") => { |_| MP4BoxType::Mdat } | -+ tag!("free") => { |_| MP4BoxType::Free } | -+ tag!("skip") => { |_| MP4BoxType::Skip } | -+ tag!("wide") => { |_| MP4BoxType::Wide } | -+ unknown_box_type -+ ) -+} -+ -+// warning, an alt combinator with 9 branches containing a tag combinator -+// can make the compilation very slow. Use functions as sub parsers, -+// or split into multiple alt! parsers if it gets slow -+named!(moov_type<&[u8], MP4BoxType>, -+ alt!( -+ tag!("mdra") => { |_| MP4BoxType::Mdra } | -+ tag!("dref") => { |_| MP4BoxType::Dref } | -+ tag!("cmov") => { |_| MP4BoxType::Cmov } | -+ tag!("rmra") => { |_| MP4BoxType::Rmra } | -+ tag!("iods") => { |_| MP4BoxType::Iods } | -+ tag!("mvhd") => { |_| MP4BoxType::Mvhd } | -+ tag!("clip") => { |_| MP4BoxType::Clip } | -+ tag!("trak") => { |_| MP4BoxType::Trak } | -+ tag!("udta") => { |_| MP4BoxType::Udta } -+ ) -+); -+ -+named!(box_header<&[u8],MP4BoxHeader>, -+ chain!( -+ length: be_u32 ~ -+ tag: box_type , -+ || { MP4BoxHeader{ length: length, tag: tag} } -+ ) -+); -+ -+named!(moov_header<&[u8],MP4BoxHeader>, -+ chain!( -+ length: be_u32 ~ -+ tag: moov_type , -+ || { MP4BoxHeader{ length: length, tag: tag} } -+ ) -+); -+ -+#[derive(Debug,PartialEq,Eq)] -+enum MP4State { -+ Main, -+ Moov, -+ Mvhd(usize) -+} -+ -+pub struct MP4Consumer { -+ state: MP4State, -+ moov_bytes: usize, -+ c_state: ConsumerState<(), (), Move> -+} -+ -+impl MP4Consumer { -+ fn new() -> MP4Consumer { -+ MP4Consumer { state: MP4State::Main, moov_bytes: 0, c_state: ConsumerState::Continue(Move::Consume(0)) } -+ } -+ -+ fn consume_main(&mut self, input: Input<&[u8]>) -> ConsumerState<(), (), Move> { -+ //println!("\nparsing box header:\n{}", input.to_hex(8)); -+ match input { -+ Input::Eof(None) => ConsumerState::Done(Move::Consume(0), ()), -+ Input::Empty => ConsumerState::Continue(Move::Consume(0)), -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ match box_header(sl) { -+ Done(i, header) => { -+ match header.tag { -+ MP4BoxType::Ftyp => { -+ println!("-> FTYP"); -+ match filetype_parser(&i[0..(header.length as usize - 8)]) { -+ Done(rest, filetype_header) => { -+ println!("filetype header: {:?}", filetype_header); -+ //return ConsumerState::Await(header.length as usize, header.length as usize - 8); -+ return ConsumerState::Continue(Move::Consume(sl.offset(rest))); -+ } -+ Error(a) => { -+ println!("ftyp parsing error: {:?}", a); -+ assert!(false); -+ return ConsumerState::Error(()); -+ }, -+ Incomplete(n) => { -+ println!("ftyp incomplete -> await: {}", sl.len()); -+ return ConsumerState::Continue(Move::Await(n)); -+ //return ConsumerState::Await(0, input.len() + 100); -+ } -+ } -+ }, -+ MP4BoxType::Moov => { -+ println!("-> MOOV"); -+ self.state = MP4State::Moov; -+ self.moov_bytes = header.length as usize - 8; -+ return ConsumerState::Continue(Move::Consume(sl.offset(i))); -+ }, -+ MP4BoxType::Mdat => println!("-> MDAT"), -+ MP4BoxType::Free => println!("-> FREE"), -+ MP4BoxType::Skip => println!("-> SKIP"), -+ MP4BoxType::Wide => println!("-> WIDE"), -+ MP4BoxType::Unknown => { -+ println!("-> UNKNOWN"); -+ println!("bytes:\n{}", (sl).to_hex(8)); -+ //return ConsumerState::Continue(Move::Consume(sl.offset(i))); -+ }, -+ _ => { println!("invalid"); return ConsumerState::Error(())} -+ } -+ return ConsumerState::Continue(Move::Seek(SeekFrom::Current((header.length) as i64))) -+ }, -+ Error(a) => { -+ println!("mp4 parsing error: {:?}", a); -+ assert!(false); -+ return ConsumerState::Error(()); -+ }, -+ Incomplete(i) => { -+ // FIXME: incomplete should send the required size -+ println!("mp4 incomplete -> await: {}", sl.len()); -+ return ConsumerState::Continue(Move::Await(i)); -+ } -+ } -+ } -+ } -+ } -+ -+ fn consume_moov(&mut self, input: Input<&[u8]>) -> ConsumerState<(), (), Move> { -+ //println!("\nparsing moov box(remaining {} bytes):\n{}", self.moov_bytes, input.to_hex(8)); -+ match input { -+ Input::Eof(None) => return ConsumerState::Error(()), -+ Input::Empty => return ConsumerState::Continue(Move::Consume(0)), -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ if self.moov_bytes == 0 { -+ //println!("finished parsing moov atom, continuing with main parser"); -+ self.state = MP4State::Main; -+ return ConsumerState::Continue(Move::Consume(0)); -+ } -+ match moov_header(sl) { -+ Done(i, header) => { -+ match header.tag { -+ MP4BoxType::Mvhd => { -+ println!("-> MVHD"); -+ self.state = MP4State::Mvhd(header.length as usize - 8); -+ // TODO: check for overflow here -+ self.moov_bytes = self.moov_bytes - (sl.len() - i.len()); -+ println!("remaining moov_bytes: {}", self.moov_bytes); -+ return ConsumerState::Continue(Move::Consume(sl.offset(i))); -+ }, -+ MP4BoxType::Wide => println!("-> WIDE"), -+ MP4BoxType::Mdra => println!("-> MDRA"), -+ MP4BoxType::Dref => println!("-> DREF"), -+ MP4BoxType::Cmov => println!("-> CMOV"), -+ MP4BoxType::Rmra => println!("-> RMRA"), -+ MP4BoxType::Iods => println!("-> IODS"), -+ MP4BoxType::Clip => println!("-> CLIP"), -+ MP4BoxType::Trak => println!("-> TRAK"), -+ MP4BoxType::Udta => println!("-> UDTA"), -+ MP4BoxType::Unknown => println!("-> MOOV UNKNOWN"), -+ _ => { println!("invalid header here: {:?}", header.tag); return ConsumerState::Error(());} -+ }; -+ // TODO: check for overflow here -+ self.moov_bytes = self.moov_bytes - header.length as usize; -+ println!("remaining moov_bytes: {}", self.moov_bytes); -+ return ConsumerState::Continue(Move::Seek(SeekFrom::Current((header.length) as i64))) -+ }, -+ Error(a) => { -+ println!("moov parsing error: {:?}", a); -+ println!("data:\n{}", sl.to_hex(8)); -+ assert!(false); -+ return ConsumerState::Error(()); -+ }, -+ Incomplete(i) => { -+ println!("moov incomplete -> await: {}", sl.len()); -+ return ConsumerState::Continue(Move::Await(i)); -+ } -+ } -+ } -+ }; -+ } -+ -+} -+ -+consumer_from_parser!(MvhdConsumer, mvhd_box); -+ -+impl<'a> Consumer<&'a[u8], (), (), Move> for MP4Consumer { -+ fn handle(&mut self, input: Input<&[u8]>) -> &ConsumerState<(), (), Move> { -+ match self.state { -+ MP4State::Main => { -+ self.c_state = self.consume_main(input); -+ }, -+ MP4State::Moov => { -+ self.c_state = self.consume_moov(input); -+ }, -+ MP4State::Mvhd(sz) => { -+ match input { -+ Input::Eof(None) => self.c_state = ConsumerState::Error(()), -+ Input::Empty => self.c_state = ConsumerState::Continue(Move::Consume(0)), -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ let mut c = MvhdConsumer{ state:ConsumerState::Continue(Move::Consume(0)) }; -+ self.c_state = c.handle(Input::Element(&sl[..sz])).flat_map(|m, _| { -+ self.state = MP4State::Moov; -+ ConsumerState::Continue(m) -+ }); -+ println!("found mvhd?: {:?}", c.state()); -+ match self.c_state { -+ ConsumerState::Continue(Move::Consume(sz)) => self.moov_bytes = self.moov_bytes - sz, -+ ConsumerState::Continue(Move::Seek(SeekFrom::Current(sz))) => self.moov_bytes = self.moov_bytes - (sz as usize), -+ _ => () -+ }; -+ println!("remaining moov_bytes: {}", self.moov_bytes); -+ } -+ } -+ } -+ }; -+ &self.c_state -+ } -+ -+ fn state(&self) -> &ConsumerState<(), (), Move> { -+ &self.c_state -+ } -+} -+ -+#[allow(unused_must_use)] -+fn explore_mp4_file(filename: &str) { -+ let mut p = FileProducer::new(filename, 400).unwrap(); -+ let mut c = MP4Consumer{state: MP4State::Main, moov_bytes: 0, c_state: ConsumerState::Continue(Move::Consume(0))}; -+ //c.run(&mut p); -+ while let &ConsumerState::Continue(mv) = p.apply(&mut c) { -+ println!("move: {:?}", mv); -+ } -+ println!("last consumer state: {:?} | last state: {:?}", c.c_state, c.state); -+ -+ if let ConsumerState::Done(Move::Consume(0), ()) = c.c_state { -+ println!("consumer state ok"); -+ } else { -+ assert!(false, "consumer should have reached Done state"); -+ } -+ assert_eq!(c.state, MP4State::Main); -+ assert_eq!(p.state(), FileProducerState::Eof); -+ //assert!(false); -+} -+ -+ -+#[test] -+fn small_test() { -+ explore_mp4_file("assets/small.mp4"); -+} -+ -+ -+#[test] -+fn big_bunny_test() { -+ explore_mp4_file("assets/bigbuckbunny.mp4"); -+} -+ -+ -+ -diff --git third_party/rust/nom-1.2.4/tests/omnom.rs third_party/rust/nom-1.2.4/tests/omnom.rs -new file mode 100644 -index 000000000000..b8cfa04fb7e4 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/omnom.rs -@@ -0,0 +1,160 @@ -+#![cfg(feature = "stream")] -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::{Producer,Consumer,ConsumerState,Input,Move,MemProducer,IResult,HexDisplay}; -+ -+#[derive(PartialEq,Eq,Debug)] -+enum State { -+ Beginning, -+ Middle, -+ End, -+ Done, -+ Error -+} -+ -+struct TestConsumer { -+ state: State, -+ c_state: ConsumerState, -+ counter: usize, -+} -+ -+named!(om_parser, tag!("om")); -+named!(nomnom_parser<&[u8],Vec<&[u8]> >, many1!(tag!("nom"))); -+named!(end_parser, tag!("kthxbye")); -+ -+impl<'a> Consumer<&'a[u8], usize, (), Move> for TestConsumer { -+ fn state(&self) -> &ConsumerState { -+ &self.c_state -+ } -+ -+ fn handle(&mut self, input: Input<&'a [u8]>) -> &ConsumerState { -+ match self.state { -+ State::Beginning => { -+ match input { -+ Input::Empty | Input::Eof(None) => { -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()); -+ }, -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ match om_parser(sl) { -+ IResult::Error(_) => { -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()); -+ }, -+ IResult::Incomplete(n) => { -+ self.c_state = ConsumerState::Continue(Move::Await(n)); -+ }, -+ IResult::Done(i,_) => { -+ self.state = State::Middle; -+ self.c_state = ConsumerState::Continue(Move::Consume(sl.offset(i))); -+ } -+ } -+ } -+ } -+ }, -+ State::Middle => { -+ match input { -+ Input::Empty | Input::Eof(None) => { -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()); -+ }, -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ match nomnom_parser(sl) { -+ IResult::Error(_) => { -+ self.state = State::End; -+ self.c_state = ConsumerState::Continue(Move::Consume(0)); -+ }, -+ IResult::Incomplete(n) => { -+ println!("Middle got Incomplete({:?})", n); -+ self.c_state = ConsumerState::Continue(Move::Await(n)); -+ }, -+ IResult::Done(i,noms_vec) => { -+ self.counter = self.counter + noms_vec.len(); -+ self.state = State::Middle; -+ self.c_state = ConsumerState::Continue(Move::Consume(sl.offset(i))); -+ } -+ } -+ } -+ } -+ }, -+ State::End => { -+ match input { -+ Input::Empty | Input::Eof(None) => { -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()); -+ }, -+ Input::Element(sl) | Input::Eof(Some(sl)) => { -+ match end_parser(sl) { -+ IResult::Error(_) => { -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()); -+ }, -+ IResult::Incomplete(n) => { -+ self.c_state = ConsumerState::Continue(Move::Await(n)); -+ }, -+ IResult::Done(i,_) => { -+ self.state = State::Done; -+ self.c_state = ConsumerState::Done(Move::Consume(sl.offset(i)), self.counter); -+ } -+ } -+ } -+ } -+ }, -+ State::Done | State::Error => { -+ // this should not be called -+ self.state = State::Error; -+ self.c_state = ConsumerState::Error(()) -+ } -+ }; -+ &self.c_state -+ } -+} -+ -+#[test] -+fn nom1() { -+ let mut p = MemProducer::new(&b"omnomkthxbye"[..], 8); -+ let mut c = TestConsumer{state: State::Beginning, counter: 0, c_state: ConsumerState::Continue(Move::Consume(0))}; -+ while let &ConsumerState::Continue(Move::Consume(_)) = p.apply(&mut c) { -+ } -+ -+ assert_eq!(c.counter, 1); -+ assert_eq!(c.state, State::Done); -+} -+ -+#[test] -+fn nomnomnom() { -+ let mut p = MemProducer::new(&b"omnomnomnomkthxbye"[..], 9); -+ let mut c = TestConsumer{state: State::Beginning, counter: 0, c_state: ConsumerState::Continue(Move::Consume(0))}; -+ while let &ConsumerState::Continue(_) = p.apply(&mut c) { -+ } -+ -+ assert_eq!(c.counter, 3); -+ assert_eq!(c.state, State::Done); -+} -+ -+#[test] -+fn no_nomnom() { -+ let mut p = MemProducer::new(&b"omkthxbye"[..], 8); -+ let mut c = TestConsumer{state: State::Beginning, counter: 0, c_state: ConsumerState::Continue(Move::Consume(0))}; -+ while let &ConsumerState::Continue(_) = p.apply(&mut c) { -+ } -+ -+ assert_eq!(c.counter, 0); -+ assert_eq!(c.state, State::Done); -+} -+ -+/* -+#[test] -+fn impolite() { -+ let mut p = MemProducer::new(&b"omnomnomnom"[..], 11); -+ let mut c = TestConsumer{state: State::Beginning, counter: 0, c_state: ConsumerState::Continue(Move::Consume(0))}; -+ while let &ConsumerState::Continue(cont) = p.apply(&mut c) { -+ println!("continue {:?}", cont); -+ } -+ -+ assert_eq!(c.counter, 3); -+ assert_eq!(c.state, State::End); -+} -+*/ -diff --git third_party/rust/nom-1.2.4/tests/test1.rs third_party/rust/nom-1.2.4/tests/test1.rs -new file mode 100644 -index 000000000000..95f8fd45b6d4 ---- /dev/null -+++ third_party/rust/nom-1.2.4/tests/test1.rs -@@ -0,0 +1,44 @@ -+#![cfg(feature = "stream")] -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,Producer,FileProducer,not_line_ending}; -+ -+use std::str; -+use std::fmt::Debug; -+ -+#[test] -+#[allow(unused_must_use)] -+fn tag() { -+ FileProducer::new("assets/links.txt", 20).map(|producer: FileProducer| { -+ let mut p = producer; -+ p.refill(); -+ -+ consumer_from_parser!(PrintConsumer<()>, flat_map!(map_res!(tag!("https!"), str::from_utf8), print)); -+ let mut cs = PrintConsumer::new(); -+ for _ in 1..4 { -+ p.apply(&mut cs); -+ } -+ }); -+} -+ -+pub fn print(input: T) -> IResult { -+ println!("{:?}", input); -+ IResult::Done(input, ()) -+} -+ -+ -+#[test] -+fn is_not() { -+ //is_not!(foo b"\r\n"); -+ named!(foo<&[u8],&[u8]>, is_not!(&b"\r\n"[..])); -+ let a = &b"ab12cd\nefgh"[..]; -+ assert_eq!(foo(a), IResult::Done(&b"\nefgh"[..], &b"ab12cd"[..])); -+} -+ -+#[test] -+fn exported_public_method_defined_by_macro() { -+ let a = &b"ab12cd\nefgh"[..]; -+ assert_eq!(not_line_ending(a), IResult::Done(&b"\nefgh"[..], &b"ab12cd"[..])); -+} -diff --git third_party/rust/nom/.cargo-checksum.json third_party/rust/nom/.cargo-checksum.json -index 9d93bcc0afc2..5baf0864c842 100644 ---- third_party/rust/nom/.cargo-checksum.json -+++ third_party/rust/nom/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".travis.yml":"6d4e81838b10c5e330749857c72c2f2b1a2e575e71abcd11c094f3b612347b2a","CHANGELOG.md":"d4722e028b2a5b88c466b0d759e463b90bdcfa1b79181a1c76cd313b0a27c615","Cargo.toml":"aebcb999933c3425db85012bea19f9ce78da8e7834dbab54d4a2966e8bc62149","LICENSE":"de730187d5563a81342a3c011d968f78dff37c934fac9b3701e8c762b6118a55","src/bits.rs":"97c9148f63e175489bb6199d039c594ddc56bdf0b7491b9f38b8d74e898bca80","src/bytes.rs":"8f29b976a5e8e6500eb618a9dead7f212688ba9eb06c7066a4016e2db99fed00","src/character.rs":"9ee081f56b508212231ff70d7455b1b85ae44722a39aa60223e8cd95c6570859","src/internal.rs":"ada499b9c178be2a7f9b56319ffb10a778f25fafcda39c78d26b364d89debd72","src/lib.rs":"34efb051214acfde2053e93a7ba718a4fd41b6e0d9edd65a1737605d99b994ab","src/macros.rs":"d39ce3a2cd2b1cb9dd57ce90c06a1ca84720a2dc75e6332cffebba6086cb75d3","src/methods.rs":"24bdbcb0e3570c8bf3fa270dd8d79dd6dfcb982276c82180a89a1e73c5e38019","src/nom.rs":"b0a9c7ce0d09388179bce8f8e23bf57df76b504d925815583c249ec3fc04baab","src/regexp.rs":"8fdae52b761dbad90179e6be87e0e66357fefa34d76af541fb0fcf550fd6ec08","src/str.rs":"198fa15d45c3636289d92c0a592002a07e5a04a431e8cfdf724266e44d484be2","src/stream.rs":"c1bd5b8e7a2061ff66eb2c954033146001f1d65a26d12efa06af8cf93ffa53e4","src/util.rs":"da40ebac865d3176567d3a37b01170234398a03e938553720ce30aa1f6005b6d","tests/arithmetic.rs":"b98936b7fa0228835ca022f6db5342b72a9c01cc3f16a4e05263bbe6424ba3e9","tests/arithmetic_ast.rs":"b18b9a46ba573ae13c40a31217425f6e8cf8fade09a75cdbbfa7146ec668f0b2","tests/cross_function_backtracking.rs":"b071d13031c1f12195473186e3775943991496b10f4590db3f36d511e9f98a1c","tests/ini.rs":"776f681542028564899e55f71533b3bcda5ed1bbb971f24b5b1b9578111ba0cb","tests/ini_str.rs":"315046d9b6dc38d6d306d3562d7ac6518c9ecce9aabcc58fb80c07577ad99789","tests/issues.rs":"2193c219397b7a417cc009b72c13adc42471e7a4917a2a4009aa0fca23c6ea8c","tests/mp4.rs":"b4bf0514fd645160851cc4da9ad6bf81d571cd14865bf134837c19578caaf6e6","tests/omnom.rs":"409d2349fa24f3503bd02e0079c1554a58ce3d40dd7eb0e5d4bb63b588afdae4","tests/test1.rs":"3e0c187bad91d822ebc113eb5cf30fc6585e53a961728304ac24e05ab2123d10"},"package":"a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"0ca452f3de1955e58ac7e6814077b430c0ee1dbf7e64c5348b6d7b0b997ffb27","Cargo.toml":"69edf4fdee4c17415625f77366f55cf6b3fd7410222c392a2b4bc262bf2e2bc9","LICENSE":"568d0ae12e18bf9dda98fcd838732321852abdb557c24900d474e71f8fd29f4e","src/bits.rs":"8cd8786191145b5365d381ffdf3aedf69002b6a8d40520c7b752c3e6adb83cc9","src/branch.rs":"e298f1d370a25e0a85f34186d38427f5805e745808f98586c2e8c51581e40480","src/bytes.rs":"bf0fe97e34f47d1f5d4ef93d3a00bd7553ae87ea248162cbce8872ea64c44b36","src/character.rs":"3891258d893c09833f6577dee5b9c7af3e12dc2e60458df542a8fcfb8516e068","src/internal.rs":"7be274fd578166404e0b8236417efeaa8a6cda4a8b10ab637083b1d6cba70f1c","src/lib.rs":"14300d7984ea66e052923e0db31b6c99840e5e234cc76042ce94645d2779c7ea","src/macros.rs":"58cde368c072e219ac19a83b7cb6eb9942d57030b2f74426110e8d91e7968145","src/methods.rs":"e6438ac91baec05fb898765879722d55bb54d9e96e29ab823ed34fe571802063","src/multi.rs":"318b4a345b185252515e1373e3fb1302d74ba3a0c65d44c55b4da39bf74a4c29","src/nom.rs":"48acec4a5dd92222823272e38b63e0decf33a31bdd3e97d22ed5d02ae4c6696c","src/regexp.rs":"8a780a8d328b31012a083ca763b8326e7126320a9071ea011629ddb9d82d178a","src/sequence.rs":"20055b97349f135fae182ba3755261439784b3b83572938ed2d9e4eda3c04758","src/simple_errors.rs":"0a37b042eba1c41da6d18b9249f3b7360f1732a5ed43150c39f36877b40594df","src/str.rs":"4cc81376b1d8c48709d73af357141554bbabb4e0546c1bb4606cfdd2ad8082cb","src/stream.rs":"f80895c621aae949a655576fc1082b65235d3e3af5d6a1cafcc9c0d2398264c9","src/traits.rs":"15db8ac6d5f698d9f55d23fbd025dd10f0e461533b34166e6234bf00e443f42e","src/util.rs":"5c8af3f73dff0efe3bcff59ff0c9cdbfeeecc4bafed14763c229a37bf26f7c99","src/verbose_errors.rs":"f640709d9bd8ffffb8baebab8252bc3d55e247a4c4ee814007b7fbda29856233","src/whitespace.rs":"0117cc62c288acd3ba53903fc14fd650934039919039ba5f83195e0435e12535","tests/arithmetic.rs":"aac143de5c80179f9cb71bf3c79268aa892876622b6f08d5e360ab9308f21341","tests/arithmetic_ast.rs":"bb8995cf726ac382e87dd9665f168cba0d25c8cc040372321027d23499ddea99","tests/blockbuf-arithmetic.rs":"485605360f68fc301390eff084657c27cb30347b8eaaed6d92a5830767d50ce6","tests/cross_function_backtracking.rs":"ea847fa762954e1ff8d8e4fbd130e453d57f41132735e4745286a2fbaf10dd6e","tests/float.rs":"7e380464cd8c2c315eaa2bcd3bb7407a4ba558ee5d6adde3ec72492c7987f784","tests/ini.rs":"c3b2b3ccd6b854c36dc89afc8d68877ff7f5cb8b2cb9d8f138e143deb8ee6ddc","tests/ini_str.rs":"7c5db358330be22e1c64900a8182f26881f7e5d38f1c78d827c60de0af68612f","tests/issues.rs":"d9af6f28be33a70732bec51213a4811910c656a1c38c4ffb5b3202efc188b4b6","tests/json.rs":"5d2c2f3f6ebb9f9c188f5b0cfad723a421ce161caceb3d8517d02fc6546fece6","tests/mp4.rs":"0e5f248dc9e27182ff82b3153481df529600bc4418b84f1f0554e1ada6cc3e08","tests/multiline.rs":"5165e95ba471f77dc0e614a716828d71bbcebcd42fe0fb882b7da1d9633222af","tests/named_args.rs":"3954a031e17e55e12e2bbb107c36a29e2204969ee2e4afb9cbd604decfe3f81a","tests/omnom.rs":"ff749d621b51df8aa3db289b1b626c706190fa15e29061dd5653de83635976d4","tests/overflow.rs":"aec98fc65bf102ae934625aa70e2b48cfcce70f4af38d6520716d79df3e95335","tests/reborrow_fold.rs":"8f140330dd0bfb3bbdab8286b4be6d6f698cadb7b064fac586dcca97e3d397fe","tests/test1.rs":"3e0c187bad91d822ebc113eb5cf30fc6585e53a961728304ac24e05ab2123d10"},"package":"05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"} -\ No newline at end of file -diff --git third_party/rust/nom/.travis.yml third_party/rust/nom/.travis.yml -deleted file mode 100644 -index 1d1e36c593aa..000000000000 ---- third_party/rust/nom/.travis.yml -+++ /dev/null -@@ -1,46 +0,0 @@ --language: rust -- --addons: -- apt: -- packages: -- - libcurl4-openssl-dev -- - libelf-dev -- - libdw-dev -- --rust: -- - nightly -- - beta -- - stable -- - 1.2.0 -- --before_script: -- - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH -- --script: -- - | -- travis-cargo --only 1.2 test -- --features regexp && -- travis-cargo --only stable test -- --features "regexp regexp_macros" && -- travis-cargo --only beta test -- --features "regexp regexp_macros" && -- travis-cargo --only nightly build -- --features "nightly core regexp" && -- travis-cargo --only nightly test -- --features "regexp" && -- travis-cargo bench && -- travis-cargo --only stable doc -- --features "regexp" -- --after_success: -- - travis-cargo coveralls --no-sudo -- --notifications: -- webhooks: -- urls: -- - https://webhooks.gitter.im/e/9c035a194ac4fd4cc061 -- on_success: change -- on_failure: always -- on_start: false -- -- --env: -- global: -- # override the default `--features unstable` used for the nightly branch (optional) -- - TRAVIS_CARGO_NIGHTLY_FEATURE=nightly -- --sudo: false -diff --git third_party/rust/nom/CHANGELOG.md third_party/rust/nom/CHANGELOG.md -index f1c331585779..35e523666bd4 100644 ---- third_party/rust/nom/CHANGELOG.md -+++ third_party/rust/nom/CHANGELOG.md -@@ -4,6 +4,267 @@ - - ### Changed - -+## 3.2.1 - 2017-10-27 -+ -+### Thanks -+ -+- @ordian for `alt_complete` fixes -+- @friedm for documentation fixes -+- @kali for improving error management -+ -+### Fixed -+ -+- there were cases where `alt_complete` could return `Incomplete` -+ -+### Added -+ -+- an `into_error_kind` method can be used to transform any error to a common value. This helps when the library is included multiple times as dependency with different feature sets -+ -+ -+## 3.2.0 - 2017-07-24 -+ -+### Thanks -+ -+- @jedireza for documentation fixes -+- @gmorenz for the `bytes` combinator -+- @meh for character combinator fixes for UTF-8 -+- @jethrogb for avoiding move issues in `separated_list` -+ -+### Changed -+ -+- new layout for the main page of documentation -+- `anychar` can now work on any input type -+- `length_bytes` is now an alias for `length_data` -+ -+### Fixed -+ -+- `one_of`, `none_of` and `char` will now index correctly UTF-8 characters -+- the `compiler_error` macro is now correctly exported -+ -+ -+### Added -+ -+- the `bytes` combinator transforms a bit stream back to a byte slice for child parsers -+ -+## 3.1.0 - 2017-06-16 -+ -+### Thanks -+ -+- @sdroege: implementing be_i24 and le_i24 -+- @Hywan: integrating faster substring search using memchr -+- @nizox: fixing type issues in bit stream parsing -+- @grissiom: documentation fixes -+- @doomrobo: implementing separated_list_complete and separated_nonempty_list_complete -+- @CWood1: fixing memchr integration in no_std -+- @lu_zero: integrating the compiler_error crate -+- @dtolnay: helping debug a type inference issue in map -+ -+### Changed -+ -+- memchr is used for substring search if possible -+- if building on nightly, some common syntax errors will display a specific error message. If building no stable, display the documentation to activate those messages -+- `count` no longer preallocates its vector -+ -+### Fixed -+ -+- better type inference in alt_complete -+- `alt` should now work with whitespace parsing -+- `map` should not make type inference errors anymore -+ -+### Added -+ -+- be_i24 and le_i24, parsing big endian and little endian signed 24 bit integers -+- `separated_list_complete` and `separated_nonempty_list_complete` will treat incomplete from sub parsers as error -+ -+## 3.0.0 - 2017-05-12 -+ -+### Thanks -+ -+- Chris Pick for some `Incomplete` related refactors -+- @drbgn for documentation fixes -+- @valarauca for adding `be_u24` -+- @ithinuel for usability fixes -+- @evuez for README readability fixes and improvements to `IResult` -+- @s3bk for allowing non-`Copy` types as input -+- @keruspe for documentation fixes -+- @0xd34d10cc for trait fixes on `InputIter` -+- @sdleffler for lifetime shenanigans on `named_args` -+- @chengsun for type inference fixes in `alt` -+- @iBelieve for adding str to no_std -+- @Hywan for simplifying code in input traits -+- @azerupi for extensive documentation of `alt` and `alt_complete` -+ -+### Breaking Changes -+ -+- `escaped`, `separated_list` and `separated_nonempty_list` can now return `Incomplete` when necessary -+- `InputIter` does not require `AsChar` on its `Item` type anymore -+- the `core` feature that was putting nom in `no_std` mode has been removed. There is now a `std` feature, activated by default. If it is not activated, nom is in `no_std` -+- in `verbose-errors` mode, the error list is now stored in a `Vec` instead of a box based linked list -+- `chain!` has finally been removed -+ -+### Changed -+ -+- `Endianness` now implements `Debug`, `PartialEq`, `Eq`, `Clone` and `Copy` -+- custom input types can now be cloned if they're not `Copy` -+- the infamous 'Cannot infer type for E' error should happen less often now -+- `str` is now available in `no_std` mode -+ -+### Fixed -+ -+- `FileProducer` will be marked as `Eof` on full buffer -+- `named_args!` now has lifetimes that cannot conflict with the lifetimes from other arguments -+ -+### Added -+ -+- `be_u24`: big endian 24 bit unsigned integer parsing -+- `IResult` now has a `unwrap_or` method -+ -+ -+## 2.2.1 - 2017-04-03 -+ -+### Thanks -+ -+- @Victor-Savu for formatting fixes in the README -+- @chifflier for detecting and fixing integer overflows -+- @utkarshkukreti for some performance improvements in benchmarks -+ -+### Changed -+ -+- when calculating how much data is needed in `IResult::Incomplete`, the addition could overflow (it is stored as a usize). This would apparently not result in any security vulnerability on release code -+ -+## 2.2.0 - 2017-03-20 -+ -+### Thanks -+ -+- @seppo0010 for fixing `named_args` -+- @keruspe for implementing or() on `IResult`, adding the option of default cases in `switch!`, adding support for `cargo-travis` -+- @timlyo for documentation fixes -+- @JayKickliter for extending `hex_u32` -+- @1011X for fixing regex integration -+- @Kerollmops for actually marking `chain!` as deprecated -+- @joliss for documentation fixes -+- @utkarshkukreti for tests refactoring and performance improvement -+- @tmccombs for documentation fixes -+ -+### Added -+ -+- `IResult` gets an `or()` method -+- `take_until1`, `take_until_and_consume1`, `take_till1!` and `take_till1_s!` require at least 1 character -+ -+### Changed -+ -+- `hex_u32` accepts uppercase digits as well -+- the character based combinators leverage the input traits -+- the whitespace parsers now work on &str and other types -+- `take_while1` returns `Incomplete` on empty input -+- `switch!` can now take a default case -+ -+### Fixed -+ -+- `named_args!` now imports `IResult` directly -+- the upgrade to regex 0.2 broke the regex combinators, they work now -+ -+## 2.1.0 - 2017-01-27 -+ -+### Thanks -+ -+- @nickbabcock for documentation fixes -+- @derekdreery for documentation fixes -+- @DirkyJerky for documentation fixes -+- @saschagrunert for documentation fixes -+- @lucab for documentation fixes -+- @hyone for documentation fixes -+- @tstorch for factoring `Slice` -+- @shepmaster for adding crate categories -+- @antoyo for adding `named_args!` -+ -+### Added -+ -+- `verify!` uses a first parser, then applies a function to check that its result satisfies some conditions -+- `named_args!` creates a parser function that can accept other arguments along with the input -+- `parse_to!` will use the `parse` method from `FromStr` to parse a value. It will automatically translate the input to a string if necessary -+- `float`, `float_s`, `double`, `double_s` can recognize floating point numbers in text -+ -+### Changed -+ -+- `escaped!` will now return `Incomplete` if needed -+- `permutation!` supports up to 20 child parsers -+ -+## 2.0.1 - 2016-12-10 -+ -+Bugfix release -+ -+*Warning*: there is a small breaking change, `add_error!` is renamed to `add_return_error!`. This was planned for the 2.0 release but was forgotten. This is a small change in a feature that not many people use, for a release that is not yet widely in use, so there will be no 3.0 release for that change. -+ -+### Thanks -+ -+- @nickbabcock for catching and fixing the `add_error!` mixup -+- @lucab for documentation fixes -+- @jtdowney for noticing that `tag_no_case!` was not working at all for byte slices -+ -+### Fixed -+ -+- `add_error!` has been renamed to `add_return_error!` -+- the `not!` combinator now accepts functions -+- `tag_no_case!` is now working as accepted (before, it accepted everything) -+ -+ -+## 2.0 - 2016-11-25 -+ -+The 2.0 release is one of the biggest yet. It was a good opportunity to clean up some badly named combinators and fix invalid behaviours. -+ -+Since this version introduces a few breaking changes, an [upgrade documentation](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_2.md) is available, detailing the steps to fix the most common migration issues. After testing on a set of 30 crates, most of them will build directly, a large part will just need to activate the "verbose-errors" compilation feature. The remaining fixes are documented. -+ -+This version also adds a lot of interesting features, like the permutation combinator or whitespace separated formats support. -+ -+### Thanks -+ -+- @lu-zero for license help -+- @adamgreig for type inference fixes -+- @keruspe for documentation and example fixes, for the `IResult => Result` conversion work, making `AsChar`'s method more consistent, and adding `many_till!` -+- @jdeeny for implementing `Offset` on `&str` -+- @vickenty for documentation fixes and his refactoring of `length_value!` and `length_bytes!` -+- @overdrivenpotato for refactoring some combinators -+- @taralx for documentation fixes -+- @keeperofdakeys for fixing eol behaviour, writing documentation and adding `named_attr!` -+- @jturner314 for writing documentation -+- @bozaro for fixing compilation errors -+- @uniphil for adding a `crates.io` badge -+- @badboy for documentation fixes -+- @jugglerchris for fixing `take_s!` -+- @AndyShiue for implementing `Error` and `Display` on `ErrorKind` and detecting incorrect UTF-8 string indexing -+ -+### Added -+ -+- the "simple" error management system does not accumulates errors when backtracking. This is a big perf gain, and is activated by default in nom 2.0 -+- nom can now work on any type that implement the traits defined in `src/traits.rs`: `InputLength`, `InputIter`, `InputTake`, `Compare`, `FindToken`, `FindSubstring`, `Slice` -+- the documentation from Github's wiki has been moved to the `doc/` directory. They are markdown files that you can build with [cargo-external-doc](https://crates.io/crates/cargo-external-doc) -+- whitespace separated format support: with the `ws!` combinator, you can automatically introduce whitespace parsers between all parsers and combinators -+- the `permutation!` combinator applies its child parsers in any order, as long as they all succeed once, and return a tuple of the results -+- `do_parse!` is a simpler alternative to `chain!`, which is now deprecated -+- you can now transform an `IResult` in a `std::result::Result` -+- `length_data!` parses a length, and returns a subslice of that length -+- `tag_no_case!` provides case independent comparison. It works nicely, without any allocation, for ASCII strings, but for UTF-8 strings, it defaults to an unsatisfying (and incorrect) comparison by lowercasing both strings -+- `named_attr!` creates functions like `named!` but can add attributes like documentation -+- `many_till!` applies repeatedly its first child parser until the second succeeds -+ -+### Changed -+ -+- the "verbose" error management that was available in previous versions is now activated by the "verbose-errors" compilation feature -+- code reorganization: most of the parsers were moved in separate files to make the source easier to navigate -+- most of the combinators are now independent from the input type -+- the `eof` function was replaced with the `eof!` macro -+- `error!` and `add_error!` were replaced with `return_error!` and `add_return_error!` to fix the name conflict with the log crate -+- the `offset()` method is now in the `Offset` trait -+- `length_value!` has been renamed to `length_count!`. The new `length_value!` selects a slice and applies the second parser once on that slice -+- `AsChar::is_0_to_9` is now `AsChar::is_dec_digit` -+- the combinators with configurable endianness now take an enum instead of a boolean as parameter -+ -+### Fixed -+- the `count!`, `count_fixed!` and `length_*!` combinator calculate incomplete data needs correctly -+- `eol`, `line_ending` and `not_line_ending` now have a consistent behaviour that works correctly with incomplete data -+- `take_s!` didn't correctly handle the case when the slice is exactly the right length -+ - ## 1.2.4 - 2016-07-20 - - ### Thanks -@@ -29,14 +290,14 @@ - - `take_bits!` is now more precise - - `many1` inccorectly used the `len` function instead of `input_len` - - the INI parser is simpler --- `recognize!` had an early `return` taht is removed now -+- `recognize!` had an early `return` that is removed now - - ## 1.2.3 - 2016-05-10 - - ### Thanks - - @lu-zero for the contribution guidelines - - @GuillaumeGomez for fixes on `length_bytes` and some documentation --- @Hywan for ducomentation and test fixes -+- @Hywan for documentation and test fixes - - @Xirdus for correct trait import issues - - @mspiegel for the new AST example - - @cholcombe973 for adding the `cond_with_error!` combinator -@@ -63,7 +324,7 @@ - ## 1.2.2 - 2016-03-09 - - ### Thanks --- @conradev for fixing take_until_s!` -+- @conradev for fixing `take_until_s!` - - @GuillaumeGomez for some documentation fixes - - @frewsxcv for some documentation fixes - - @tstorch for some test refactorings -@@ -121,7 +382,7 @@ - - there were type inference issues in a few combinators. They will now be easier to compile - - `peek!` compilation with bare functions - - `&str` parsers were splitting data at the byte level, not at the char level, which can result in inconsistencies in parsing UTF-8 characters. They now use character indexes --- some method implementations were missing on `ÌResult` (with specified error type instead of implicit) -+- some method implementations were missing on `IResult` (with specified error type instead of implicit) - - ## 1.1.0 - 2016-01-01 - -@@ -137,11 +398,11 @@ There are also a few performance improvements and documentation fixes. - - @meh for fixing `Option` and `Vec` imports - - @hoodie for a documentation fix - - @joelself for some documentation fixes --- @vberger for his traits magic making `nom functions more generic -+- @vberger for his traits magic making nom functions more generic - - ### Added - --- string related parsers: `tag_s!`, `take_s!`, `is_a_s!`, `is_not_s!`, `take_while_s!`, `take_while1_s!`, `take_till_s! -+- string related parsers: `tag_s!`, `take_s!`, `is_a_s!`, `is_not_s!`, `take_while_s!`, `take_while1_s!`, `take_till_s!` - - `value!` is a combinator that always returns the same value. If a child parser is passed as second argument, that value is returned when the child parser succeeds - - ### Changed -@@ -521,8 +782,17 @@ Considering the number of changes since the last release, this version can conta - - ## Compare code - --* [unreleased]: https://github.com/Geal/nom/compare/1.2.4...HEAD --* [1.2.3]: https://github.com/Geal/nom/compare/1.2.3...1.2.4 -+* [unreleased]: https://github.com/Geal/nom/compare/3.2.1...HEAD -+* [3.2.1]: https://github.com/Geal/nom/compare/3.2.0...3.2.1 -+* [3.2.0]: https://github.com/Geal/nom/compare/3.1.0...3.2.0 -+* [3.1.0]: https://github.com/Geal/nom/compare/3.0.0...3.1.0 -+* [3.0.0]: https://github.com/Geal/nom/compare/2.2.1...3.0.0 -+* [2.2.1]: https://github.com/Geal/nom/compare/2.2.0...2.2.1 -+* [2.2.0]: https://github.com/Geal/nom/compare/2.1.0...2.2.0 -+* [2.1.0]: https://github.com/Geal/nom/compare/2.0.1...2.1.0 -+* [2.0.1]: https://github.com/Geal/nom/compare/2.0.0...2.0.1 -+* [2.0.0]: https://github.com/Geal/nom/compare/1.2.4...2.0.0 -+* [1.2.4]: https://github.com/Geal/nom/compare/1.2.3...1.2.4 - * [1.2.3]: https://github.com/Geal/nom/compare/1.2.2...1.2.3 - * [1.2.2]: https://github.com/Geal/nom/compare/1.2.1...1.2.2 - * [1.2.1]: https://github.com/Geal/nom/compare/1.2.0...1.2.1 -diff --git third_party/rust/nom/Cargo.toml third_party/rust/nom/Cargo.toml -index ae8045bf1135..1ee10cf12c2b 100644 ---- third_party/rust/nom/Cargo.toml -+++ third_party/rust/nom/Cargo.toml -@@ -1,38 +1,50 @@ --[package] -+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -+# -+# When uploading crates to the registry Cargo will automatically -+# "normalize" Cargo.toml files for maximal compatibility -+# with all versions of Cargo and also rewrite `path` dependencies -+# to registry (e.g. crates.io) dependencies -+# -+# If you believe there's an error in this file please file an -+# issue against the rust-lang/cargo repository. If you're -+# editing this file be aware that the upstream Cargo.toml -+# will likely look very different (and much more reasonable) - -+[package] - name = "nom" --version = "1.2.4" --authors = [ "contact@geoffroycouprie.com" ] -+version = "3.2.1" -+authors = ["contact@geoffroycouprie.com"] -+include = ["CHANGELOG.md", "LICENSE", ".gitignore", ".travis.yml", "Cargo.toml", "src/*.rs", "tests/*.rs"] - description = "A byte-oriented, zero-copy, parser combinators library" --license = "MIT" --repository = "https://github.com/Geal/nom" --readme = "README.md" - documentation = "http://rust.unhandledexpression.com/nom/" -+readme = "README.md" - keywords = ["parser", "parser-combinators", "parsing", "streaming", "bit"] -+categories = ["parsing"] -+license = "MIT" -+repository = "https://github.com/Geal/nom" -+[dependencies.memchr] -+version = "^1.0.1" -+default-features = false - --include = [ -- "CHANGELOG.md", -- "LICENSE", -- ".gitignore", -- ".travis.yml", -- "Cargo.toml", -- "src/*.rs", -- "tests/*.rs" --] -- --[features] --core = [] --nightly = [] --default = ["stream"] --regexp = ["regex"] --regexp_macros = ["regexp", "lazy_static"] --stream = [] -+[dependencies.compiler_error] -+version = "0.1.1" -+optional = true - - [dependencies.regex] --version = "^0.1.56" -+version = "^0.2" - optional = true - - [dependencies.lazy_static] --version = "^0.2.1" -+version = "^0.2.2" - optional = true - -+[features] -+default = ["std", "stream"] -+regexp = ["regex"] -+verbose-errors = [] -+stream = [] -+nightly = ["compiler_error"] -+regexp_macros = ["regexp", "lazy_static"] -+std = ["memchr/use_std"] -+[badges.travis-ci] -+repository = "Geal/nom" -diff --git third_party/rust/nom/LICENSE third_party/rust/nom/LICENSE -index 0bd6a1c33dc6..a885458136ae 100644 ---- third_party/rust/nom/LICENSE -+++ third_party/rust/nom/LICENSE -@@ -1,4 +1,4 @@ --Copyright (c) 2015 Geoffroy Couprie -+Copyright (c) 2015-2016 Geoffroy Couprie - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -diff --git third_party/rust/nom/src/bits.rs third_party/rust/nom/src/bits.rs -index a8bd8b24aa99..d475cd32ebcd 100644 ---- third_party/rust/nom/src/bits.rs -+++ third_party/rust/nom/src/bits.rs -@@ -36,6 +36,7 @@ macro_rules! bits ( - ); - ); - -+#[cfg(feature = "verbose-errors")] - /// Internal parser, do not use directly - #[doc(hidden)] - #[macro_export] -@@ -44,7 +45,7 @@ macro_rules! bits_impl ( - { - let input = ($i, 0usize); - match $submac!(input, $($args)*) { -- $crate::IResult::Error(e) => { -+ $crate::IResult::Error(e) => { - let err = match e { - $crate::Err::Code(k) | $crate::Err::Node(k, _) => $crate::Err::Code(k), - $crate::Err::Position(k, (i,b)) | $crate::Err::NodePosition(k, (i,b), _) => { -@@ -68,6 +69,131 @@ macro_rules! bits_impl ( - ); - ); - -+#[cfg(not(feature = "verbose-errors"))] -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! bits_impl ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let input = ($i, 0usize); -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(e) => { -+ $crate::IResult::Error(e) -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ //println!("bits parser returned Needed::Size({})", i); -+ $crate::IResult::Incomplete($crate::Needed::Size(i / 8 + 1)) -+ }, -+ $crate::IResult::Done((i, bit_index), o) => { -+ let byte_index = bit_index / 8 + if bit_index % 8 == 0 { 0 } else { 1 } ; -+ //println!("bit index=={} => byte index=={}", bit_index, byte_index); -+ $crate::IResult::Done(&i[byte_index..], o) -+ } -+ } -+ } -+ ); -+); -+ -+/// Counterpart to bits, -+/// `bytes!( parser ) => ( (&[u8], usize), &[u8] -> IResult<&[u8], T> ) -> IResult<(&[u8], usize), T>`, -+/// transforms its bits stream input into a byte slice for the underlying parsers. If we start in the -+/// middle of a byte throws away the bits until the end of the byte. -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::rest; -+/// # fn main() { -+/// named!( parse<(u8, u8, &[u8])>, bits!( tuple!( -+/// take_bits!(u8, 4), -+/// take_bits!(u8, 8), -+/// bytes!(rest) -+/// ))); -+/// -+/// let input = &[0xde, 0xad, 0xbe, 0xaf]; -+/// -+/// assert_eq!(parse( input ), Done(&[][..], (0xd, 0xea, &[0xbe, 0xaf][..]))); -+/// # } -+#[macro_export] -+macro_rules! bytes ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ bytes_impl!($i, $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr) => ( -+ bytes_impl!($i, call!($f)); -+ ); -+); -+ -+#[cfg(feature = "verbose-errors")] -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! bytes_impl ( -+ ($macro_i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let inp; -+ if $macro_i.1 % 8 != 0 { -+ inp = & $macro_i.0[1 + $macro_i.1 / 8 ..]; -+ } -+ else { -+ inp = & $macro_i.0[$macro_i.1 / 8 ..]; -+ } -+ -+ match $submac!(inp, $($args)*) { -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code(k) | $crate::Err::Node(k, _) => $crate::Err::Code(k), -+ $crate::Err::Position(k, i) | $crate::Err::NodePosition(k, i, _) => { -+ $crate::Err::Position(k, (i, 0)) -+ } -+ }; -+ $crate::IResult::Error(err) -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ $crate::IResult::Incomplete($crate::Needed::Size(i * 8)) -+ }, -+ $crate::IResult::Done(i, o) => { -+ $crate::IResult::Done((i, 0), o) -+ } -+ } -+ } -+ ); -+); -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! bytes_impl ( -+ ($macro_i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let inp; -+ if $macro_i.1 % 8 != 0 { -+ inp = & $macro_i.0[1 + $macro_i.1 / 8 ..]; -+ } -+ else { -+ inp = & $macro_i.0[$macro_i.1 / 8 ..]; -+ } -+ -+ match $submac!(inp, $($args)*) { -+ $crate::IResult::Error(e) => { -+ $crate::IResult::Error(e) -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ $crate::IResult::Incomplete($crate::Needed::Size(i * 8)) -+ }, -+ $crate::IResult::Done(i, o) => { -+ $crate::IResult::Done((i, 0), o) -+ } -+ } -+ } -+ ); -+); -+ - /// `take_bits!(type, nb) => ( (&[T], usize), U, usize) -> IResult<(&[T], usize), U>` - /// generates a parser consuming the specified number of bits. - /// -@@ -89,17 +215,18 @@ macro_rules! take_bits ( - ($i:expr, $t:ty, $count:expr) => ( - { - use std::ops::Div; -+ use std::convert::Into; - //println!("taking {} bits from {:?}", $count, $i); - let (input, bit_offset) = $i; - let res : $crate::IResult<(&[u8],usize), $t> = if $count == 0 { -- $crate::IResult::Done( (input, bit_offset), 0) -+ $crate::IResult::Done( (input, bit_offset), (0 as u8).into()) - } else { - let cnt = ($count as usize + bit_offset).div(8); - if input.len() * 8 < $count as usize + bit_offset { - //println!("returning incomplete: {}", $count as usize + bit_offset); - $crate::IResult::Incomplete($crate::Needed::Size($count as usize)) - } else { -- let mut acc:$t = 0; -+ let mut acc:$t = (0 as u8).into(); - let mut offset: usize = bit_offset; - let mut remaining: usize = $count; - let mut end_offset: usize = 0; -@@ -109,9 +236,9 @@ macro_rules! take_bits ( - break; - } - let val: $t = if offset == 0 { -- *byte as $t -+ (*byte as u8).into() - } else { -- ((*byte << offset) as u8 >> offset) as $t -+ (((*byte as u8) << offset) as u8 >> offset).into() - }; - - if remaining < 8 - offset { -@@ -144,11 +271,11 @@ macro_rules! tag_bits ( - let res: $crate::IResult<(&[u8],usize),$t> = $crate::IResult::Done(i, o); - res - } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagBits, $i)) -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TagBits, $i)) - } - }, - _ => { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagBits, $i)) -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TagBits, $i)) - } - } - } -@@ -157,12 +284,13 @@ macro_rules! tag_bits ( - - #[cfg(test)] - mod tests { -- use internal::{IResult,Needed,Err}; -+ use std::ops::{Shr,Shl,AddAssign}; -+ use internal::{IResult,Needed}; - use ErrorKind; - - #[test] - fn take_bits() { -- let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let input = [0b10101010, 0b11110000, 0b00110011]; - let sl = &input[..]; - - assert_eq!(take_bits!( (sl, 0), u8, 0 ), IResult::Done((sl, 0), 0)); -@@ -184,7 +312,7 @@ mod tests { - - #[test] - fn tag_bits() { -- let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let input = [0b10101010, 0b11110000, 0b00110011]; - let sl = &input[..]; - - assert_eq!(tag_bits!( (sl, 0), u8, 3, 0b101), IResult::Done((&sl[0..], 3), 5)); -@@ -192,17 +320,17 @@ mod tests { - } - - named!(ch<(&[u8],usize),(u8,u8)>, -- chain!( -- tag_bits!(u8, 3, 0b101) ~ -- x: take_bits!(u8, 4) ~ -- y: take_bits!(u8, 5) , -- || { (x,y) } -+ do_parse!( -+ tag_bits!(u8, 3, 0b101) >> -+ x: take_bits!(u8, 4) >> -+ y: take_bits!(u8, 5) >> -+ (x,y) - ) - ); - - #[test] - fn chain_bits() { -- let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let input = [0b10101010, 0b11110000, 0b00110011]; - let sl = &input[..]; - assert_eq!(ch((&input[..],0)), IResult::Done((&sl[1..], 4), (5,15))); - assert_eq!(ch((&input[..],4)), IResult::Done((&sl[2..], 0), (7,16))); -@@ -212,9 +340,55 @@ mod tests { - named!(ch_bytes<(u8,u8)>, bits!(ch)); - #[test] - fn bits_to_bytes() { -- let input = vec![0b10101010, 0b11110000, 0b00110011]; -+ let input = [0b10101010, 0b11110000, 0b00110011]; - assert_eq!(ch_bytes(&input[..]), IResult::Done(&input[2..], (5,15))); - assert_eq!(ch_bytes(&input[..1]), IResult::Incomplete(Needed::Size(2))); -- assert_eq!(ch_bytes(&input[1..]), IResult::Error(Err::Position(ErrorKind::TagBits, &input[1..]))); -+ assert_eq!(ch_bytes(&input[1..]), IResult::Error(error_position!(ErrorKind::TagBits, &input[1..]))); -+ } -+ -+ #[derive(PartialEq,Debug)] -+ struct FakeUint(u32); -+ -+ impl AddAssign for FakeUint { -+ -+ fn add_assign(&mut self, other: FakeUint) { -+ *self = FakeUint(&self.0 + other.0); -+ } -+ -+ } -+ -+ impl Shr for FakeUint { -+ type Output = FakeUint; -+ -+ fn shr(self, shift: usize) -> FakeUint { -+ FakeUint(&self.0 >> shift) -+ } -+ -+ } -+ -+ impl Shl for FakeUint { -+ type Output = FakeUint; -+ -+ fn shl(self, shift: usize) -> FakeUint { -+ FakeUint(&self.0 << shift) -+ } -+ -+ } -+ -+ impl From for FakeUint { -+ -+ fn from(i: u8) -> FakeUint { -+ FakeUint(u32::from(i)) -+ } -+ } -+ -+ #[test] -+ fn non_privitive_type() { -+ let input = [0b10101010, 0b11110000, 0b00110011]; -+ let sl = &input[..]; -+ -+ assert_eq!(take_bits!( (sl, 0), FakeUint, 20 ), IResult::Done((&sl[2..], 4), FakeUint(700163))); -+ assert_eq!(take_bits!( (sl, 4), FakeUint, 20 ), IResult::Done((&sl[3..], 0), FakeUint(716851))); -+ assert_eq!(take_bits!( (sl, 4), FakeUint, 22 ), IResult::Incomplete(Needed::Size(22))); - } - } -diff --git third_party/rust/nom/src/branch.rs third_party/rust/nom/src/branch.rs -new file mode 100644 -index 000000000000..a925437145a0 ---- /dev/null -+++ third_party/rust/nom/src/branch.rs -@@ -0,0 +1,871 @@ -+/// Try a list of parsers and return the result of the first successful one -+/// -+/// ```rust,ignore -+/// alt!(I -> IResult | I -> IResult | ... | I -> IResult ) => I -> IResult -+/// ``` -+/// All the parsers must have the same return type. -+/// -+/// If one of the parsers returns `Incomplete`, `alt!` will return `Incomplete`, to retry -+/// once you get more input. Note that it is better for performance to know the -+/// minimum size of data you need before you get into `alt!`. -+/// -+/// The `alt!` combinator is used in the following way: -+/// -+/// ```rust,ignore -+/// alt!(parser_1 | parser_2 | ... | parser_n) -+/// ``` -+/// -+/// # Basic example -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # fn main() { -+/// // Create a parser that will match either "dragon" or "beast" -+/// named!( dragon_or_beast, alt!( tag!( "dragon" ) | tag!( "beast" ) ) ); -+/// -+/// // Given the input "dragon slayer", the parser will match "dragon" -+/// // and the rest will be " slayer" -+/// let (rest, result) = dragon_or_beast(b"dragon slayer").unwrap(); -+/// assert_eq!(result, b"dragon"); -+/// assert_eq!(rest, b" slayer"); -+/// -+/// // Given the input "beast of Gevaudan", the parser will match "beast" -+/// // and the rest will be " of Gevaudan" -+/// let (rest, result) = dragon_or_beast(&b"beast of Gevaudan"[..]).unwrap(); -+/// assert_eq!(result, b"beast"); -+/// assert_eq!(rest, b" of Gevaudan"); -+/// # } -+/// ``` -+/// -+/// # Manipulate results -+/// -+/// There exists another syntax for `alt!` that gives you the ability to -+/// manipulate the result from each parser: -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// # -+/// // We create an enum to represent our creatures -+/// #[derive(Debug,PartialEq,Eq)] -+/// enum Creature { -+/// Dragon, -+/// Beast, -+/// Unknown(usize) -+/// } -+/// -+/// // Let's make a helper function that returns true when not a space -+/// // we are required to do this because the `take_while!` macro is limited -+/// // to idents, so we can't negate `ìs_space` at the call site -+/// fn is_not_space(c: u8) -> bool { ! nom::is_space(c) } -+/// -+/// // Our parser will return the `Dragon` variant when matching "dragon", -+/// // the `Beast` variant when matching "beast" and otherwise it will consume -+/// // the input until a space is found and return an `Unknown` creature with -+/// // the size of it's name. -+/// named!(creature, alt!( -+/// tag!("dragon") => { |_| Creature::Dragon } | -+/// tag!("beast") => { |_| Creature::Beast } | -+/// take_while!(is_not_space) => { |r: &[u8]| Creature::Unknown(r.len()) } -+/// // the closure takes the result as argument if the parser is successful -+/// )); -+/// -+/// // Given the input "dragon slayer" the parser will return `Creature::Dragon` -+/// // and the rest will be " slayer" -+/// let (rest, result) = creature(b"dragon slayer").unwrap(); -+/// assert_eq!(result, Creature::Dragon); -+/// assert_eq!(rest, b" slayer"); -+/// -+/// // Given the input "beast of Gevaudan" the parser will return `Creature::Beast` -+/// // and the rest will be " of Gevaudan" -+/// let (rest, result) = creature(b"beast of Gevaudan").unwrap(); -+/// assert_eq!(result, Creature::Beast); -+/// assert_eq!(rest, b" of Gevaudan"); -+/// -+/// // Given the input "demon hunter" the parser will return `Creature::Unkown(5)` -+/// // and the rest will be " hunter" -+/// let (rest, result) = creature(b"demon hunter").unwrap(); -+/// assert_eq!(result, Creature::Unknown(5)); -+/// assert_eq!(rest, b" hunter"); -+/// # } -+/// ``` -+/// -+/// # Behaviour of `alt!` -+/// -+/// **BE CAREFUL** there is a case where the behaviour of `alt!` can be confusing: -+/// -+/// when the alternatives have different lengths, like this case: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "abcd" ) | tag!( "ef" ) | tag!( "ghi" ) | tag!( "kl" ) ) ); -+/// ``` -+/// -+/// With this parser, if you pass `"abcd"` as input, the first alternative parses it correctly, -+/// but if you pass `"efg"`, the first alternative will return `Incomplete`, since it needs an input -+/// of 4 bytes. This behaviour of `alt!` is expected: if you get a partial input that isn't matched -+/// by the first alternative, but would match if the input was complete, you want `alt!` to indicate -+/// that it cannot decide with limited information. -+/// -+/// There are two ways to fix this behaviour. The first one consists in ordering the alternatives -+/// by size, like this: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "ef" ) | tag!( "kl") | tag!( "ghi" ) | tag!( "abcd" ) ) ); -+/// ``` -+/// -+/// With this solution, the largest alternative will be tested last. -+/// -+/// The other solution uses the `complete!` combinator, which transforms an `Incomplete` in an -+/// `Error`. If one of the alternatives returns `Incomplete` but is wrapped by `complete!`, -+/// `alt!` will try the next alternative. This is useful when you know that -+/// you will not get partial input: -+/// -+/// ```ignore -+/// named!( test, -+/// alt!( -+/// complete!( tag!( "abcd" ) ) | -+/// complete!( tag!( "ef" ) ) | -+/// complete!( tag!( "ghi" ) ) | -+/// complete!( tag!( "kl" ) ) -+/// ) -+/// ); -+/// ``` -+/// -+/// If you want the `complete!` combinator to be applied to all rules then use the convenience -+/// `alt_complete!` macro (see below). -+/// -+/// This behaviour of `alt!` can get especially confusing if multiple alternatives have different -+/// sizes but a common prefix, like this: -+/// -+/// ```ignore -+/// named!( test, alt!( tag!( "abcd" ) | tag!( "ab" ) | tag!( "ef" ) ) ); -+/// ``` -+/// -+/// in that case, if you order by size, passing `"abcd"` as input will always be matched by the -+/// smallest parser, so the solution using `complete!` is better suited. -+/// -+/// You can also nest multiple `alt!`, like this: -+/// -+/// ```ignore -+/// named!( test, -+/// alt!( -+/// preceded!( -+/// tag!("ab"), -+/// alt!( -+/// tag!( "cd" ) | -+/// eof!() -+/// ) -+/// ) -+/// | tag!( "ef" ) -+/// ) -+/// ); -+/// ``` -+/// -+/// `preceded!` will first parse `"ab"` then, if successful, try the alternatives "cd", -+/// or empty input (End Of File). If none of them work, `preceded!` will fail and -+/// "ef" will be tested. -+/// -+#[macro_export] -+macro_rules! alt ( -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)* ) => ( -+ compiler_error!("alt uses '|' as separator, not ',': -+ -+ alt!( -+ tag!(\"abcd\") | -+ tag!(\"efgh\") | -+ tag!(\"ijkl\") -+ ) -+ "); -+ ); -+ (__impl $i:expr, $e:ident, $($rest:tt)* ) => ( -+ alt!(__impl $i, call!($e) , $($rest)*); -+ ); -+ (__impl $i:expr, $e:ident | $($rest:tt)*) => ( -+ alt!(__impl $i, call!($e) | $($rest)*); -+ ); -+ -+ (__impl $i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ let res = $subrule!(i_, $($args)*); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ $crate::IResult::Incomplete(_) => res, -+ $crate::IResult::Error(e) => { -+ let out = alt!(__impl $i, $($rest)*); -+ -+ // Compile-time hack to ensure that res's E type is not under-specified. -+ // This all has no effect at runtime. -+ fn unify_types(_: &T, _: &T) {} -+ if let $crate::IResult::Error(ref e2) = out { -+ unify_types(&e, e2); -+ } -+ -+ out -+ } -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ match $subrule!(i_, $($args)* ) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(e) => { -+ let out = alt!(__impl $i, $($rest)*); -+ -+ // Compile-time hack to ensure that res's E type is not under-specified. -+ // This all has no effect at runtime. -+ fn unify_types(_: &T, _: &T) {} -+ if let $crate::IResult::Error(ref e2) = out { -+ unify_types(&e, e2); -+ } -+ -+ out -+ } -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt!(__impl $i, call!($e) => { $gen } | $($rest)*); -+ ); -+ -+ (__impl $i:expr, __end) => ( -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Alt,$i)) -+ ); -+ -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ alt!(__impl $i, $($rest)* | __end) -+ } -+ ); -+); -+ -+/// Is equivalent to the `alt!` combinator, except that it will not return `Incomplete` -+/// when one of the constituting parsers returns `Incomplete`. Instead, it will try the -+/// next alternative in the chain. -+/// -+/// You should use this combinator only if you know you -+/// will not receive partial input for the rules you're trying to match (this -+/// is almost always the case for parsing programming languages). -+/// -+/// ```rust,ignore -+/// alt_complete!(I -> IResult | I -> IResult | ... | I -> IResult ) => I -> IResult -+/// ``` -+/// All the parsers must have the same return type. -+/// -+/// If one of the parsers return `Incomplete`, `alt_complete!` will try the next alternative. -+/// If there is no other parser left to try, an `Error` will be returned. -+/// -+/// ```rust,ignore -+/// alt_complete!(parser_1 | parser_2 | ... | parser_n) -+/// ``` -+/// **For more in depth examples, refer to the documentation of `alt!`** -+#[macro_export] -+macro_rules! alt_complete ( -+ // Recursive rules (must include `complete!` around the head) -+ -+ ($i:expr, $e:ident | $($rest:tt)*) => ( -+ alt_complete!($i, complete!(call!($e)) | $($rest)*); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ let res = complete!(i_, $subrule!($($args)*)); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ e => { -+ let out = alt_complete!($i, $($rest)*); -+ -+ if let (&$crate::IResult::Error(ref e1), &$crate::IResult::Error(ref e2)) = (&e, &out) { -+ // Compile-time hack to ensure that res's E type is not under-specified. -+ // This all has no effect at runtime. -+ fn unify_types(_: &T, _: &T) {} -+ unify_types(e1, e2); -+ } -+ -+ out -+ }, -+ } -+ } -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -+ { -+ let i_ = $i.clone(); -+ match complete!(i_, $subrule!($($args)*)) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ e => { -+ let out = alt_complete!($i, $($rest)*); -+ -+ if let (&$crate::IResult::Error(ref e1), &$crate::IResult::Error(ref e2)) = (&e, &out) { -+ // Compile-time hack to ensure that res's E type is not under-specified. -+ // This all has no effect at runtime. -+ fn unify_types(_: &T, _: &T) {} -+ unify_types(e1, e2); -+ } -+ -+ out -+ }, -+ } -+ } -+ ); -+ -+ ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt_complete!($i, complete!(call!($e)) => { $gen } | $($rest)*); -+ ); -+ -+ // Tail (non-recursive) rules -+ -+ ($i:expr, $e:ident => { $gen:expr }) => ( -+ alt_complete!($i, call!($e) => { $gen }); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -+ alt!(__impl $i, complete!($subrule!($($args)*)) => { $gen } | __end) -+ ); -+ -+ ($i:expr, $e:ident) => ( -+ alt_complete!($i, call!($e)); -+ ); -+ -+ ($i:expr, $subrule:ident!( $($args:tt)*)) => ( -+ alt!(__impl $i, complete!($subrule!($($args)*)) | __end) -+ ); -+); -+ -+/// `switch!(I -> IResult, P => I -> IResult | ... | P => I -> IResult ) => I -> IResult` -+/// choose the next parser depending on the result of the first one, if successful, -+/// and returns the result of the second parser -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::{Position, NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => tag!("XYZ") | -+/// b"efgh" => tag!("123") -+/// ) -+/// ); -+/// -+/// let a = b"abcdXYZ123"; -+/// let b = b"abcdef"; -+/// let c = b"efgh123"; -+/// let d = b"blah"; -+/// -+/// assert_eq!(sw(&a[..]), Done(&b"123"[..], &b"XYZ"[..])); -+/// assert_eq!(sw(&b[..]), Error(error_node_position!(ErrorKind::Switch, &b"abcdef"[..], -+/// error_position!(ErrorKind::Tag, &b"ef"[..])))); -+/// assert_eq!(sw(&c[..]), Done(&b""[..], &b"123"[..])); -+/// assert_eq!(sw(&d[..]), Error(error_position!(ErrorKind::Switch, &b"blah"[..]))); -+/// # } -+/// ``` -+/// -+/// You can specify a default case like with a normal match, using `_` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => tag!("XYZ") | -+/// _ => value!(&b"default"[..]) -+/// ) -+/// ); -+/// -+/// let a = b"abcdXYZ123"; -+/// let b = b"blah"; -+/// -+/// assert_eq!(sw(&a[..]), Done(&b"123"[..], &b"XYZ"[..])); -+/// assert_eq!(sw(&b[..]), Done(&b""[..], &b"default"[..])); -+/// # } -+/// ``` -+/// -+/// Due to limitations in Rust macros, it is not possible to have simple functions on the right hand -+/// side of pattern, like this: -+/// -+/// ```ignore -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => tag!("XYZ") | -+/// b"efgh" => tag!("123") -+/// ) -+/// ); -+/// ``` -+/// -+/// If you want to pass your own functions instead, you can use the `call!` combinator as follows: -+/// -+/// ```ignore -+/// named!(xyz, tag!("XYZ")); -+/// named!(num, tag!("123")); -+/// named!(sw, -+/// switch!(take!(4), -+/// b"abcd" => call!(xyz) | -+/// b"efgh" => call!(num) -+/// ) -+/// ); -+/// ``` -+/// -+#[macro_export] -+macro_rules! switch ( -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => ( -+ { -+ let i_ = $i.clone(); -+ match map!(i_, $submac!($($args)*), |o| Some(o)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(error_node_position!( -+ $crate::ErrorKind::Switch, $i, e -+ )), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match o { -+ $(Some($p) => match $subrule!(i, $($args2)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(error_node_position!( -+ $crate::ErrorKind::Switch, $i, e -+ )), -+ a => a, -+ }),*, -+ _ => $crate::IResult::Error(error_position!($crate::ErrorKind::Switch,$i)) -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)*), $($rest:tt)*) => ( -+ { -+ switch!(__impl $i, $submac!($($args)*), $($rest)*) -+ } -+ ); -+ ($i:expr, $e:ident, $($rest:tt)*) => ( -+ { -+ switch!(__impl $i, call!($e), $($rest)*) -+ } -+ ); -+); -+ -+/// -+/// -+/// `permutation!(I -> IResult, I -> IResult, ... I -> IResult ) => I -> IResult` -+/// applies its sub parsers in a sequence, but independent from their order -+/// this parser will only succeed if all of its sub parsers succeed -+/// -+/// the tuple of results is in the same order as the parsers are declared -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error,Incomplete}; -+/// # use nom::{ErrorKind,Needed}; -+/// # fn main() { -+/// named!(perm<(&[u8], &[u8], &[u8])>, -+/// permutation!(tag!("abcd"), tag!("efg"), tag!("hi")) -+/// ); -+/// -+/// // whatever the order, if the parser succeeds, each -+/// // tag should have matched correctly -+/// let expected = (&b"abcd"[..], &b"efg"[..], &b"hi"[..]); -+/// -+/// let a = &b"abcdefghijk"[..]; -+/// assert_eq!(perm(a), Done(&b"jk"[..], expected)); -+/// let b = &b"efgabcdhijkl"[..]; -+/// assert_eq!(perm(b), Done(&b"jkl"[..], expected)); -+/// let c = &b"hiefgabcdjklm"[..]; -+/// assert_eq!(perm(c), Done(&b"jklm"[..], expected)); -+/// -+/// let d = &b"efgxyzabcdefghi"[..]; -+/// assert_eq!(perm(d), Error(error_position!(ErrorKind::Permutation, &b"xyzabcdefghi"[..]))); -+/// -+/// let e = &b"efgabc"[..]; -+/// assert_eq!(perm(e), Incomplete(Needed::Size(7))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! permutation ( -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ let mut res = permutation_init!((), $($rest)*); -+ let mut input = $i; -+ let mut error = ::std::option::Option::None; -+ let mut needed = ::std::option::Option::None; -+ -+ loop { -+ let mut all_done = true; -+ permutation_iterator!(0, input, all_done, needed, res, $($rest)*); -+ -+ //if we reach that part, it means none of the parsers were able to read anything -+ if !all_done { -+ //FIXME: should wrap the error returned by the child parser -+ error = ::std::option::Option::Some(error_position!($crate::ErrorKind::Permutation, input)); -+ } -+ break; -+ } -+ -+ if let ::std::option::Option::Some(need) = needed { -+ if let $crate::Needed::Size(sz) = need { -+ $crate::IResult::Incomplete( -+ $crate::Needed::Size( -+ $crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&input) + -+ sz -+ ) -+ ) -+ } else { -+ $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } -+ } else if let ::std::option::Option::Some(e) = error { -+ $crate::IResult::Error(e) -+ } else { -+ let unwrapped_res = permutation_unwrap!(0, (), res, $($rest)*); -+ $crate::IResult::Done(input, unwrapped_res) -+ } -+ } -+ ); -+); -+ -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! permutation_init ( -+ ((), $e:ident, $($rest:tt)*) => ( -+ permutation_init!((::std::option::Option::None), $($rest)*) -+ ); -+ ((), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ permutation_init!((::std::option::Option::None), $($rest)*) -+ ); -+ (($($parsed:expr),*), $e:ident, $($rest:tt)*) => ( -+ permutation_init!(($($parsed),* , ::std::option::Option::None), $($rest)*); -+ ); -+ (($($parsed:expr),*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ permutation_init!(($($parsed),* , ::std::option::Option::None), $($rest)*); -+ ); -+ (($($parsed:expr),*), $e:ident) => ( -+ ($($parsed),* , ::std::option::Option::None) -+ ); -+ (($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => ( -+ ($($parsed),* , ::std::option::Option::None) -+ ); -+ (($($parsed:expr),*),) => ( -+ ($($parsed),*) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! succ ( -+ (0, $submac:ident ! ($($rest:tt)*)) => ($submac!(1, $($rest)*)); -+ (1, $submac:ident ! ($($rest:tt)*)) => ($submac!(2, $($rest)*)); -+ (2, $submac:ident ! ($($rest:tt)*)) => ($submac!(3, $($rest)*)); -+ (3, $submac:ident ! ($($rest:tt)*)) => ($submac!(4, $($rest)*)); -+ (4, $submac:ident ! ($($rest:tt)*)) => ($submac!(5, $($rest)*)); -+ (5, $submac:ident ! ($($rest:tt)*)) => ($submac!(6, $($rest)*)); -+ (6, $submac:ident ! ($($rest:tt)*)) => ($submac!(7, $($rest)*)); -+ (7, $submac:ident ! ($($rest:tt)*)) => ($submac!(8, $($rest)*)); -+ (8, $submac:ident ! ($($rest:tt)*)) => ($submac!(9, $($rest)*)); -+ (9, $submac:ident ! ($($rest:tt)*)) => ($submac!(10, $($rest)*)); -+ (10, $submac:ident ! ($($rest:tt)*)) => ($submac!(11, $($rest)*)); -+ (11, $submac:ident ! ($($rest:tt)*)) => ($submac!(12, $($rest)*)); -+ (12, $submac:ident ! ($($rest:tt)*)) => ($submac!(13, $($rest)*)); -+ (13, $submac:ident ! ($($rest:tt)*)) => ($submac!(14, $($rest)*)); -+ (14, $submac:ident ! ($($rest:tt)*)) => ($submac!(15, $($rest)*)); -+ (15, $submac:ident ! ($($rest:tt)*)) => ($submac!(16, $($rest)*)); -+ (16, $submac:ident ! ($($rest:tt)*)) => ($submac!(17, $($rest)*)); -+ (17, $submac:ident ! ($($rest:tt)*)) => ($submac!(18, $($rest)*)); -+ (18, $submac:ident ! ($($rest:tt)*)) => ($submac!(19, $($rest)*)); -+ (19, $submac:ident ! ($($rest:tt)*)) => ($submac!(20, $($rest)*)); -+); -+ -+// HACK: for some reason, Rust 1.11 does not accept $res.$it in -+// permutation_unwrap. This is a bit ugly, but it will have no -+// impact on the generated code -+#[doc(hidden)] -+#[macro_export] -+macro_rules! acc ( -+ (0, $tup:expr) => ($tup.0); -+ (1, $tup:expr) => ($tup.1); -+ (2, $tup:expr) => ($tup.2); -+ (3, $tup:expr) => ($tup.3); -+ (4, $tup:expr) => ($tup.4); -+ (5, $tup:expr) => ($tup.5); -+ (6, $tup:expr) => ($tup.6); -+ (7, $tup:expr) => ($tup.7); -+ (8, $tup:expr) => ($tup.8); -+ (9, $tup:expr) => ($tup.9); -+ (10, $tup:expr) => ($tup.10); -+ (11, $tup:expr) => ($tup.11); -+ (12, $tup:expr) => ($tup.12); -+ (13, $tup:expr) => ($tup.13); -+ (14, $tup:expr) => ($tup.14); -+ (15, $tup:expr) => ($tup.15); -+ (16, $tup:expr) => ($tup.16); -+ (17, $tup:expr) => ($tup.17); -+ (18, $tup:expr) => ($tup.18); -+ (19, $tup:expr) => ($tup.19); -+ (20, $tup:expr) => ($tup.20); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! permutation_unwrap ( -+ ($it:tt, (), $res:ident, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ succ!($it, permutation_unwrap!((acc!($it, $res).unwrap()), $res, $($rest)*)); -+ ); -+ ($it:tt, ($($parsed:expr),*), $res:ident, $e:ident, $($rest:tt)*) => ( -+ succ!($it, permutation_unwrap!(($($parsed),* , acc!($it, $res).unwrap()), $res, $($rest)*)); -+ ); -+ ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ succ!($it, permutation_unwrap!(($($parsed),* , acc!($it, $res).unwrap()), $res, $($rest)*)); -+ ); -+ ($it:tt, ($($parsed:expr),*), $res:ident, $e:ident) => ( -+ ($($parsed),* , { acc!($it, $res).unwrap() }) -+ ); -+ ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* )) => ( -+ ($($parsed),* , acc!($it, $res).unwrap() ) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! permutation_iterator ( -+ ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident, $($rest:tt)*) => ( -+ permutation_iterator!($it, $i, $all_done, $needed, $res, call!($e), $($rest)*); -+ ); -+ ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => { -+ if acc!($it, $res) == ::std::option::Option::None { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ $i = i; -+ acc!($it, $res) = ::std::option::Option::Some(o); -+ continue; -+ }, -+ $crate::IResult::Error(_) => { -+ $all_done = false; -+ }, -+ $crate::IResult::Incomplete(i) => { -+ $needed = ::std::option::Option::Some(i); -+ break; -+ } -+ }; -+ } -+ succ!($it, permutation_iterator!($i, $all_done, $needed, $res, $($rest)*)); -+ }; -+ ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident) => ( -+ permutation_iterator!($it, $i, $all_done, $res, call!($e)); -+ ); -+ ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* )) => { -+ if acc!($it, $res) == ::std::option::Option::None { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ $i = i; -+ acc!($it, $res) = ::std::option::Option::Some(o); -+ continue; -+ }, -+ $crate::IResult::Error(_) => { -+ $all_done = false; -+ }, -+ $crate::IResult::Incomplete(i) => { -+ $needed = ::std::option::Option::Some(i); -+ break; -+ } -+ }; -+ } -+ }; -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::{Needed,IResult}; -+ use internal::IResult::*; -+ use util::ErrorKind; -+ -+ // reproduce the tag and take macros, because of module import order -+ macro_rules! tag ( -+ ($i:expr, $inp: expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ -+ tag_bytes!($i,bytes) -+ } -+ ); -+ ); -+ -+ macro_rules! tag_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ use std::cmp::min; -+ let len = $i.len(); -+ let blen = $bytes.len(); -+ let m = min(len, blen); -+ let reduced = &$i[..m]; -+ let b = &$bytes[..m]; -+ -+ let res: $crate::IResult<_,_> = if reduced != b { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) -+ } else if m < blen { -+ $crate::IResult::Incomplete($crate::Needed::Size(blen)) -+ } else { -+ $crate::IResult::Done(&$i[blen..], reduced) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ macro_rules! take( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res:$crate::IResult<&[u8],&[u8]> = if $i.len() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ }; -+ res -+ } -+ ); -+ ); -+ -+#[test] -+ fn alt() { -+ fn work(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(&b""[..], input) -+ } -+ -+ #[allow(unused_variables)] -+ fn dont_work(input: &[u8]) -> IResult<&[u8],&[u8],&'static str> { -+ Error(error_code!(ErrorKind::Custom("abcd"))) -+ } -+ -+ fn work2(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(input, &b""[..]) -+ } -+ -+ fn alt1(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work) -+ } -+ fn alt2(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | work) -+ } -+ fn alt3(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work | work2 | dont_work) -+ } -+ //named!(alt1, alt!(dont_work | dont_work)); -+ //named!(alt2, alt!(dont_work | work)); -+ //named!(alt3, alt!(dont_work | dont_work | work2 | dont_work)); -+ -+ let a = &b"abcd"[..]; -+ assert_eq!(alt1(a), Error(error_position!(ErrorKind::Alt, a))); -+ assert_eq!(alt2(a), Done(&b""[..], a)); -+ assert_eq!(alt3(a), Done(a, &b""[..])); -+ -+ named!(alt4, alt!(tag!("abcd") | tag!("efgh"))); -+ let b = &b"efgh"[..]; -+ assert_eq!(alt4(a), Done(&b""[..], a)); -+ assert_eq!(alt4(b), Done(&b""[..], b)); -+ -+ // test the alternative syntax -+ named!(alt5, alt!(tag!("abcd") => { |_| false } | tag!("efgh") => { |_| true })); -+ assert_eq!(alt5(a), Done(&b""[..], false)); -+ assert_eq!(alt5(b), Done(&b""[..], true)); -+ -+ // compile-time test guarding against an underspecified E generic type (#474) -+ named!(alt_eof1, alt!(eof!() | eof!())); -+ named!(alt_eof2, alt!(eof!() => {|x| x} | eof!() => {|x| x})); -+ let _ = (alt_eof1, alt_eof2); -+ -+ } -+ -+ #[test] -+ fn alt_incomplete() { -+ named!(alt1, alt!(tag!("a") | tag!("bc") | tag!("def"))); -+ -+ let a = &b""[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(1))); -+ let a = &b"b"[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(2))); -+ let a = &b"bcd"[..]; -+ assert_eq!(alt1(a), Done(&b"d"[..], &b"bc"[..])); -+ let a = &b"cde"[..]; -+ assert_eq!(alt1(a), Error(error_position!(ErrorKind::Alt, a))); -+ let a = &b"de"[..]; -+ assert_eq!(alt1(a), Incomplete(Needed::Size(3))); -+ let a = &b"defg"[..]; -+ assert_eq!(alt1(a), Done(&b"g"[..], &b"def"[..])); -+ } -+ -+ #[test] -+ fn alt_complete() { -+ named!(ac<&[u8], &[u8]>, -+ alt_complete!(tag!("abcd") | tag!("ef") | tag!("ghi") | tag!("kl")) -+ ); -+ -+ let a = &b""[..]; -+ assert_eq!(ac(a), Error(error_position!(ErrorKind::Alt, a))); -+ let a = &b"ef"[..]; -+ assert_eq!(ac(a), Done(&b""[..], &b"ef"[..])); -+ let a = &b"cde"[..]; -+ assert_eq!(ac(a), Error(error_position!(ErrorKind::Alt, a))); -+ } -+ -+ #[allow(unused_variables)] -+ #[test] -+ fn switch() { -+ named!(sw, -+ switch!(take!(4), -+ b"abcd" => take!(2) | -+ b"efgh" => take!(4) -+ ) -+ ); -+ -+ let a = &b"abcdefgh"[..]; -+ assert_eq!(sw(a), Done(&b"gh"[..], &b"ef"[..])); -+ -+ let b = &b"efghijkl"[..]; -+ assert_eq!(sw(b), Done(&b""[..], &b"ijkl"[..])); -+ let c = &b"afghijkl"[..]; -+ assert_eq!(sw(c), Error(error_position!(ErrorKind::Switch, &b"afghijkl"[..]))); -+ } -+ -+ #[test] -+ fn permutation() { -+ //trace_macros!(true); -+ named!(perm<(&[u8], &[u8], &[u8])>, -+ permutation!(tag!("abcd"), tag!("efg"), tag!("hi")) -+ ); -+ //trace_macros!(false); -+ -+ let expected = (&b"abcd"[..], &b"efg"[..], &b"hi"[..]); -+ -+ let a = &b"abcdefghijk"[..]; -+ assert_eq!(perm(a), Done(&b"jk"[..], expected)); -+ let b = &b"efgabcdhijk"[..]; -+ assert_eq!(perm(b), Done(&b"jk"[..], expected)); -+ let c = &b"hiefgabcdjk"[..]; -+ assert_eq!(perm(c), Done(&b"jk"[..], expected)); -+ -+ let d = &b"efgxyzabcdefghi"[..]; -+ assert_eq!(perm(d), Error(error_position!(ErrorKind::Permutation, &b"xyzabcdefghi"[..]))); -+ -+ let e = &b"efgabc"[..]; -+ assert_eq!(perm(e), Incomplete(Needed::Size(7))); -+ } -+ -+ /* -+ named!(does_not_compile, -+ alt!(tag!("abcd"), tag!("efgh")) -+ ); -+ */ -+} -diff --git third_party/rust/nom/src/bytes.rs third_party/rust/nom/src/bytes.rs -index 3f31598dc344..462ed0262f67 100644 ---- third_party/rust/nom/src/bytes.rs -+++ third_party/rust/nom/src/bytes.rs -@@ -1,92 +1,81 @@ - //! Byte level parsers and combinators - //! -+#[allow(unused_variables)] - --/// `recognize!(&[T] -> IResult<&[T], O> ) => &[T] -> IResult<&[T], &[T]>` --/// if the child parser was successful, return the consumed input as produced value -+/// `tag!(&[T]: nom::AsBytes) => &[T] -> IResult<&[T], &[T]>` -+/// declares a byte array as a suite to recognize -+/// -+/// consumes the recognized characters - /// - /// ``` - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::Done; - /// # fn main() { --/// named!(x, recognize!(delimited!(tag!("")))); --/// let r = x(&b" aaa"[..]); --/// assert_eq!(r, Done(&b" aaa"[..], &b""[..])); -+/// named!(x, tag!("abcd")); -+/// let r = x(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); - /// # } - /// ``` - #[macro_export] --macro_rules! recognize ( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+macro_rules! tag ( -+ ($i:expr, $tag: expr) => ( - { -- use $crate::HexDisplay; -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,_) => { -- let index = ($i).offset(i); -- $crate::IResult::Done(i, &($i)[..index]) -+ use $crate::{Compare,CompareResult,InputLength,Slice}; -+ let res: $crate::IResult<_,_> = match ($i).compare($tag) { -+ CompareResult::Ok => { -+ let blen = $tag.input_len(); -+ $crate::IResult::Done($i.slice(blen..), $i.slice(..blen)) - }, -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -+ CompareResult::Incomplete => { -+ $crate::IResult::Incomplete($crate::Needed::Size($tag.input_len())) -+ }, -+ CompareResult::Error => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) -+ } -+ }; -+ res - } - ); -- ($i:expr, $f:expr) => ( -- recognize!($i, call!($f)) -- ); - ); - --/// `tag!(&[T]: nom::AsBytes) => &[T] -> IResult<&[T], &[T]>` --/// declares a byte array as a suite to recognize -+/// `tag_no_case!(&[T]) => &[T] -> IResult<&[T], &[T]>` -+/// declares a case insensitive ascii string as a suite to recognize - /// - /// consumes the recognized characters - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; -+/// # use nom::IResult::{self,Done}; - /// # fn main() { --/// named!(x, tag!("abcd")); --/// let r = x(&b"abcdefgh"[..]); --/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); -+/// named!(test, tag_no_case!("ABcd")); -+/// -+/// let r = test(&b"aBCdefgh"[..]); -+/// assert_eq!(r, Done(&b"efgh"[..], &b"aBCd"[..])); - /// # } - /// ``` - #[macro_export] --macro_rules! tag ( -- ($i:expr, $inp: expr) => ( -- { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $inp; -- let bytes = as_bytes(&expected); -- -- tag_bytes!($i,bytes) -- } -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! tag_bytes ( -- ($i:expr, $bytes: expr) => ( -+macro_rules! tag_no_case ( -+ ($i:expr, $tag: expr) => ( - { -- let len = $i.len(); -- let blen = $bytes.len(); -- let m = if len < blen { len } else { blen }; -- let reduced = &$i[..m]; -- let b = &$bytes[..m]; -- -- let res: $crate::IResult<_,_> = if reduced != b { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Tag, $i)) -- } else if m < blen { -- $crate::IResult::Incomplete($crate::Needed::Size(blen)) -- } else { -- $crate::IResult::Done(&$i[blen..], reduced) -+ use $crate::{Compare,CompareResult,InputLength,Slice}; -+ let res: $crate::IResult<_,_> = match ($i).compare_no_case($tag) { -+ CompareResult::Ok => { -+ let blen = $tag.input_len(); -+ $crate::IResult::Done($i.slice(blen..), $i.slice(..blen)) -+ }, -+ CompareResult::Incomplete => { -+ $crate::IResult::Incomplete($crate::Needed::Size($tag.input_len())) -+ }, -+ CompareResult::Error => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) -+ } - }; - res - } - ); - ); - -+ - /// `is_not!(&[T:AsBytes]) => &[T] -> IResult<&[T], &[T]>` - /// returns the longest list of bytes that do not appear in the provided array - /// -@@ -103,39 +92,22 @@ macro_rules! tag_bytes ( - #[macro_export] - macro_rules! is_not( - ($input:expr, $arr:expr) => ( -- { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $arr; -- let bytes = as_bytes(&expected); -- -- is_not_bytes!($input, bytes) -- } -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! is_not_bytes ( -- ($input:expr, $bytes:expr) => ( - { - use $crate::InputLength; -- let res: $crate::IResult<_,_> = match $input.iter().position(|c| { -- for &i in $bytes.iter() { -- if *c == i { return true } -- } -- false -+ use $crate::InputIter; -+ use $crate::FindToken; -+ use $crate::Slice; -+ -+ let res: $crate::IResult<_,_> = match $input.position(|c| { -+ c.find_token($arr) - }) { -- Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsNot,$input)), -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::IsNot,$input)), - Some(n) => { -- let res = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ let res = $crate::IResult::Done($input.slice(n..), $input.slice(..n)); - res - }, - None => { -- $crate::IResult::Done(&$input[$input.input_len()..], $input) -+ $crate::IResult::Done($input.slice($input.input_len()..), $input) - } - }; - res -@@ -162,39 +134,22 @@ macro_rules! is_not_bytes ( - #[macro_export] - macro_rules! is_a ( - ($input:expr, $arr:expr) => ( -- { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $arr; -- let bytes = as_bytes(&expected); -- -- is_a_bytes!($input, bytes) -- } -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! is_a_bytes ( -- ($input:expr, $bytes:expr) => ( - { - use $crate::InputLength; -- let res: $crate::IResult<_,_> = match $input.iter().position(|c| { -- for &i in $bytes.iter() { -- if *c == i { return false } -- } -- true -+ use $crate::InputIter; -+ use $crate::FindToken; -+ use $crate::Slice; -+ -+ let res: $crate::IResult<_,_> = match $input.position(|c| { -+ !c.find_token($arr) - }) { -- Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsA,$input)), -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::IsA,$input)), - Some(n) => { -- let res: $crate::IResult<_,_> = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($input.slice(n..), $input.slice(..n)); - res - }, - None => { -- $crate::IResult::Done(&$input[($input).input_len()..], $input) -+ $crate::IResult::Done($input.slice(($input).input_len()..), $input) - } - }; - res -@@ -213,77 +168,55 @@ macro_rules! is_a_bytes ( - /// # use nom::IResult::Done; - /// # use nom::alpha; - /// # fn main() { --/// named!(esc, escaped!(call!(alpha), '\\', is_a_bytes!(&b"\"n\\"[..]))); -+/// named!(esc, escaped!(call!(alpha), '\\', one_of!("\"n\\"))); - /// assert_eq!(esc(&b"abcd"[..]), Done(&b""[..], &b"abcd"[..])); - /// assert_eq!(esc(&b"ab\\\"cd"[..]), Done(&b""[..], &b"ab\\\"cd"[..])); - /// # } - /// ``` - #[macro_export] - macro_rules! escaped ( -- ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -- { -- escaped1!($i, $submac!($($args)*), $control_char, $($rest)*) -- } -- ); -- -- ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -- escaped1!($i, call!($f), $control_char, $($rest)*) -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! escaped1 ( -- ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -- { -- escaped_impl!($i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -- } -- ); -- ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -- escaped_impl!($i, $submac1!($($args)*), $control_char, call!($g)) -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! escaped_impl ( -- ($i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $escapable:ident!( $($args2:tt)* )) => ( -+ // Internal parser, do not use directly -+ (__impl $i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $escapable:ident!( $($args2:tt)* )) => ( - { - use $crate::InputLength; -- let cl = || { -- use $crate::HexDisplay; -+ use $crate::Slice; -+ let cl = || -> $crate::IResult<_,_,_> { -+ use $crate::Offset; - let mut index = 0; - -- while index < $i.len() { -- if let $crate::IResult::Done(i,_) = $normal!(&$i[index..], $($args)*) { -- if i.is_empty() { -- return $crate::IResult::Done(&$i[$i.input_len()..], $i) -- } else { -- index = $i.offset(i); -- } -- } else if $i[index] == $control_char as u8 { -- if index + 1 >= $i.len() { -- return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Escaped,&$i[index..])); -- } else { -- match $escapable!(&$i[index+1..], $($args2)*) { -- $crate::IResult::Done(i,_) => { -- if i.is_empty() { -- return $crate::IResult::Done(&$i[$i.input_len()..], $i) -- } else { -- index = $i.offset(i); -+ while index < $i.input_len() { -+ match $normal!($i.slice(index..), $($args)*) { -+ $crate::IResult::Done(i, _) => { -+ if i.is_empty() { -+ return $crate::IResult::Done($i.slice($i.input_len()..), $i) -+ } else { -+ index = $i.offset(i); -+ } -+ }, -+ $crate::IResult::Incomplete(i) => { -+ return $crate::IResult::Incomplete(i) -+ }, -+ $crate::IResult::Error(e) => { -+ if $i[index] == $control_char as u8 { -+ if index + 1 >= $i.input_len() { -+ return $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } else { -+ match $escapable!($i.slice(index+1..), $($args2)*) { -+ $crate::IResult::Done(i,_) => { -+ if i.is_empty() { -+ return $crate::IResult::Done($i.slice($i.input_len()..), $i) -+ } else { -+ index = $i.offset(i); -+ } -+ }, -+ $crate::IResult::Incomplete(i) => return $crate::IResult::Incomplete(i), -+ $crate::IResult::Error(e2) => return $crate::IResult::Error(e2) - } -- }, -- $crate::IResult::Incomplete(i) => return $crate::IResult::Incomplete(i), -- $crate::IResult::Error(e) => return $crate::IResult::Error(e) -+ } -+ } else { -+ return $crate::IResult::Done($i.slice(index..), $i.slice(..index)); - } - } -- } else { -- if index == 0 { -- return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Escaped,&$i[index..])) -- } else { -- return $crate::IResult::Done(&$i[index..], &$i[..index]) -- } - } - } - $crate::IResult::Done(&$i[index..], &$i[..index]) -@@ -292,22 +225,46 @@ macro_rules! escaped_impl ( - $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), - $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), - $crate::IResult::Error(e) => { -- return $crate::IResult::Error($crate::Err::NodePosition($crate::ErrorKind::Escaped, $i, Box::new(e))) -+ return $crate::IResult::Error(error_node_position!($crate::ErrorKind::Escaped, $i, e)) - } - } - } - ); -+ // Internal parser, do not use directly -+ (__impl_1 $i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -+ { -+ escaped!(__impl $i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -+ } -+ ); -+ // Internal parser, do not use directly -+ (__impl_1 $i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -+ escaped!(__impl $i, $submac1!($($args)*), $control_char, call!($g)) -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -+ { -+ let input: &[u8] = $i; -+ -+ escaped!(__impl_1 input, $submac!($($args)*), $control_char, $($rest)*) -+ } -+ ); -+ -+ ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -+ escaped!(__impl_1 $i, call!($f), $control_char, $($rest)*) -+ ); - ); - - /// `escaped_transform!(&[T] -> IResult<&[T], &[T]>, T, &[T] -> IResult<&[T], &[T]>) => &[T] -> IResult<&[T], Vec>` - /// matches a byte string with escaped characters. - /// - /// The first argument matches the normal characters (it must not match the control character), the second argument is the control character (like `\` in most languages), --/// the third argument matches the escaped characters and trnasforms them. -+/// the third argument matches the escaped characters and transforms them. - /// - /// As an example, the chain `abc\tdef` could be `abc def` (it also consumes the control character) - /// --/// ``` -+/// WARNING: if you do not use the `verbose-errors` feature, this combinator will currently fail to build -+/// because of a type inference error -+/// -+/// ```ignore - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::Done; - /// # use nom::alpha; -@@ -333,59 +290,32 @@ macro_rules! escaped_impl ( - /// ``` - #[macro_export] - macro_rules! escaped_transform ( -- ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -- { -- escaped_transform1!($i, $submac!($($args)*), $control_char, $($rest)*) -- } -- ); -- -- ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -- escaped_transform1!($i, call!($f), $control_char, $($rest)*) -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! escaped_transform1 ( -- ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -- { -- escaped_transform_impl!($i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -- } -- ); -- ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -- escaped_transform_impl!($i, $submac1!($($args)*), $control_char, call!($g)) -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! escaped_transform_impl ( -- ($i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $transform:ident!( $($args2:tt)* )) => ( -+ // Internal parser, do not use directly -+ (__impl $i: expr, $normal:ident!( $($args:tt)* ), $control_char: expr, $transform:ident!( $($args2:tt)* )) => ( - { -- use $crate::InputLength; -+ use $crate::{InputLength,Slice}; - let cl = || { -- use $crate::HexDisplay; -+ use $crate::Offset; - let mut index = 0; - let mut res = Vec::new(); - -- while index < $i.len() { -- if let $crate::IResult::Done(i,o) = $normal!(&$i[index..], $($args)*) { -+ while index < $i.input_len() { -+ if let $crate::IResult::Done(i,o) = $normal!($i.slice(index..), $($args)*) { - res.extend(o.iter().cloned()); - if i.is_empty() { -- return $crate::IResult::Done(&$i[$i.input_len()..], res) -+ return $crate::IResult::Done($i.slice($i.input_len()..), res); - } else { - index = $i.offset(i); - } - } else if $i[index] == $control_char as u8 { -- if index + 1 >= $i.len() { -- return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::EscapedTransform,&$i[index..])); -+ if index + 1 >= $i.input_len() { -+ return $crate::IResult::Error(error_position!($crate::ErrorKind::EscapedTransform,$i.slice(index..))); - } else { -- match $transform!(&$i[index+1..], $($args2)*) { -+ match $transform!($i.slice(index+1..), $($args2)*) { - $crate::IResult::Done(i,o) => { - res.extend(o.iter().cloned()); - if i.is_empty() { -- return $crate::IResult::Done(&$i[$i.input_len()..], res) -+ return $crate::IResult::Done($i.slice($i.input_len()..), res) - } else { - index = $i.offset(i); - } -@@ -396,23 +326,44 @@ macro_rules! escaped_transform_impl ( - } - } else { - if index == 0 { -- return $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::EscapedTransform,&$i[index..])) -+ return $crate::IResult::Error(error_position!($crate::ErrorKind::EscapedTransform,$i.slice(index..))) - } else { -- return $crate::IResult::Done(&$i[index..], res) -+ return $crate::IResult::Done($i.slice(index..), res) - } - } - } -- $crate::IResult::Done(&$i[index..], res) -+ $crate::IResult::Done($i.slice(index..), res) - }; - match cl() { - $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), - $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), - $crate::IResult::Error(e) => { -- return $crate::IResult::Error($crate::Err::NodePosition($crate::ErrorKind::EscapedTransform, $i, Box::new(e))) -+ return $crate::IResult::Error(error_node_position!($crate::ErrorKind::EscapedTransform, $i, e)) - } - } - } -- ) -+ ); -+ // Internal parser, do not use directly -+ (__impl_1 $i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => ( -+ { -+ escaped_transform!(__impl $i, $submac1!($($args)*), $control_char, $submac2!($($args2)*)) -+ } -+ ); -+ // Internal parser, do not use directly -+ (__impl_1 $i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $g:expr) => ( -+ escaped_transform_impl!($i, $submac1!($($args)*), $control_char, call!($g)) -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $control_char: expr, $($rest:tt)+) => ( -+ { -+ let input: &[u8] = $i; -+ -+ escaped_transform!(__impl_1 input, $submac!($($args)*), $control_char, $($rest)*) -+ } -+ ); -+ -+ ($i:expr, $f:expr, $control_char: expr, $($rest:tt)+) => ( -+ escaped_transform!(__impl_1 $i, call!($f), $control_char, $($rest)*) -+ ); - ); - - /// `take_while!(T -> bool) => &[T] -> IResult<&[T], &[T]>` -@@ -435,13 +386,16 @@ macro_rules! escaped_transform_impl ( - macro_rules! take_while ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( - { -- match $input.iter().position(|c| !$submac!(*c, $($args)*)) { -+ use $crate::{InputLength,InputIter,Slice}; -+ let input = $input; -+ -+ match input.position(|c| !$submac!(c, $($args)*)) { - Some(n) => { -- let res:$crate::IResult<_,_> = $crate::IResult::Done(&$input[n..], &$input[..n]); -+ let res:$crate::IResult<_,_> = $crate::IResult::Done(input.slice(n..), input.slice(..n)); - res - }, - None => { -- $crate::IResult::Done(&$input[($input).len()..], $input) -+ $crate::IResult::Done(input.slice(input.input_len()..), input) - } - } - } -@@ -451,7 +405,7 @@ macro_rules! take_while ( - ); - ); - --/// `take_while1!(&[T] -> bool) => &[T] -> IResult<&[T], &[T]>` -+/// `take_while1!(T -> bool) => &[T] -> IResult<&[T], &[T]>` - /// returns the longest (non empty) list of bytes until the provided function fails. - /// - /// The argument is either a function `&[T] -> bool` or a macro returning a `bool -@@ -459,17 +413,21 @@ macro_rules! take_while ( - macro_rules! take_while1 ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( - { -+ let input = $input; -+ - use $crate::InputLength; -- if ($input).input_len() == 0 { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1,$input)) -+ use $crate::InputIter; -+ use $crate::Slice; -+ if input.input_len() == 0 { -+ $crate::IResult::Incomplete($crate::Needed::Size(1)) - } else { -- match $input.iter().position(|c| !$submac!(*c, $($args)*)) { -- Some(0) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1,$input)), -+ match input.position(|c| !$submac!(c, $($args)*)) { -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::TakeWhile1,input)), - Some(n) => { -- $crate::IResult::Done(&$input[n..], &$input[..n]) -+ $crate::IResult::Done(input.slice(n..), input.slice(..n)) - }, - None => { -- $crate::IResult::Done(&$input[($input).len()..], $input) -+ $crate::IResult::Done(input.slice(input.input_len()..), input) - } - } - } -@@ -488,10 +446,14 @@ macro_rules! take_while1 ( - macro_rules! take_till ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( - { -+ let input = $input; -+ - use $crate::InputLength; -- match $input.iter().position(|c| $submac!(c, $($args)*)) { -- Some(n) => $crate::IResult::Done(&$input[n..], &$input[..n]), -- None => $crate::IResult::Done(&$input[($input).input_len()..], $input) -+ use $crate::InputIter; -+ use $crate::Slice; -+ match input.position(|c| $submac!(c, $($args)*)) { -+ Some(n) => $crate::IResult::Done(input.slice(n..), input.slice(..n)), -+ None => $crate::IResult::Done(input.slice(input.input_len()..), input) - } - } - ); -@@ -500,6 +462,35 @@ macro_rules! take_till ( - ); - ); - -+/// `take_till1!(T -> bool) => &[T] -> IResult<&[T], &[T]>` -+/// returns the longest non empty list of bytes until the provided function succeeds -+/// -+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool -+#[macro_export] -+macro_rules! take_till1 ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ let input = $input; -+ -+ use $crate::InputLength; -+ use $crate::InputIter; -+ use $crate::Slice; -+ if input.input_len() == 0 { -+ $crate::IResult::Incomplete($crate::Needed::Size(1)) -+ } else { -+ match input.position(|c| $submac!(c, $($args)*)) { -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::TakeTill1,input)), -+ Some(n) => $crate::IResult::Done(input.slice(n..), input.slice(..n)), -+ None => $crate::IResult::Done(input.slice(input.input_len()..), input) -+ } -+ } -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_till1!($input, call!($f)); -+ ); -+); -+ - /// `take!(nb) => &[T] -> IResult<&[T], &[T]>` - /// generates a parser consuming the specified number of bytes - /// -@@ -519,69 +510,80 @@ macro_rules! take_till ( - macro_rules! take ( - ($i:expr, $count:expr) => ( - { -+ use $crate::InputIter; -+ use $crate::Slice; -+ let input = $i; -+ - let cnt = $count as usize; -- let res: $crate::IResult<_,_> = if $i.len() < cnt { -- $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -- } else { -- $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ -+ let res: $crate::IResult<_,_> = match input.slice_index(cnt) { -+ None => $crate::IResult::Incomplete($crate::Needed::Size(cnt)), -+ //FIXME: use the InputTake trait -+ Some(index) => $crate::IResult::Done(input.slice(index..), input.slice(..index)) - }; - res - } - ); - ); - --/// `take!(nb) => &[T] -> IResult<&[T], &str>` -+/// `take_str!(nb) => &[T] -> IResult<&[T], &str>` - /// same as take! but returning a &str - #[macro_export] - macro_rules! take_str ( -- ( $i:expr, $size:expr ) => ( map_res!($i, take!($size), ::std::str::from_utf8) ); -+ ( $i:expr, $size:expr ) => ( -+ { -+ let input: &[u8] = $i; -+ -+ map_res!(input, take!($size), ::std::str::from_utf8) -+ } -+ ); - ); - - /// `take_until_and_consume!(tag) => &[T] -> IResult<&[T], &[T]>` - /// generates a parser consuming bytes until the specified byte sequence is found, and consumes it - #[macro_export] --macro_rules! take_until_and_consume( -- ($i:expr, $inp:expr) => ( -+macro_rules! take_until_and_consume ( -+ ($i:expr, $substr:expr) => ( - { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -+ use $crate::InputLength; -+ use $crate::FindSubstring; -+ use $crate::Slice; - -- let expected = $inp; -- let bytes = as_bytes(&expected); -- take_until_and_consume_bytes!($i, bytes) -+ let res: $crate::IResult<_,_> = if $substr.input_len() > $i.input_len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.input_len())) -+ } else { -+ match ($i).find_substring($substr) { -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilAndConsume,$i)) -+ }, -+ Some(index) => { -+ $crate::IResult::Done($i.slice(index+$substr.input_len()..), $i.slice(0..index)) -+ }, -+ } -+ }; -+ res - } - ); - ); - --#[doc(hidden)] -+/// `take_until_and_consume1!(tag) => &[T] -> IResult<&[T], &[T]>` -+/// generates a parser consuming bytes (at least 1) until the specified byte sequence is found, and consumes it - #[macro_export] --macro_rules! take_until_and_consume_bytes ( -- ($i:expr, $bytes:expr) => ( -+macro_rules! take_until_and_consume1 ( -+ ($i:expr, $substr:expr) => ( - { -- let res: $crate::IResult<_,_> = if $bytes.len() > $i.len() { -- $crate::IResult::Incomplete($crate::Needed::Size($bytes.len())) -- } else { -- let mut index = 0; -- let mut parsed = false; -- -- for idx in 0..$i.len() { -- if idx + $bytes.len() > $i.len() { -- index = idx; -- break; -- } -- if &$i[idx..idx + $bytes.len()] == $bytes { -- parsed = true; -- index = idx; -- break; -- } -- } -+ use $crate::InputLength; - -- if parsed { -- $crate::IResult::Done(&$i[(index + $bytes.len())..], &$i[0..index]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilAndConsume,$i)) -+ let res: $crate::IResult<_,_> = if 1 + $substr.input_len() > $i.input_len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.input_len())) -+ } else { -+ match ($i).find_substring($substr) { -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilAndConsume,$i)) -+ }, -+ Some(index) => { -+ $crate::IResult::Done($i.slice(index+$substr.input_len()..), $i.slice(0..index)) -+ }, - } - }; - res -@@ -592,48 +594,50 @@ macro_rules! take_until_and_consume_bytes ( - /// `take_until!(tag) => &[T] -> IResult<&[T], &[T]>` - /// consumes data until it finds the specified tag - #[macro_export] --macro_rules! take_until( -- ($i:expr, $inp:expr) => ( -+macro_rules! take_until ( -+ ($i:expr, $substr:expr) => ( - { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -+ use $crate::InputLength; -+ use $crate::FindSubstring; -+ use $crate::Slice; - -- let expected = $inp; -- let bytes = as_bytes(&expected); -- take_until_bytes!($i, bytes) -+ let res: $crate::IResult<_,_> = if $substr.input_len() > $i.input_len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.input_len())) -+ } else { -+ match ($i).find_substring($substr) { -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntil,$i)) -+ }, -+ Some(index) => { -+ $crate::IResult::Done($i.slice(index..), $i.slice(0..index)) -+ }, -+ } -+ }; -+ res - } - ); - ); - --#[doc(hidden)] -+/// `take_until1!(tag) => &[T] -> IResult<&[T], &[T]>` -+/// consumes data until it finds the specified tag - #[macro_export] --macro_rules! take_until_bytes( -- ($i:expr, $bytes:expr) => ( -+macro_rules! take_until1 ( -+ ($i:expr, $substr:expr) => ( - { -- let res: $crate::IResult<_,_> = if $bytes.len() > $i.len() { -- $crate::IResult::Incomplete($crate::Needed::Size($bytes.len())) -- } else { -- let mut index = 0; -- let mut parsed = false; -- -- for idx in 0..$i.len() { -- if idx + $bytes.len() > $i.len() { -- index = idx; -- break; -- } -- if &$i[idx..idx+$bytes.len()] == $bytes { -- parsed = true; -- index = idx; -- break; -- } -- } -+ use $crate::InputLength; -+ use $crate::FindSubstring; -+ use $crate::Slice; - -- if parsed { -- $crate::IResult::Done(&$i[index..], &$i[0..index]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntil,$i)) -+ let res: $crate::IResult<_,_> = if 1+$substr.input_len() > $i.input_len() { -+ $crate::IResult::Incomplete($crate::Needed::Size($substr.input_len())) -+ } else { -+ match ($i).find_substring($substr) { -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntil,$i)) -+ }, -+ Some(index) => { -+ $crate::IResult::Done($i.slice(index..), $i.slice(0..index)) -+ }, - } - }; - res -@@ -644,136 +648,78 @@ macro_rules! take_until_bytes( - /// `take_until_either_and_consume!(tag) => &[T] -> IResult<&[T], &[T]>` - /// consumes data until it finds any of the specified characters, and consume it - #[macro_export] --macro_rules! take_until_either_and_consume( -- ($i:expr, $inp:expr) => ( -+macro_rules! take_until_either_and_consume ( -+ ($input:expr, $arr:expr) => ( - { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $inp; -- let bytes = as_bytes(&expected); -- take_until_either_and_consume_bytes!($i, bytes) -- } -- ); --); -+ use $crate::InputLength; -+ use $crate::InputIter; -+ use $crate::FindToken; -+ use $crate::Slice; - --#[doc(hidden)] --#[macro_export] --macro_rules! take_until_either_and_consume_bytes( -- ($i:expr, $bytes:expr) => ( -- { -- let res: $crate::IResult<_,_> = if 1 > $i.len() { -+ if $input.input_len() == 0 { - $crate::IResult::Incomplete($crate::Needed::Size(1)) - } else { -- let mut index = 0; -- let mut parsed = false; -- -- for idx in 0..$i.len() { -- if idx + 1 > $i.len() { -- index = idx; -- break; -- } -- for &t in $bytes.iter() { -- if $i[idx] == t { -- parsed = true; -- index = idx; -- break; -- } -+ let res: $crate::IResult<_,_> = match $input.position(|c| { -+ c.find_token($arr) -+ }) { -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilEitherAndConsume,$input)), -+ Some(n) => { -+ let res = $crate::IResult::Done($input.slice(n+1..), $input.slice(..n)); -+ res -+ }, -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilEitherAndConsume,$input)) - } -- if parsed { break; } -- } -- -- if parsed { -- $crate::IResult::Done(&$i[(index+1)..], &$i[0..index]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilEitherAndConsume,$i)) -- } -- }; -- res -+ }; -+ res -+ } - } - ); - ); - - /// `take_until_either!(tag) => &[T] -> IResult<&[T], &[T]>` - #[macro_export] --macro_rules! take_until_either( -- ($i:expr, $inp:expr) => ( -+macro_rules! take_until_either ( -+ ($input:expr, $arr:expr) => ( - { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $inp; -- let bytes = as_bytes(&expected); -- take_until_either_bytes!($i, bytes) -- } -- ); --); -+ use $crate::InputLength; -+ use $crate::InputIter; -+ use $crate::FindToken; -+ use $crate::Slice; - --#[doc(hidden)] --#[macro_export] --macro_rules! take_until_either_bytes( -- ($i:expr, $bytes:expr) => ( -- { -- let res: $crate::IResult<_,_> = if 1 > $i.len() { -+ if $input.input_len() == 0 { - $crate::IResult::Incomplete($crate::Needed::Size(1)) - } else { -- let mut index = 0; -- let mut parsed = false; -- -- for idx in 0..$i.len() { -- if idx + 1 > $i.len() { -- index = idx; -- break; -- } -- for &t in $bytes.iter() { -- if $i[idx] == t { -- parsed = true; -- index = idx; -- break; -- } -+ let res: $crate::IResult<_,_> = match $input.position(|c| { -+ c.find_token($arr) -+ }) { -+ Some(0) => $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilEither,$input)), -+ Some(n) => { -+ let res = $crate::IResult::Done($input.slice(n..), $input.slice(..n)); -+ res -+ }, -+ None => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TakeUntilEither,$input)) - } -- if parsed { break; } -- } -- -- if parsed { -- $crate::IResult::Done(&$i[index..], &$i[0..index]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilEither,$i)) -- } -- }; -- res -+ }; -+ res -+ } - } - ); - ); - --/// `length_bytes!(&[T] -> IResult<&[T], nb>) => &[T] -> IResult<&[T], &[T]> --/// gets a number from the first parser, then extracts that many bytes from the -+/// `length_bytes!(&[T] -> IResult<&[T], nb>) => &[T] -> IResult<&[T], &[T]>` -+/// Gets a number from the first parser, then extracts that many bytes from the - /// remaining stream - #[macro_export] - macro_rules! length_bytes( - ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i1,nb) => { -- let nb = nb as usize; -- let length_remaining = i1.len(); -- if length_remaining < nb { -- $crate::IResult::Incomplete($crate::Needed::Size(nb - length_remaining)) -- } else { -- $crate::IResult::Done(&i1[nb..], &i1[..nb]) -- } -- } -- } -+ length_data!($i, $submac!($($args)*)) - } - ); - ($i:expr, $f:expr) => ( -- length_bytes!($i, call!($f)) -+ length_data!($i, call!($f)) - ) - ); - -@@ -781,10 +727,53 @@ macro_rules! length_bytes( - mod tests { - use internal::Needed; - use internal::IResult::*; -- use internal::Err::*; - use util::ErrorKind; - use nom::{alpha, digit, hex_digit, oct_digit, alphanumeric, space, multispace}; - -+ macro_rules! one_of ( -+ ($i:expr, $inp: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ one_of_bytes!($i, bytes) -+ } -+ } -+ ); -+ ); -+ -+ macro_rules! one_of_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ if $i.is_empty() { -+ $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -+ } else { -+ let mut found = false; -+ -+ for &i in $bytes { -+ if i == $i[0] { -+ found = true; -+ break; -+ } -+ } -+ -+ if found { -+ $crate::IResult::Done(&$i[1..], $i[0] as char) -+ } else { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::OneOf, $i)) -+ } -+ } -+ } -+ ); -+ ); -+ - #[test] - fn is_a() { - named!(a_or_b, is_a!(&b"ab"[..])); -@@ -796,7 +785,7 @@ mod tests { - assert_eq!(a_or_b(b), Done(&b"cde"[..], &b"b"[..])); - - let c = &b"cdef"[..]; -- assert_eq!(a_or_b(c), Error(Position(ErrorKind::IsA,c))); -+ assert_eq!(a_or_b(c), Error(error_position!(ErrorKind::IsA,c))); - - let d = &b"bacdef"[..]; - assert_eq!(a_or_b(d), Done(&b"cdef"[..], &b"ba"[..])); -@@ -813,7 +802,7 @@ mod tests { - assert_eq!(a_or_b(b), Done(&b"bde"[..], &b"c"[..])); - - let c = &b"abab"[..]; -- assert_eq!(a_or_b(c), Error(Position(ErrorKind::IsNot,c))); -+ assert_eq!(a_or_b(c), Error(error_position!(ErrorKind::IsNot,c))); - - let d = &b"cdefba"[..]; - assert_eq!(a_or_b(d), Done(&b"ba"[..], &b"cdef"[..])); -@@ -825,27 +814,34 @@ mod tests { - assert_eq!(a_or_b(f), Done(&b""[..], &b"fghi"[..])); - } - -+ #[allow(unused_variables)] - #[test] - fn escaping() { -- named!(esc, escaped!(call!(alpha), '\\', is_a_bytes!(&b"\"n\\"[..]))); -+ named!(esc, escaped!(call!(alpha), '\\', one_of!("\"n\\"))); - assert_eq!(esc(&b"abcd"[..]), Done(&b""[..], &b"abcd"[..])); - assert_eq!(esc(&b"ab\\\"cd"[..]), Done(&b""[..], &b"ab\\\"cd"[..])); - assert_eq!(esc(&b"\\\"abcd"[..]), Done(&b""[..], &b"\\\"abcd"[..])); - assert_eq!(esc(&b"\\n"[..]), Done(&b""[..], &b"\\n"[..])); - assert_eq!(esc(&b"ab\\\"12"[..]), Done(&b"12"[..], &b"ab\\\""[..])); -- assert_eq!(esc(&b"AB\\"[..]), Error(NodePosition(ErrorKind::Escaped, &b"AB\\"[..], Box::new(Position(ErrorKind::Escaped, &b"\\"[..]))))); -- assert_eq!(esc(&b"AB\\A"[..]), Error(NodePosition(ErrorKind::Escaped, &b"AB\\A"[..], Box::new(Position(ErrorKind::IsA, &b"A"[..]))))); -+ assert_eq!(esc(&b"AB\\"[..]), Incomplete(Needed::Unknown)); -+ assert_eq!(esc(&b"AB\\A"[..]), Error(error_node_position!(ErrorKind::Escaped, &b"AB\\A"[..], -+ error_position!(ErrorKind::OneOf, &b"A"[..])))); -+ -+ named!(esc2, escaped!(call!(digit), '\\', one_of!("\"n\\"))); -+ assert_eq!(esc2(&b"12\\nnn34"[..]), Done(&b"nn34"[..], &b"12\\n"[..])); - } - -+ #[cfg(feature = "verbose-errors")] - fn to_s(i:Vec) -> String { - String::from_utf8_lossy(&i).into_owned() - } - -+ #[cfg(feature = "verbose-errors")] - #[test] - fn escape_transform() { - use std::str; - -- named!(esc< String >, map!(escaped_transform!(alpha, '\\', -+ named!(esc, map!(escaped_transform!(alpha, '\\', - alt!( - tag!("\\") => { |_| &b"\\"[..] } - | tag!("\"") => { |_| &b"\""[..] } -@@ -858,8 +854,9 @@ mod tests { - assert_eq!(esc(&b"\\\"abcd"[..]), Done(&b""[..], String::from("\"abcd"))); - assert_eq!(esc(&b"\\n"[..]), Done(&b""[..], String::from("\n"))); - assert_eq!(esc(&b"ab\\\"12"[..]), Done(&b"12"[..], String::from("ab\""))); -- assert_eq!(esc(&b"AB\\"[..]), Error(NodePosition(ErrorKind::EscapedTransform, &b"AB\\"[..], Box::new(Position(ErrorKind::EscapedTransform, &b"\\"[..]))))); -- assert_eq!(esc(&b"AB\\A"[..]), Error(NodePosition(ErrorKind::EscapedTransform, &b"AB\\A"[..], Box::new(Position(ErrorKind::Alt, &b"A"[..]))))); -+ assert_eq!(esc(&b"AB\\"[..]), Error(error_node_position!(ErrorKind::EscapedTransform, &b"AB\\"[..], error_position!(ErrorKind::EscapedTransform, &b"\\"[..])))); -+ assert_eq!(esc(&b"AB\\A"[..]), Error(error_node_position!(ErrorKind::EscapedTransform, &b"AB\\A"[..], -+ error_position!(ErrorKind::Alt, &b"A"[..])))); - - let e = "è"; - let a = "à"; -@@ -893,6 +890,7 @@ mod tests { - } - - #[test] -+ #[cfg(feature = "std")] - fn take_until_test() { - named!(x, take_until_and_consume!("efgh")); - let r = x(&b"abcdabcdefghijkl"[..]); -@@ -905,7 +903,7 @@ mod tests { - - println!("Done 2\n"); - let r3 = x(&b"abcefg"[..]); -- assert_eq!(r3, Error(Position(ErrorKind::TakeUntilAndConsume, &b"abcefg"[..]))); -+ assert_eq!(r3, Error(error_position!(ErrorKind::TakeUntilAndConsume, &b"abcefg"[..]))); - - assert_eq!( - x(&b"ab"[..]), -@@ -913,15 +911,34 @@ mod tests { - ); - } - -+ #[test] -+ fn take_until_either() { -+ named!(x, take_until_either!("!.")); -+ assert_eq!( -+ x(&b"123!abc"[..]), -+ Done(&b"!abc"[..], &b"123"[..]) -+ ); -+ } -+ - #[test] - fn take_until_either_incomplete() { - named!(x, take_until_either!("!.")); - assert_eq!( - x(&b"123"[..]), -- Error(Position(ErrorKind::TakeUntilEither, &b"123"[..])) -+ Error(error_position!(ErrorKind::TakeUntilEither, &b"123"[..])) -+ ); -+ } -+ -+ #[test] -+ fn take_until_either_and_consume() { -+ named!(x, take_until_either_and_consume!("!.")); -+ assert_eq!( -+ x(&b"123.abc"[..]), -+ Done(&b"abc"[..], &b"123"[..]) - ); - } - -+ - #[test] - fn take_until_incomplete() { - named!(y, take_until!("end")); -@@ -931,7 +948,7 @@ mod tests { - ); - assert_eq!( - y(&b"123"[..]), -- Error(Position(ErrorKind::TakeUntil, &b"123"[..])) -+ Error(error_position!(ErrorKind::TakeUntil, &b"123"[..])) - ); - } - -@@ -996,10 +1013,40 @@ mod tests { - let c = b"abcd123"; - let d = b"123"; - -- assert_eq!(f(&a[..]), Error(Position(ErrorKind::TakeWhile1, &b""[..]))); -+ assert_eq!(f(&a[..]), Incomplete(Needed::Size(1))); - assert_eq!(f(&b[..]), Done(&a[..], &b[..])); - assert_eq!(f(&c[..]), Done(&b"123"[..], &b[..])); -- assert_eq!(f(&d[..]), Error(Position(ErrorKind::TakeWhile1, &d[..]))); -+ assert_eq!(f(&d[..]), Error(error_position!(ErrorKind::TakeWhile1, &d[..]))); -+ } -+ -+ #[test] -+ fn take_till() { -+ use nom::is_alphabetic; -+ named!(f, take_till!(is_alphabetic)); -+ let a = b""; -+ let b = b"abcd"; -+ let c = b"123abcd"; -+ let d = b"123"; -+ -+ assert_eq!(f(&a[..]), Done(&b""[..], &b""[..])); -+ assert_eq!(f(&b[..]), Done(&b"abcd"[..], &b""[..])); -+ assert_eq!(f(&c[..]), Done(&b"abcd"[..], &b"123"[..])); -+ assert_eq!(f(&d[..]), Done(&b""[..], &b"123"[..])); -+ } -+ -+ #[test] -+ fn take_till1() { -+ use nom::is_alphabetic; -+ named!(f, take_till1!(is_alphabetic)); -+ let a = b""; -+ let b = b"abcd"; -+ let c = b"123abcd"; -+ let d = b"123"; -+ -+ assert_eq!(f(&a[..]), Incomplete(Needed::Size(1))); -+ assert_eq!(f(&b[..]), Error(error_position!(ErrorKind::TakeTill1, &b[..]))); -+ assert_eq!(f(&c[..]), Done(&b"abcd"[..], &b"123"[..])); -+ assert_eq!(f(&d[..]), Done(&b""[..], &b"123"[..])); - } - - #[cfg(feature = "nightly")] -@@ -1016,6 +1063,7 @@ mod tests { - } - - #[test] -+ #[cfg(feature = "std")] - fn recognize_take_while() { - use nom::is_alphanumeric; - named!(x, take_while!(is_alphanumeric)); -@@ -1024,4 +1072,48 @@ mod tests { - println!("X: {:?}", x(&b"ab"[..])); - assert_eq!(y(&b"ab"[..]), Done(&[][..], &b"ab"[..])); - } -+ -+ #[test] -+ fn length_bytes() { -+ use nom::le_u8; -+ named!(x, length_bytes!(le_u8)); -+ assert_eq!(x(b"\x02..>>"), Done(&b">>"[..], &b".."[..])); -+ assert_eq!(x(b"\x02.."), Done(&[][..], &b".."[..])); -+ assert_eq!(x(b"\x02."), Incomplete(Needed::Size(3))); -+ assert_eq!(x(b"\x02"), Incomplete(Needed::Size(3))); -+ -+ named!(y, do_parse!(tag!("magic") >> b: length_bytes!(le_u8) >> (b))); -+ assert_eq!(y(b"magic\x02..>>"), Done(&b">>"[..], &b".."[..])); -+ assert_eq!(y(b"magic\x02.."), Done(&[][..], &b".."[..])); -+ assert_eq!(y(b"magic\x02."), Incomplete(Needed::Size(8))); -+ assert_eq!(y(b"magic\x02"), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ fn case_insensitive() { -+ named!(test, tag_no_case!("ABcd")); -+ assert_eq!(test(&b"aBCdefgh"[..]), Done(&b"efgh"[..], &b"aBCd"[..])); -+ assert_eq!(test(&b"abcdefgh"[..]), Done(&b"efgh"[..], &b"abcd"[..])); -+ assert_eq!(test(&b"ABCDefgh"[..]), Done(&b"efgh"[..], &b"ABCD"[..])); -+ assert_eq!(test(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(test(&b"Hello"[..]), Error(error_position!(ErrorKind::Tag, &b"Hello"[..]))); -+ assert_eq!(test(&b"Hel"[..]), Error(error_position!(ErrorKind::Tag, &b"Hel"[..]))); -+ -+ named!(test2<&str, &str>, tag_no_case!("ABcd")); -+ assert_eq!(test2("aBCdefgh"), Done("efgh", "aBCd")); -+ assert_eq!(test2("abcdefgh"), Done("efgh", "abcd")); -+ assert_eq!(test2("ABCDefgh"), Done("efgh", "ABCD")); -+ assert_eq!(test2("ab"), Incomplete(Needed::Size(4))); -+ assert_eq!(test2("Hello"), Error(error_position!(ErrorKind::Tag, &"Hello"[..]))); -+ assert_eq!(test2("Hel"), Error(error_position!(ErrorKind::Tag, &"Hel"[..]))); -+ } -+ -+ #[test] -+ fn tag_fixed_size_array() { -+ named!(test, tag!([0x42])); -+ named!(test2, tag!(&[0x42])); -+ let input = [0x42, 0x00]; -+ assert_eq!(test(&input), Done(&b"\x00"[..], &b"\x42"[..])); -+ assert_eq!(test2(&input), Done(&b"\x00"[..], &b"\x42"[..])); -+ } - } -diff --git third_party/rust/nom/src/character.rs third_party/rust/nom/src/character.rs -index 781065b35270..6748e0790b68 100644 ---- third_party/rust/nom/src/character.rs -+++ third_party/rust/nom/src/character.rs -@@ -1,51 +1,39 @@ - /// Character level parsers - --use internal::{IResult,Needed,Err}; --use util::ErrorKind; -+use internal::{IResult,Needed}; -+use traits::{AsChar,InputIter,InputLength,Slice}; -+use std::ops::RangeFrom; - - /// matches one of the provided characters -+/// -+/// # Example -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult; -+/// # fn main() { -+/// named!(simple, one_of!(&b"abc"[..])); -+/// assert_eq!(simple(b"a123"), IResult::Done(&b"123"[..], 'a')); -+/// -+/// named!(a_or_b<&str, char>, one_of!("ab汉")); -+/// assert_eq!(a_or_b("汉jiosfe"), IResult::Done("jiosfe", '汉')); -+/// # } -+/// ``` - #[macro_export] - macro_rules! one_of ( - ($i:expr, $inp: expr) => ( - { -- if $i.is_empty() { -- $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -- } else { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $inp; -- let bytes = as_bytes(&expected); -- one_of_bytes!($i, bytes) -- } -- } -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! one_of_bytes ( -- ($i:expr, $bytes: expr) => ( -- { -- if $i.is_empty() { -- $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -- } else { -- let mut found = false; -- -- for &i in $bytes { -- if i == $i[0] { -- found = true; -- break; -- } -- } -- -- if found { -- $crate::IResult::Done(&$i[1..], $i[0] as char) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::OneOf, $i)) -- } -+ use $crate::Slice; -+ use $crate::AsChar; -+ use $crate::FindToken; -+ use $crate::InputIter; -+ -+ match ($i).iter_elements().next().map(|c| { -+ (c, c.find_token($inp)) -+ }) { -+ None => $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)), -+ Some((_, false)) => $crate::IResult::Error(error_position!($crate::ErrorKind::OneOf, $i)), -+ //the unwrap should be safe here -+ Some((c, true)) => $crate::IResult::Done($i.slice(c.len()..), $i.iter_elements().next().unwrap().as_char()) - } - } - ); -@@ -56,44 +44,18 @@ macro_rules! one_of_bytes ( - macro_rules! none_of ( - ($i:expr, $inp: expr) => ( - { -- if $i.is_empty() { -- $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -- } else { -- #[inline(always)] -- fn as_bytes(b: &T) -> &[u8] { -- b.as_bytes() -- } -- -- let expected = $inp; -- let bytes = as_bytes(&expected); -- none_of_bytes!($i, bytes) -- } -- } -- ); --); -- --#[doc(hidden)] --#[macro_export] --macro_rules! none_of_bytes ( -- ($i:expr, $bytes: expr) => ( -- { -- if $i.is_empty() { -- $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)) -- } else { -- let mut found = false; -- -- for &i in $bytes { -- if i == $i[0] { -- found = true; -- break; -- } -- } -- -- if !found { -- $crate::IResult::Done(&$i[1..], $i[0] as char) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::NoneOf, $i)) -- } -+ use $crate::Slice; -+ use $crate::AsChar; -+ use $crate::FindToken; -+ use $crate::InputIter; -+ -+ match ($i).iter_elements().next().map(|c| { -+ (c, !c.find_token($inp)) -+ }) { -+ None => $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)), -+ Some((_, false)) => $crate::IResult::Error(error_position!($crate::ErrorKind::NoneOf, $i)), -+ //the unwrap should be safe here -+ Some((c, true)) => $crate::IResult::Done($i.slice(c.len()..), $i.iter_elements().next().unwrap().as_char()) - } - } - ); -@@ -104,49 +66,39 @@ macro_rules! none_of_bytes ( - macro_rules! char ( - ($i:expr, $c: expr) => ( - { -- if $i.is_empty() { -- let res: $crate::IResult<&[u8], char> = $crate::IResult::Incomplete($crate::Needed::Size(1)); -- res -- } else { -- if $i[0] == $c as u8 { -- $crate::IResult::Done(&$i[1..], $i[0] as char) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Char, $i)) -- } -+ use $crate::Slice; -+ use $crate::AsChar; -+ use $crate::InputIter; -+ -+ match ($i).iter_elements().next().map(|c| { -+ (c, c.as_char() == $c) -+ }) { -+ None => $crate::IResult::Incomplete::<_, _>($crate::Needed::Size(1)), -+ Some((_, false)) => $crate::IResult::Error(error_position!($crate::ErrorKind::Char, $i)), -+ //the unwrap should be safe here -+ Some((c, true)) => $crate::IResult::Done($i.slice(c.len()..), $i.iter_elements().next().unwrap().as_char()) - } - } - ); - ); - --named!(pub newline, char!('\n')); -+named!(#[doc="Matches a newline character '\\n'"], pub newline, char!('\n')); - --pub fn crlf(input:&[u8]) -> IResult<&[u8], char> { -- if input.len() < 2 { -- IResult::Incomplete(Needed::Size(2)) -- } else { -- if &input[0..2] == &b"\r\n"[..] { -- IResult::Done(&input[2..], '\n') -- } else { -- IResult::Error(Err::Position(ErrorKind::CrLf, input)) -- } -- } --} -- --named!(pub eol, alt!(crlf | newline)); --named!(pub tab, char!('\t')); -+named!(#[doc="Matches a tab character '\\t'"], pub tab, char!('\t')); - --pub fn anychar(input:&[u8]) -> IResult<&[u8], char> { -- if input.is_empty() { -+pub fn anychar(input: T) -> IResult where -+ T: InputIter+InputLength+Slice>, -+ ::Item: AsChar { -+ if input.input_len() == 0 { - IResult::Incomplete(Needed::Size(1)) - } else { -- IResult::Done(&input[1..], input[0] as char) -+ IResult::Done(input.slice(1..), input.iter_elements().next().expect("slice should contain at least one element").as_char()) - } - } - - #[cfg(test)] - mod tests { - use internal::IResult::*; -- use internal::Err::*; - use util::ErrorKind; - - #[test] -@@ -157,7 +109,13 @@ mod tests { - assert_eq!(f(a), Done(&b"bcd"[..], 'a')); - - let b = &b"cde"[..]; -- assert_eq!(f(b), Error(Position(ErrorKind::OneOf, b))); -+ assert_eq!(f(b), Error(error_position!(ErrorKind::OneOf, b))); -+ -+ named!(utf8(&str) -> char, -+ one_of!("+\u{FF0B}")); -+ -+ assert!(utf8("+").is_done()); -+ assert!(utf8("\u{FF0B}").is_done()); - } - - #[test] -@@ -165,7 +123,7 @@ mod tests { - named!(f, none_of!("ab")); - - let a = &b"abcd"[..]; -- assert_eq!(f(a), Error(Position(ErrorKind::NoneOf, a))); -+ assert_eq!(f(a), Error(error_position!(ErrorKind::NoneOf, a))); - - let b = &b"cde"[..]; - assert_eq!(f(b), Done(&b"de"[..], 'c')); -@@ -176,9 +134,10 @@ mod tests { - named!(f, char!('c')); - - let a = &b"abcd"[..]; -- assert_eq!(f(a), Error(Position(ErrorKind::Char, a))); -+ assert_eq!(f(a), Error(error_position!(ErrorKind::Char, a))); - - let b = &b"cde"[..]; - assert_eq!(f(b), Done(&b"de"[..], 'c')); - } -+ - } -diff --git third_party/rust/nom/src/internal.rs third_party/rust/nom/src/internal.rs -index deb39a86654d..c5a51ee2bb09 100644 ---- third_party/rust/nom/src/internal.rs -+++ third_party/rust/nom/src/internal.rs -@@ -2,27 +2,15 @@ - - use self::IResult::*; - use self::Needed::*; --use util::ErrorKind; - --#[cfg(feature = "core")] -+#[cfg(not(feature = "std"))] - use std::prelude::v1::*; --use std::boxed::Box; - --/// Contains the error that a parser can return --/// --/// It can represent a linked list of errors, indicating the path taken in the parsing tree, with corresponding position in the input data. --/// It depends on P, the input position (for a &[u8] parser, it would be a &[u8]), and E, the custom error type (by default, u32) --#[derive(Debug,PartialEq,Eq,Clone)] --pub enum Err{ -- /// An error code, represented by an ErrorKind, which can contain a custom error code represented by E -- Code(ErrorKind), -- /// An error code, and the next error -- Node(ErrorKind, Box>), -- /// An error code, and the input position -- Position(ErrorKind, P), -- /// An error code, the input position and the next error -- NodePosition(ErrorKind, P, Box>) --} -+#[cfg(feature = "verbose-errors")] -+use verbose_errors::Err; -+ -+#[cfg(not(feature = "verbose-errors"))] -+use simple_errors::Err; - - /// Contains information on needed data if a parser returned `Incomplete` - #[derive(Debug,PartialEq,Eq,Clone,Copy)] -@@ -48,10 +36,23 @@ impl Needed { - } - } - -+#[cfg(feature = "verbose-errors")] - /// Holds the result of parsing functions - /// - /// It depends on I, the input type, O, the output type, and E, the error type (by default u32) - /// -+/// Depending on a compilation flag, the content of the `Error` variant -+/// can change. By default, it will be a `ErrorKind` (with `E` configurable). -+/// -+/// If you activate the `verbose-errors` compilation flags, it will be an -+/// enum that contains an error code, optionally, an input position, -+/// and an error sent by child parsers. -+/// -+/// The verbose errors feature allows very flexible error management: -+/// you can know precisely which parser got to which part of the input. -+/// The main drawback is that it is a lot slower than default error -+/// management. -+/// - #[derive(Debug,PartialEq,Eq,Clone)] - pub enum IResult { - /// indicates a correct parsing, the first field containing the rest of the unparsed data, the second field contains the parsed data -@@ -62,6 +63,41 @@ pub enum IResult { - Incomplete(Needed) - } - -+#[cfg(not(feature = "verbose-errors"))] -+/// Holds the result of parsing functions -+/// -+/// It depends on I, the input type, O, the output type, and E, the error type (by default u32) -+/// -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum IResult { -+ /// indicates a correct parsing, the first field containing the rest of the unparsed data, the second field contains the parsed data -+ Done(I,O), -+ /// contains a Err, an enum that can indicate an error code, a position in the input, and a pointer to another error, making a list of errors in the parsing tree -+ Error(Err), -+ /// Incomplete contains a Needed, an enum than can represent a known quantity of input data, or unknown -+ Incomplete(Needed) -+} -+ -+#[cfg(feature = "verbose-errors")] -+/// This is the same as IResult, but without Done -+/// -+/// This is used as the Error type when converting to std::result::Result -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum IError { -+ Error(Err), -+ Incomplete(Needed) -+} -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// This is the same as IResult, but without Done -+/// -+/// This is used as the Error type when converting to std::result::Result -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum IError { -+ Error(Err), -+ Incomplete(Needed) -+} -+ - impl IResult { - pub fn is_done(&self) -> bool { - match *self { -@@ -84,6 +120,14 @@ impl IResult { - } - } - -+ pub fn or(self, other: IResult) -> IResult { -+ if self.is_done() { -+ self -+ } else { -+ other -+ } -+ } -+ - /// Maps a `IResult` to `IResult` by appling a function - /// to a contained `Done` value, leaving `Error` and `Incomplete` value - /// untouched. -@@ -109,19 +153,6 @@ impl IResult { - } - } - -- /// Maps a `IResult` to `IResult` by appling a function -- /// to a contained `Error` value, leaving `Done` and `Incomplete` value -- /// untouched. -- #[inline] -- pub fn map_err(self, f: F) -> IResult -- where F: FnOnce(Err) -> Err { -- match self { -- Error(e) => Error(f(e)), -- Incomplete(n) => Incomplete(n), -- Done(i, o) => Done(i, o), -- } -- } -- - /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not - /// `Done`. - pub fn unwrap(self) -> (I, O) { -@@ -132,23 +163,23 @@ impl IResult { - } - } - -- /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not -+ /// Unwrap the contained `Done(I, O)` value or a default if the `IResult` is not - /// `Done`. -- pub fn unwrap_inc(self) -> Needed { -+ pub fn unwrap_or(self, default: (I, O)) -> (I, O) { - match self { -- Incomplete(n) => n, -- Done(_, _) => panic!("unwrap_inc() called on an IResult that is Done"), -- Error(_) => panic!("unwrap_inc() called on an IResult that is Error") -+ Done(i, o) => (i, o), -+ Incomplete(_) => default, -+ Error(_) => default - } - } - -- /// Unwrap the contained `Done(I, O)` value, or panic if the `IResult` is not -- /// `Done`. -- pub fn unwrap_err(self) -> Err { -+ /// Unwrap the contained `Incomplete(n)` value, or panic if the `IResult` is not -+ /// `Incomplete`. -+ pub fn unwrap_inc(self) -> Needed { - match self { -- Error(e) => e, -- Done(_, _) => panic!("unwrap_err() called on an IResult that is Done"), -- Incomplete(_) => panic!("unwrap_err() called on an IResult that is Incomplete"), -+ Incomplete(n) => n, -+ Done(_, _) => panic!("unwrap_inc() called on an IResult that is Done"), -+ Error(_) => panic!("unwrap_inc() called on an IResult that is Error") - } - } - } -@@ -215,35 +246,130 @@ impl<'a,I,E> GetOutput<&'a str> for IResult { - } - } - --#[cfg(not(feature = "core"))] --use std::any::Any; --#[cfg(not(feature = "core"))] --use std::{error,fmt}; --#[cfg(not(feature = "core"))] --use std::fmt::Debug; --#[cfg(not(feature = "core"))] --impl error::Error for Err { -- fn description(&self) -> &str { -- let kind = match *self { -- Err::Code(ref e) | Err::Node(ref e, _) | Err::Position(ref e, _) | Err::NodePosition(ref e, _, _) => e -+#[cfg(feature = "verbose-errors")] -+/// creates a parse error from a `nom::ErrorKind` -+#[macro_export] -+macro_rules! error_code( -+ ($code:expr) => ($crate::Err::Code($code)); -+); -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// creates a parse error from a `nom::ErrorKind` -+#[macro_export] -+macro_rules! error_code( -+ ($code:expr) => ($code); -+); -+ -+#[cfg(feature = "verbose-errors")] -+/// creates a parse error from a `nom::ErrorKind` -+/// and the next error in the parsing tree. -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[macro_export] -+macro_rules! error_node( -+ ($code:expr, $next:expr) => { -+ let next_errors = match $next { -+ $crate::Err::Code(e) => { -+ let mut v = ::std::vec::Vec::new(); -+ v.push($crate::Err::Code(e)); -+ v -+ }, -+ $crate::Err::Position(e, p) => { -+ let mut v = ::std::vec::Vec::new(); -+ v.push($crate::Err::Position(e,p)); -+ v -+ }, -+ $crate::Err::Node(e, mut next) => { -+ next.push($crate::Err::Code(e)); -+ next -+ }, -+ $crate::Err::NodePosition(e, p, mut next) => { -+ next.push($crate::Err::Position(e,p)); -+ next -+ }, - }; -- kind.description() -- } --} -- --#[cfg(not(feature = "core"))] --impl fmt::Display for Err { -- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -- match *self { -- Err::Code(ref e) | Err::Node(ref e, _) => { -- write!(f, "{:?}", e) -+ $crate::Err::Node($code, next_errors) -+ }; -+); -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// creates a parse error from a `nom::ErrorKind` -+/// and the next error in the parsing tree. -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[allow(unused_variables)] -+#[macro_export] -+macro_rules! error_node( -+ ($code:expr, $next:expr) => ($code); -+); -+ -+#[cfg(feature = "verbose-errors")] -+/// creates a parse error from a `nom::ErrorKind` -+/// and the position in the input -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[macro_export] -+macro_rules! error_position( -+ ($code:expr, $input:expr) => ($crate::Err::Position($code, $input)); -+); -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// creates a parse error from a `nom::ErrorKind` -+/// and the position in the input -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[allow(unused_variables)] -+#[macro_export] -+macro_rules! error_position( -+ ($code:expr, $input:expr) => ($code); -+); -+ -+#[cfg(feature = "verbose-errors")] -+/// creates a parse error from a `nom::ErrorKind`, -+/// the position in the input and the next error in -+/// the parsing tree. -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[macro_export] -+macro_rules! error_node_position( -+ ($code:expr, $input:expr, $next:expr) => { -+ { -+ let next_errors = match $next { -+ $crate::Err::Code(e) => { -+ let mut v = ::std::vec::Vec::new(); -+ v.push($crate::Err::Code(e)); -+ v - }, -- Err::Position(ref e, ref p) | Err::NodePosition(ref e, ref p, _) => { -- write!(f, "{:?}:{:?}", p, e) -+ $crate::Err::Position(e, p) => { -+ let mut v = ::std::vec::Vec::new(); -+ v.push($crate::Err::Position(e,p)); -+ v -+ }, -+ $crate::Err::Node(e, mut next) => { -+ next.push($crate::Err::Code(e)); -+ next -+ }, -+ $crate::Err::NodePosition(e, p, mut next) => { -+ next.push($crate::Err::Position(e,p)); -+ next - } -+ }; -+ $crate::Err::NodePosition($code, $input, next_errors) - } - } --} -+); -+ -+#[cfg(not(feature = "verbose-errors"))] -+/// creates a parse error from a `nom::ErrorKind`, -+/// the position in the input and the next error in -+/// the parsing tree. -+/// if "verbose-errors" is not activated, -+/// it default to only the error code -+#[allow(unused_variables)] -+#[macro_export] -+macro_rules! error_node_position( -+ ($code:expr, $input: expr, $next:expr) => ($code); -+); - - #[cfg(test)] - mod tests { -@@ -252,9 +378,16 @@ mod tests { - - const REST: [u8; 0] = []; - const DONE: IResult<&'static [u8], u32> = IResult::Done(&REST, 5); -- const ERROR: IResult<&'static [u8], u32> = IResult::Error(Err::Code(ErrorKind::Tag)); -+ const ERROR: IResult<&'static [u8], u32> = IResult::Error(error_code!(ErrorKind::Tag)); - const INCOMPLETE: IResult<&'static [u8], u32> = IResult::Incomplete(Needed::Unknown); - -+ #[test] -+ fn iresult_or() { -+ assert_eq!(DONE.or(ERROR), DONE); -+ assert_eq!(ERROR.or(DONE), DONE); -+ assert_eq!(INCOMPLETE.or(ERROR), ERROR); -+ } -+ - #[test] - fn needed_map() { - let unknown = Needed::Unknown; -@@ -267,7 +400,7 @@ mod tests { - #[test] - fn iresult_map() { - assert_eq!(DONE.map(|x| x * 2), IResult::Done(&b""[..], 10)); -- assert_eq!(ERROR.map(|x| x * 2), IResult::Error(Err::Code(ErrorKind::Tag))); -+ assert_eq!(ERROR.map(|x| x * 2), IResult::Error(error_code!(ErrorKind::Tag))); - assert_eq!(INCOMPLETE.map(|x| x * 2), IResult::Incomplete(Needed::Unknown)); - } - -@@ -277,17 +410,18 @@ mod tests { - let inc_size: IResult<&[u8], u32> = IResult::Incomplete(Needed::Size(5)); - - assert_eq!(DONE.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Done(&b""[..], 5)); -- assert_eq!(ERROR.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Error(Err::Code(ErrorKind::Tag))); -+ assert_eq!(ERROR.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Error(error_code!(ErrorKind::Tag))); - assert_eq!(inc_unknown.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Incomplete(Needed::Unknown)); - assert_eq!(inc_size.map_inc(|n| if let Needed::Size(i) = n {Needed::Size(i+1)} else {n}), IResult::Incomplete(Needed::Size(6))); - } - - #[test] -+ #[cfg(feature = "std")] - fn iresult_map_err() { - #[derive(Clone, Copy, Debug, PartialEq, Eq)] - struct Error(u32); - -- let error_kind = Err::Code(ErrorKind::Custom(Error(5))); -+ let error_kind = error_code!(ErrorKind::Custom(Error(5))); - - assert_eq!(DONE.map_err(|_| error_kind.clone()), IResult::Done(&b""[..], 5)); - assert_eq!(ERROR.map_err(|x| {println!("err: {:?}", x); error_kind.clone()}), IResult::Error(error_kind.clone())); -@@ -311,6 +445,21 @@ mod tests { - INCOMPLETE.unwrap(); - } - -+ #[test] -+ fn iresult_unwrap_or_on_done() { -+ assert_eq!(DONE.unwrap_or((&b""[..], 2)), (&b""[..], 5)); -+ } -+ -+ #[test] -+ fn iresult_unwrap_or_on_err() { -+ assert_eq!(ERROR.unwrap_or((&b""[..], 2)), (&b""[..], 2)); -+ } -+ -+ #[test] -+ fn iresult_unwrap_or_on_inc() { -+ assert_eq!(INCOMPLETE.unwrap_or((&b""[..], 2)), (&b""[..], 2)); -+ } -+ - #[test] - #[should_panic] - fn iresult_unwrap_err_on_done() { -@@ -319,7 +468,7 @@ mod tests { - - #[test] - fn iresult_unwrap_err_on_err() { -- assert_eq!(ERROR.unwrap_err(), Err::Code(ErrorKind::Tag)); -+ assert_eq!(ERROR.unwrap_err(), error_code!(ErrorKind::Tag)); - } - - #[test] -@@ -344,4 +493,23 @@ mod tests { - fn iresult_unwrap_inc_on_inc() { - assert_eq!(INCOMPLETE.unwrap_inc(), Needed::Unknown); - } -+ -+ #[test] -+ fn iresult_to_result() { -+ assert_eq!(DONE.to_result(), Ok(5)); -+ assert_eq!(ERROR.to_result(), Err(error_code!(ErrorKind::Tag))); -+ } -+ -+ #[test] -+ #[should_panic] -+ fn iresult_to_result_on_incomplete() { -+ INCOMPLETE.to_result().unwrap(); -+ } -+ -+ #[test] -+ fn iresult_to_full_result() { -+ assert_eq!(DONE.to_full_result(), Ok(5)); -+ assert_eq!(INCOMPLETE.to_full_result(), Err(IError::Incomplete(Needed::Unknown))); -+ assert_eq!(ERROR.to_full_result(), Err(IError::Error(error_code!(ErrorKind::Tag)))); -+ } - } -diff --git third_party/rust/nom/src/lib.rs third_party/rust/nom/src/lib.rs -index 11b475d59517..150ef85fce57 100644 ---- third_party/rust/nom/src/lib.rs -+++ third_party/rust/nom/src/lib.rs -@@ -5,6 +5,318 @@ - //! - //! The code is available on [Github](https://github.com/Geal/nom) - //! -+//! There are a few [guides](http://rust.unhandledexpression.com/nom/home.html) with more details -+//! about [the design of nom](http://rust.unhandledexpression.com/nom/how_nom_macros_work.html), -+//! [how to write parsers](http://rust.unhandledexpression.com/nom/making_a_new_parser_from_scratch.html), -+//! or the [error management system](http://rust.unhandledexpression.com/nom/error_management.html). -+//! -+//! If you are upgrading to nom 2.0, please read the -+//! [migration document](http://rust.unhandledexpression.com/nom/upgrading_to_nom_2.html). -+//! -+//! See also the [FAQ](http://rust.unhandledexpression.com/nom/FAQ.html). -+//! -+//! # What are parser combinators? -+//! -+//! Parser combinators are a way to build parsers out of small functions. instead of -+//! writing a huge grammar file then generaing code, like you would do with lex and yacc, -+//! you write small functions, to parse small things like a character, or a number, -+//! and then you assemble them in larger and larger functions, that can parse larger -+//! parts of your formats. -+//! -+//! You end up with a list of small functions that you can reuse everywhere you need. Each -+//! of them can be unit tested anf fuzzed separately. -+//! -+//! # nom parser design -+//! -+//! All nom parsers follow the same convention. They are all functions with the following signature: -+//! -+//! ```ignore -+//! fn parser(input: I) -> IResult { ... } -+//! ``` -+//! -+//! Here is the definition of that `IResult` type: -+//! -+//! ``` -+//! # #[macro_use] extern crate nom; -+//! # use nom::{Err,Needed}; -+//! # fn main() {} -+//! pub enum IResult { -+//! Done(I,O), -+//! Error(Err), // indicates the parser encountered an error. E is a custom error type you can redefine -+//! /// Incomplete contains a Needed, an enum than can represent a known quantity of input data, or unknown -+//! Incomplete(Needed) // if the parser did not have enough data to decide -+//! } -+//! ``` -+//! -+//! What it means: -+//! -+//! * `Done(i,o)` means the parser was successful. `i` is the remaining part of the input, `o` is the correctly parsed value -+//! The remaining part can then be used as input for other parsers called in a sequence -+//! * `Error(e)` indicates the parser encountered an error. The `Err` type is an enum of possible parser errors, -+//! that can also contain a custom error that you'd specify, by redefining the `E` error type -+//! * `Incomplete(i)` means the parser did not have enough information to decide, and tells you, if possible, -+//! how much data it needs -+//! -+//! That way, you could write your own parser that recognizes the letter 'a' like this: -+//! -+//! ``` -+//! #[macro_use] extern crate nom; -+//! use nom::{IResult,Needed,Err,ErrorKind}; -+//! # fn main() {} -+//! -+//! fn a(input: &[u8]) -> IResult<&[u8], char> { -+//! // if there is not enough data, we return Ìncomplete -+//! if input.len() == 0 { -+//! IResult::Incomplete(Needed::Size(1)) -+//! } else { -+//! if input[0] == 'a' as u8 { -+//! // the first part of the returned value is the remaining slice -+//! IResult::Done(&input[1..], 'a') -+//! } else { -+//! IResult::Error(error_code!(ErrorKind::Custom(42))) -+//! } -+//! } -+//! } -+//! ``` -+//! -+//! Writing all the parsers manually, like this, is dangerous, despite Rust's safety features. There -+//! are still a lot of mistakes one can make. That's why nom provides a list of macros to help in -+//! developing parsers. As an example, here is a parser that would recognize the phrase -+//! "Hello " and return the name of the person we hail: -+//! -+//! ``` -+//! #[macro_use] extern crate nom; -+//! use nom::alpha; -+//! -+//! named!(hello, preceded!(tag!("Hello "), alpha)); -+//! # use nom::IResult; -+//! # fn main() { -+//! # assert_eq!(hello(b"Hello nom."), IResult::Done(&b"."[..], &b"nom"[..])); -+//! # } -+//! ``` -+//! -+//! Let's deconstruct it: -+//! -+//! * `named!` generates a function with the correct type. Without `named` here, we could write the parser -+//! as follows: -+//! -+//! ``` -+//! #[macro_use] extern crate nom; -+//! use nom::{alpha,IResult}; -+//! -+//! fn hello(input: &[u8]) -> IResult<&[u8], &[u8]> { -+//! preceded!(input, -+//! tag!("Hello "), alpha) -+//! } -+//! # fn main() { -+//! # assert_eq!(hello(b"Hello nom."), IResult::Done(&b"."[..], &b"nom"[..])); -+//! # } -+//! ``` -+//! -+//! By default, `named` makes a function that takes `&[u8]` as input type, and returns `&[u8]` as output type. -+//! You can override it like this: -+//! -+//! * `named!(hello<&str>, ...):` would take `&[u8]` as input type, and return `&str` as output type. -+//! * `named!(hello<&str, &str>, ...):` would take `&str` as input type, and return `&str` as output type. -+//! -+//! *Note* : when we don't use `named!`, we must pass the input as first argument of the top -+//! level combinator (see the line `preceded!(input,` in the preceding code example). This is a macro trick -+//! in nom to pass input from one combinator to the next by rewriting the call. -+//! -+//! Next part of the parser: `preceded!(tag!("Hello "), alpha))`. Here, `tag!` is a combinator that recognizes -+//! a specific serie of bytes or characters. `alpha` is a function that recognizes alphabetical characters. -+//! The `preceded!` combinator assembles them in a more complex parser: if both parsers are successful, -+//! it returns the result of the second one (`alpha` is preceded by `tag!`). -+//! -+//! *Note* : combinators can assemble other combinators (macros), or parser functions, as long as they follow -+//! the same interface. Here, `alpha` is a parser function already implemented in nom. -+//! -+//! # List of parsers and combinators -+//! -+//! ## Basic elements -+//! -+//! Those are used to recognize the lowest level elements of your grammar, like, "here is a dot", or -+//! "here is an big endian integer". -+//! -+//! * **char!**: matches one character: `char!('a')` will make a parser that recognizes the letter 'a' (works with non ASCII chars too) -+//! * **eof!**: `eof!()` returns its input if it is at the end of input data -+//! * **is_a!, is_a_s!**: matches a sequence of any of the characters passed as arguments. `is_a!("ab1")` could recognize `ababa` or `1bb`. `is_a_s!` is a legacy combinator, it does exactly the same thing as `is_a` -+//! * **is_not!, is_not_s!**: matches a sequence of none of the characters passed as arguments -+//! * **one_of!**: matches one of the provided characters. `one_of!("abc")` could recognize 'a', 'b', or 'c'. It also works with non ASCII characters -+//! * **none_of!**: matches anything but the provided characters -+//! * **tag!, tag_s!**: recognizes a specific suite of characters or bytes. `tag!("hello")` matches "hello" -+//! * **tag_no_case!**: recognizes a suite of ASCII characters, case insensitive. `tag_no_case!("hello")` could match "hello", "Hello" or even "HeLlO" -+//! * **tag_no_case_s!** works like `tag_no_case` but on UTF-8 characters too (uses `&str` as input). Note that case insensitive comparison is not well defined for unicode, and that you might have bad surprises. Also, this combinator allocates a new string for the comparison. Ponder for a bit before using this combinator -+//! * **take!, take_s!**: takes a specific number of bytes or characters. `take!(5)` would return "hello" from the string "hello world" -+//! * **take_str!**: same as `take!` but returning a `&str` -+//! * **take_till!, take_till_s!**: returns the longest list of bytes until the provided function succeeds. `take_till!(is_alphabetic)` with input "123abc" would return "123" -+//! * **take_till1!, take_till1_s!**: same as `take_till!`, but the result must not be empty: `take_till1!(is_alphabetic)` would fail on "abc" -+//! * **take_until!, take_until_s!**: returns the longest list of bytes until the provided tag is found. `take_until!("world")` with input "Hello world!" would return "Hello " and leave "world!" as remaining input -+//! * **take_until1!**: same as `take_until!`, but cannot return an empty result -+//! * **take_until_and_consume!, take_until_and_consume_s!**: same as `take_until!` but consumes the tag. `take_until_and_consume!("world")` with input "Hello world!" would return "Hello " and leave "!" as remaining input -+//! * **take_until_and_consume1!**: same as `take_until_and_consume!`, but cannot return an empty result -+//! * **take_until_either!**: returns the longest list of bytes until any of the provided characters are found -+//! * **take_until_either_and_consume!**: same as `take_until_either!`, but consumes the terminating character -+//! * **take_while!, take_while_s!**: returns the longest list of bytes for which the function is true. `take_while!(is_alphabetic)` with input "abc123" would return "abc" -+//! * **take_while1!, take_while1_s!**: same as `take_while!`, but cannot return an empty result -+//! * **value!**: you can use `value!` to always return the same result value without consuming input, like this: `value!(42)`. Or you can replace the result of a child parser with a predefined value, like this: `value!(42, tag!("abcd"))` which would replace, if successful, the return value from "abcd", to 42 -+//! -+//! Parsing integers from binary formats can be done in two ways: with parser functions, or combinators with configurable endianness: -+//! -+//! * configurable endianness: **i16!, i32!, i64!, u16!, u32!, u64!** are combinators that take as argument a `nom::Endianness`, -+//! like this: `i16!(endianness)`. If the parameter is nom::Endianness::Big, parse a big endian i16 integer, otherwise a little endian i16 integer -+//! * fixed endianness: the functions are prefixed by "be_" for big endian numbers, and by "le_" for little endian numbers, and the suffix is the type they parse to. As an example, "be_u32" parses a big endian unsigned integer stored in 32 bits. -+//! * **be_f32, be_f64, le_f32, le_f64**: recognize floating point numbers -+//! * **be_i8, be_i16, be_i32, be_i24, be_i32, be_i64**: big endian signed integers -+//! * **be_u8, be_u16, be_u32, be_u24, be_u32, be_u64**: big endian unsigned integers -+//! * **le_i8, le_i16, le_i32, le_i24, le_i32, le_i64**: little endian signed integers -+//! * **le_u8, le_u16, le_u32, le_u24, le_u32, le_u64**: little endian unsigned integers -+//! -+//! ## Modifiers -+//! -+//! * **complete!**: replaces a Incomplete returned by the child parser with an Error -+//! * **cond!**: conditional combinator -+//! * **cond_reduce!**: Conditional combinator with error -+//! * **cond_with_error!**: Conditional combinator -+//! * **expr_opt!**: evaluates an expression that returns a Option and returns a IResult::Done(I,T) if Some -+//! * **expr_res!**: evaluates an expression that returns a Result and returns a IResult::Done(I,T) if Ok -+//! * **flat_map!**: -+//! * **map!**: maps a function on the result of a parser -+//! * **map_opt!**: maps a function returning an Option on the output of a parser -+//! * **map_res!**: maps a function returning a Result on the output of a parser -+//! * **not!**: returns a result only if the embedded parser returns Error or Incomplete does not consume the input -+//! * **opt!**: make the underlying parser optional -+//! * **opt_res!**: make the underlying parser optional -+//! * **parse_to!**: uses the parse method from std::str::FromStr to convert the current input to the specified type -+//! * **peek!**: returns a result without consuming the input -+//! * **recognize!**: if the child parser was successful, return the consumed input as produced value -+//! * **return_error!**: prevents backtracking if the child parser fails -+//! * **tap!**: allows access to the parser's result without affecting it -+//! * **verify!**: returns the result of the child parser if it satisfies a verification function -+//! -+//! ## Error management and debugging -+//! -+//! * **add_return_error!**: Add an error if the child parser fails -+//! * **dbg!**: Prints a message if the parser fails -+//! * **dbg_dmp!**: Prints a message and the input if the parser fails -+//! * **error_code!**: creates a parse error from a nom::ErrorKind -+//! * **error_node!**: creates a parse error from a nom::ErrorKind and the next error in the parsing tree. if "verbose-errors" is not activated, it default to only the error code -+//! * **error_node_position!**: creates a parse error from a nom::ErrorKind, the position in the input and the next error in the parsing tree. if "verbose-errors" is not activated, it default to only the error code -+//! * **error_position!**: creates a parse error from a nom::ErrorKind and the position in the input if "verbose-errors" is not activated, it default to only the error code -+//! * **fix_error!**: translate parser result from IResult to IResult with a custom type -+//! -+//! ## Choice combinators -+//! -+//! * **alt!**: try a list of parsers and return the result of the first successful one -+//! * **alt_complete!**: is equivalent to the alt! combinator, except that it will not return Incomplete when one of the constituting parsers returns Incomplete. Instead, it will try the next alternative in the chain. -+//! * **switch!**: choose the next parser depending on the result of the first one, if successful, and returns the result of the second parser -+//! -+//! # Sequence combinators -+//! -+//! * **delimited!**: delimited(opening, X, closing) returns X -+//! * **do_parse!**: do_parse applies sub parsers in a sequence. it can store intermediary results and make them available for later parsers -+//! * **pair!**: pair(X,Y), returns (x,y) -+//! * **permutation!**: applies its sub parsers in a sequence, but independent from their order this parser will only succeed if all of its sub parsers succeed -+//! * **preceded!**: preceded(opening, X) returns X -+//! * **separated_pair!**: separated_pair(X,sep,Y) returns (x,y) -+//! * **terminated!**: terminated(X, closing) returns X -+//! * **tuple!**: chains parsers and assemble the sub results in a tuple. -+//! -+//! ## Applying a parser multiple times -+//! -+//! * **count!**: Applies the child parser a specified number of times -+//! * **count_fixed!**: Applies the child parser a fixed number of times and returns a fixed size array The type must be specified and it must be Copy -+//! * **fold_many0!**: Applies the parser 0 or more times and folds the list of return values -+//! * **fold_many1!**: Applies the parser 1 or more times and folds the list of return values -+//! * **fold_many_m_n!**: Applies the parser between m and n times (n included) and folds the list of return value -+//! * **length_count!**: gets a number from the first parser, then applies the second parser that many times -+//! * **many0!**: Applies the parser 0 or more times and returns the list of results in a Vec -+//! * **many1!**: Applies the parser 1 or more times and returns the list of results in a Vec -+//! * **many_m_n!**: Applies the parser between m and n times (n included) and returns the list of results in a Vec -+//! * **many_till!**: Applies the first parser until the second applies. Returns a tuple containing the list of results from the first in a Vec and the result of the second. -+//! * **separated_list!**: separated_list(sep, X) returns Vec will return Incomplete if there may be more elements -+//! * **separated_list_complete!**: This is equivalent to the separated_list! combinator, except that it will return Error when either the separator or element subparser returns Incomplete. -+//! * **separated_nonempty_list!**: separated_nonempty_list(sep, X) returns Vec will return Incomplete if there may be more elements -+//! * **separated_nonempty_list_complete!**: This is equivalent to the separated_nonempty_list! combinator, except that it will return Error when either the separator or element subparser returns Incomplete. -+//! -+//! ## Text parsing -+//! -+//! * **escaped!**: matches a byte string with escaped characters. -+//! * **escaped_transform!**: matches a byte string with escaped characters, and returns a new string with the escaped characters replaced -+//! -+//! ## Binary format parsing -+//! -+//! * **length_data!**: gets a number from the first parser, than takes a subslice of the input of that size, and returns that subslice -+//! * **length_bytes!**: alias for `length_data` -+//! * **length_value!**: gets a number from the first parser, takes a subslice of the input of that size, then applies the second parser on that subslice. If the second parser returns Incomplete, length_value will return an error -+//! -+//! ## Bit stream parsing -+//! -+//! * **bits!**: transforms the current input type (byte slice `&[u8]`) to a bit stream on which bit specific parsers and more general combinators can be applied -+//! * **bytes!**: transforms its bits stream input back into a byte slice for the underlying parsers. -+//! * **tag_bits!**: matches an integer pattern to a bitstream. The number of bits of the input to compare must be specified -+//! * **take_bits!**: generates a parser consuming the specified number of bits -+//! -+//! ## Whitespace delimited formats parsing -+//! -+//! * **eat_separator!**: helper macros to build a separator parser -+//! * **sep!**: sep is the parser rewriting macro for whitespace separated formats -+//! * **wrap_sep!**: -+//! * **ws!**: -+//! -+//! ## Remaining combinators -+//! -+//! * **apply!**: emulate function currying: apply!(my_function, arg1, arg2, ...) becomes my_function(input, arg1, arg2, ...) -+//! * **apply_m!**: emulate function currying for method calls on structs apply_m!(self.my_function, arg1, arg2, ...) becomes self.my_function(input, arg1, arg2, ...) -+//! * **call!**: Used to wrap common expressions and function as macros -+//! * **call_m!**: Used to called methods then move self back into self -+//! * **closure!**: Wraps a parser in a closure -+//! * **method!**: Makes a method from a parser combination -+//! * **named!**: Makes a function from a parser combination -+//! * **named_args!**: Makes a function from a parser combination with arguments. -+//! * **named_attr!**: Makes a function from a parser combination, with attributes -+//! * **try_parse!**: A bit like std::try!, this macro will return the remaining input and parsed value if the child parser returned Done, and will do an early return for Error and Incomplete this can provide more flexibility than do_parse! if needed -+//! -+//! ## Character test functions -+//! -+//! use those functions with a combinator like `take_while!`: -+//! -+//! * **is_alphabetic**: Tests if byte is ASCII alphabetic: A-Z, a-z -+//! * **is_alphanumeric**: Tests if byte is ASCII alphanumeric: A-Z, a-z, 0-9 -+//! * **is_digit**: Tests if byte is ASCII digit: 0-9 -+//! * **is_hex_digit**: Tests if byte is ASCII hex digit: 0-9, A-F, a-f -+//! * **is_oct_digit**: Tests if byte is ASCII octal digit: 0-7 -+//! * **is_space**: Tests if byte is ASCII space or tab -+//! -+//! ## Remaining functions (sort those out in the other categories) -+//! -+//! * **alpha**: Recognizes one or more lowercase and uppercase alphabetic characters: a-zA-Z -+//! * **alphanumeric**: Recognizes one or more numerical and alphabetic characters: 0-9a-zA-Z -+//! * **anychar**: -+//! * **begin**: -+//! * **crlf**: -+//! * **digit**: Recognizes one or more numerical characters: 0-9 -+//! * **double**: Recognizes floating point number in a byte string and returns a f64 -+//! * **double_s**: Recognizes floating point number in a string and returns a f64 -+//! * **eol**: -+//! * **float**: Recognizes floating point number in a byte string and returns a f32 -+//! * **float_s**: Recognizes floating point number in a string and returns a f32 -+//! * **hex_digit**: Recognizes one or more hexadecimal numerical characters: 0-9, A-F, a-f -+//! * **hex_u32**: Recognizes a hex-encoded integer -+//! * **line_ending**: Recognizes an end of line (both '\n' and "\r\n") -+//! * **multispace**: Recognizes one or more spaces, tabs, carriage returns and line feeds -+//! * **newline**: Matches a newline character '\n' -+//! * **non_empty**: Recognizes non empty buffers -+//! * **not_line_ending**: -+//! * **oct_digit**: Recognizes one or more octal characters: 0-7 -+//! * **rest**: Return the remaining input. -+//! * **rest_s**: Return the remaining input, for strings. -+//! * **shift**: -+//! * **sized_buffer**: -+//! * **space**: Recognizes one or more spaces and tabs -+//! * **tab**: Matches a tab character '\t' -+//! * **tag_cl**: -+//! - //! # Example - //! - //! ``` -@@ -12,65 +324,57 @@ - //! extern crate nom; - //! - //! use nom::{IResult,digit}; --//! use nom::IResult::*; - //! - //! // Parser definition - //! - //! use std::str; - //! use std::str::FromStr; - //! --//! named!(parens, delimited!( --//! char!('('), --//! expr, --//! char!(')') --//! ) --//! ); -+//! // We parse any expr surrounded by parens, ignoring all whitespaces around those -+//! named!(parens, ws!(delimited!( tag!("("), expr, tag!(")") )) ); - //! --//! named!(i64_digit, --//! map_res!( -+//! // We transform an integer string into a i64, ignoring surrounding whitespaces -+//! // We look for a digit suite, and try to convert it. -+//! // If either str::from_utf8 or FromStr::from_str fail, -+//! // we fallback to the parens parser defined above -+//! named!(factor, alt!( - //! map_res!( --//! digit, --//! str::from_utf8 --//! ), --//! FromStr::from_str --//! ) --//! ); --//! --//! // We transform an integer string into a i64 --//! // we look for a digit suite, and try to convert it. --//! // if either str::from_utf8 or FromStr::from_str fail, --//! // the parser will fail --//! named!(factor, --//! alt!( --//! i64_digit -+//! map_res!( -+//! ws!(digit), -+//! str::from_utf8 -+//! ), -+//! FromStr::from_str -+//! ) - //! | parens - //! ) - //! ); - //! --//! // we define acc as mutable to update its value whenever a new term is found --//! named!(term , --//! chain!( --//! mut acc: factor ~ --//! many0!( --//! alt!( --//! tap!(mul: preceded!(tag!("*"), factor) => acc = acc * mul) | --//! tap!(div: preceded!(tag!("/"), factor) => acc = acc / div) --//! ) --//! ), --//! || { return acc } -+//! // We read an initial factor and for each time we find -+//! // a * or / operator followed by another factor, we do -+//! // the math by folding everything -+//! named!(term , do_parse!( -+//! init: factor >> -+//! res: fold_many0!( -+//! pair!(alt!(tag!("*") | tag!("/")), factor), -+//! init, -+//! |acc, (op, val): (&[u8], i64)| { -+//! if (op[0] as char) == '*' { acc * val } else { acc / val } -+//! } -+//! ) >> -+//! (res) - //! ) - //! ); - //! --//! named!(expr , --//! chain!( --//! mut acc: term ~ --//! many0!( --//! alt!( --//! tap!(add: preceded!(tag!("+"), term) => acc = acc + add) | --//! tap!(sub: preceded!(tag!("-"), term) => acc = acc - sub) --//! ) --//! ), --//! || { return acc } -+//! named!(expr , do_parse!( -+//! init: term >> -+//! res: fold_many0!( -+//! pair!(alt!(tag!("+") | tag!("-")), term), -+//! init, -+//! |acc, (op, val): (&[u8], i64)| { -+//! if (op[0] as char) == '+' { acc + val } else { acc - val } -+//! } -+//! ) >> -+//! (res) - //! ) - //! ); - //! -@@ -84,25 +388,38 @@ - //! assert_eq!(expr(b"2*2/(5-1)+3"), IResult::Done(&b""[..], 4)); - //! } - //! ``` --#![cfg_attr(feature = "core", feature(no_std))] --#![cfg_attr(feature = "core", feature(collections))] --#![cfg_attr(feature = "core", no_std)] -+#![cfg_attr(not(feature = "std"), feature(no_std))] -+#![cfg_attr(not(feature = "std"), feature(collections))] -+#![cfg_attr(not(feature = "std"), no_std)] - #![cfg_attr(feature = "nightly", feature(test))] - #![cfg_attr(feature = "nightly", feature(const_fn))] -+#![cfg_attr(feature = "nightly", feature(plugin))] -+#![cfg_attr(feature = "nightly", plugin(compiler_error))] -+//#![warn(missing_docs)] - --#[cfg(feature = "core")] -+#[cfg(not(feature = "std"))] - extern crate collections; - #[cfg(feature = "regexp")] - extern crate regex; - #[cfg(feature = "regexp_macros")] - #[macro_use] extern crate lazy_static; -+extern crate memchr; - #[cfg(feature = "nightly")] - extern crate test; - --#[cfg(feature = "core")] -+#[cfg(not(feature = "nightly"))] -+#[allow(unused_macros)] -+#[macro_export] -+macro_rules! compiler_error { -+ ($e:expr) => { -+ INVALID_NOM_SYNTAX_PLEASE_SEE_FAQ //https://github.com/Geal/nom/blob/master/doc/FAQ.md#using-nightly-to-get-better-error-messages -+ } -+} -+ -+#[cfg(not(feature = "std"))] - mod std { - #[macro_use] -- pub use core::{fmt, iter, option, ops, slice, mem}; -+ pub use core::{fmt, cmp, iter, option, result, ops, slice, str, mem, convert}; - pub use collections::{boxed, vec, string}; - pub mod prelude { - pub use core::prelude as v1; -@@ -110,8 +427,19 @@ mod std { - } - - pub use self::util::*; -+pub use self::traits::*; -+ -+#[cfg(feature = "verbose-errors")] -+pub use self::verbose_errors::*; -+ -+#[cfg(not(feature = "verbose-errors"))] -+pub use self::simple_errors::*; -+ - pub use self::internal::*; - pub use self::macros::*; -+pub use self::branch::*; -+pub use self::sequence::*; -+pub use self::multi::*; - pub use self::methods::*; - pub use self::bytes::*; - pub use self::bits::*; -@@ -119,33 +447,45 @@ pub use self::bits::*; - pub use self::nom::*; - pub use self::character::*; - -+pub use self::whitespace::*; -+ - #[cfg(feature = "regexp")] - pub use self::regexp::*; - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] - #[cfg(feature = "stream")] - pub use self::stream::*; - --#[cfg(not(feature = "core"))] - pub use self::str::*; - - #[macro_use] mod util; --mod internal; -+mod traits; -+ -+#[cfg(feature = "verbose-errors")] #[macro_use] pub mod verbose_errors; -+ -+#[cfg(not(feature = "verbose-errors"))] #[macro_use] pub mod simple_errors; -+ -+#[macro_use] mod internal; - #[macro_use] mod macros; --#[macro_use] mod methods; -+#[macro_use] mod branch; -+#[macro_use] mod sequence; -+#[macro_use] mod multi; -+#[macro_use] pub mod methods; - #[macro_use] mod bytes; --#[macro_use] mod bits; -+#[macro_use] pub mod bits; - - #[macro_use] mod nom; - #[macro_use] mod character; - -+#[macro_use] -+pub mod whitespace; -+ - #[cfg(feature = "regexp")] - #[macro_use] mod regexp; - - #[macro_use] --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] - #[cfg(feature = "stream")] - mod stream; - --#[cfg(not(feature = "core"))] - mod str; -diff --git third_party/rust/nom/src/macros.rs third_party/rust/nom/src/macros.rs -index 3e346a94f522..2bbe4bca412d 100644 ---- third_party/rust/nom/src/macros.rs -+++ third_party/rust/nom/src/macros.rs -@@ -61,7 +61,8 @@ - //! take_while!($input, call!($f)); - //! ); - //! ); --//! -+//! ``` -+#[allow(unused_variables)] - - /// Wraps a parser in a closure - #[macro_export] -@@ -93,52 +94,168 @@ macro_rules! closure ( - /// ``` - #[macro_export] - macro_rules! named ( -+ (#$($args:tt)*) => ( -+ named_attr!(#$($args)*); -+ ); - ($name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( i: $i ) -> $crate::IResult<$i,$o,u32> { - $submac!(i, $($args)*) - } - ); - ($name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { - $submac!(i, $($args)*) - } - ); - ($name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { - $submac!(i, $($args)*) - } - ); - ($name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name<'a>( i: &'a[u8] ) -> $crate::IResult<&'a [u8], $o, u32> { - $submac!(i, $($args)*) - } - ); - ($name:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( i: &[u8] ) -> $crate::IResult<&[u8], &[u8], u32> { - $submac!(i, $($args)*) - } - ); - (pub $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( i: $i ) -> $crate::IResult<$i,$o, u32> { - $submac!(i, $($args)*) - } - ); - (pub $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { - $submac!(i, $($args)*) - } - ); - (pub $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { - $submac!(i, $($args)*) - } - ); - (pub $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( i: &[u8] ) -> $crate::IResult<&[u8], $o, u32> { - $submac!(i, $($args)*) - } - ); - (pub $name:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] -+ pub fn $name<'a>( i: &'a [u8] ) -> $crate::IResult<&[u8], &[u8], u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+); -+ -+/// Makes a function from a parser combination with arguments. -+#[macro_export] -+macro_rules! named_args { -+ (pub $func_name:ident ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => { -+ pub fn $func_name(input: &[u8], $( $arg : $typ ),*) -> $crate::IResult<&[u8], $return_type> { -+ $submac!(input, $($args)*) -+ } -+ }; -+ (pub $func_name:ident < 'a > ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => { -+ pub fn $func_name<'this_is_probably_unique_i_hope_please, 'a>(input: &'this_is_probably_unique_i_hope_please [u8], $( $arg : $typ ),*) -> $crate::IResult<&'this_is_probably_unique_i_hope_please [u8], $return_type> { -+ $submac!(input, $($args)*) -+ } -+ }; -+ ($func_name:ident ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => { -+ fn $func_name(input: &[u8], $( $arg : $typ ),*) -> $crate::IResult<&[u8], $return_type> { -+ $submac!(input, $($args)*) -+ } -+ }; -+ ($func_name:ident < 'a > ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => { -+ fn $func_name<'this_is_probably_unique_i_hope_please, 'a>(input: &'this_is_probably_unique_i_hope_please [u8], $( $arg : $typ ),*) -> $crate::IResult<&'this_is_probably_unique_i_hope_please [u8], $return_type> { -+ $submac!(input, $($args)*) -+ } -+ }; -+} -+ -+/// Makes a function from a parser combination, with attributes -+/// -+/// The usage of this macro is almost identical to `named!`, except that -+/// you also pass attributes to be attached to the generated function. -+/// This is ideal for adding documentation to your parser. -+/// -+/// ```ignore -+/// // Create my_function as if you wrote it with the doc comment /// My Func -+/// named_attr!(#[doc = "My Func"], my_function( &[u8] ) -> &[u8], tag!("abcd")); -+/// // Also works for pub functions, and multiple lines -+/// named!(#[doc = "My Func\nRecognise abcd"], pub my_function, tag!("abcd")); -+/// // Multiple attributes can be passed if required -+/// named!(#[doc = "My Func"] #[inline(always)], pub my_function, tag!("abcd")); -+/// ``` -+#[macro_export] -+macro_rules! named_attr ( -+ ($(#[$attr:meta])*, $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ fn $name( i: $i ) -> $crate::IResult<$i,$o,u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ fn $name<'a>( i: &'a[u8] ) -> $crate::IResult<&'a [u8], $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, $name:ident, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ fn $name( i: &[u8] ) -> $crate::IResult<&[u8], &[u8], u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, pub $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ pub fn $name( i: $i ) -> $crate::IResult<$i,$o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, pub $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ pub fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, pub $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ pub fn $name( i: $i ) -> $crate::IResult<$i, $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, pub $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* -+ pub fn $name( i: &[u8] ) -> $crate::IResult<&[u8], $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($(#[$attr:meta])*, pub $name:ident, $submac:ident!( $($args:tt)* )) => ( -+ $(#[$attr])* - pub fn $name<'a>( i: &'a [u8] ) -> $crate::IResult<&[u8], &[u8], u32> { - $submac!(i, $($args)*) - } -@@ -154,7 +271,7 @@ macro_rules! named ( - /// fn take_wrapper(input: &[u8], i: u8) -> IResult<&[u8],&[u8]> { take!(input, i * 10) } - /// - /// // will make a parser taking 20 bytes --/// named!(parser, apply!(take_wrapper, 2)); -+/// named!(parser, call!(take_wrapper, 2)); - /// # } - /// ``` - #[macro_export] -@@ -185,7 +302,7 @@ macro_rules! apply ( - /// This parser will do an early return instead of sending - /// its result to the parent parser. - /// --/// If another `error!` combinator is present in the parent -+/// If another `return_error!` combinator is present in the parent - /// chain, the error will be wrapped and another early - /// return will be made. - /// -@@ -200,16 +317,17 @@ macro_rules! apply ( - /// # #[macro_use] extern crate nom; - /// # use std::collections; - /// # use nom::IResult::Error; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::{Position,NodePosition}; - /// # use nom::ErrorKind; - /// # fn main() { - /// named!(err_test, alt!( - /// tag!("abcd") | --/// preceded!(tag!("efgh"), error!(ErrorKind::Custom(42), --/// chain!( --/// tag!("ijkl") ~ --/// res: error!(ErrorKind::Custom(128), tag!("mnop")) , --/// || { res } -+/// preceded!(tag!("efgh"), return_error!(ErrorKind::Custom(42), -+/// do_parse!( -+/// tag!("ijkl") >> -+/// res: return_error!(ErrorKind::Custom(128), tag!("mnop")) >> -+/// (res) - /// ) - /// ) - /// ) -@@ -223,131 +341,73 @@ macro_rules! apply ( - /// let res_a = err_test(a); - /// let res_b = err_test(b); - /// let res_c = err_test(c); --/// assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); --/// assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], --/// Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah)))))) -+/// assert_eq!(res_a, Error(error_node_position!(ErrorKind::Custom(42), blah, error_position!(ErrorKind::Tag, blah)))); -+/// assert_eq!(res_b, Error(error_node_position!(ErrorKind::Custom(42), &b"ijklblah"[..], -+/// error_node_position!(ErrorKind::Custom(128), blah, error_position!(ErrorKind::Tag, blah)))) - /// ); - /// # } - /// ``` - /// - #[macro_export] --macro_rules! error ( -+macro_rules! return_error ( - ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( - { -+ let i_ = $i.clone(); - let cl = || { -- $submac!($i, $($args)*) -+ $submac!(i_, $($args)*) - }; - - match cl() { - $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), - $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), - $crate::IResult::Error(e) => { -- return $crate::IResult::Error($crate::Err::NodePosition($code, $i, Box::new(e))) -+ return $crate::IResult::Error(error_node_position!($code, $i, e)) - } - } - } - ); - ($i:expr, $code:expr, $f:expr) => ( -- error!($i, $code, call!($f)); -+ return_error!($i, $code, call!($f)); - ); - ); - - /// Add an error if the child parser fails - /// - /// While error! does an early return and avoids backtracking, --/// add_error! backtracks normally. It just provides more context -+/// add_return_error! backtracks normally. It just provides more context - /// for an error - /// - /// ``` - /// # #[macro_use] extern crate nom; - /// # use std::collections; - /// # use nom::IResult::Error; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::{Position,NodePosition}; - /// # use nom::ErrorKind; - /// # fn main() { --/// named!(err_test, add_error!(ErrorKind::Custom(42), tag!("abcd"))); -+/// named!(err_test, add_return_error!(ErrorKind::Custom(42), tag!("abcd"))); - /// - /// let a = &b"efghblah"[..]; - /// let res_a = err_test(a); --/// assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), a, Box::new(Position(ErrorKind::Tag, a))))); -+/// assert_eq!(res_a, Error(error_node_position!(ErrorKind::Custom(42), a, error_position!(ErrorKind::Tag, a)))); - /// # } - /// ``` - /// - #[macro_export] --macro_rules! add_error ( -+macro_rules! add_return_error ( - ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( - { - match $submac!($i, $($args)*) { - $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), - $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), - $crate::IResult::Error(e) => { -- $crate::IResult::Error($crate::Err::NodePosition($code, $i, Box::new(e))) -+ $crate::IResult::Error(error_node_position!($code, $i, e)) - } - } - } - ); - ($i:expr, $code:expr, $f:expr) => ( -- add_error!($i, $code, call!($f)); -- ); --); -- -- --/// translate parser result from IResult to IResult with a custom type --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use std::collections; --/// # use nom::IResult::Error; --/// # use nom::Err::{Position,NodePosition}; --/// # use nom::ErrorKind; --/// # fn main() { --/// // will add a Custom(42) error to the error chain --/// named!(err_test, add_error!(ErrorKind::Custom(42), tag!("abcd"))); --/// // Convert to IREsult<&[u8], &[u8], &str> --/// named!(parser<&[u8], &[u8], &str>, add_error!(ErrorKind::Custom("custom error message"), fix_error!(&str, err_test))); --/// --/// let a = &b"efghblah"[..]; --/// let res_a = parser(a); --/// assert_eq!(res_a, Error(NodePosition( ErrorKind::Custom("custom error message"), a, Box::new(Position(ErrorKind::Fix, a))))); --/// # } --/// ``` --#[macro_export] --macro_rules! fix_error ( -- ($i:expr, $t:ty, $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -- $crate::IResult::Error(e) => { -- let err = match e { -- $crate::Err::Code($crate::ErrorKind::Custom(_)) | -- $crate::Err::Node($crate::ErrorKind::Custom(_), _) => { -- let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -- $crate::Err::Code(e) -- }, -- $crate::Err::Position($crate::ErrorKind::Custom(_), p) | -- $crate::Err::NodePosition($crate::ErrorKind::Custom(_), p, _) => { -- let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -- $crate::Err::Position(e, p) -- }, -- $crate::Err::Code(_) | -- $crate::Err::Node(_, _) => { -- let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -- $crate::Err::Code(e) -- }, -- $crate::Err::Position(_, p) | -- $crate::Err::NodePosition(_, p, _) => { -- let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -- $crate::Err::Position(e, p) -- }, -- }; -- $crate::IResult::Error(err) -- } -- } -- } -- ); -- ($i:expr, $t:ty, $f:expr) => ( -- fix_error!($i, $t, call!($f)); -+ add_return_error!($i, $code, call!($f)); - ); - ); - -@@ -358,6 +418,7 @@ macro_rules! fix_error ( - /// # #[macro_use] extern crate nom; - /// # use std::collections; - /// # use nom::IResult::Error; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::{Position,NodePosition}; - /// # use nom::ErrorKind; - /// # fn main() { -@@ -365,7 +426,7 @@ macro_rules! fix_error ( - /// - /// let a = &b"abcd"[..]; - /// let res_a = take_5(a); --/// assert_eq!(res_a, Error(Position(ErrorKind::Complete, a))); -+/// assert_eq!(res_a, Error(error_position!(ErrorKind::Complete, a))); - /// # } - /// ``` - /// -@@ -373,11 +434,12 @@ macro_rules! fix_error ( - macro_rules! complete ( - ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- match $submac!($i, $($args)*) { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { - $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete(_) => { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Complete, $i)) -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Complete, $i)) - }, - } - } -@@ -389,11 +451,12 @@ macro_rules! complete ( - - /// A bit like `std::try!`, this macro will return the remaining input and parsed value if the child parser returned `Done`, - /// and will do an early return for `Error` and `Incomplete` --/// this can provide more flexibility than `chain!` if needed -+/// this can provide more flexibility than `do_parse!` if needed - /// - /// ``` - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::{self, Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::Position; - /// # use nom::{be_u8,ErrorKind}; - /// -@@ -411,7 +474,7 @@ macro_rules! complete ( - /// let arr2 = [0xFE, 2, 3, 4, 5]; - /// // size is overflowing - /// let r1 = take_add(&arr2[..], 42); --/// assert_eq!(r1, Error(Position(ErrorKind::ExprOpt,&[2,3,4,5][..]))); -+/// assert_eq!(r1, Error(error_position!(ErrorKind::ExprOpt,&[2,3,4,5][..]))); - /// # } - /// ``` - #[macro_export] -@@ -428,153 +491,159 @@ macro_rules! try_parse ( - ); - ); - --/// `flat_map!(R -> IResult, S -> IResult) => R -> IResult` --/// --/// combines a parser R -> IResult and --/// a parser S -> IResult to return another --/// parser R -> IResult -+/// `map!(I -> IResult, O -> P) => I -> IResult` -+/// maps a function on the result of a parser - #[macro_export] --macro_rules! flat_map( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+macro_rules! map( -+ // Internal parser, do not use directly -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( - { -+ pub fn _unify R>(f: F, t: T) -> R { -+ f(t) -+ } - match $submac!($i, $($args)*) { - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), - $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -- $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -- $crate::IResult::Error(e) => { -- let err = match e { -- $crate::Err::Code(k) | $crate::Err::Node(k, _) | $crate::Err::Position(k, _) | $crate::Err::NodePosition(k, _, _) => { -- $crate::Err::Position(k, $i) -- } -- }; -- $crate::IResult::Error(err) -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(ref i2)) => $crate::IResult::Incomplete($crate::Needed::Size(*i2)), -- $crate::IResult::Done(_, o2) => $crate::IResult::Done(i, o2) -- } -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, _unify($g, o)) - } - } - ); - ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- flat_map!($i, $submac!($($args)*), call!($g)); -- ); -- ($i:expr, $f:expr, $g:expr) => ( -- flat_map!($i, call!($f), call!($g)); -- ); -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- flat_map!($i, call!($f), $submac!($($args)*)); -- ); --); -- --/// `map!(I -> IResult, O -> P) => I -> IResult` --/// maps a function on the result of a parser --#[macro_export] --macro_rules! map( -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- map_impl!($i, $submac!($($args)*), call!($g)); -- ); -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- map_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ map!(__impl $i, $submac!($($args)*), $g); - ); - ($i:expr, $f:expr, $g:expr) => ( -- map_impl!($i, call!($f), call!($g)); -- ); -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- map_impl!($i, call!($f), $submac!($($args)*)); -+ map!(__impl $i, call!($f), $g); - ); - ); - --/// Internal parser, do not use directly --#[doc(hidden)] -+/// `map_res!(I -> IResult, O -> Result

) => I -> IResult` -+/// maps a function returning a Result on the output of a parser - #[macro_export] --macro_rules! map_impl( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+macro_rules! map_res ( -+ // Internal parser, do not use directly -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( - { -- match $submac!($i, $($args)*) { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), - $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -- $crate::IResult::Done(i, o) => $crate::IResult::Done(i, $submac2!(o, $($args2)*)) -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ Ok(output) => $crate::IResult::Done(i, output), -+ Err(_) => $crate::IResult::Error(error_position!($crate::ErrorKind::MapRes, $i)) -+ } - } - } - ); --); -- --/// `map_res!(I -> IResult, O -> Result

) => I -> IResult` --/// maps a function returning a Result on the output of a parser --#[macro_export] --macro_rules! map_res ( - ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- map_res_impl!($i, $submac!($($args)*), call!($g)); -+ map_res!(__impl $i, $submac!($($args)*), call!($g)); - ); - ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- map_res_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ map_res!(__impl $i, $submac!($($args)*), $submac2!($($args2)*)); - ); - ($i:expr, $f:expr, $g:expr) => ( -- map_res_impl!($i, call!($f), call!($g)); -+ map_res!(__impl $i, call!($f), call!($g)); - ); - ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- map_res_impl!($i, call!($f), $submac!($($args)*)); -+ map_res!(__impl $i, call!($f), $submac!($($args)*)); - ); - ); - --/// Internal parser, do not use directly --#[doc(hidden)] -+/// `map_opt!(I -> IResult, O -> Option

) => I -> IResult` -+/// maps a function returning an Option on the output of a parser - #[macro_export] --macro_rules! map_res_impl ( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+macro_rules! map_opt ( -+ // Internal parser, do not use directly -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( - { -- match $submac!($i, $($args)*) { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), - $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), - $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -- Ok(output) => $crate::IResult::Done(i, output), -- Err(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::MapRes, $i)) -+ ::std::option::Option::Some(output) => $crate::IResult::Done(i, output), -+ ::std::option::Option::None => $crate::IResult::Error(error_position!($crate::ErrorKind::MapOpt, $i)) - } - } - } - ); --); -- -- --/// `map_opt!(I -> IResult, O -> Option

) => I -> IResult` --/// maps a function returning an Option on the output of a parser --#[macro_export] --macro_rules! map_opt ( - ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- map_opt_impl!($i, $submac!($($args)*), call!($g)); -+ map_opt!(__impl $i, $submac!($($args)*), call!($g)); - ); - ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- map_opt_impl!($i, $submac!($($args)*), $submac2!($($args2)*)); -+ map_opt!(__impl $i, $submac!($($args)*), $submac2!($($args2)*)); - ); - ($i:expr, $f:expr, $g:expr) => ( -- map_opt_impl!($i, call!($f), call!($g)); -+ map_opt!(__impl $i, call!($f), call!($g)); - ); - ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- map_opt_impl!($i, call!($f), $submac!($($args)*)); -+ map_opt!(__impl $i, call!($f), $submac!($($args)*)); - ); - ); - --/// Internal parser, do not use directly --#[doc(hidden)] -+/// `parse_to!(O) => I -> IResult` -+/// uses the `parse` method from `std::str::FromStr` to convert the current -+/// input to the specified type -+/// -+/// this will completely consume the input - #[macro_export] --macro_rules! map_opt_impl ( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+macro_rules! parse_to ( -+ ($i:expr, $t:ty ) => ( - { -- match $submac!($i, $($args)*) { -+ use $crate::ParseTo; -+ use $crate::Slice; -+ use $crate::InputLength; -+ match ($i).parse_to() { -+ ::std::option::Option::Some(output) => $crate::IResult::Done($i.slice(..$i.input_len()), output), -+ ::std::option::Option::None => $crate::IResult::Error(error_position!($crate::ErrorKind::MapOpt, $i)) -+ } -+ } -+ ); -+); -+ -+/// `verify!(I -> IResult, O -> bool) => I -> IResult` -+/// returns the result of the child parser if it satisfies a verification function -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # use nom::be_u32; -+/// # fn main() { -+/// named!(check, verify!(be_u32, |val:u32| val >= 0 && val < 3)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! verify ( -+ // Internal parser, do not use directly -+ (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), - $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -- $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -- ::std::option::Option::Some(output) => $crate::IResult::Done(i, output), -- ::std::option::Option::None => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::MapOpt, $i)) -+ $crate::IResult::Done(i, o) => if $submac2!(o, $($args2)*) { -+ $crate::IResult::Done(i, o) -+ } else { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Verify, $i)) - } - } - } - ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ verify!(__impl $i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ verify!(__impl $i, $submac!($($args)*), $submac2!($($args2)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ verify!(__impl $i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ verify!(__impl $i, call!($f), $submac!($($args)*)); -+ ); - ); - - /// `value!(T, R -> IResult ) => R -> IResult` -@@ -603,7 +672,8 @@ macro_rules! value ( - { - match $submac!($i, $($args)*) { - $crate::IResult::Done(i,_) => { -- $crate::IResult::Done(i, $res) -+ let res: $crate::IResult<_,_> = $crate::IResult::Done(i, $res); -+ res - }, - $crate::IResult::Error(e) => $crate::IResult::Error(e), - $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -@@ -614,7 +684,10 @@ macro_rules! value ( - value!($i, $res, call!($f)) - ); - ($i:expr, $res:expr) => ( -- $crate::IResult::Done($i, $res) -+ { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($i, $res); -+ res -+ } - ); - ); - -@@ -628,7 +701,7 @@ macro_rules! expr_res ( - { - match $e { - Ok(output) => $crate::IResult::Done($i, output), -- Err(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ExprRes, $i)) -+ Err(_) => $crate::IResult::Error(error_position!($crate::ErrorKind::ExprRes, $i)) - } - } - ); -@@ -642,15 +715,16 @@ macro_rules! expr_res ( - /// ``` - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::{self, Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::Position; - /// # use nom::{be_u8,ErrorKind}; - /// - /// fn take_add(input:&[u8], size: u8) -> IResult<&[u8],&[u8]> { --/// chain!(input, --/// sz: be_u8 ~ --/// length: expr_opt!(size.checked_add(sz)) ~ // checking for integer overflow (returns an Option) --/// data: take!(length) , --/// ||{ data } -+/// do_parse!(input, -+/// sz: be_u8 >> -+/// length: expr_opt!(size.checked_add(sz)) >> // checking for integer overflow (returns an Option) -+/// data: take!(length) >> -+/// (data) - /// ) - /// } - /// # fn main() { -@@ -661,7 +735,7 @@ macro_rules! expr_res ( - /// let arr2 = [0xFE, 2, 3, 4, 5]; - /// // size is overflowing - /// let r1 = take_add(&arr2[..], 42); --/// assert_eq!(r1, Error(Position(ErrorKind::ExprOpt,&[2,3,4,5][..]))); -+/// assert_eq!(r1, Error(error_position!(ErrorKind::ExprOpt,&[2,3,4,5][..]))); - /// # } - /// ``` - #[macro_export] -@@ -670,2011 +744,423 @@ macro_rules! expr_opt ( - { - match $e { - ::std::option::Option::Some(output) => $crate::IResult::Done($i, output), -- ::std::option::Option::None => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ExprOpt, $i)) -+ ::std::option::Option::None => $crate::IResult::Error(error_position!($crate::ErrorKind::ExprOpt, $i)) - } - } - ); - ); - --/// `chain!(I->IResult ~ I->IResult ~ ... I->IResult , || { return O } ) => I -> IResult` --/// chains parsers and assemble the results through a closure --/// --/// The input type `I` must implement `nom::InputLength`. -+/// `opt!(I -> IResult) => I -> IResult>` -+/// make the underlying parser optional - /// --/// This combinator will count how much data is consumed by every child parser and take it into account if --/// there is not enough data -+/// returns an Option of the returned type. This parser returns `Some(result)` if the child parser -+/// succeeds,`None` if it fails, and `Incomplete` if it did not have enough data to decide - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{self, Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; --/// #[derive(PartialEq,Eq,Debug)] --/// struct B { --/// a: u8, --/// b: Option --/// } --/// --/// named!(y, tag!("efgh")); --/// --/// fn ret_int(i:&[u8]) -> IResult<&[u8], u8> { Done(i, 1) } --/// named!(ret_y<&[u8], u8>, map!(y, |_| 1)); // return 1 if the "efgh" tag is found --/// --/// named!(z<&[u8], B>, --/// chain!( --/// tag!("abcd") ~ // the '~' character is used as separator --/// aa: ret_int ~ // the result of that parser will be used in the closure --/// tag!("abcd")? ~ // this parser is optional --/// bb: ret_y? , // the result of that parser is an option --/// // the last parser in the chain is followed by a ',' --/// ||{B{a: aa, b: bb}} --/// ) --/// ); --/// -+/// # use nom::IResult::Done; - /// # fn main() { --/// // the first "abcd" tag is not present, we have an error --/// let r1 = z(&b"efgh"[..]); --/// assert_eq!(r1, Error(Position(ErrorKind::Tag,&b"efgh"[..]))); --/// --/// // everything is present, everything is parsed --/// let r2 = z(&b"abcdabcdefgh"[..]); --/// assert_eq!(r2, Done(&b""[..], B{a: 1, b: Some(1)})); --/// --/// // the second "abcd" tag is optional --/// let r3 = z(&b"abcdefgh"[..]); --/// assert_eq!(r3, Done(&b""[..], B{a: 1, b: Some(1)})); -+/// named!( o<&[u8], Option<&[u8]> >, opt!( tag!( "abcd" ) ) ); - /// --/// // the result of ret_y is optional, as seen in the B structure --/// let r4 = z(&b"abcdabcdwxyz"[..]); --/// assert_eq!(r4, Done(&b"wxyz"[..], B{a: 1, b: None})); --/// # } -+/// let a = b"abcdef"; -+/// let b = b"bcdefg"; -+/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -+/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], None)); -+/// # } - /// ``` - #[macro_export] --macro_rules! chain ( -- ($i:expr, $($rest:tt)*) => ( -- { -- chaining_parser!($i, 0usize, $($rest)*) -- } -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! chaining_parser ( -- ($i:expr, $consumed:expr, $e:ident ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, call!($e) ~ $($rest)*); -- ); -- ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,_) => { -- chaining_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), $($rest)*) -- } -- } -- } --); -- -- ($i:expr, $consumed:expr, $e:ident ? ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, call!($e) ? ~ $($rest)*); -- ); -- -- ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -+macro_rules! opt( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let input = if let $crate::IResult::Done(i,_) = res { -- i -- } else { -- $i -- }; -- chaining_parser!(input, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input)), $($rest)*) -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ _ => { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($i, ::std::option::Option::None); -+ res -+ }, - } - } - ); -- -- ($i:expr, $consumed:expr, $field:ident : $e:ident ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, $field: call!($e) ~ $($rest)*); -+ ($i:expr, $f:expr) => ( -+ opt!($i, call!($f)); - ); -+); - -- ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -+/// `opt_res!(I -> IResult) => I -> IResult>` -+/// make the underlying parser optional -+/// -+/// returns a Result, with Err containing the parsing error -+/// -+/// ```ignore -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!( o<&[u8], Result<&[u8], nom::Err<&[u8]> > >, opt_res!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdef"; -+/// let b = b"bcdefg"; -+/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Ok(&b"abcd"[..]))); -+/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], Err(error_position!(ErrorKind::Tag, &b[..])))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! opt_res ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- let $field = o; -- chaining_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), $($rest)*) -- } -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::result::Result::Ok(o)), -+ $crate::IResult::Error(e) => $crate::IResult::Done($i, ::std::result::Result::Err(e)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } - } - ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $e:ident ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, mut $field: call!($e) ~ $($rest)*); -+ ($i:expr, $f:expr) => ( -+ opt_res!($i, call!($f)); - ); -+); - -- ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)*) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- let mut $field = o; -- chaining_parser!(i, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i), $($rest)*) -- } -- } -- } -- ); -- -- ($i:expr, $consumed:expr, $field:ident : $e:ident ? ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, $field : call!($e) ? ~ $($rest)*); -- ); -- -- ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -- { -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let ($field,input) = if let $crate::IResult::Done(i,o) = res { -- (::std::option::Option::Some(o),i) -- } else { -- (::std::option::Option::None,$i) -- }; -- chaining_parser!(input, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input), $($rest)*) -- } -- } -- ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $e:ident ? ~ $($rest:tt)*) => ( -- chaining_parser!($i, $consumed, mut $field : call!($e) ? ~ $($rest)*); -- ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ? ~ $($rest:tt)*) => ( -- { -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let (mut $field,input) = if let $crate::IResult::Done(i,o) = res { -- (::std::option::Option::Some(o),i) -- } else { -- (::std::option::Option::None,$i) -- }; -- chaining_parser!(input, $consumed + $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input), $($rest)*) -- } -- } -- ); -- -- // ending the chain -- ($i:expr, $consumed:expr, $e:ident, $assemble:expr) => ( -- chaining_parser!($i, $consumed, call!($e), $assemble); -- ); -- -- ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,_) => { -- $crate::IResult::Done(i, $assemble()) -- } -- } -- ); -- -- ($i:expr, $consumed:expr, $e:ident ?, $assemble:expr) => ( -- chaining_parser!($i, $consumed, call!($e) ?, $assemble); -- ); -- -- ($i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ?, $assemble:expr) => ({ -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let input = if let $crate::IResult::Done(i,_) = res { -- i -- } else { -- $i -- }; -- $crate::IResult::Done(input, $assemble()) -- } -- }); -- -- ($i:expr, $consumed:expr, $field:ident : $e:ident, $assemble:expr) => ( -- chaining_parser!($i, $consumed, $field: call!($e), $assemble); -- ); -- -- ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- let $field = o; -- $crate::IResult::Done(i, $assemble()) -- } -- } -- ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $e:ident, $assemble:expr) => ( -- chaining_parser!($i, $consumed, mut $field: call!($e), $assemble); -- ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ), $assemble:expr) => ( -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- let mut $field = o; -- $crate::IResult::Done(i, $assemble()) -- } -- } -- ); -- -- ($i:expr, $consumed:expr, $field:ident : $e:ident ? , $assemble:expr) => ( -- chaining_parser!($i, $consumed, $field : call!($e) ? , $assemble); -- ); -- -- ($i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ? , $assemble:expr) => ({ -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let ($field,input) = if let $crate::IResult::Done(i,o) = res { -- (::std::option::Option::Some(o), i) -- } else { -- (::std::option::Option::None, $i) -- }; -- $crate::IResult::Done(input, $assemble()) -- } -- }); -- -- ($i:expr, $consumed:expr, mut $field:ident : $e:ident ? , $assemble:expr) => ( -- chaining_parser!($i, $consumed, $field : call!($e) ? , $assemble); -- ); -- -- ($i:expr, $consumed:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) ? , $assemble:expr) => ({ -- let res = $submac!($i, $($args)*); -- if let $crate::IResult::Incomplete(inc) = res { -- match inc { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(i) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- } -- } else { -- let (mut $field,input) = if let $crate::IResult::Done(i,o) = res { -- (::std::option::Option::Some(o), i) -- } else { -- (::std::option::Option::None, $i) -- }; -- $crate::IResult::Done(input, $assemble()) -- } -- }); -- -- ($i:expr, $consumed:expr, $assemble:expr) => ( -- $crate::IResult::Done($i, $assemble()) -- ) --); -- -- --/// `tuple!(I->IResult, I->IResult, ... I->IResult) => I -> IResult` --/// chains parsers and assemble the sub results in a tuple. --/// --/// The input type `I` must implement `nom::InputLength`. --/// --/// This combinator will count how much data is consumed by every child parser and take it into account if --/// there is not enough data --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::{self, Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; --/// # use nom::be_u16; --/// // the return type depends of the children parsers --/// named!(parser<&[u8], (u16, &[u8], &[u8]) >, --/// tuple!( --/// be_u16 , --/// take!(3), --/// tag!("fg") --/// ) --/// ); --/// --/// # fn main() { --/// assert_eq!( --/// parser(&b"abcdefgh"[..]), --/// Done( --/// &b"h"[..], --/// (0x6162u16, &b"cde"[..], &b"fg"[..]) --/// ) --/// ); --/// # } --/// ``` --#[macro_export] --macro_rules! tuple ( -- ($i:expr, $($rest:tt)*) => ( -- { -- tuple_parser!($i, 0usize, (), $($rest)*) -- } -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! tuple_parser ( -- ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => ( -- tuple_parser!($i, $consumed, ($($parsed),*), call!($e), $($rest)*); -- ); -- ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- tuple_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), (o), $($rest)*) -- } -- } -- } -- ); -- ($i:expr, $consumed:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- tuple_parser!(i, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), ($($parsed)* , o), $($rest)*) -- } -- } -- } -- ); -- ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident) => ( -- tuple_parser!($i, $consumed, ($($parsed),*), call!($e)); -- ); -- ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- $crate::IResult::Done(i, (o)) -- } -- } -- } -- ); -- ($i:expr, $consumed:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -- $crate::IResult::Done(i,o) => { -- $crate::IResult::Done(i, ($($parsed),* , o)) -- } -- } -- } -- ); -- ($i:expr, $consumed:expr, ($($parsed:expr),*)) => ( -- { -- $crate::IResult::Done($i, ($($parsed),*)) -- } -- ); --); --/// `alt!(I -> IResult | I -> IResult | ... | I -> IResult ) => I -> IResult` --/// try a list of parsers, return the result of the first successful one --/// --/// If one of the parser returns Incomplete, alt will return Incomplete, to retry --/// once you get more input. Note that it is better for performance to know the --/// minimum size of data you need before you get into alt. --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # fn main() { --/// named!( test, alt!( tag!( "abcd" ) | tag!( "efgh" ) ) ); --/// let r1 = test(b"abcdefgh"); --/// assert_eq!(r1, Done(&b"efgh"[..], &b"abcd"[..])); --/// let r2 = test(&b"efghijkl"[..]); --/// assert_eq!(r2, Done(&b"ijkl"[..], &b"efgh"[..])); --/// # } --/// ``` --/// --/// There is another syntax for alt allowing a block to manipulate the result: --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # fn main() { --/// #[derive(Debug,PartialEq,Eq)] --/// enum Tagged { --/// Abcd, --/// Efgh, --/// Took(usize) --/// } --/// named!(test, alt!( --/// tag!("abcd") => { |_| Tagged::Abcd } --/// | tag!("efgh") => { |_| Tagged::Efgh } --/// | take!(5) => { |res: &[u8]| Tagged::Took(res.len()) } // the closure takes the result as argument if the parser is successful --/// )); --/// let r1 = test(b"abcdefgh"); --/// assert_eq!(r1, Done(&b"efgh"[..], Tagged::Abcd)); --/// let r2 = test(&b"efghijkl"[..]); --/// assert_eq!(r2, Done(&b"ijkl"[..], Tagged::Efgh)); --/// let r3 = test(&b"mnopqrst"[..]); --/// assert_eq!(r3, Done(&b"rst"[..], Tagged::Took(5))); --/// # } --/// ``` --/// --/// **BE CAREFUL** there is a case where the behaviour of `alt!` can be confusing: --/// --/// when the alternatives have different lengths, like this case: --/// --/// ```ignore --/// named!( test, alt!( tag!( "abcd" ) | tag!( "ef" ) | tag!( "ghi" ) | tag!( "kl" ) ) ); --/// ``` --/// --/// With this parser, if you pass `"abcd"` as input, the first alternative parses it correctly, --/// but if you pass `"efg"`, the first alternative will return `Incomplete`, since it needs an input --/// of 4 bytes. This behaviour of `alt!` is expected: if you get a partial input that isn't matched --/// by the first alternative, but would match if the input was complete, you want `alt!` to indicate --/// that it cannot decide with limited information. --/// --/// There are two ways to fix this behaviour. The first one consists in ordering the alternatives --/// by size, like this: --/// --/// ```ignore --/// named!( test, alt!( tag!( "ef" ) | tag!( "kl") | tag!( "ghi" ) | tag!( "abcd" ) ) ); --/// ``` --/// --/// With this solution, the largest alternative will be tested last. --/// --/// The other solution uses the `complete!` combinator, which transforms an `Incomplete` in an --/// `Error`. If one of the alternatives returns `Incomplete` but is wrapped by `complete!`, --/// `alt!` will try the next alternative. This is useful when you know that --/// you will not get partial input: --/// --/// ```ignore --/// named!( test, --/// alt!( --/// complete!( tag!( "abcd" ) ) | --/// complete!( tag!( "ef" ) ) | --/// complete!( tag!( "ghi" ) ) | --/// complete!( tag!( "kl" ) ) --/// ) --/// ); --/// ``` --/// --/// If you want the `complete!` combinator to be applied to all rules then use the convenience --/// `alt_complete!` macro (see below). --/// --/// This behaviour of `alt!` can get especially confusing if multiple alternatives have different --/// sizes but a common prefix, like this: --/// --/// ```ignore --/// named!( test, alt!( tag!( "abcd" ) | tag!( "ab" ) | tag!( "ef" ) ) ); --/// ``` --/// --/// in that case, if you order by size, passing `"abcd"` as input will always be matched by the --/// smallest parser, so the solution using `complete!` is better suited. --/// --/// You can also nest multiple `alt!`, like this: --/// --/// ```ignore --/// named!( test, --/// alt!( --/// preceded!( --/// tag!("ab"), --/// alt!( --/// tag!( "cd" ) | --/// eof --/// ) --/// ) --/// | tag!( "ef" ) --/// ) --/// ); --/// ``` --/// --/// `preceded!` will first parse `"ab"` then, if successful, try the alternatives "cd", --/// or empty input (End Of File). If none of them work, `preceded!` will fail and --/// "ef" will be tested. --/// --#[macro_export] --macro_rules! alt ( -- ($i:expr, $($rest:tt)*) => ( -- { -- alt_parser!($i, $($rest)*) -- } -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! alt_parser ( -- ($i:expr, $e:ident | $($rest:tt)*) => ( -- alt_parser!($i, call!($e) | $($rest)*); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -- { -- let res = $subrule!($i, $($args)*); -- match res { -- $crate::IResult::Done(_,_) => res, -- $crate::IResult::Incomplete(_) => res, -- _ => alt_parser!($i, $($rest)*) -- } -- } -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -- { -- match $subrule!( $i, $($args)* ) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Error(_) => { -- alt_parser!($i, $($rest)*) -- } -- } -- } -- ); -- -- ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -- alt_parser!($i, call!($e) => { $gen } | $($rest)*); -- ); -- -- ($i:expr, $e:ident => { $gen:expr }) => ( -- alt_parser!($i, call!($e) => { $gen }); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -- { -- match $subrule!( $i, $($args)* ) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Error(_) => { -- alt_parser!($i) -- } -- } -- } -- ); -- -- ($i:expr, $e:ident) => ( -- alt_parser!($i, call!($e)); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)*)) => ( -- { -- match $subrule!( $i, $($args)* ) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i,o), -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Error(_) => { -- alt_parser!($i) -- } -- } -- } -- ); -- -- ($i:expr) => ( -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Alt,$i)) -- ); --); -- --/// This is a combination of the `alt!` and `complete!` combinators. Rather --/// than returning `Incomplete` on partial input, `alt_complete!` will try the --/// next alternative in the chain. You should use this only if you know you --/// will not receive partial input for the rules you're trying to match (this --/// is almost always the case for parsing programming languages). --#[macro_export] --macro_rules! alt_complete ( -- // Recursive rules (must include `complete!` around the head) -- -- ($i:expr, $e:ident | $($rest:tt)*) => ( -- alt_complete!($i, complete!(call!($e)) | $($rest)*); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -- { -- let res = complete!($i, $subrule!($($args)*)); -- match res { -- $crate::IResult::Done(_,_) => res, -- _ => alt_complete!($i, $($rest)*), -- } -- } -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -- { -- match complete!($i, $subrule!($($args)*)) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -- _ => alt_complete!($i, $($rest)*), -- } -- } -- ); -- -- ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -- alt_complete!($i, complete!(call!($e)) => { $gen } | $($rest)*); -- ); -- -- // Tail (non-recursive) rules -- -- ($i:expr, $e:ident => { $gen:expr }) => ( -- alt_complete!($i, call!($e) => { $gen }); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -- alt_parser!($i, $subrule!($($args)*) => { $gen }) -- ); -- -- ($i:expr, $e:ident) => ( -- alt_complete!($i, call!($e)); -- ); -- -- ($i:expr, $subrule:ident!( $($args:tt)*)) => ( -- alt_parser!($i, $subrule!($($args)*)) -- ); --); -- --/// `switch!(I -> IResult, P => I -> IResult | ... | P => I -> IResult ) => I -> IResult` --/// choose the next parser depending on the result of the first one, if successful, --/// and returns the result of the second parser --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done,Error}; --/// # use nom::Err::{Position, NodePosition}; --/// # use nom::ErrorKind; --/// # fn main() { --/// named!(sw, --/// switch!(take!(4), --/// b"abcd" => tag!("XYZ") | --/// b"efgh" => tag!("123") --/// ) --/// ); --/// --/// let a = b"abcdXYZ123"; --/// let b = b"abcdef"; --/// let c = b"efgh123"; --/// let d = b"blah"; --/// --/// assert_eq!(sw(&a[..]), Done(&b"123"[..], &b"XYZ"[..])); --/// assert_eq!(sw(&b[..]), Error(NodePosition(ErrorKind::Switch, &b"abcdef"[..], Box::new(Position(ErrorKind::Tag, &b"ef"[..]))))); --/// assert_eq!(sw(&c[..]), Done(&b""[..], &b"123"[..])); --/// assert_eq!(sw(&d[..]), Error(Position(ErrorKind::Switch, &b"blah"[..]))); --/// # } --/// ``` --/// --/// Due to limitations in Rust macros, it is not possible to have simple functions on the right hand --/// side of pattern, like this: --/// --/// ```ignore --/// named!(sw, --/// switch!(take!(4), --/// b"abcd" => tag!("XYZ") | --/// b"efgh" => tag!("123") --/// ) --/// ); --/// ``` --/// --/// If you want to pass your own functions instead, you can use the `call!` combinator as follows: --/// --/// ```ignore --/// named!(xyz, tag!("XYZ")); --/// named!(num, tag!("123")); --/// named!(sw, --/// switch!(take!(4), --/// b"abcd" => call!(xyz) | --/// b"efgh" => call!(num) --/// ) --/// ); --/// ``` --/// --#[macro_export] --macro_rules! switch ( -- ($i:expr, $submac:ident!( $($args:tt)*), $($rest:tt)*) => ( -- { -- switch_impl!($i, $submac!($($args)*), $($rest)*) -- } -- ); -- ($i:expr, $e:ident, $($rest:tt)*) => ( -- { -- switch_impl!($i, call!($e), $($rest)*) -- } -- ); --); -- --/// Internal parser, do not use directly --#[doc(hidden)] --#[macro_export] --macro_rules! switch_impl ( -- ($i:expr, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error($crate::Err::NodePosition( -- $crate::ErrorKind::Switch, $i, ::std::boxed::Box::new(e) -- )), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i, o) => { -- match o { -- $($p => match $subrule!(i, $($args2)*) { -- $crate::IResult::Error(e) => $crate::IResult::Error($crate::Err::NodePosition( -- $crate::ErrorKind::Switch, $i, ::std::boxed::Box::new(e) -- )), -- a => a, -- }),*, -- _ => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Switch,$i)) -- } -- } -- } -- } -- ); --); --/// `opt!(I -> IResult) => I -> IResult>` --/// make the underlying parser optional --/// --/// returns an Option of the returned type. This parser returns `Some(result)` if the child parser --/// succeeds,`None` if it fails, and `Incomplete` if it did not have enough data to decide --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # fn main() { --/// named!( o<&[u8], Option<&[u8]> >, opt!( tag!( "abcd" ) ) ); --/// --/// let a = b"abcdef"; --/// let b = b"bcdefg"; --/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); --/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], None)); --/// # } --/// ``` --#[macro_export] --macro_rules! opt( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -- $crate::IResult::Error(_) => $crate::IResult::Done($i, ::std::option::Option::None), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } -- ); -- ($i:expr, $f:expr) => ( -- opt!($i, call!($f)); -- ); --); -- --/// `opt_res!(I -> IResult) => I -> IResult>` --/// make the underlying parser optional --/// --/// returns a Result, with Err containing the parsing error --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; --/// # fn main() { --/// named!( o<&[u8], Result<&[u8], nom::Err<&[u8]> > >, opt_res!( tag!( "abcd" ) ) ); --/// --/// let a = b"abcdef"; --/// let b = b"bcdefg"; --/// assert_eq!(o(&a[..]), Done(&b"ef"[..], Ok(&b"abcd"[..]))); --/// assert_eq!(o(&b[..]), Done(&b"bcdefg"[..], Err(Position(ErrorKind::Tag, &b[..])))); --/// # } --/// ``` --#[macro_export] --macro_rules! opt_res ( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i, Ok(o)), -- $crate::IResult::Error(e) => $crate::IResult::Done($i, Err(e)), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } -- ); -- ($i:expr, $f:expr) => ( -- opt_res!($i, call!($f)); -- ); --); -- --/// `cond_with_error!(bool, I -> IResult) => I -> IResult>` --/// Conditional combinator --/// --/// Wraps another parser and calls it if the --/// condition is met. This combinator returns --/// an Option of the return type of the child --/// parser. --/// --/// This is especially useful if a parser depends --/// on the value return by a preceding parser in --/// a `chain!`. --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # use nom::IResult; --/// # fn main() { --/// let b = true; --/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], --/// cond!( b, tag!("abcd") )) --/// ); --/// --/// let a = b"abcdef"; --/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); --/// --/// let b2 = false; --/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], --/// cond!( b2, tag!("abcd") )) --/// ); --/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); --/// # } --/// ``` --/// --#[macro_export] --macro_rules! cond_with_error( -- ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- if $cond { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } else { -- $crate::IResult::Done($i, ::std::option::Option::None) -- } -- } -- ); -- ($i:expr, $cond:expr, $f:expr) => ( -- cond!($i, $cond, call!($f)); -- ); --); -- --/// `cond!(bool, I -> IResult) => I -> IResult>` --/// Conditional combinator --/// --/// Wraps another parser and calls it if the --/// condition is met. This combinator returns --/// an Option of the return type of the child --/// parser. --/// --/// This is especially useful if a parser depends --/// on the value return by a preceding parser in --/// a `chain!`. --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # use nom::IResult; --/// # fn main() { --/// let b = true; --/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], --/// cond!( b, tag!("abcd") )) --/// ); --/// --/// let a = b"abcdef"; --/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); --/// --/// let b2 = false; --/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], --/// cond!( b2, tag!("abcd") )) --/// ); --/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); --/// # } --/// ``` --/// --#[macro_export] --macro_rules! cond( -- ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- if $cond { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -- $crate::IResult::Error(_) => $crate::IResult::Done($i, ::std::option::Option::None), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } else { -- $crate::IResult::Done($i, ::std::option::Option::None) -- } -- } -- ); -- ($i:expr, $cond:expr, $f:expr) => ( -- cond!($i, $cond, call!($f)); -- ); --); -- --/// `cond_reduce!(bool, I -> IResult) => I -> IResult` --/// Conditional combinator with error --/// --/// Wraps another parser and calls it if the --/// condition is met. This combinator returns --/// an error if the condition is false --/// --/// This is especially useful if a parser depends --/// on the value return by a preceding parser in --/// a `chain!`. --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done,Error}; --/// # use nom::{Err,ErrorKind}; --/// # fn main() { --/// let b = true; --/// let f = closure!(&'static[u8], --/// cond_reduce!( b, tag!("abcd") ) --/// ); --/// --/// let a = b"abcdef"; --/// assert_eq!(f(&a[..]), Done(&b"ef"[..], &b"abcd"[..])); --/// --/// let b2 = false; --/// let f2 = closure!(&'static[u8], --/// cond_reduce!( b2, tag!("abcd") ) --/// ); --/// assert_eq!(f2(&a[..]), Error(Err::Position(ErrorKind::CondReduce, &a[..]))); --/// # } --/// ``` --/// --#[macro_export] --macro_rules! cond_reduce( -- ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- if $cond { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => $crate::IResult::Done(i, o), -- $crate::IResult::Error(e) => $crate::IResult::Error(e), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::CondReduce, $i)) -- } -- } -- ); -- ($i:expr, $cond:expr, $f:expr) => ( -- cond_reduce!($i, $cond, call!($f)); -- ); --); -- --/// `peek!(I -> IResult) => I -> IResult` --/// returns a result without consuming the input --/// --/// the embedded parser may return Incomplete --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # fn main() { --/// named!(ptag, peek!( tag!( "abcd" ) ) ); --/// --/// let r = ptag(&b"abcdefgh"[..]); --/// assert_eq!(r, Done(&b"abcdefgh"[..], &b"abcd"[..])); --/// # } --/// ``` --#[macro_export] --macro_rules! peek( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(_,o) => $crate::IResult::Done($i, o), -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } -- ); -- ($i:expr, $f:expr) => ( -- peek!($i, call!($f)); -- ); --); -- --/// `not!(I -> IResult) => I -> IResult` --/// returns a result only if the embedded parser returns Error or Incomplete --/// does not consume the input --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done, Error}; --/// # use nom::Err::{Position}; --/// # use nom::ErrorKind; --/// # fn main() { --/// named!(not_e, chain!( --/// res: tag!("abc") ~ --/// not!(char!('e')), --/// || { res })); --/// --/// let r = not_e(&b"abcd"[..]); --/// assert_eq!(r, Done(&b"d"[..], &b"abc"[..])); --/// --/// let r2 = not_e(&b"abce"[..]); --/// assert_eq!(r2, Error(Position(ErrorKind::Not, &b"e"[..]))); --/// # } --/// ``` --#[macro_export] --macro_rules! not( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(_, _) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Not, $i)), -- $crate::IResult::Error(_) => $crate::IResult::Done($i, &($i)[..0]), -- $crate::IResult::Incomplete(_) => $crate::IResult::Done($i, &($i)[..0]) -- } -- } -- ); --); -- --/// `tap!(name: I -> IResult => { block }) => I -> IResult` --/// allows access to the parser's result without affecting it --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::Done; --/// # use std::str; --/// # fn main() { --/// named!(ptag, tap!(res: tag!( "abcd" ) => { println!("recognized {}", str::from_utf8(res).unwrap()) } ) ); --/// --/// let r = ptag(&b"abcdefgh"[..]); --/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); --/// # } --/// ``` --#[macro_export] --macro_rules! tap ( -- ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => ( -- { -- match $submac!($i, $($args)*) { -- $crate::IResult::Done(i,o) => { -- let $name = o; -- $e; -- $crate::IResult::Done(i, $name) -- }, -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) -- } -- } -- ); -- ($i:expr, $name: ident: $f:expr => $e:expr) => ( -- tap!($i, $name: call!($f) => $e); -- ); --); -- --/// `pair!(I -> IResult, I -> IResult) => I -> IResult` --/// pair(X,Y), returns (x,y) --/// --#[macro_export] --macro_rules! pair( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- { -- tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) -- } -- ); -- -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- pair!($i, $submac!($($args)*), call!($g)); -- ); -- -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- pair!($i, call!($f), $submac!($($args)*)); -- ); -- -- ($i:expr, $f:expr, $g:expr) => ( -- pair!($i, call!($f), call!($g)); -- ); --); -- --/// `separated_pair!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` --/// separated_pair(X,sep,Y) returns (x,y) --#[macro_export] --macro_rules! separated_pair( -- ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -- { -- match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i1, (o1, _, o2)) => { -- $crate::IResult::Done(i1, (o1, o2)) -- } -- } -- } -- ); -- -- ($i:expr, $f:expr, $($rest:tt)+) => ( -- separated_pair!($i, call!($f), $($rest)*); -- ); --); -- --/// `preceded!(I -> IResult, I -> IResult) => I -> IResult` --/// preceded(opening, X) returns X --#[macro_export] --macro_rules! preceded( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- { -- match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(remaining, (_,o)) => { -- $crate::IResult::Done(remaining, o) -- } -- } -- } -- ); -- -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- preceded!($i, $submac!($($args)*), call!($g)); -- ); -- -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- preceded!($i, call!($f), $submac!($($args)*)); -- ); -- -- ($i:expr, $f:expr, $g:expr) => ( -- preceded!($i, call!($f), call!($g)); -- ); --); -- --/// `terminated!(I -> IResult, I -> IResult) => I -> IResult` --/// terminated(X, closing) returns X --#[macro_export] --macro_rules! terminated( -- ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -- { -- match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(remaining, (o,_)) => { -- $crate::IResult::Done(remaining, o) -- } -- } -- } -- ); -- -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- terminated!($i, $submac!($($args)*), call!($g)); -- ); -- -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- terminated!($i, call!($f), $submac!($($args)*)); -- ); -- -- ($i:expr, $f:expr, $g:expr) => ( -- terminated!($i, call!($f), call!($g)); -- ); --); -- --/// `delimited!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` --/// delimited(opening, X, closing) returns X --#[macro_export] --macro_rules! delimited( -- ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -- { -- match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i1, (_, o, _)) => { -- $crate::IResult::Done(i1, o) -- } -- } -- } -- ); -- -- ($i:expr, $f:expr, $($rest:tt)+) => ( -- delimited!($i, call!($f), $($rest)*); -- ); --); -- --/// `separated_list!(I -> IResult, I -> IResult) => I -> IResult>` --/// separated_list(sep, X) returns Vec --#[macro_export] --macro_rules! separated_list( -- ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -- { -- let mut res = ::std::vec::Vec::new(); -- let mut input = $i; -- -- // get the first element -- match $submac!(input, $($args2)*) { -- $crate::IResult::Error(_) => $crate::IResult::Done(input, ::std::vec::Vec::new()), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i,o) => { -- if i.len() == input.len() { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::SeparatedList,input)) -- } else { -- res.push(o); -- input = i; -- -- loop { -- // get the separator first -- if let $crate::IResult::Done(i2,_) = $sep!(input, $($args)*) { -- if i2.len() == input.len() { -- break; -- } -- -- // get the element next -- if let $crate::IResult::Done(i3,o3) = $submac!(i2, $($args2)*) { -- if i3.len() == i2.len() { -- break; -- } -- res.push(o3); -- input = i3; -- } else { -- break; -- } -- } else { -- break; -- } -- } -- $crate::IResult::Done(input, res) -- } -- }, -- } -- } -- ); -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- separated_list!($i, $submac!($($args)*), call!($g)); -- ); -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- separated_list!($i, call!($f), $submac!($($args)*)); -- ); -- ($i:expr, $f:expr, $g:expr) => ( -- separated_list!($i, call!($f), call!($g)); -- ); --); -- --/// `separated_nonempty_list!(I -> IResult, I -> IResult) => I -> IResult>` --/// separated_nonempty_list(sep, X) returns Vec --#[macro_export] --macro_rules! separated_nonempty_list( -- ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -- { -- let mut res = ::std::vec::Vec::new(); -- let mut input = $i; -- -- // get the first element -- match $submac!(input, $($args2)*) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i,o) => { -- if i.len() == input.len() { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::SeparatedNonEmptyList,input)) -- } else { -- res.push(o); -- input = i; -- -- loop { -- if let $crate::IResult::Done(i2,_) = $sep!(input, $($args)*) { -- if i2.len() == input.len() { -- break; -- } -- -- if let $crate::IResult::Done(i3,o3) = $submac!(i2, $($args2)*) { -- if i3.len() == i2.len() { -- break; -- } -- res.push(o3); -- input = i3; -- } else { -- break; -- } -- } else { -- break; -- } -- } -- $crate::IResult::Done(input, res) -- } -- }, -- } -- } -- ); -- ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -- separated_nonempty_list!($i, $submac!($($args)*), call!($g)); -- ); -- ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -- separated_nonempty_list!($i, call!($f), $submac!($($args)*)); -- ); -- ($i:expr, $f:expr, $g:expr) => ( -- separated_nonempty_list!($i, call!($f), call!($g)); -- ); --); -- --/// `many0!(I -> IResult) => I -> IResult>` --/// Applies the parser 0 or more times and returns the list of results in a Vec -+/// `cond_with_error!(bool, I -> IResult) => I -> IResult>` -+/// Conditional combinator - /// --/// the embedded parser may return Incomplete -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an Option of the return type of the child -+/// parser. -+/// -+/// This is especially useful if a parser depends -+/// on the value returned by a preceding parser in -+/// a `do_parse!`. - /// - /// ``` - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::Done; -+/// # use nom::IResult; - /// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, many0!( tag!( "abcd" ) ) ); -+/// let b = true; -+/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b, tag!("abcd") )) -+/// ); - /// --/// let a = b"abcdabcdefgh"; --/// let b = b"azerty"; -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); - /// --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); --/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); --/// # } -+/// let b2 = false; -+/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b2, tag!("abcd") )) -+/// ); -+/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); -+/// # } - /// ``` --/// 0 or more -+/// - #[macro_export] --macro_rules! many0( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+macro_rules! cond_with_error( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( - { -- use $crate::InputLength; -- -- let ret; -- let mut res = ::std::vec::Vec::new(); -- let mut input = $i; -- -- loop { -- if input.input_len() == 0 { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $submac!(input, $($args)*) { -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Done(input, res); break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- let size = i + ($i).input_len() - input.input_len(); -- ret = $crate::IResult::Incomplete($crate::Needed::Size(size)); break; -- }, -- $crate::IResult::Done(i, o) => { -- // loop trip must always consume (otherwise infinite loops) -- if i == input { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many0,input)); break; -- } -- -- res.push(o); -- input = i; -- } -+ if $cond { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } -+ } else { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($i, ::std::option::Option::None); -+ res - } -- -- ret - } - ); -- ($i:expr, $f:expr) => ( -- many0!($i, call!($f)); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond_with_error!($i, $cond, call!($f)); - ); - ); - --/// `many1!(I -> IResult) => I -> IResult>` --/// Applies the parser 1 or more times and returns the list of results in a Vec -+/// `cond!(bool, I -> IResult) => I -> IResult>` -+/// Conditional combinator - /// --/// the embedded parser may return Incomplete -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an Option of the return type of the child -+/// parser. -+/// -+/// This is especially useful if a parser depends -+/// on the value returned by a preceding parser in -+/// a `do_parse!`. - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; -+/// # use nom::IResult::Done; -+/// # use nom::IResult; - /// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, many1!( tag!( "abcd" ) ) ); -+/// let b = true; -+/// let f: Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b, tag!("abcd") )) -+/// ); - /// --/// let a = b"abcdabcdefgh"; --/// let b = b"azerty"; -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); - /// --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); --/// assert_eq!(multi(&b[..]), Error(Position(ErrorKind::Many1,&b[..]))); --/// # } -+/// let b2 = false; -+/// let f2:Box IResult<&[u8],Option<&[u8]>>> = Box::new(closure!(&'static[u8], -+/// cond!( b2, tag!("abcd") )) -+/// ); -+/// assert_eq!(f2(&a[..]), Done(&b"abcdef"[..], None)); -+/// # } - /// ``` -+/// - #[macro_export] --macro_rules! many1( -- ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+macro_rules! cond( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( - { -- use $crate::InputLength; -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many1,$i)), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i1,o1) => { -- if i1.input_len() == 0 { -- $crate::IResult::Done(i1,vec![o1]) -- } else { -- -- let mut res = ::std::vec::Vec::with_capacity(4); -- res.push(o1); -- let mut input = i1; -- let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -- loop { -- if input.input_len() == 0 { -- break; -- } -- match $submac!(input, $($args)*) { -- $crate::IResult::Error(_) => { -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -- break; -- }, -- $crate::IResult::Done(i, o) => { -- if i.input_len() == input.input_len() { -- break; -- } -- res.push(o); -- input = i; -- } -- } -- } -- -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Done(input, res) -- } -- } -+ if $cond { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, ::std::option::Option::Some(o)), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Error(_) => { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($i, ::std::option::Option::None); -+ res -+ }, - } -+ } else { -+ let res: $crate::IResult<_,_> = $crate::IResult::Done($i, ::std::option::Option::None); -+ res - } - } - ); -- ($i:expr, $f:expr) => ( -- many1!($i, call!($f)); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond!($i, $cond, call!($f)); - ); - ); - --/// `many_m_n!(usize, usize, I -> IResult) => I -> IResult>` --/// Applies the parser between m and n times (n included) and returns the list of results in a Vec -+/// `cond_reduce!(bool, I -> IResult) => I -> IResult` -+/// Conditional combinator with error - /// --/// the embedded parser may return Incomplete -+/// Wraps another parser and calls it if the -+/// condition is met. This combinator returns -+/// an error if the condition is false -+/// -+/// This is especially useful if a parser depends -+/// on the value returned by a preceding parser in -+/// a `do_parse!`. - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; -+/// # use nom::IResult::{Done,Error}; -+/// # use nom::{Err,ErrorKind}; - /// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, tag!( "abcd" ) ) ); -+/// let b = true; -+/// let f = closure!(&'static[u8], -+/// cond_reduce!( b, tag!("abcd") ) -+/// ); - /// --/// let a = b"abcdefgh"; --/// let b = b"abcdabcdefgh"; --/// let c = b"abcdabcdabcdabcdabcdefgh"; -+/// let a = b"abcdef"; -+/// assert_eq!(f(&a[..]), Done(&b"ef"[..], &b"abcd"[..])); - /// --/// assert_eq!(multi(&a[..]),Error(Position(ErrorKind::ManyMN,&a[..]))); --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); --/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); --/// # } -+/// let b2 = false; -+/// let f2 = closure!(&'static[u8], -+/// cond_reduce!( b2, tag!("abcd") ) -+/// ); -+/// assert_eq!(f2(&a[..]), Error(error_position!(ErrorKind::CondReduce, &a[..]))); -+/// # } - /// ``` -+/// - #[macro_export] --macro_rules! many_m_n( -- ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* )) => ( -+macro_rules! cond_reduce( -+ ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => ( - { -- use $crate::InputLength; -- let mut res = ::std::vec::Vec::with_capacity($m); -- let mut input = $i; -- let mut count: usize = 0; -- let mut err = false; -- let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -- loop { -- if count == $n { break } -- match $submac!(input, $($args)*) { -- $crate::IResult::Done(i, o) => { -- // do not allow parsers that do not consume input (causes infinite loops) -- if i.input_len() == input.input_len() { -- break; -- } -- res.push(o); -- input = i; -- count += 1; -- } -- $crate::IResult::Error(_) => { -- err = true; -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -- break; -- }, -- } -- if input.input_len() == 0 { -- break; -- } -- } -- -- if count < $m { -- if err { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ManyMN,$i)) -- } else { -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Incomplete($crate::Needed::Unknown) -- } -+ if $cond { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } - } else { -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Done(input, res) -- } -+ $crate::IResult::Error(error_position!($crate::ErrorKind::CondReduce, $i)) - } - } - ); -- ($i:expr, $m:expr, $n: expr, $f:expr) => ( -- many_m_n!($i, $m, $n, call!($f)); -+ ($i:expr, $cond:expr, $f:expr) => ( -+ cond_reduce!($i, $cond, call!($f)); - ); - ); - --/// `count!(I -> IResult, nb) => I -> IResult>` --/// Applies the child parser a specified number of times -+/// `peek!(I -> IResult) => I -> IResult` -+/// returns a result without consuming the input -+/// -+/// the embedded parser may return Incomplete - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done,Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; -+/// # use nom::IResult::Done; - /// # fn main() { --/// named!(counter< Vec<&[u8]> >, count!( tag!( "abcd" ), 2 ) ); --/// --/// let a = b"abcdabcdabcdef"; --/// let b = b"abcdefgh"; --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// named!(ptag, peek!( tag!( "abcd" ) ) ); - /// --/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); --/// assert_eq!(counter(&b[..]), Error(Position(ErrorKind::Count, &b[..]))); -+/// let r = ptag(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"abcdefgh"[..], &b"abcd"[..])); - /// # } - /// ``` --/// - #[macro_export] --macro_rules! count( -- ($i:expr, $submac:ident!( $($args:tt)* ), $count: expr) => ( -+macro_rules! peek( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- let ret; -- let mut input = $i; -- let mut res = ::std::vec::Vec::with_capacity($count); -- -- loop { -- if res.len() == $count { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $submac!(input, $($args)*) { -- $crate::IResult::Done(i,o) => { -- res.push(o); -- input = i; -- }, -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Count,$i)); break; -- }, -- $crate::IResult::Incomplete(_) => { -- ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -- } -- } -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(_,o) => $crate::IResult::Done($i, o), -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } -- -- ret - } - ); -- ($i:expr, $f:expr, $count: expr) => ( -- count!($i, call!($f), $count); -+ ($i:expr, $f:expr) => ( -+ peek!($i, call!($f)); - ); - ); - --/// `count_fixed!(O, I -> IResult, nb) => I -> IResult` --/// Applies the child parser a fixed number of times and returns a fixed size array --/// The type must be specified and it must be `Copy` -+/// `not!(I -> IResult) => I -> IResult` -+/// returns a result only if the embedded parser returns Error or Incomplete -+/// does not consume the input - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done,Error}; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] - /// # use nom::Err::Position; - /// # use nom::ErrorKind; - /// # fn main() { --/// named!(counter< [&[u8]; 2] >, count_fixed!( &[u8], tag!( "abcd" ), 2 ) ); --/// // can omit the type specifier if returning slices --/// // named!(counter< [&[u8]; 2] >, count_fixed!( tag!( "abcd" ), 2 ) ); -+/// named!(not_e, do_parse!( -+/// res: tag!("abc") >> -+/// not!(char!('e')) >> -+/// (res) -+/// )); - /// --/// let a = b"abcdabcdabcdef"; --/// let b = b"abcdefgh"; --/// let res = [&b"abcd"[..], &b"abcd"[..]]; -+/// let r = not_e(&b"abcd"[..]); -+/// assert_eq!(r, Done(&b"d"[..], &b"abc"[..])); - /// --/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); --/// assert_eq!(counter(&b[..]), Error(Position(ErrorKind::Count, &b[..]))); -+/// let r2 = not_e(&b"abce"[..]); -+/// assert_eq!(r2, Error(error_position!(ErrorKind::Not, &b"e"[..]))); - /// # } - /// ``` --/// --#[macro_export] --macro_rules! count_fixed ( -- ($i:expr, $typ:ty, $submac:ident!( $($args:tt)* ), $count: expr) => ( -- { -- let ret; -- let mut input = $i; -- // `$typ` must be Copy, and thus having no destructor, this is panic safe -- let mut res: [$typ; $count] = unsafe{[::std::mem::uninitialized(); $count as usize]}; -- let mut cnt: usize = 0; -- -- loop { -- if cnt == $count { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $submac!(input, $($args)*) { -- $crate::IResult::Done(i,o) => { -- res[cnt] = o; -- cnt += 1; -- input = i; -- }, -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Count,$i)); break; -- }, -- $crate::IResult::Incomplete(_) => { -- ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -- } -- } -- } -- -- ret -- } -- ); -- ($i:expr, $typ: ty, $f:ident, $count: expr) => ( -- count_fixed!($i, $typ, call!($f), $count); -- ); --); -- --/// `length_value!(I -> IResult, I -> IResult) => I -> IResult>` --/// gets a number from the first parser, then applies the second parser that many times - #[macro_export] --macro_rules! length_value( -- ($i:expr, $f:expr, $g:expr) => ( -+macro_rules! not( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- match $f($i) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Done(inum, onum) => { -- let ret; -- let length_token = $i.len() - inum.len(); -- let mut input = inum; -- let mut res = ::std::vec::Vec::new(); -- -- loop { -- if res.len() == onum as usize { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $g(input) { -- $crate::IResult::Done(iparse, oparse) => { -- res.push(oparse); -- input = iparse; -- }, -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::LengthValue,$i)); break; -- }, -- $crate::IResult::Incomplete(a) => { -- ret = match a { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(length) => $crate::IResult::Incomplete($crate::Needed::Size(length_token + onum as usize * length)) -- }; -- break; -- } -- } -- } -- -- ret -- } -+ use $crate::Slice; -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(_, _) => $crate::IResult::Error(error_position!($crate::ErrorKind::Not, $i)), -+ $crate::IResult::Error(_) => $crate::IResult::Done($i, ($i).slice(..0)), -+ $crate::IResult::Incomplete(_) => $crate::IResult::Done($i, ($i).slice(..0)) - } - } - ); -- ($i:expr, $f:expr, $g:expr, $length:expr) => ( -- { -- match $f($i) { -- $crate::IResult::Error(a) => $crate::IResult::Error(a), -- $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -- $crate::IResult::Done(inum, onum) => { -- let ret; -- let length_token = $i.len() - inum.len(); -- let mut input = inum; -- let mut res = ::std::vec::Vec::new(); -- -- loop { -- if res.len() == onum as usize { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $g(input) { -- $crate::IResult::Done(iparse, oparse) => { -- res.push(oparse); -- input = iparse; -- }, -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::LengthValue,$i)); break; -- }, -- $crate::IResult::Incomplete(a) => { -- ret = match a { -- $crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown), -- $crate::Needed::Size(_) => $crate::IResult::Incomplete($crate::Needed::Size(length_token + onum as usize * $length)) -- }; -- break; -- } -- } -- } -- -- ret -- } -- } -- } -+ ($i:expr, $f:expr) => ( -+ not!($i, call!($f)); - ); - ); - --/// `fold_many0!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` --/// Applies the parser 0 or more times and folds the list of return values --/// --/// the embedded parser may return Incomplete -+/// `tap!(name: I -> IResult => { block }) => I -> IResult` -+/// allows access to the parser's result without affecting it - /// - /// ``` - /// # #[macro_use] extern crate nom; - /// # use nom::IResult::Done; -+/// # use std::str; - /// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, fold_many0!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { --/// acc.push(item); --/// acc --/// })); --/// --/// let a = b"abcdabcdefgh"; --/// let b = b"azerty"; -+/// named!(ptag, tap!(res: tag!( "abcd" ) => { println!("recognized {}", str::from_utf8(res).unwrap()) } ) ); - /// --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); --/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); -+/// let r = ptag(&b"abcdefgh"[..]); -+/// assert_eq!(r, Done(&b"efgh"[..], &b"abcd"[..])); - /// # } - /// ``` --/// 0 or more - #[macro_export] --macro_rules! fold_many0( -- ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+macro_rules! tap ( -+ ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => ( - { -- use $crate::InputLength; -- let ret; -- let f = $f; -- let mut res = $init; -- let mut input = $i; -- -- loop { -- if input.input_len() == 0 { -- ret = $crate::IResult::Done(input, res); break; -- } -- -- match $submac!(input, $($args)*) { -- $crate::IResult::Error(_) => { -- ret = $crate::IResult::Done(input, res); break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- ret = $crate::IResult::Incomplete($crate::Needed::Unknown); break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- let size = i + ($i).input_len() - input.input_len(); -- ret = $crate::IResult::Incomplete($crate::Needed::Size(size)); break; -- }, -- $crate::IResult::Done(i, o) => { -- // loop trip must always consume (otherwise infinite loops) -- if i == input { -- ret = $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many0,input)); break; -- } -- -- res = f(res, o); -- input = i; -- } -- } -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ let $name = o; -+ $e; -+ $crate::IResult::Done(i, $name) -+ }, -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } -- -- ret - } - ); -- ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -- fold_many0!($i, call!($f), $init, $fold_f); -- ); --); -- --/// `fold_many1!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` --/// Applies the parser 1 or more times and folds the list of return values --/// --/// the embedded parser may return Incomplete --/// --/// ``` --/// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; --/// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, fold_many1!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { --/// acc.push(item); --/// acc --/// })); --/// --/// let a = b"abcdabcdefgh"; --/// let b = b"azerty"; -+ ($i:expr, $name: ident: $f:expr => $e:expr) => ( -+ tap!($i, $name: call!($f) => $e); -+ ); -+); -+ -+/// `eof!()` returns its input if it is at the end of input data - /// --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); --/// assert_eq!(multi(&b[..]), Error(Position(ErrorKind::Many1,&b[..]))); --/// # } --/// ``` -+/// please note that for now, eof only means there's no more -+/// data available, it does not work yet with smarter input -+/// types - #[macro_export] --macro_rules! fold_many1( -- ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+macro_rules! eof ( -+ ($i:expr,) => ( - { - use $crate::InputLength; -- match $submac!($i, $($args)*) { -- $crate::IResult::Error(_) => $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Many1,$i)), -- $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -- $crate::IResult::Done(i1,o1) => { -- let acc = $init; -- let f = $f; -- if i1.len() == 0 { -- let acc = f(acc, o1); -- $crate::IResult::Done(i1,acc) -- } else { -- let mut acc = f(acc, o1); -- let mut input = i1; -- let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -- loop { -- if input.input_len() == 0 { -- break; -- } -- match $submac!(input, $($args)*) { -- $crate::IResult::Error(_) => { -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -- break; -- }, -- $crate::IResult::Done(i, o) => { -- if i.input_len() == input.input_len() { -- break; -- } -- acc = f(acc, o); -- input = i; -- } -- } -- } -- -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Done(input, acc) -- } -- } -- } -+ if ($i).input_len() == 0 { -+ $crate::IResult::Done($i, $i) -+ } else { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Eof, $i)) - } - } - ); -- ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -- fold_many1!($i, call!($f), $init, $fold_f); -- ); - ); - --/// `fold_many_m_n!(usize, usize, I -> IResult, R, Fn(R, O) -> R) => I -> IResult` --/// Applies the parser between m and n times (n included) and folds the list of return value --/// --/// the embedded parser may return Incomplete -+/// `recognize!(I -> IResult ) => I -> IResult` -+/// if the child parser was successful, return the consumed input as produced value - /// - /// ``` - /// # #[macro_use] extern crate nom; --/// # use nom::IResult::{Done, Error}; --/// # use nom::Err::Position; --/// # use nom::ErrorKind; -+/// # use nom::IResult::Done; - /// # fn main() { --/// named!(multi<&[u8], Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { --/// acc.push(item); --/// acc --/// })); --/// --/// let a = b"abcdefgh"; --/// let b = b"abcdabcdefgh"; --/// let c = b"abcdabcdabcdabcdabcdefgh"; --/// --/// assert_eq!(multi(&a[..]),Error(Position(ErrorKind::ManyMN,&a[..]))); --/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); --/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; --/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); -+/// named!(x, recognize!(delimited!(tag!("")))); -+/// let r = x(&b" aaa"[..]); -+/// assert_eq!(r, Done(&b" aaa"[..], &b""[..])); - /// # } - /// ``` - #[macro_export] --macro_rules! fold_many_m_n( -- ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+macro_rules! recognize ( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( - { -- use $crate::InputLength; -- let mut acc = $init; -- let f = $f; -- let mut input = $i; -- let mut count: usize = 0; -- let mut err = false; -- let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -- loop { -- if count == $n { break } -- match $submac!(input, $($args)*) { -- $crate::IResult::Done(i, o) => { -- // do not allow parsers that do not consume input (causes infinite loops) -- if i.input_len() == input.input_len() { -- break; -- } -- acc = f(acc, o); -- input = i; -- count += 1; -- } -- $crate::IResult::Error(_) => { -- err = true; -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Unknown) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -- break; -- }, -- $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -- incomplete = ::std::option::Option::Some($crate::Needed::Size(i + ($i).input_len() - input.input_len())); -- break; -- }, -- } -- if input.input_len() == 0 { -- break; -- } -- } -- -- if count < $m { -- if err { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::ManyMN,$i)) -- } else { -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Incomplete($crate::Needed::Unknown) -- } -- } -- } else { -- match incomplete { -- ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -- ::std::option::Option::None => $crate::IResult::Done(input, acc) -- } -+ use $crate::Offset; -+ use $crate::Slice; -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(i,_) => { -+ let index = (&$i).offset(&i); -+ $crate::IResult::Done(i, ($i).slice(..index)) -+ }, -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i) - } - } - ); -- ($i:expr, $m:expr, $n: expr, $f:expr, $init:expr, $fold_f:expr) => ( -- fold_many_m_n!($i, $m, $n, call!($f), $init, $fold_f); -+ ($i:expr, $f:expr) => ( -+ recognize!($i, call!($f)) - ); - ); - -+ - #[cfg(test)] - mod tests { -- use internal::{Needed,IResult,Err}; -+ use internal::{Needed,IResult}; -+ #[cfg(feature = "verbose-errors")] -+ use verbose_errors::Err; -+ -+ #[cfg(not(feature = "verbose-errors"))] -+ use simple_errors::Err; -+ - use internal::IResult::*; -- use internal::Err::*; - use util::ErrorKind; - - // reproduce the tag and take macros, because of module import order -@@ -2705,7 +1191,7 @@ mod tests { - let b = &$bytes[..m]; - - let res: $crate::IResult<_,_> = if reduced != b { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::Tag, $i)) -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) - } else if m < blen { - $crate::IResult::Incomplete($crate::Needed::Size(blen)) - } else { -@@ -2753,333 +1239,6 @@ mod tests { - assert_eq!(b, 6); - } - -- #[derive(PartialEq,Eq,Debug)] -- struct B { -- a: u8, -- b: u8 -- } -- -- #[test] -- fn chain2() { -- fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -- fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -- -- named!(chain_parser<&[u8],B>, -- chain!( -- tag!("abcd") ~ -- tag!("abcd")? ~ -- aa: ret_int1 ~ -- tag!("efgh") ~ -- bb: ret_int2 ~ -- tag!("efgh") , -- ||{B{a: aa, b: bb}} -- ) -- ); -- -- assert_eq!(chain_parser(&b"abcdabcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -- assert_eq!(chain_parser(&b"abcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -- assert_eq!(chain_parser(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(chain_parser(&b"abcdefghef"[..]), Incomplete(Needed::Size(12))); -- } -- -- #[test] -- fn nested_chain() { -- fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -- fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -- -- named!(chain_parser<&[u8],B>, -- chain!( -- chain!( -- tag!("abcd") ~ -- tag!("abcd")? , -- || {} -- ) ~ -- aa: ret_int1 ~ -- tag!("efgh") ~ -- bb: ret_int2 ~ -- tag!("efgh") , -- ||{B{a: aa, b: bb}} -- ) -- ); -- -- assert_eq!(chain_parser(&b"abcdabcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -- assert_eq!(chain_parser(&b"abcdefghefghX"[..]), Done(&b"X"[..], B{a: 1, b: 2})); -- assert_eq!(chain_parser(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(chain_parser(&b"abcdefghef"[..]), Incomplete(Needed::Size(12))); -- } -- -- #[derive(PartialEq,Eq,Debug)] -- struct C { -- a: u8, -- b: Option -- } -- -- #[test] -- fn chain_mut() { -- fn ret_b1_2(i:&[u8]) -> IResult<&[u8], B> { Done(i,B{a:1,b:2}) }; -- named!(f<&[u8],B>, -- chain!( -- tag!("abcd") ~ -- tag!("abcd")? ~ -- tag!("efgh") ~ -- mut bb: ret_b1_2 ~ -- tag!("efgh") , -- ||{ -- bb.b = 3; -- bb -- } -- ) -- ); -- -- let r = f(&b"abcdabcdefghefghX"[..]); -- assert_eq!(r, Done(&b"X"[..], B{a: 1, b: 3})); -- } -- -- #[test] -- fn chain_opt() { -- named!(y, tag!("efgh")); -- fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -- named!(ret_y<&[u8], u8>, map!(y, |_| 2)); -- -- named!(chain_parser<&[u8],C>, -- chain!( -- tag!("abcd") ~ -- aa: ret_int1 ~ -- bb: ret_y? , -- ||{C{a: aa, b: bb}} -- ) -- ); -- -- assert_eq!(chain_parser(&b"abcdefghX"[..]), Done(&b"X"[..], C{a: 1, b: Some(2)})); -- assert_eq!(chain_parser(&b"abcdWXYZ"[..]), Done(&b"WXYZ"[..], C{a: 1, b: None})); -- assert_eq!(chain_parser(&b"abcdX"[..]), Done(&b"X"[..], C{ a: 1, b: None })); -- assert_eq!(chain_parser(&b"abcdef"[..]), Incomplete(Needed::Size(8))); -- } -- -- use util::{error_to_list, add_error_pattern, print_error}; -- -- fn error_to_string

(e: &Err

) -> &'static str { -- let v:Vec = error_to_list(e); -- // do it this way if you can use slice patterns -- /* -- match &v[..] { -- [ErrorKind::Custom(42), ErrorKind::Tag] => "missing `ijkl` tag", -- [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] => "missing `mnop` tag after `ijkl`", -- _ => "unrecognized error" -- } -- */ -- if &v[..] == [ErrorKind::Custom(42),ErrorKind::Tag] { -- "missing `ijkl` tag" -- } else if &v[..] == [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] { -- "missing `mnop` tag after `ijkl`" -- } else { -- "unrecognized error" -- } -- } -- -- // do it this way if you can use box patterns -- /*use std::str; -- fn error_to_string(e:Err) -> String -- match e { -- NodePosition(ErrorKind::Custom(42), i1, box Position(ErrorKind::Tag, i2)) => { -- format!("missing `ijkl` tag, found '{}' instead", str::from_utf8(i2).unwrap()) -- }, -- NodePosition(ErrorKind::Custom(42), i1, box NodePosition(ErrorKind::Custom(128), i2, box Position(ErrorKind::Tag, i3))) => { -- format!("missing `mnop` tag after `ijkl`, found '{}' instead", str::from_utf8(i3).unwrap()) -- }, -- _ => "unrecognized error".to_string() -- } -- }*/ -- use std::collections; -- #[test] -- fn err() { -- named!(err_test, alt!( -- tag!("abcd") | -- preceded!(tag!("efgh"), error!(ErrorKind::Custom(42), -- chain!( -- tag!("ijkl") ~ -- res: error!(ErrorKind::Custom(128), tag!("mnop")) , -- || { res } -- ) -- ) -- ) -- )); -- let a = &b"efghblah"[..]; -- let b = &b"efghijklblah"[..]; -- let c = &b"efghijklmnop"[..]; -- -- let blah = &b"blah"[..]; -- -- let res_a = err_test(a); -- let res_b = err_test(b); -- let res_c = err_test(c); -- assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); -- assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah))))))); -- assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -- -- // Merr-like error matching -- let mut err_map = collections::HashMap::new(); -- assert!(add_error_pattern(&mut err_map, err_test(&b"efghpouet"[..]), "missing `ijkl` tag")); -- assert!(add_error_pattern(&mut err_map, err_test(&b"efghijklpouet"[..]), "missing `mnop` tag after `ijkl`")); -- -- let res_a2 = res_a.clone(); -- match res_a { -- Error(e) => { -- assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Tag]); -- assert_eq!(error_to_string(&e), "missing `ijkl` tag"); -- assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `ijkl` tag")); -- }, -- _ => panic!() -- }; -- -- let res_b2 = res_b.clone(); -- match res_b { -- Error(e) => { -- assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag]); -- assert_eq!(error_to_string(&e), "missing `mnop` tag after `ijkl`"); -- assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `mnop` tag after `ijkl`")); -- }, -- _ => panic!() -- }; -- -- print_error(a, res_a2); -- print_error(b, res_b2); -- } -- -- #[test] -- fn add_err() { -- named!(err_test, -- preceded!(tag!("efgh"), add_error!(ErrorKind::Custom(42), -- chain!( -- tag!("ijkl") ~ -- res: add_error!(ErrorKind::Custom(128), tag!("mnop")) , -- || { res } -- ) -- ) -- )); -- let a = &b"efghblah"[..]; -- let b = &b"efghijklblah"[..]; -- let c = &b"efghijklmnop"[..]; -- -- let blah = &b"blah"[..]; -- -- let res_a = err_test(a); -- let res_b = err_test(b); -- let res_c = err_test(c); -- assert_eq!(res_a, Error(NodePosition(ErrorKind::Custom(42), blah, Box::new(Position(ErrorKind::Tag, blah))))); -- assert_eq!(res_b, Error(NodePosition(ErrorKind::Custom(42), &b"ijklblah"[..], Box::new(NodePosition(ErrorKind::Custom(128), blah, Box::new(Position(ErrorKind::Tag, blah))))))); -- assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -- } -- -- #[test] -- fn complete() { -- named!(err_test, -- chain!( -- tag!("ijkl") ~ -- res: complete!(tag!("mnop")) , -- || { res } -- ) -- ); -- let a = &b"ijklmn"[..]; -- -- let res_a = err_test(a); -- assert_eq!(res_a, Error(Position(ErrorKind::Complete, &b"mn"[..]))); -- } -- #[test] -- fn alt() { -- fn work(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -- Done(&b""[..], input) -- } -- -- #[allow(unused_variables)] -- fn dont_work(input: &[u8]) -> IResult<&[u8],&[u8],&'static str> { -- Error(Code(ErrorKind::Custom("abcd"))) -- } -- -- fn work2(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -- Done(input, &b""[..]) -- } -- -- fn alt1(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -- alt!(i, dont_work | dont_work) -- } -- fn alt2(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -- alt!(i, dont_work | work) -- } -- fn alt3(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -- alt!(i, dont_work | dont_work | work2 | dont_work) -- } -- //named!(alt1, alt!(dont_work | dont_work)); -- //named!(alt2, alt!(dont_work | work)); -- //named!(alt3, alt!(dont_work | dont_work | work2 | dont_work)); -- -- let a = &b"abcd"[..]; -- assert_eq!(alt1(a), Error(Position(ErrorKind::Alt, a))); -- assert_eq!(alt2(a), Done(&b""[..], a)); -- assert_eq!(alt3(a), Done(a, &b""[..])); -- -- named!(alt4, alt!(tag!("abcd") | tag!("efgh"))); -- let b = &b"efgh"[..]; -- assert_eq!(alt4(a), Done(&b""[..], a)); -- assert_eq!(alt4(b), Done(&b""[..], b)); -- -- // test the alternative syntax -- named!(alt5, alt!(tag!("abcd") => { |_| false } | tag!("efgh") => { |_| true })); -- assert_eq!(alt5(a), Done(&b""[..], false)); -- assert_eq!(alt5(b), Done(&b""[..], true)); -- -- } -- -- #[test] -- fn alt_incomplete() { -- named!(alt1, alt!(tag!("a") | tag!("bc") | tag!("def"))); -- -- let a = &b""[..]; -- assert_eq!(alt1(a), Incomplete(Needed::Size(1))); -- let a = &b"b"[..]; -- assert_eq!(alt1(a), Incomplete(Needed::Size(2))); -- let a = &b"bcd"[..]; -- assert_eq!(alt1(a), Done(&b"d"[..], &b"bc"[..])); -- let a = &b"cde"[..]; -- assert_eq!(alt1(a), Error(Position(ErrorKind::Alt, a))); -- let a = &b"de"[..]; -- assert_eq!(alt1(a), Incomplete(Needed::Size(3))); -- let a = &b"defg"[..]; -- assert_eq!(alt1(a), Done(&b"g"[..], &b"def"[..])); -- } -- -- #[test] -- fn alt_complete() { -- named!(ac<&[u8], &[u8]>, -- alt_complete!(tag!("abcd") | tag!("ef") | tag!("ghi") | tag!("kl")) -- ); -- -- let a = &b""[..]; -- assert_eq!(ac(a), Incomplete(Needed::Size(2))); -- let a = &b"ef"[..]; -- assert_eq!(ac(a), Done(&b""[..], &b"ef"[..])); -- let a = &b"cde"[..]; -- assert_eq!(ac(a), Error(Position(ErrorKind::Alt, a))); -- } -- -- #[test] -- fn switch() { -- named!(sw, -- switch!(take!(4), -- b"abcd" => take!(2) | -- b"efgh" => take!(4) -- ) -- ); -- -- let a = &b"abcdefgh"[..]; -- assert_eq!(sw(a), Done(&b"gh"[..], &b"ef"[..])); -- -- let b = &b"efghijkl"[..]; -- assert_eq!(sw(b), Done(&b""[..], &b"ijkl"[..])); -- let c = &b"afghijkl"[..]; -- assert_eq!(sw(c), Error(Position(ErrorKind::Switch, &b"afghijkl"[..]))); -- } -- - #[test] - fn opt() { - named!(opt_abcd<&[u8],Option<&[u8]> >, opt!(tag!("abcd"))); -@@ -3092,22 +1251,39 @@ mod tests { - assert_eq!(opt_abcd(c), Incomplete(Needed::Size(4))); - } - -+ #[cfg(feature = "verbose-errors")] -+ #[test] -+ fn opt_res() { -+ named!(opt_res_abcd<&[u8], Result<&[u8], Err<&[u8]> > >, opt_res!(tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"bcdefg"[..]; -+ let c = &b"ab"[..]; -+ assert_eq!(opt_res_abcd(a), Done(&b"ef"[..], Ok(&b"abcd"[..]))); -+ assert_eq!(opt_res_abcd(b), Done(&b"bcdefg"[..], Err(error_position!(ErrorKind::Tag, b)))); -+ assert_eq!(opt_res_abcd(c), Incomplete(Needed::Size(4))); -+ } -+ -+ #[cfg(not(feature = "verbose-errors"))] - #[test] - fn opt_res() { -- named!(opt_res_abcd<&[u8], Result<&[u8], Err<&[u8]>> >, opt_res!(tag!("abcd"))); -+ named!(opt_res_abcd<&[u8], Result<&[u8], Err> >, opt_res!(tag!("abcd"))); - - let a = &b"abcdef"[..]; - let b = &b"bcdefg"[..]; - let c = &b"ab"[..]; - assert_eq!(opt_res_abcd(a), Done(&b"ef"[..], Ok(&b"abcd"[..]))); -- assert_eq!(opt_res_abcd(b), Done(&b"bcdefg"[..], Err(Position(ErrorKind::Tag, b)))); -+ assert_eq!(opt_res_abcd(b), Done(&b"bcdefg"[..], Err(error_position!(ErrorKind::Tag, b)))); - assert_eq!(opt_res_abcd(c), Incomplete(Needed::Size(4))); - } - - #[test] -+ #[cfg(feature = "std")] - fn cond() { -- let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( true, tag!("abcd") ) )); -- let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( false, tag!("abcd") ) )); -+ let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = -+ Box::new(closure!(&'static [u8], fix_error!(&str, cond!( true, tag!("abcd") ) ))); -+ let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = -+ Box::new(closure!(&'static [u8], fix_error!(&str, cond!( false, tag!("abcd") ) ))); - //let f_false = closure!(&'static [u8], cond!( false, tag!("abcd") ) ); - - assert_eq!(f_true(&b"abcdef"[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -@@ -3120,11 +1296,14 @@ mod tests { - } - - #[test] -+ #[cfg(feature = "std")] - fn cond_wrapping() { - // Test that cond!() will wrap a given identifier in the call!() macro. - named!( tag_abcd, tag!("abcd") ); -- let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( true, tag_abcd ) )); -- let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = Box::new(closure!(&'static [u8], cond!( false, tag_abcd ) )); -+ let f_true: Box IResult<&[u8],Option<&[u8]>, &str>> = -+ Box::new(closure!(&'static [u8], fix_error!(&str, cond!( true, tag_abcd ) ))); -+ let f_false: Box IResult<&[u8],Option<&[u8]>, &str>> = -+ Box::new(closure!(&'static [u8], fix_error!(&str, cond!( false, tag_abcd ) ))); - //let f_false = closure!(&'static [u8], cond!( b2, tag!("abcd") ) ); - - assert_eq!(f_true(&b"abcdef"[..]), Done(&b"ef"[..], Some(&b"abcd"[..]))); -@@ -3142,420 +1321,22 @@ mod tests { - - assert_eq!(peek_tag(&b"abcdef"[..]), Done(&b"abcdef"[..], &b"abcd"[..])); - assert_eq!(peek_tag(&b"ab"[..]), Incomplete(Needed::Size(4))); -- assert_eq!(peek_tag(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- } -- -- #[test] -- fn pair() { -- named!( tag_abc, tag!("abc") ); -- named!( tag_def, tag!("def") ); -- named!( pair_abc_def<&[u8],(&[u8], &[u8])>, pair!(tag_abc, tag_def) ); -- -- assert_eq!(pair_abc_def(&b"abcdefghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -- assert_eq!(pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -- assert_eq!(pair_abc_def(&b"abcd"[..]), Incomplete(Needed::Size(6))); -- assert_eq!(pair_abc_def(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- assert_eq!(pair_abc_def(&b"xxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxdef"[..]))); -- assert_eq!(pair_abc_def(&b"abcxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- } -- -- #[test] -- fn separated_pair() { -- named!( tag_abc, tag!("abc") ); -- named!( tag_def, tag!("def") ); -- named!( tag_separator, tag!(",") ); -- named!( sep_pair_abc_def<&[u8],(&[u8], &[u8])>, separated_pair!(tag_abc, tag_separator, tag_def) ); -- -- assert_eq!(sep_pair_abc_def(&b"abc,defghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -- assert_eq!(sep_pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -- assert_eq!(sep_pair_abc_def(&b"abc,d"[..]), Incomplete(Needed::Size(7))); -- assert_eq!(sep_pair_abc_def(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- assert_eq!(sep_pair_abc_def(&b"xxx,def"[..]), Error(Position(ErrorKind::Tag, &b"xxx,def"[..]))); -- assert_eq!(sep_pair_abc_def(&b"abc,xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- } -- -- #[test] -- fn preceded() { -- named!( tag_abcd, tag!("abcd") ); -- named!( tag_efgh, tag!("efgh") ); -- named!( preceded_abcd_efgh<&[u8], &[u8]>, preceded!(tag_abcd, tag_efgh) ); -- -- assert_eq!(preceded_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"efgh"[..])); -- assert_eq!(preceded_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -- assert_eq!(preceded_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(preceded_abcd_efgh(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- assert_eq!(preceded_abcd_efgh(&b"xxxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxxdef"[..]))); -- assert_eq!(preceded_abcd_efgh(&b"abcdxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- } -- -- #[test] -- fn terminated() { -- named!( tag_abcd, tag!("abcd") ); -- named!( tag_efgh, tag!("efgh") ); -- named!( terminated_abcd_efgh<&[u8], &[u8]>, terminated!(tag_abcd, tag_efgh) ); -- -- assert_eq!(terminated_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"abcd"[..])); -- assert_eq!(terminated_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -- assert_eq!(terminated_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(terminated_abcd_efgh(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- assert_eq!(terminated_abcd_efgh(&b"xxxxdef"[..]), Error(Position(ErrorKind::Tag, &b"xxxxdef"[..]))); -- assert_eq!(terminated_abcd_efgh(&b"abcdxxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxxx"[..]))); -- } -- -- #[test] -- fn delimited() { -- named!( tag_abc, tag!("abc") ); -- named!( tag_def, tag!("def") ); -- named!( tag_ghi, tag!("ghi") ); -- named!( delimited_abc_def_ghi<&[u8], &[u8]>, delimited!(tag_abc, tag_def, tag_ghi) ); -- -- assert_eq!(delimited_abc_def_ghi(&b"abcdefghijkl"[..]), Done(&b"jkl"[..], &b"def"[..])); -- assert_eq!(delimited_abc_def_ghi(&b"ab"[..]), Incomplete(Needed::Size(3))); -- assert_eq!(delimited_abc_def_ghi(&b"abcde"[..]), Incomplete(Needed::Size(6))); -- assert_eq!(delimited_abc_def_ghi(&b"abcdefgh"[..]), Incomplete(Needed::Size(9))); -- assert_eq!(delimited_abc_def_ghi(&b"xxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- assert_eq!(delimited_abc_def_ghi(&b"xxxdefghi"[..]), Error(Position(ErrorKind::Tag, &b"xxxdefghi"[..]))); -- assert_eq!(delimited_abc_def_ghi(&b"abcxxxghi"[..]), Error(Position(ErrorKind::Tag, &b"xxxghi"[..]))); -- assert_eq!(delimited_abc_def_ghi(&b"abcdefxxx"[..]), Error(Position(ErrorKind::Tag, &b"xxx"[..]))); -- } -- -- #[test] -- fn separated_list() { -- named!(multi<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!("abcd"))); -- named!(multi_empty<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!(""))); -- -- let a = &b"abcdef"[..]; -- let b = &b"abcd,abcdef"[..]; -- let c = &b"azerty"[..]; -- let d = &b",,abc"[..]; -- let e = &b"abcd,abcd,ef"[..]; -- -- let res1 = vec![&b"abcd"[..]]; -- assert_eq!(multi(a), Done(&b"ef"[..], res1)); -- let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(b), Done(&b"ef"[..], res2)); -- assert_eq!(multi(c), Done(&b"azerty"[..], Vec::new())); -- assert_eq!(multi_empty(d), Error(Position(ErrorKind::SeparatedList, d))); -- //let res3 = vec![&b""[..], &b""[..], &b""[..]]; -- //assert_eq!(multi_empty(d), Done(&b"abc"[..], res3)); -- let res4 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(e), Done(&b",ef"[..], res4)); -- } -- -- #[test] -- fn separated_nonempty_list() { -- named!(multi<&[u8],Vec<&[u8]> >, separated_nonempty_list!(tag!(","), tag!("abcd"))); -- -- let a = &b"abcdef"[..]; -- let b = &b"abcd,abcdef"[..]; -- let c = &b"azerty"[..]; -- let d = &b"abcd,abcd,ef"[..]; -- -- let res1 = vec![&b"abcd"[..]]; -- assert_eq!(multi(a), Done(&b"ef"[..], res1)); -- let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(b), Done(&b"ef"[..], res2)); -- assert_eq!(multi(c), Error(Position(ErrorKind::Tag,c))); -- let res3 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(d), Done(&b",ef"[..], res3)); -- } -- -- #[test] -- fn many0() { -- named!( tag_abcd, tag!("abcd") ); -- named!( tag_empty, tag!("") ); -- named!( multi<&[u8],Vec<&[u8]> >, many0!(tag_abcd) ); -- named!( multi_empty<&[u8],Vec<&[u8]> >, many0!(tag_empty) ); -- -- assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -- assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -- assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -- assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -- assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -- assert_eq!(multi_empty(&b"abcdef"[..]), Error(Position(ErrorKind::Many0, &b"abcdef"[..]))); -- } -- -- #[cfg(feature = "nightly")] -- use test::Bencher; -- -- #[cfg(feature = "nightly")] -- #[bench] -- fn many0_bench(b: &mut Bencher) { -- named!(multi<&[u8],Vec<&[u8]> >, many0!(tag!("abcd"))); -- b.iter(|| { -- multi(&b"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"[..]) -- }); -- } -- -- #[test] -- fn many1() { -- named!(multi<&[u8],Vec<&[u8]> >, many1!(tag!("abcd"))); -- -- let a = &b"abcdef"[..]; -- let b = &b"abcdabcdefgh"[..]; -- let c = &b"azerty"[..]; -- let d = &b"abcdab"[..]; -- -- let res1 = vec![&b"abcd"[..]]; -- assert_eq!(multi(a), Done(&b"ef"[..], res1)); -- let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -- assert_eq!(multi(c), Error(Position(ErrorKind::Many1,c))); -- assert_eq!(multi(d), Incomplete(Needed::Size(8))); -- } -- -- #[test] -- fn infinite_many() { -- fn tst(input: &[u8]) -> IResult<&[u8], &[u8]> { -- println!("input: {:?}", input); -- Error(Position(ErrorKind::Custom(0),input)) -- } -- -- // should not go into an infinite loop -- named!(multi0<&[u8],Vec<&[u8]> >, many0!(tst)); -- let a = &b"abcdef"[..]; -- assert_eq!(multi0(a), Done(a, Vec::new())); -- -- named!(multi1<&[u8],Vec<&[u8]> >, many1!(tst)); -- let a = &b"abcdef"[..]; -- assert_eq!(multi1(a), Error(Position(ErrorKind::Many1,a))); -- } -- -- #[test] -- fn many_m_n() { -- named!(multi<&[u8],Vec<&[u8]> >, many_m_n!(2, 4, tag!("Abcd"))); -- -- let a = &b"Abcdef"[..]; -- let b = &b"AbcdAbcdefgh"[..]; -- let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -- let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -- let e = &b"AbcdAb"[..]; -- -- assert_eq!(multi(a), Error(Err::Position(ErrorKind::ManyMN,a))); -- let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -- let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -- let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -- assert_eq!(multi(e), Incomplete(Needed::Size(8))); -- } -- -- #[test] -- fn count() { -- const TIMES: usize = 2; -- named!( tag_abc, tag!("abc") ); -- named!( cnt_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -- -- assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]])); -- assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Unknown)); -- assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Unknown)); -- assert_eq!(cnt_2(&b"xxx"[..]), Error(Position(ErrorKind::Count, &b"xxx"[..]))); -- assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(Position(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -- assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(Position(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -- } -- -- #[test] -- fn count_zero() { -- const TIMES: usize = 0; -- named!( tag_abc, tag!("abc") ); -- named!( counter_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -- -- let done = &b"abcabcabcdef"[..]; -- let parsed_done = Vec::new(); -- let rest = done; -- let incomplete_1 = &b"ab"[..]; -- let parsed_incompl_1 = Vec::new(); -- let incomplete_2 = &b"abcab"[..]; -- let parsed_incompl_2 = Vec::new(); -- let error = &b"xxx"[..]; -- let error_remain = &b"xxx"[..]; -- let parsed_err = Vec::new(); -- let error_1 = &b"xxxabcabcdef"[..]; -- let parsed_err_1 = Vec::new(); -- let error_1_remain = &b"xxxabcabcdef"[..]; -- let error_2 = &b"abcxxxabcdef"[..]; -- let parsed_err_2 = Vec::new(); -- let error_2_remain = &b"abcxxxabcdef"[..]; -- -- assert_eq!(counter_2(done), Done(rest, parsed_done)); -- assert_eq!(counter_2(incomplete_1), Done(incomplete_1, parsed_incompl_1)); -- assert_eq!(counter_2(incomplete_2), Done(incomplete_2, parsed_incompl_2)); -- assert_eq!(counter_2(error), Done(error_remain, parsed_err)); -- assert_eq!(counter_2(error_1), Done(error_1_remain, parsed_err_1)); -- assert_eq!(counter_2(error_2), Done(error_2_remain, parsed_err_2)); -- } -- -- #[test] -- fn count_fixed() { -- const TIMES: usize = 2; -- named!( tag_abc, tag!("abc") ); -- named!( cnt_2<&[u8], [&[u8]; TIMES] >, count_fixed!(&[u8], tag_abc, TIMES ) ); -- -- assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], [&b"abc"[..], &b"abc"[..]])); -- assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Unknown)); -- assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Unknown)); -- assert_eq!(cnt_2(&b"xxx"[..]), Error(Position(ErrorKind::Count, &b"xxx"[..]))); -- assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(Position(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -- assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(Position(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -- } -- -- use nom::{le_u16,eof}; -- #[allow(dead_code)] -- pub fn compile_count_fixed(input: &[u8]) -> IResult<&[u8], ()> { -- chain!(input, -- tag!("abcd") ~ -- count_fixed!( u16, le_u16, 4 ) ~ -- eof , -- || { () } -- ) -- } -- -- #[test] -- fn count_fixed_no_type() { -- const TIMES: usize = 2; -- named!( tag_abc, tag!("abc") ); -- named!( counter_2<&[u8], [&[u8]; TIMES], () >, count_fixed!(&[u8], tag_abc, TIMES ) ); -- -- let done = &b"abcabcabcdef"[..]; -- let parsed_main = [&b"abc"[..], &b"abc"[..]]; -- let rest = &b"abcdef"[..]; -- let incomplete_1 = &b"ab"[..]; -- let incomplete_2 = &b"abcab"[..]; -- let error = &b"xxx"[..]; -- let error_1 = &b"xxxabcabcdef"[..]; -- let error_1_remain = &b"xxxabcabcdef"[..]; -- let error_2 = &b"abcxxxabcdef"[..]; -- let error_2_remain = &b"abcxxxabcdef"[..]; -- -- assert_eq!(counter_2(done), Done(rest, parsed_main)); -- assert_eq!(counter_2(incomplete_1), Incomplete(Needed::Unknown)); -- assert_eq!(counter_2(incomplete_2), Incomplete(Needed::Unknown)); -- assert_eq!(counter_2(error), Error(Position(ErrorKind::Count, error))); -- assert_eq!(counter_2(error_1), Error(Position(ErrorKind::Count, error_1_remain))); -- assert_eq!(counter_2(error_2), Error(Position(ErrorKind::Count, error_2_remain))); -- } -- -- use nom::{be_u8,be_u16}; -- #[test] -- fn length_value_test() { -- named!(length_value_1<&[u8], Vec >, length_value!(be_u8, be_u16)); -- named!(length_value_2<&[u8], Vec >, length_value!(be_u8, be_u16, 2)); -- -- let i1 = vec![0, 5, 6]; -- assert_eq!(length_value_1(&i1), IResult::Done(&i1[1..], vec![])); -- assert_eq!(length_value_2(&i1), IResult::Done(&i1[1..], vec![])); -- -- let i2 = vec![1, 5, 6, 3]; -- assert_eq!(length_value_1(&i2), IResult::Done(&i2[3..], vec![1286])); -- assert_eq!(length_value_2(&i2), IResult::Done(&i2[3..], vec![1286])); -- -- let i3 = vec![2, 5, 6, 3, 4, 5, 7]; -- assert_eq!(length_value_1(&i3), IResult::Done(&i3[5..], vec![1286, 772])); -- assert_eq!(length_value_2(&i3), IResult::Done(&i3[5..], vec![1286, 772])); -- -- let i4 = vec![2, 5, 6, 3]; -- assert_eq!(length_value_1(&i4), IResult::Incomplete(Needed::Size(5))); -- assert_eq!(length_value_2(&i4), IResult::Incomplete(Needed::Size(5))); -- -- let i5 = vec![3, 5, 6, 3, 4, 5]; -- assert_eq!(length_value_1(&i5), IResult::Incomplete(Needed::Size(7))); -- assert_eq!(length_value_2(&i5), IResult::Incomplete(Needed::Size(7))); -- } -- -- #[test] -- fn fold_many0() { -- fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -- acc.push(item); -- acc -- }; -- named!( tag_abcd, tag!("abcd") ); -- named!( tag_empty, tag!("") ); -- named!( multi<&[u8],Vec<&[u8]> >, fold_many0!(tag_abcd, Vec::new(), fold_into_vec) ); -- named!( multi_empty<&[u8],Vec<&[u8]> >, fold_many0!(tag_empty, Vec::new(), fold_into_vec) ); -- -- assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -- assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -- assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -- assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -- assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -- assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -- assert_eq!(multi_empty(&b"abcdef"[..]), Error(Position(ErrorKind::Many0, &b"abcdef"[..]))); -- } -- -- #[test] -- fn fold_many1() { -- fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -- acc.push(item); -- acc -- }; -- named!(multi<&[u8],Vec<&[u8]> >, fold_many1!(tag!("abcd"), Vec::new(), fold_into_vec)); -- -- let a = &b"abcdef"[..]; -- let b = &b"abcdabcdefgh"[..]; -- let c = &b"azerty"[..]; -- let d = &b"abcdab"[..]; -- -- let res1 = vec![&b"abcd"[..]]; -- assert_eq!(multi(a), Done(&b"ef"[..], res1)); -- let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -- assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -- assert_eq!(multi(c), Error(Position(ErrorKind::Many1,c))); -- assert_eq!(multi(d), Incomplete(Needed::Size(8))); -- } -- -- #[test] -- fn fold_many_m_n() { -- fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -- acc.push(item); -- acc -- }; -- named!(multi<&[u8],Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!("Abcd"), Vec::new(), fold_into_vec)); -- -- let a = &b"Abcdef"[..]; -- let b = &b"AbcdAbcdefgh"[..]; -- let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -- let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -- let e = &b"AbcdAb"[..]; -- -- assert_eq!(multi(a), Error(Err::Position(ErrorKind::ManyMN,a))); -- let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -- let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -- let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -- assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -- assert_eq!(multi(e), Incomplete(Needed::Size(8))); -- } -- -- #[test] -- fn chain_incomplete() { -- let res = chain!(&b"abcdefgh"[..], -- a: take!(4) ~ -- b: take!(8), -- ||{(a,b )} -- ); -- -- assert_eq!(res, IResult::Incomplete(Needed::Size(12))); -+ assert_eq!(peek_tag(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); - } - -- #[test] -- fn tuple_test() { -- named!(tuple_3<&[u8], (u16, &[u8], &[u8]) >, -- tuple!( be_u16 , take!(3), tag!("fg") ) ); -- -- assert_eq!(tuple_3(&b"abcdefgh"[..]), Done(&b"h"[..], (0x6162u16, &b"cde"[..], &b"fg"[..]))); -- assert_eq!(tuple_3(&b"abcd"[..]), Incomplete(Needed::Size(5))); -- assert_eq!(tuple_3(&b"abcde"[..]), Incomplete(Needed::Size(7))); -- assert_eq!(tuple_3(&b"abcdejk"[..]), Error(Position(ErrorKind::Tag, &b"jk"[..]))); -- } -- - #[test] - fn not() { - named!(not_aaa, not!(tag!("aaa"))); -- assert_eq!(not_aaa(&b"aaa"[..]), Error(Position(ErrorKind::Not, &b"aaa"[..]))); -+ assert_eq!(not_aaa(&b"aaa"[..]), Error(error_position!(ErrorKind::Not, &b"aaa"[..]))); - assert_eq!(not_aaa(&b"aa"[..]), Done(&b"aa"[..], &b""[..])); - assert_eq!(not_aaa(&b"abcd"[..]), Done(&b"abcd"[..], &b""[..])); - } -+ -+ #[test] -+ fn verify() { -+ named!(test, verify!(take!(5), |slice: &[u8]| slice[0] == 'a' as u8)); -+ assert_eq!(test(&b"bcd"[..]), Incomplete(Needed::Size(5))); -+ assert_eq!(test(&b"bcdefg"[..]), Error(error_position!(ErrorKind::Verify, &b"bcdefg"[..]))); -+ assert_eq!(test(&b"abcdefg"[..]), Done(&b"fg"[..], &b"abcde"[..])); -+ } - } -diff --git third_party/rust/nom/src/methods.rs third_party/rust/nom/src/methods.rs -index 22868541a96c..7bdabfd063f3 100644 ---- third_party/rust/nom/src/methods.rs -+++ third_party/rust/nom/src/methods.rs -@@ -77,12 +77,12 @@ - //! counterparts: - //! ```ignore - //! method!(pub simple_chain<&mut Parser<'a>, &'a str, &'a str>, self, --//! chain!( --//! call_m!(self.tag_abc) ~ --//! call_m!(self.tag_def) ~ --//! call_m!(self.tag_ghi) ~ --//! last: call_m!(self.simple_peek) , --//! ||{sb.parsed = last; last} -+//! do_parse!( -+//! call_m!(self.tag_abc) >> -+//! call_m!(self.tag_def) >> -+//! call_m!(self.tag_ghi) >> -+//! last: map!(call_m!(self.simple_peek), |parsed| sb.parsed = parsed) >> -+//! (last) - //! ) - //! ); - //! ``` -@@ -107,30 +107,35 @@ - macro_rules! method ( - // Non-public immutable self - ($name:ident<$a:ty>( $i:ty ) -> $o:ty, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$i:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -- fn $name<'a>( $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ #[allow(unused_variables)] -+ fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], $o, u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) -@@ -138,30 +143,35 @@ macro_rules! method ( - ); - // Public immutable self - (pub $name:ident<$a:ty>( $i:ty ) -> $o:ty, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$i:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( $self_: $a,i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$o:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -- pub fn $name<'a>( $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ #[allow(unused_variables)] -+ pub fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], $o, u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty>, $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) -@@ -169,30 +179,35 @@ macro_rules! method ( - ); - // Non-public mutable self - ($name:ident<$a:ty>( $i:ty ) -> $o:ty, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$i:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -- fn $name<'a>( mut $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ #[allow(unused_variables)] -+ fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], $o, u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - ($name:ident<$a:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) -@@ -200,30 +215,35 @@ macro_rules! method ( - ); - // Public mutable self - (pub $name:ident<$a:ty>( $i:ty ) -> $o:ty, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$i:ty,$o:ty,$e:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - fn $name( mut $self_: $a, i: $i ) -> ($a, $crate::IResult<$i, $o, $e>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$i:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( mut $self_: $a,i: $i ) -> ($a, $crate::IResult<$i,$o,u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty,$o:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -- pub fn $name<'a>( mut $self_: $a, i: &'a[u8] ) -> ($a, $crate::IResult<&'a [u8], $o, u32>) { -+ #[allow(unused_variables)] -+ pub fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], $o, u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) - } - ); - (pub $name:ident<$a:ty>, mut $self_:ident, $submac:ident!( $($args:tt)* )) => ( -+ #[allow(unused_variables)] - pub fn $name( mut $self_: $a, i: &[u8] ) -> ($a, $crate::IResult<&[u8], &[u8], u32>) { - let result = $submac!(i, $($args)*); - ($self_, result) -@@ -251,8 +271,8 @@ macro_rules! call_m ( - ); - - --/// emulate function currying for method calls on structs --/// `apply!(self.my_function, arg1, arg2, ...)` becomes `self.my_function(input, arg1, arg2, ...)` -+/// emulate function currying for method calls on structs -+/// `apply_m!(self.my_function, arg1, arg2, ...)` becomes `self.my_function(input, arg1, arg2, ...)` - /// - /// Supports up to 6 arguments - #[macro_export] -@@ -274,7 +294,7 @@ mod tests { - } else if ($i).starts_with($tag) { - $crate::IResult::Done(&$i[$tag.len()..], &$i[0..$tag.len()]) - } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagStr, $i)) -+ $crate::IResult::Error(error_position!($crate::ErrorKind::TagStr, $i)) - }; - res - } -@@ -325,10 +345,10 @@ mod tests { - peek!(call_m!(self.take3)) - ); - method!(pub simple_chain, &'a str, &'a str>, mut self, -- chain!( -- bcd: call_m!(self.tag_bcd) ~ -- last: call_m!(self.simple_peek) , -- ||{self.bcd = bcd; last} -+ do_parse!( -+ map!(call_m!(self.tag_bcd), |bcd| self.bcd = bcd) >> -+ last: call_m!(self.simple_peek) >> -+ (last) - ) - ); - fn tag_stuff(mut self: Parser<'a>, input: &'a str, something: &'a str) -> (Parser<'a>, ::IResult<&'a str, &'a str>) { -diff --git third_party/rust/nom/src/multi.rs third_party/rust/nom/src/multi.rs -new file mode 100644 -index 000000000000..f42164dcf2e3 ---- /dev/null -+++ third_party/rust/nom/src/multi.rs -@@ -0,0 +1,1614 @@ -+//! Parsers for applying parsers multiple times -+ -+/// `separated_list!(I -> IResult, I -> IResult) => I -> IResult>` -+/// separated_list(sep, X) returns Vec will return Incomplete if there may be more elements -+#[macro_export] -+macro_rules! separated_list( -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ -+ //FIXME: use crate vec -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i.clone(); -+ -+ // get the first element -+ let input_ = input.clone(); -+ match $submac!(input_, $($args2)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Done(input, ::std::vec::Vec::new()), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i,o) => { -+ if i.input_len() == input.input_len() { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::SeparatedList,input)) -+ } else { -+ res.push(o); -+ input = i; -+ -+ let ret; -+ -+ loop { -+ // get the separator first -+ let input_ = input.clone(); -+ match $sep!(input_, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(needed)) => { -+ let (size,overflowed) = needed.overflowing_add(($i).input_len() - input.input_len()); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i2,_) => { -+ let i2_len = i2.input_len(); -+ if i2_len == input.input_len() { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ -+ // get the element next -+ match $submac!(i2, $($args2)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(needed)) => { -+ let (size,overflowed) = needed.overflowing_add(($i).input_len() - i2_len); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i3,o3) => { -+ if i3.input_len() == i2_len { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ res.push(o3); -+ input = i3; -+ } -+ } -+ } -+ } -+ } -+ -+ ret -+ } -+ }, -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_list!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_list!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_list!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `separated_nonempty_list!(I -> IResult, I -> IResult) => I -> IResult>` -+/// separated_nonempty_list(sep, X) returns Vec will return Incomplete if there may be more elements -+#[macro_export] -+macro_rules! separated_nonempty_list( -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i.clone(); -+ -+ // get the first element -+ let input_ = input.clone(); -+ match $submac!(input_, $($args2)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i,o) => { -+ if i.input_len() == input.len() { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::SeparatedNonEmptyList,input)) -+ } else { -+ res.push(o); -+ input = i; -+ -+ let ret; -+ -+ loop { -+ // get the separator first -+ let input_ = input.clone(); -+ match $sep!(input_, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(needed)) => { -+ let (size,overflowed) = needed.overflowing_add(($i).input_len() - input.input_len()); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i2,_) => { -+ let i2_len = i2.input_len(); -+ if i2_len == input.input_len() { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ -+ // get the element next -+ match $submac!(i2, $($args2)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(needed)) => { -+ let (size,overflowed) = needed.overflowing_add(($i).input_len() - i2_len); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i3,o3) => { -+ if i3.input_len() == i2_len { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ res.push(o3); -+ input = i3; -+ } -+ } -+ } -+ } -+ } -+ -+ ret -+ } -+ }, -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_nonempty_list!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_nonempty_list!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_nonempty_list!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `separated_list_complete!(I -> IResult, I -> IResult) => I -> IResult>` -+/// This is equivalent to the `separated_list!` combinator, except that it will return `Error` -+/// when either the separator or element subparser returns `Incomplete`. -+#[macro_export] -+macro_rules! separated_list_complete { -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ({ -+ separated_list!($i, complete!($sep!($($args)*)), complete!($submac!($($args2)*))) -+ }); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_list_complete!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_list_complete!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_list_complete!($i, call!($f), call!($g)); -+ ); -+} -+ -+/// `separated_nonempty_list_complete!(I -> IResult, I -> IResult) => I -> IResult>` -+/// This is equivalent to the `separated_nonempty_list!` combinator, except that it will return -+/// `Error` when either the separator or element subparser returns `Incomplete`. -+#[macro_export] -+macro_rules! separated_nonempty_list_complete { -+ ($i:expr, $sep:ident!( $($args:tt)* ), $submac:ident!( $($args2:tt)* )) => ({ -+ separated_nonempty_list!($i, complete!($sep!($($args)*)), complete!($submac!($($args2)*))) -+ }); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_nonempty_list_complete!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_nonempty_list_complete!($i, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ separated_nonempty_list_complete!($i, call!($f), call!($g)); -+ ); -+} -+ -+/// `many0!(I -> IResult) => I -> IResult>` -+/// Applies the parser 0 or more times and returns the list of results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many0!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); -+/// # } -+/// ``` -+/// 0 or more -+#[macro_export] -+macro_rules! many0( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ -+ let ret; -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i.clone(); -+ -+ loop { -+ if input.input_len() == 0 { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ -+ let input_ = input.clone(); -+ match $submac!(input_, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add(($i).input_len() - input.input_len()); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ // loop trip must always consume (otherwise infinite loops) -+ if i == input { -+ ret = $crate::IResult::Error(error_position!($crate::ErrorKind::Many0,input)); -+ break; -+ } -+ -+ res.push(o); -+ input = i; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ many0!($i, call!($f)); -+ ); -+); -+ -+/// `many1!(I -> IResult) => I -> IResult>` -+/// Applies the parser 1 or more times and returns the list of results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many1!( tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Error(error_position!(ErrorKind::Many1,&b[..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! many1( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Error( -+ error_position!($crate::ErrorKind::Many1,$i) -+ ), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,o1) => { -+ if i1.input_len() == 0 { -+ let mut res = ::std::vec::Vec::new(); -+ res.push(o1); -+ $crate::IResult::Done(i1,res) -+ } else { -+ -+ let mut res = ::std::vec::Vec::with_capacity(4); -+ res.push(o1); -+ let mut input = i1; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = -+ ::std::option::Option::None; -+ loop { -+ if input.input_len() == 0 { -+ break; -+ } -+ let input_ = input.clone(); -+ match $submac!(input_, $($args)*) { -+ $crate::IResult::Error(_) => { -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add(($i).input_len() - input.input_len()); -+ incomplete = ::std::option::Option::Some( -+ match overflowed { -+ true => $crate::Needed::Unknown, -+ false => $crate::Needed::Size(size), -+ } -+ ); -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ res.push(o); -+ input = i; -+ } -+ } -+ } -+ -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, res) -+ } -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr) => ( -+ many1!($i, call!($f)); -+ ); -+); -+ -+/// `many_till!(I -> IResult, I -> IResult) => I -> IResult, P)>` -+/// Applies the first parser until the second applies. Returns a tuple containing the list -+/// of results from the first in a Vec and the result of the second. -+/// -+/// The first embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( tag!( "abcd" ), tag!( "efgh" ) ) ); -+/// -+/// let a = b"abcdabcdefghabcd"; -+/// let b = b"efghabcd"; -+/// let c = b"azerty"; -+/// -+/// let res_a = (vec![&b"abcd"[..], &b"abcd"[..]], &b"efgh"[..]); -+/// let res_b: (Vec<&[u8]>, &[u8]) = (Vec::new(), &b"efgh"[..]); -+/// assert_eq!(multi(&a[..]), Done(&b"abcd"[..], res_a)); -+/// assert_eq!(multi(&b[..]), Done(&b"abcd"[..], res_b)); -+/// assert_eq!(multi(&c[..]), Error(error_node_position!(ErrorKind::ManyTill,&c[..],error_position!(ErrorKind::Tag,&c[..])))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! many_till( -+ ($i:expr, $submac1:ident!( $($args1:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ -+ let ret; -+ let mut res = ::std::vec::Vec::new(); -+ let mut input = $i.clone(); -+ -+ loop { -+ match $submac2!(input, $($args2)*) { -+ $crate::IResult::Done(i, o) => { -+ ret = $crate::IResult::Done(i, (res, o)); -+ break; -+ }, -+ _ => { -+ match $submac1!(input, $($args1)*) { -+ $crate::IResult::Error(err) => { -+ ret = $crate::IResult::Error(error_node_position!($crate::ErrorKind::ManyTill,input, err)); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add(($i).input_len() - input.input_len()); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ // loop trip must always consume (otherwise infinite loops) -+ if i == input { -+ ret = $crate::IResult::Error(error_position!($crate::ErrorKind::ManyTill,input)); -+ break; -+ } -+ -+ res.push(o); -+ input = i; -+ }, -+ } -+ }, -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr, $g: expr) => ( -+ many_till!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `many_m_n!(usize, usize, I -> IResult) => I -> IResult>` -+/// Applies the parser between m and n times (n included) and returns the list of -+/// results in a Vec -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, tag!( "abcd" ) ) ); -+/// -+/// let a = b"abcdefgh"; -+/// let b = b"abcdabcdefgh"; -+/// let c = b"abcdabcdabcdabcdabcdefgh"; -+/// -+/// assert_eq!(multi(&a[..]),Error(error_position!(ErrorKind::ManyMN,&a[..]))); -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); -+/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! many_m_n( -+ ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ use $crate::InputLength; -+ let mut res = ::std::vec::Vec::with_capacity($m); -+ let mut input = $i.clone(); -+ let mut count: usize = 0; -+ let mut err = false; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if count == $n { break } -+ let i_ = input.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Done(i, o) => { -+ // do not allow parsers that do not consume input (causes infinite loops) -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ res.push(o); -+ input = i; -+ count += 1; -+ } -+ $crate::IResult::Error(_) => { -+ err = true; -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add($i.input_len() - input.input_len()); -+ incomplete = ::std::option::Option::Some( -+ match overflowed { -+ true => $crate::Needed::Unknown, -+ false => $crate::Needed::Size(size), -+ } -+ ); -+ break; -+ }, -+ } -+ if input.input_len() == 0 { -+ break; -+ } -+ } -+ -+ if count < $m { -+ if err { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::ManyMN,$i)) -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Incomplete( -+ $crate::Needed::Unknown -+ ) -+ } -+ } -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, res) -+ } -+ } -+ } -+ ); -+ ($i:expr, $m:expr, $n: expr, $f:expr) => ( -+ many_m_n!($i, $m, $n, call!($f)); -+ ); -+); -+ -+/// `count!(I -> IResult, nb) => I -> IResult>` -+/// Applies the child parser a specified number of times -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(counter< Vec<&[u8]> >, count!( tag!( "abcd" ), 2 ) ); -+/// -+/// let a = b"abcdabcdabcdef"; -+/// let b = b"abcdefgh"; -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// -+/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); -+/// assert_eq!(counter(&b[..]), Error(error_position!(ErrorKind::Count, &b[..]))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! count( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $count: expr) => ( -+ { -+ let ret: $crate::IResult<_,_>; -+ let mut input = $i.clone(); -+ let mut res = ::std::vec::Vec::new(); -+ -+ loop { -+ if res.len() == $count { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ -+ let input_ = input.clone(); -+ match $submac!(input_, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ res.push(o); -+ input = i; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error(error_position!($crate::ErrorKind::Count,$i)); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ } -+ $crate::IResult::Incomplete($crate::Needed::Size(sz)) => { -+ let (size,overflowed) = sz.overflowing_add( -+ $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input) -+ ); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr, $count: expr) => ( -+ count!($i, call!($f), $count); -+ ); -+); -+ -+/// `count_fixed!(O, I -> IResult, nb) => I -> IResult` -+/// Applies the child parser a fixed number of times and returns a fixed size array -+/// The type must be specified and it must be `Copy` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done,Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(counter< [&[u8]; 2] >, count_fixed!( &[u8], tag!( "abcd" ), 2 ) ); -+/// // can omit the type specifier if returning slices -+/// // named!(counter< [&[u8]; 2] >, count_fixed!( tag!( "abcd" ), 2 ) ); -+/// -+/// let a = b"abcdabcdabcdef"; -+/// let b = b"abcdefgh"; -+/// let res = [&b"abcd"[..], &b"abcd"[..]]; -+/// -+/// assert_eq!(counter(&a[..]), Done(&b"abcdef"[..], res)); -+/// assert_eq!(counter(&b[..]), Error(error_position!(ErrorKind::Count, &b[..]))); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! count_fixed ( -+ ($i:expr, $typ:ty, $submac:ident!( $($args:tt)* ), $count: expr) => ( -+ { -+ let ret; -+ let mut input = $i.clone(); -+ // `$typ` must be Copy, and thus having no destructor, this is panic safe -+ let mut res: [$typ; $count] = unsafe{[::std::mem::uninitialized(); $count as usize]}; -+ let mut cnt: usize = 0; -+ -+ loop { -+ if cnt == $count { -+ ret = $crate::IResult::Done(input, res); break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i,o) => { -+ res[cnt] = o; -+ cnt += 1; -+ input = i; -+ }, -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Error(error_position!($crate::ErrorKind::Count,$i)); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ } -+ $crate::IResult::Incomplete($crate::Needed::Size(sz)) => { -+ let (size,overflowed) = sz.overflowing_add( -+ $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&input) -+ ); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ } -+ } -+ } -+ -+ ret -+ } -+); -+ ($i:expr, $typ: ty, $f:ident, $count: expr) => ( -+ count_fixed!($i, $typ, call!($f), $count); -+ ); -+); -+ -+/// `length_count!(I -> IResult, I -> IResult) => I -> IResult>` -+/// gets a number from the first parser, then applies the second parser that many times -+#[macro_export] -+macro_rules! length_count( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match count!(i, $submac2!($($args2)*), o as usize) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(n)) => { -+ let (size,overflowed) = n.overflowing_add( -+ $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i) -+ ); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ } -+ }, -+ $crate::IResult::Done(i2, o2) => $crate::IResult::Done(i2, o2) -+ } -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ length_count!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ length_count!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ length_count!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `length_data!(I -> IResult) => O` -+/// -+/// `length_data` gets a number from the first parser, than takes a subslice of the input -+/// of that size, and returns that subslice -+#[macro_export] -+macro_rules! length_data( -+ ($i:expr, $submac:ident!( $($args:tt)* )) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match take!(i, o as usize) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(n)) => { -+ let (size,overflowed) = n.overflowing_add( -+ $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i) -+ ); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ } -+ }, -+ $crate::IResult::Done(i2, o2) => $crate::IResult::Done(i2, o2) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $f:expr) => ( -+ length_data!($i, call!($f)); -+ ); -+); -+ -+/// `length_value!(I -> IResult, I -> IResult) => I -> IResult>` -+/// gets a number from the first parser, takes a subslice of the input of that size, -+/// then applies the second parser on that subslice. If the second parser returns -+/// `Incomplete`, `length_value` will return an error -+#[macro_export] -+macro_rules! length_value( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match take!(i, o as usize) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(n)) => { -+ let (size,overflowed) = n.overflowing_add( -+ $crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i) -+ ); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ } -+ }, -+ $crate::IResult::Done(i2, o2) => { -+ match complete!(o2, $submac2!($($args2)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(_, o3) => $crate::IResult::Done(i2, o3) -+ } -+ } -+ } -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ length_value!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ length_value!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ length_value!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `fold_many0!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser 0 or more times and folds the list of return values -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, -+/// fold_many0!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Done(&b"azerty"[..], Vec::new())); -+/// # } -+/// ``` -+/// 0 or more -+#[macro_export] -+macro_rules! fold_many0( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ let ret; -+ let f = $f; -+ let mut res = $init; -+ let mut input = $i.clone(); -+ -+ loop { -+ if input.input_len() == 0 { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ } -+ -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ ret = $crate::IResult::Done(input, res); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ ret = $crate::IResult::Incomplete($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add( ($i).input_len() - input.input_len() ); -+ ret = match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(size)), -+ }; -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ // loop trip must always consume (otherwise infinite loops) -+ if i == input { -+ ret = $crate::IResult::Error( -+ error_position!($crate::ErrorKind::Many0,input) -+ ); -+ break; -+ } -+ -+ res = f(res, o); -+ input = i; -+ } -+ } -+ } -+ -+ ret -+ } -+ ); -+ ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many0!($i, call!($f), $init, $fold_f); -+ ); -+); -+ -+/// `fold_many1!(I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser 1 or more times and folds the list of return values -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, -+/// fold_many1!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdabcdefgh"; -+/// let b = b"azerty"; -+/// -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&a[..]), Done(&b"efgh"[..], res)); -+/// assert_eq!(multi(&b[..]), Error(error_position!(ErrorKind::Many1,&b[..]))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fold_many1( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(_) => $crate::IResult::Error( -+ error_position!($crate::ErrorKind::Many1,$i) -+ ), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,o1) => { -+ let acc = $init; -+ let f = $f; -+ if i1.input_len() == 0 { -+ let acc = f(acc, o1); -+ $crate::IResult::Done(i1,acc) -+ } else { -+ let mut acc = f(acc, o1); -+ let mut input = i1; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = -+ ::std::option::Option::None; -+ loop { -+ if input.input_len() == 0 { -+ break; -+ } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Error(_) => { -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add( ($i).input_len() - input.input_len() ); -+ incomplete = ::std::option::Option::Some( -+ match overflowed { -+ true => $crate::Needed::Unknown, -+ false => $crate::Needed::Size(size), -+ } -+ ); -+ break; -+ }, -+ $crate::IResult::Done(i, o) => { -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ acc = f(acc, o); -+ input = i; -+ } -+ } -+ } -+ -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, acc) -+ } -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many1!($i, call!($f), $init, $fold_f); -+ ); -+); -+ -+/// `fold_many_m_n!(usize, usize, I -> IResult, R, Fn(R, O) -> R) => I -> IResult` -+/// Applies the parser between m and n times (n included) and folds the list of return value -+/// -+/// the embedded parser may return Incomplete -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// named!(multi<&[u8], Vec<&[u8]> >, -+/// fold_many_m_n!(2, 4, tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| { -+/// acc.push(item); -+/// acc -+/// })); -+/// -+/// let a = b"abcdefgh"; -+/// let b = b"abcdabcdefgh"; -+/// let c = b"abcdabcdabcdabcdabcdefgh"; -+/// -+/// assert_eq!(multi(&a[..]),Error(error_position!(ErrorKind::ManyMN,&a[..]))); -+/// let res = vec![&b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&b[..]), Done(&b"efgh"[..], res)); -+/// let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]]; -+/// assert_eq!(multi(&c[..]), Done(&b"abcdefgh"[..], res2)); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fold_many_m_n( -+ ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* ), $init:expr, $f:expr) => ( -+ { -+ use $crate::InputLength; -+ let mut acc = $init; -+ let f = $f; -+ let mut input = $i.clone(); -+ let mut count: usize = 0; -+ let mut err = false; -+ let mut incomplete: ::std::option::Option<$crate::Needed> = ::std::option::Option::None; -+ loop { -+ if count == $n { break } -+ match $submac!(input, $($args)*) { -+ $crate::IResult::Done(i, o) => { -+ // do not allow parsers that do not consume input (causes infinite loops) -+ if i.input_len() == input.input_len() { -+ break; -+ } -+ acc = f(acc, o); -+ input = i; -+ count += 1; -+ } -+ $crate::IResult::Error(_) => { -+ err = true; -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => { -+ incomplete = ::std::option::Option::Some($crate::Needed::Unknown); -+ break; -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (size,overflowed) = i.overflowing_add( ($i).input_len() - input.input_len() ); -+ incomplete = ::std::option::Option::Some( -+ match overflowed { -+ true => $crate::Needed::Unknown, -+ false => $crate::Needed::Size(size), -+ } -+ ); -+ break; -+ }, -+ } -+ if input.input_len() == 0 { -+ break; -+ } -+ } -+ -+ if count < $m { -+ if err { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::ManyMN,$i)) -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } -+ } -+ } else { -+ match incomplete { -+ ::std::option::Option::Some(i) => $crate::IResult::Incomplete(i), -+ ::std::option::Option::None => $crate::IResult::Done(input, acc) -+ } -+ } -+ } -+ ); -+ ($i:expr, $m:expr, $n: expr, $f:expr, $init:expr, $fold_f:expr) => ( -+ fold_many_m_n!($i, $m, $n, call!($f), $init, $fold_f); -+ ); -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::{Needed,IResult}; -+ -+ use internal::IResult::*; -+ use util::ErrorKind; -+ use nom::{alpha,be_u8,be_u16,le_u16,digit}; -+ use std::str::{self,FromStr}; -+ -+ // reproduce the tag and take macros, because of module import order -+ macro_rules! tag ( -+ ($i:expr, $inp: expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ -+ tag_bytes!($i,bytes) -+ } -+ ); -+ ); -+ -+ macro_rules! tag_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ use std::cmp::min; -+ let len = $i.len(); -+ let blen = $bytes.len(); -+ let m = min(len, blen); -+ let reduced = &$i[..m]; -+ let b = &$bytes[..m]; -+ -+ let res: $crate::IResult<_,_> = if reduced != b { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) -+ } else if m < blen { -+ $crate::IResult::Incomplete($crate::Needed::Size(blen)) -+ } else { -+ $crate::IResult::Done(&$i[blen..], reduced) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ macro_rules! take( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res:$crate::IResult<&[u8],&[u8]> = if $i.len() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ }; -+ res -+ } -+ ) -+ ); -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn separated_list() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!("abcd"))); -+ named!(multi_empty<&[u8],Vec<&[u8]> >, separated_list!(tag!(","), tag!(""))); -+ named!(multi_longsep<&[u8],Vec<&[u8]> >, separated_list!(tag!(".."), tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b",,abc"[..]; -+ let e = &b"abcd,abcd,ef"[..]; -+ let f = &b"abc"[..]; -+ let g = &b"abcd."[..]; -+ let h = &b"abcd,abc"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"ef"[..], res2)); -+ assert_eq!(multi(c), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi_empty(d), Error(error_position!(ErrorKind::SeparatedList, d))); -+ //let res3 = vec![&b""[..], &b""[..], &b""[..]]; -+ //assert_eq!(multi_empty(d), Done(&b"abc"[..], res3)); -+ let res4 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(e), Done(&b",ef"[..], res4)); -+ -+ assert_eq!(multi(f), Incomplete(Needed::Size(4))); -+ assert_eq!(multi_longsep(g), Incomplete(Needed::Size(6))); -+ assert_eq!(multi(h), Incomplete(Needed::Size(9))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn separated_list_complete() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_list_complete!(tag!(","), alpha)); -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"abcd,abcd,ef"[..]; -+ let d = &b"abc."[..]; -+ let e = &b"abcd,ef."[..]; -+ let f = &b"123"[..]; -+ -+ assert_eq!(multi(a), Done(&b""[..], vec!(a))); -+ assert_eq!(multi(b), Done(&b""[..], vec!(&b"abcd"[..], &b"abcdef"[..]))); -+ assert_eq!(multi(c), Done(&b""[..], vec!(&b"abcd"[..], &b"abcd"[..], &b"ef"[..]))); -+ assert_eq!(multi(d), Done(&b"."[..], vec!(&b"abc"[..]))); -+ assert_eq!(multi(e), Done(&b"."[..], vec!(&b"abcd"[..], &b"ef"[..]))); -+ assert_eq!(multi(f), Done(&b"123"[..], Vec::new())); -+ } -+ -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn separated_nonempty_list() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_nonempty_list!(tag!(","), tag!("abcd"))); -+ named!(multi_longsep<&[u8],Vec<&[u8]> >, separated_nonempty_list!(tag!(".."), tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcd,abcd,ef"[..]; -+ -+ let f = &b"abc"[..]; -+ let g = &b"abcd."[..]; -+ let h = &b"abcd,abc"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"ef"[..], res2)); -+ assert_eq!(multi(c), Error(error_position!(ErrorKind::Tag,c))); -+ let res3 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(d), Done(&b",ef"[..], res3)); -+ -+ assert_eq!(multi(f), Incomplete(Needed::Size(4))); -+ assert_eq!(multi_longsep(g), Incomplete(Needed::Size(6))); -+ assert_eq!(multi(h), Incomplete(Needed::Size(9))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn separated_nonempty_list_complete() { -+ named!(multi<&[u8],Vec<&[u8]> >, separated_nonempty_list_complete!(tag!(","), alpha)); -+ let a = &b"abcdef"[..]; -+ let b = &b"abcd,abcdef"[..]; -+ let c = &b"abcd,abcd,ef"[..]; -+ let d = &b"abc."[..]; -+ let e = &b"abcd,ef."[..]; -+ let f = &b"123"[..]; -+ -+ assert_eq!(multi(a), Done(&b""[..], vec!(a))); -+ assert_eq!(multi(b), Done(&b""[..], vec!(&b"abcd"[..], &b"abcdef"[..]))); -+ assert_eq!(multi(c), Done(&b""[..], vec!(&b"abcd"[..], &b"abcd"[..], &b"ef"[..]))); -+ assert_eq!(multi(d), Done(&b"."[..], vec!(&b"abc"[..]))); -+ assert_eq!(multi(e), Done(&b"."[..], vec!(&b"abcd"[..], &b"ef"[..]))); -+ assert_eq!(multi(f), Error(error_position!(ErrorKind::Alpha, &b"123"[..]))); -+ } -+ -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn many0() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_empty, tag!("") ); -+ named!( multi<&[u8],Vec<&[u8]> >, many0!(tag_abcd) ); -+ named!( multi_empty<&[u8],Vec<&[u8]> >, many0!(tag_empty) ); -+ -+ assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -+ assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -+ assert_eq!(multi_empty(&b"abcdef"[..]), Error(error_position!(ErrorKind::Many0, &b"abcdef"[..]))); -+ } -+ -+ #[cfg(feature = "nightly")] -+ use test::Bencher; -+ -+ #[cfg(feature = "nightly")] -+ #[bench] -+ fn many0_bench(b: &mut Bencher) { -+ named!(multi<&[u8],Vec<&[u8]> >, many0!(tag!("abcd"))); -+ b.iter(|| { -+ multi(&b"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"[..]) -+ }); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn many1() { -+ named!(multi<&[u8],Vec<&[u8]> >, many1!(tag!("abcd"))); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcdabcdefgh"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcdab"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -+ assert_eq!(multi(c), Error(error_position!(ErrorKind::Many1,c))); -+ assert_eq!(multi(d), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn many_till() { -+ named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( tag!( "abcd" ), tag!( "efgh" ) ) ); -+ -+ let a = b"abcdabcdefghabcd"; -+ let b = b"efghabcd"; -+ let c = b"azerty"; -+ -+ let res_a = (vec![&b"abcd"[..], &b"abcd"[..]], &b"efgh"[..]); -+ let res_b: (Vec<&[u8]>, &[u8]) = (Vec::new(), &b"efgh"[..]); -+ assert_eq!(multi(&a[..]), Done(&b"abcd"[..], res_a)); -+ assert_eq!(multi(&b[..]), Done(&b"abcd"[..], res_b)); -+ assert_eq!(multi(&c[..]), Error(error_node_position!(ErrorKind::ManyTill,&c[..], error_position!(ErrorKind::Tag,&c[..])))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn infinite_many() { -+ fn tst(input: &[u8]) -> IResult<&[u8], &[u8]> { -+ println!("input: {:?}", input); -+ Error(error_position!(ErrorKind::Custom(0),input)) -+ } -+ -+ // should not go into an infinite loop -+ named!(multi0<&[u8],Vec<&[u8]> >, many0!(tst)); -+ let a = &b"abcdef"[..]; -+ assert_eq!(multi0(a), Done(a, Vec::new())); -+ -+ named!(multi1<&[u8],Vec<&[u8]> >, many1!(tst)); -+ let a = &b"abcdef"[..]; -+ assert_eq!(multi1(a), Error(error_position!(ErrorKind::Many1,a))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn many_m_n() { -+ named!(multi<&[u8],Vec<&[u8]> >, many_m_n!(2, 4, tag!("Abcd"))); -+ -+ let a = &b"Abcdef"[..]; -+ let b = &b"AbcdAbcdefgh"[..]; -+ let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -+ let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -+ let e = &b"AbcdAb"[..]; -+ -+ assert_eq!(multi(a), Error(error_position!(ErrorKind::ManyMN,a))); -+ let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -+ let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -+ let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -+ assert_eq!(multi(e), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn count() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( cnt_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -+ -+ assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]])); -+ assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(cnt_2(&b"xxx"[..]), Error(error_position!(ErrorKind::Count, &b"xxx"[..]))); -+ assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(error_position!(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -+ assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(error_position!(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn count_zero() { -+ const TIMES: usize = 0; -+ named!( tag_abc, tag!("abc") ); -+ named!( counter_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) ); -+ -+ let done = &b"abcabcabcdef"[..]; -+ let parsed_done = Vec::new(); -+ let rest = done; -+ let incomplete_1 = &b"ab"[..]; -+ let parsed_incompl_1 = Vec::new(); -+ let incomplete_2 = &b"abcab"[..]; -+ let parsed_incompl_2 = Vec::new(); -+ let error = &b"xxx"[..]; -+ let error_remain = &b"xxx"[..]; -+ let parsed_err = Vec::new(); -+ let error_1 = &b"xxxabcabcdef"[..]; -+ let parsed_err_1 = Vec::new(); -+ let error_1_remain = &b"xxxabcabcdef"[..]; -+ let error_2 = &b"abcxxxabcdef"[..]; -+ let parsed_err_2 = Vec::new(); -+ let error_2_remain = &b"abcxxxabcdef"[..]; -+ -+ assert_eq!(counter_2(done), Done(rest, parsed_done)); -+ assert_eq!(counter_2(incomplete_1), Done(incomplete_1, parsed_incompl_1)); -+ assert_eq!(counter_2(incomplete_2), Done(incomplete_2, parsed_incompl_2)); -+ assert_eq!(counter_2(error), Done(error_remain, parsed_err)); -+ assert_eq!(counter_2(error_1), Done(error_1_remain, parsed_err_1)); -+ assert_eq!(counter_2(error_2), Done(error_2_remain, parsed_err_2)); -+ } -+ -+ #[test] -+ fn count_fixed() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( cnt_2<&[u8], [&[u8]; TIMES] >, count_fixed!(&[u8], tag_abc, TIMES ) ); -+ -+ assert_eq!(cnt_2(&b"abcabcabcdef"[..]), Done(&b"abcdef"[..], [&b"abc"[..], &b"abc"[..]])); -+ assert_eq!(cnt_2(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(cnt_2(&b"abcab"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(cnt_2(&b"xxx"[..]), Error(error_position!(ErrorKind::Count, &b"xxx"[..]))); -+ assert_eq!(cnt_2(&b"xxxabcabcdef"[..]), Error(error_position!(ErrorKind::Count, &b"xxxabcabcdef"[..]))); -+ assert_eq!(cnt_2(&b"abcxxxabcdef"[..]), Error(error_position!(ErrorKind::Count, &b"abcxxxabcdef"[..]))); -+ } -+ -+ #[allow(dead_code)] -+ pub fn compile_count_fixed(input: &[u8]) -> IResult<&[u8], ()> { -+ do_parse!(input, -+ tag!("abcd") >> -+ count_fixed!( u16, le_u16, 4 ) >> -+ eof!() >> -+ () -+ ) -+ } -+ -+ #[allow(unused_variables)] -+ #[test] -+ fn count_fixed_no_type() { -+ const TIMES: usize = 2; -+ named!( tag_abc, tag!("abc") ); -+ named!( counter_2<&[u8], [&[u8]; TIMES], () >, count_fixed!(&[u8], tag_abc, TIMES ) ); -+ -+ let done = &b"abcabcabcdef"[..]; -+ let parsed_main = [&b"abc"[..], &b"abc"[..]]; -+ let rest = &b"abcdef"[..]; -+ let incomplete_1 = &b"ab"[..]; -+ let incomplete_2 = &b"abcab"[..]; -+ let error = &b"xxx"[..]; -+ let error_1 = &b"xxxabcabcdef"[..]; -+ let error_1_remain = &b"xxxabcabcdef"[..]; -+ let error_2 = &b"abcxxxabcdef"[..]; -+ let error_2_remain = &b"abcxxxabcdef"[..]; -+ -+ assert_eq!(counter_2(done), Done(rest, parsed_main)); -+ assert_eq!(counter_2(incomplete_1), Incomplete(Needed::Size(3))); -+ assert_eq!(counter_2(incomplete_2), Incomplete(Needed::Size(6))); -+ assert_eq!(counter_2(error), Error(error_position!(ErrorKind::Count, error))); -+ assert_eq!(counter_2(error_1), Error(error_position!(ErrorKind::Count, error_1_remain))); -+ assert_eq!(counter_2(error_2), Error(error_position!(ErrorKind::Count, error_2_remain))); -+ } -+ -+ named!(pub number, map_res!( -+ map_res!( -+ digit, -+ str::from_utf8 -+ ), -+ FromStr::from_str -+ )); -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn length_count() { -+ named!(tag_abc, tag!(&b"abc"[..]) ); -+ named!( cnt<&[u8], Vec<&[u8]> >, length_count!(number, tag_abc) ); -+ -+ assert_eq!(cnt(&b"2abcabcabcdef"[..]), Done(&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]])); -+ assert_eq!(cnt(&b"2ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(cnt(&b"3abcab"[..]), Incomplete(Needed::Size(7))); -+ assert_eq!(cnt(&b"xxx"[..]), Error(error_position!(ErrorKind::Digit, &b"xxx"[..]))); -+ assert_eq!(cnt(&b"2abcxxx"[..]), Error(error_position!(ErrorKind::Count, &b"abcxxx"[..]))); -+ } -+ -+ #[test] -+ fn length_data() { -+ named!( take<&[u8], &[u8]>, length_data!(number) ); -+ -+ assert_eq!(take(&b"6abcabcabcdef"[..]), Done(&b"abcdef"[..], &b"abcabc"[..])); -+ assert_eq!(take(&b"3ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(take(&b"xxx"[..]), Error(error_position!(ErrorKind::Digit, &b"xxx"[..]))); -+ assert_eq!(take(&b"2abcxxx"[..]), Done(&b"cxxx"[..], &b"ab"[..])); -+ } -+ -+ #[test] -+ fn length_value_test() { -+ named!(length_value_1<&[u8], u16 >, length_value!(be_u8, be_u16)); -+ named!(length_value_2<&[u8], (u8, u8) >, length_value!(be_u8, tuple!(be_u8, be_u8))); -+ -+ let i1 = [0, 5, 6]; -+ assert_eq!(length_value_1(&i1), IResult::Error(error_position!(ErrorKind::Complete, &b""[..]))); -+ assert_eq!(length_value_2(&i1), IResult::Error(error_position!(ErrorKind::Complete, &b""[..]))); -+ -+ let i2 = [1, 5, 6, 3]; -+ assert_eq!(length_value_1(&i2), IResult::Error(error_position!(ErrorKind::Complete, &i2[1..2]))); -+ assert_eq!(length_value_2(&i2), IResult::Error(error_position!(ErrorKind::Complete, &i2[1..2]))); -+ -+ let i3 = [2, 5, 6, 3, 4, 5, 7]; -+ assert_eq!(length_value_1(&i3), IResult::Done(&i3[3..], 1286)); -+ assert_eq!(length_value_2(&i3), IResult::Done(&i3[3..], (5, 6))); -+ -+ let i4 = [3, 5, 6, 3, 4, 5]; -+ assert_eq!(length_value_1(&i4), IResult::Done(&i4[4..], 1286)); -+ assert_eq!(length_value_2(&i4), IResult::Done(&i4[4..], (5, 6))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn fold_many0() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_empty, tag!("") ); -+ named!( multi<&[u8],Vec<&[u8]> >, fold_many0!(tag_abcd, Vec::new(), fold_into_vec) ); -+ named!( multi_empty<&[u8],Vec<&[u8]> >, fold_many0!(tag_empty, Vec::new(), fold_into_vec) ); -+ -+ assert_eq!(multi(&b"abcdef"[..]), Done(&b"ef"[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b"abcdabcdefgh"[..]), Done(&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]])); -+ assert_eq!(multi(&b"azerty"[..]), Done(&b"azerty"[..], Vec::new())); -+ assert_eq!(multi(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(multi(&b"abcd"[..]), Done(&b""[..], vec![&b"abcd"[..]])); -+ assert_eq!(multi(&b""[..]), Done(&b""[..], Vec::new())); -+ assert_eq!(multi_empty(&b"abcdef"[..]), Error(error_position!(ErrorKind::Many0, &b"abcdef"[..]))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn fold_many1() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!(multi<&[u8],Vec<&[u8]> >, fold_many1!(tag!("abcd"), Vec::new(), fold_into_vec)); -+ -+ let a = &b"abcdef"[..]; -+ let b = &b"abcdabcdefgh"[..]; -+ let c = &b"azerty"[..]; -+ let d = &b"abcdab"[..]; -+ -+ let res1 = vec![&b"abcd"[..]]; -+ assert_eq!(multi(a), Done(&b"ef"[..], res1)); -+ let res2 = vec![&b"abcd"[..], &b"abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res2)); -+ assert_eq!(multi(c), Error(error_position!(ErrorKind::Many1,c))); -+ assert_eq!(multi(d), Incomplete(Needed::Size(8))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn fold_many_m_n() { -+ fn fold_into_vec(mut acc: Vec, item: T) -> Vec { -+ acc.push(item); -+ acc -+ }; -+ named!(multi<&[u8],Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!("Abcd"), Vec::new(), fold_into_vec)); -+ -+ let a = &b"Abcdef"[..]; -+ let b = &b"AbcdAbcdefgh"[..]; -+ let c = &b"AbcdAbcdAbcdAbcdefgh"[..]; -+ let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..]; -+ let e = &b"AbcdAb"[..]; -+ -+ assert_eq!(multi(a), Error(error_position!(ErrorKind::ManyMN,a))); -+ let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(b), Done(&b"efgh"[..], res1)); -+ let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(c), Done(&b"efgh"[..], res2)); -+ let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]]; -+ assert_eq!(multi(d), Done(&b"Abcdefgh"[..], res3)); -+ assert_eq!(multi(e), Incomplete(Needed::Size(8))); -+ } -+ -+} -diff --git third_party/rust/nom/src/nom.rs third_party/rust/nom/src/nom.rs -index 74bac5bfb0c4..7f48afc511bd 100644 ---- third_party/rust/nom/src/nom.rs -+++ third_party/rust/nom/src/nom.rs -@@ -6,16 +6,18 @@ - //! but the macros system makes no promises. - //! - --#[cfg(feature = "core")] -+#[cfg(not(feature = "std"))] - use std::prelude::v1::*; - use std::boxed::Box; - - use std::fmt::Debug; - use internal::*; - use internal::IResult::*; --use internal::Err::*; --use util::{ErrorKind,IterIndices,AsChar,InputLength}; -+use util::ErrorKind; -+use traits::{AsChar,InputLength,InputIter}; - use std::mem::transmute; -+use std::ops::{Range,RangeFrom,RangeTo}; -+use traits::{Compare,CompareResult,Slice}; - - #[inline] - pub fn tag_cl<'a,'b>(rec:&'a[u8]) -> Box IResult<&'b[u8], &'b[u8]> + 'a> { -@@ -23,12 +25,12 @@ pub fn tag_cl<'a,'b>(rec:&'a[u8]) -> Box IResult<&'b[u8], &'b[u8 - if i.len() >= rec.len() && &i[0..rec.len()] == rec { - Done(&i[rec.len()..], &i[0..rec.len()]) - } else { -- Error(Position(ErrorKind::TagClosure, i)) -+ Error(error_position!(ErrorKind::TagClosure, i)) - } - }) - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] - #[inline] - pub fn print(input: T) -> IResult { - println!("{:?}", input); -@@ -40,38 +42,89 @@ pub fn begin(input: &[u8]) -> IResult<(), &[u8]> { - Done((), input) - } - -+pub fn crlf(input:T) -> IResult where -+ T:Slice>+Slice>+Slice>, -+ T: InputIter, -+ T: Compare<&'static str> { -+ match input.compare("\r\n") { -+ //FIXME: is this the right index? -+ CompareResult::Ok => { -+ IResult::Done(input.slice(2..), input.slice(0..2)) -+ }, -+ CompareResult::Incomplete => IResult::Incomplete(Needed::Size(2)), -+ CompareResult::Error => IResult::Error(error_position!(ErrorKind::CrLf, input)) -+ } -+} -+ - // FIXME: when rust-lang/rust#17436 is fixed, macros will be able to export - // public methods --//pub is_not!(line_ending b"\r\n") --pub fn not_line_ending(input:&[u8]) -> IResult<&[u8], &[u8]> { -- for (idx, item) in input.iter().enumerate() { -- for &i in b"\r\n".iter() { -- if *item == i { -- return Done(&input[idx..], &input[0..idx]) -+pub fn not_line_ending(input:T) -> IResult where -+ T:Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ T: Compare<&'static str>, -+ ::Item: AsChar { -+ match input.iter_elements().position(|item| { -+ let c = item.as_char(); -+ c == '\r' || c == '\n' -+ }) { -+ None => Done(input.slice(input.input_len()..), input), -+ Some(index) => { -+ let mut it = input.iter_elements(); -+ let nth = it.nth(index).unwrap().as_char(); -+ if nth == '\r' { -+ let sliced = input.slice(index..); -+ let comp = sliced.compare("\r\n"); -+ match comp { -+ //FIXME: calculate the right index -+ CompareResult::Incomplete => Incomplete(Needed::Unknown), -+ CompareResult::Error => Error(error_position!(ErrorKind::Tag, input)), -+ CompareResult::Ok => Done(input.slice(index..), input.slice(..index)) -+ } -+ } else { -+ Done(input.slice(index..), input.slice(..index)) -+ } -+ } - } -+} -+ -+/// Recognizes an end of line (both '\n' and '\r\n') -+pub fn line_ending(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ T: Compare<&'static str> { -+ -+ match input.compare("\n") { -+ CompareResult::Ok => Done(input.slice(1..), input.slice(0..1)), -+ CompareResult::Incomplete => Incomplete(Needed::Size(1)), -+ CompareResult::Error => match input.compare("\r\n") { -+ //FIXME: is this the right index? -+ CompareResult::Ok => Done(input.slice(2..), input.slice(0..2)), -+ CompareResult::Incomplete => Incomplete(Needed::Size(2)), -+ CompareResult::Error => Error(error_position!(ErrorKind::CrLf, input)) - } - } -- Done(&input[input.len()..], input) - } - --named!(tag_ln, tag!("\n")); -- --/// Recognizes a line feed --#[inline] --pub fn line_ending(input:&[u8]) -> IResult<&[u8], &[u8]> { -- tag_ln(input) -+pub fn eol(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ T: Compare<&'static str> { -+ line_ending(input) - } - -+/// Tests if byte is ASCII alphabetic: A-Z, a-z - #[inline] - pub fn is_alphabetic(chr:u8) -> bool { - (chr >= 0x41 && chr <= 0x5A) || (chr >= 0x61 && chr <= 0x7A) - } - -+/// Tests if byte is ASCII digit: 0-9 - #[inline] - pub fn is_digit(chr: u8) -> bool { - chr >= 0x30 && chr <= 0x39 - } - -+/// Tests if byte is ASCII hex digit: 0-9, A-F, a-f - #[inline] - pub fn is_hex_digit(chr: u8) -> bool { - (chr >= 0x30 && chr <= 0x39) || -@@ -79,16 +132,19 @@ pub fn is_hex_digit(chr: u8) -> bool { - (chr >= 0x61 && chr <= 0x66) - } - -+/// Tests if byte is ASCII octal digit: 0-7 - #[inline] - pub fn is_oct_digit(chr: u8) -> bool { - chr >= 0x30 && chr <= 0x37 - } - -+/// Tests if byte is ASCII alphanumeric: A-Z, a-z, 0-9 - #[inline] - pub fn is_alphanumeric(chr: u8) -> bool { - is_alphabetic(chr) || is_digit(chr) - } - -+/// Tests if byte is ASCII space or tab - #[inline] - pub fn is_space(chr:u8) -> bool { - chr == ' ' as u8 || chr == '\t' as u8 -@@ -101,154 +157,160 @@ pub fn is_space(chr:u8) -> bool { - //pub filter!(oct_digit is_oct_digit) - //pub filter!(alphanumeric is_alphanumeric) - --use std::ops::{Index,Range,RangeFrom}; --/// Recognizes lowercase and uppercase alphabetic characters: a-zA-Z --pub fn alpha<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more lowercase and uppercase alphabetic characters: a-zA-Z -+pub fn alpha(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::Alpha, input)) -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - if ! item.is_alpha() { - if idx == 0 { -- return Error(Position(ErrorKind::Alpha, input)) -+ return Error(error_position!(ErrorKind::Alpha, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes numerical characters: 0-9 --pub fn digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more numerical characters: 0-9 -+pub fn digit(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::Digit, input)) -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { -- if ! item.is_0_to_9() { -+ if ! item.is_dec_digit() { - if idx == 0 { -- return Error(Position(ErrorKind::Digit, input)) -+ return Error(error_position!(ErrorKind::Digit, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes hexadecimal numerical characters: 0-9, A-F, a-f --pub fn hex_digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more hexadecimal numerical characters: 0-9, A-F, a-f -+pub fn hex_digit(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::HexDigit, input)) -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - if ! item.is_hex_digit() { - if idx == 0 { -- return Error(Position(ErrorKind::HexDigit, input)) -+ return Error(error_position!(ErrorKind::HexDigit, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes octal characters: 0-7 --pub fn oct_digit<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more octal characters: 0-7 -+pub fn oct_digit(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::OctDigit, input)) -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - if ! item.is_oct_digit() { - if idx == 0 { -- return Error(Position(ErrorKind::OctDigit, input)) -+ return Error(error_position!(ErrorKind::OctDigit, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes numerical and alphabetic characters: 0-9a-zA-Z --pub fn alphanumeric<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more numerical and alphabetic characters: 0-9a-zA-Z -+pub fn alphanumeric(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::AlphaNumeric, input)); -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - if ! item.is_alphanum() { - if idx == 0 { -- return Error(Position(ErrorKind::AlphaNumeric, input)) -+ return Error(error_position!(ErrorKind::AlphaNumeric, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes spaces and tabs --pub fn space<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more spaces and tabs -+pub fn space(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::Space, input)); -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - let chr = item.as_char(); - if ! (chr == ' ' || chr == '\t') { - if idx == 0 { -- return Error(Position(ErrorKind::Space, input)) -+ return Error(error_position!(ErrorKind::Space, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - --/// Recognizes spaces, tabs, carriage returns and line feeds --pub fn multispace<'a, T: ?Sized>(input:&'a T) -> IResult<&'a T, &'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: IterIndices+InputLength { -+/// Recognizes one or more spaces, tabs, carriage returns and line feeds -+pub fn multispace(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputIter+InputLength, -+ ::Item: AsChar { - let input_length = input.input_len(); - if input_length == 0 { -- return Error(Position(ErrorKind::MultiSpace, input)); -+ return Incomplete(Needed::Unknown); - } - - for (idx, item) in input.iter_indices() { - let chr = item.as_char(); - if ! (chr == ' ' || chr == '\t' || chr == '\r' || chr == '\n') { - if idx == 0 { -- return Error(Position(ErrorKind::MultiSpace, input)) -+ return Error(error_position!(ErrorKind::MultiSpace, input)) - } else { -- return Done(&input[idx..], &input[0..idx]) -+ return Done(input.slice(idx..), input.slice(0..idx)) - } - } - } -- Done(&input[input_length..], input) -+ Done(input.slice(input_length..), input) - } - - pub fn sized_buffer(input:&[u8]) -> IResult<&[u8], &[u8]> { -@@ -265,20 +327,6 @@ pub fn sized_buffer(input:&[u8]) -> IResult<&[u8], &[u8]> { - } - } - --pub fn length_value(input:&[u8]) -> IResult<&[u8], &[u8]> { -- let input_len = input.len(); -- if input_len == 0 { -- return Error(Position(ErrorKind::LengthValueFn, input)) -- } -- -- let len = input[0] as usize; -- if input_len - 1 >= len { -- IResult::Done(&input[len+1..], &input[1..len+1]) -- } else { -- IResult::Incomplete(Needed::Size(1+len)) -- } --} -- - /// Recognizes an unsigned 1 byte integer (equivalent to take!(1) - #[inline] - pub fn be_u8(i: &[u8]) -> IResult<&[u8], u8> { -@@ -300,6 +348,17 @@ pub fn be_u16(i: &[u8]) -> IResult<&[u8], u16> { - } - } - -+/// Recognizes big endian unsigned 3 byte integer -+#[inline] -+pub fn be_u24(i: &[u8]) -> IResult<&[u8], u32> { -+ if i.len() < 3 { -+ Incomplete(Needed::Size(3)) -+ } else { -+ let res = ((i[0] as u32) << 16) + ((i[1] as u32) << 8) + (i[2] as u32); -+ Done(&i[3..], res) -+ } -+} -+ - /// Recognizes big endian unsigned 4 bytes integer - #[inline] - pub fn be_u32(i: &[u8]) -> IResult<&[u8], u32> { -@@ -335,6 +394,13 @@ pub fn be_i16(i:&[u8]) -> IResult<&[u8], i16> { - map!(i, be_u16, | x | { x as i16 }) - } - -+/// Recognizes big endian signed 3 bytes integer -+#[inline] -+pub fn be_i24(i: &[u8]) -> IResult<&[u8], i32> { -+ // Same as the unsigned version but we need to sign-extend manually here -+ map!(i, be_u24, | x | if x & 0x80_00_00 != 0 { (x | 0xff_00_00_00) as i32 } else { x as i32 }) -+} -+ - /// Recognizes big endian signed 4 bytes integer - #[inline] - pub fn be_i32(i:&[u8]) -> IResult<&[u8], i32> { -@@ -368,6 +434,17 @@ pub fn le_u16(i: &[u8]) -> IResult<&[u8], u16> { - } - } - -+/// Recognizes little endian unsigned 3 byte integer -+#[inline] -+pub fn le_u24(i: &[u8]) -> IResult<&[u8], u32> { -+ if i.len() < 3 { -+ Incomplete(Needed::Size(3)) -+ } else { -+ let res = (i[0] as u32) + ((i[1] as u32) << 8) + ((i[2] as u32) << 16); -+ Done(&i[3..], res) -+ } -+} -+ - /// Recognizes little endian unsigned 4 bytes integer - #[inline] - pub fn le_u32(i: &[u8]) -> IResult<&[u8], u32> { -@@ -403,6 +480,13 @@ pub fn le_i16(i:&[u8]) -> IResult<&[u8], i16> { - map!(i, le_u16, | x | { x as i16 }) - } - -+/// Recognizes little endian signed 3 bytes integer -+#[inline] -+pub fn le_i24(i: &[u8]) -> IResult<&[u8], i32> { -+ // Same as the unsigned version but we need to sign-extend manually here -+ map!(i, le_u24, | x | if x & 0x80_00_00 != 0 { (x | 0xff_00_00_00) as i32 } else { x as i32 }) -+} -+ - /// Recognizes little endian signed 4 bytes integer - #[inline] - pub fn le_i32(i:&[u8]) -> IResult<&[u8], i32> { -@@ -415,31 +499,38 @@ pub fn le_i64(i:&[u8]) -> IResult<&[u8], i64> { - map!(i, le_u64, | x | { x as i64 }) - } - --/// if parameter is true, parse a big endian u16 integer, -+/// Configurable endianness -+#[derive(Debug,PartialEq,Eq,Clone,Copy)] -+pub enum Endianness { -+ Big, -+ Little, -+} -+ -+/// if the parameter is nom::Endianness::Big, parse a big endian u16 integer, - /// otherwise a little endian u16 integer - #[macro_export] --macro_rules! u16 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u16($i) } else { $crate::le_u16($i) } } );); --/// if parameter is true, parse a big endian u32 integer, -+macro_rules! u16 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_u16($i) } else { $crate::le_u16($i) } } );); -+/// if the parameter is nom::Endianness::Big, parse a big endian u32 integer, - /// otherwise a little endian u32 integer - #[macro_export] --macro_rules! u32 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u32($i) } else { $crate::le_u32($i) } } );); --/// if parameter is true, parse a big endian u64 integer, -+macro_rules! u32 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_u32($i) } else { $crate::le_u32($i) } } );); -+/// if the parameter is nom::Endianness::Big, parse a big endian u64 integer, - /// otherwise a little endian u64 integer - #[macro_export] --macro_rules! u64 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_u64($i) } else { $crate::le_u64($i) } } );); -+macro_rules! u64 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_u64($i) } else { $crate::le_u64($i) } } );); - --/// if parameter is true, parse a big endian i16 integer, -+/// if the parameter is nom::Endianness::Big, parse a big endian i16 integer, - /// otherwise a little endian i16 integer - #[macro_export] --macro_rules! i16 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i16($i) } else { $crate::le_i16($i) } } );); --/// if parameter is true, parse a big endian i32 integer, -+macro_rules! i16 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_i16($i) } else { $crate::le_i16($i) } } );); -+/// if the parameter is nom::Endianness::Big, parse a big endian i32 integer, - /// otherwise a little endian i32 integer - #[macro_export] --macro_rules! i32 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i32($i) } else { $crate::le_i32($i) } } );); --/// if parameter is true, parse a big endian i64 integer, -+macro_rules! i32 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_i32($i) } else { $crate::le_i32($i) } } );); -+/// if the parameter is nom::Endianness::Big, parse a big endian i64 integer, - /// otherwise a little endian i64 integer - #[macro_export] --macro_rules! i64 ( ($i:expr, $e:expr) => ( {if $e { $crate::be_i64($i) } else { $crate::le_i64($i) } } );); -+macro_rules! i64 ( ($i:expr, $e:expr) => ( {if $crate::Endianness::Big == $e { $crate::be_i64($i) } else { $crate::le_i64($i) } } );); - - /// Recognizes big endian 4 bytes floating point number - #[inline] -@@ -500,7 +591,7 @@ pub fn le_f64(input: &[u8]) -> IResult<&[u8], f64> { - /// Recognizes a hex-encoded integer - #[inline] - pub fn hex_u32(input: &[u8]) -> IResult<&[u8], u32> { -- match is_a!(input, &b"0123456789abcdef"[..]) { -+ match is_a!(input, &b"0123456789abcdefABCDEF"[..]) { - Error(e) => Error(e), - Incomplete(e) => Incomplete(e), - Done(i,o) => { -@@ -524,30 +615,15 @@ pub fn hex_u32(input: &[u8]) -> IResult<&[u8], u32> { - } - } - --/// Recognizes empty input buffers --/// --/// useful to verify that the previous parsers used all of the input --#[inline] --//pub fn eof(input:&[u8]) -> IResult<&[u8], &[u8]> { --pub fn eof<'a, T:?Sized>(input: &'a T) -> IResult<&'a T,&'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: InputLength { -- if input.input_len() == 0 { -- Done(input, input) -- } else { -- Error(Position(ErrorKind::Eof, input)) -- } --} -- - /// Recognizes non empty buffers - #[inline] --pub fn non_empty<'a, T:?Sized>(input: &'a T) -> IResult<&'a T,&'a T> where -- T:Index, Output=T>+Index, Output=T>, -- &'a T: InputLength { -+pub fn non_empty(input:T) -> IResult where -+ T: Slice>+Slice>+Slice>, -+ T: InputLength { - if input.input_len() == 0 { -- Error(Position(ErrorKind::NonEmpty, input)) -+ Error(error_position!(ErrorKind::NonEmpty, input)) - } else { -- Done(&input[input.input_len()..], input) -+ Done(input.slice(input.input_len()..), input) - } - } - -@@ -563,12 +639,102 @@ pub fn rest_s(input: &str) -> IResult<&str, &str> { - IResult::Done(&input[input.len()..], input) - } - -+/// Recognizes floating point number in a byte string and returns a f32 -+#[cfg(feature = "std")] -+pub fn float(input: &[u8]) -> IResult<&[u8],f32> { -+ flat_map!(input, -+ recognize!( -+ tuple!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ alt!( -+ delimited!(digit, tag!("."), opt!(digit)) -+ | delimited!(opt!(digit), tag!("."), digit) -+ ), -+ opt!(complete!(tuple!( -+ alt!(tag!("e") | tag!("E")), -+ opt!(alt!(tag!("+") | tag!("-"))), -+ digit -+ ) -+ )) -+ ) -+ ), -+ parse_to!(f32) -+ ) -+} -+ -+/// Recognizes floating point number in a string and returns a f32 -+#[cfg(feature = "std")] -+pub fn float_s(input: &str) -> IResult<&str,f32> { -+ flat_map!(input, -+ recognize!( -+ tuple!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ alt!( -+ delimited!(digit, tag!("."), opt!(digit)) -+ | delimited!(opt!(digit), tag!("."), digit) -+ ), -+ opt!(complete!(tuple!( -+ alt!(tag!("e") | tag!("E")), -+ opt!(alt!(tag!("+") | tag!("-"))), -+ digit -+ ) -+ )) -+ ) -+ ), -+ parse_to!(f32) -+ ) -+} -+ -+/// Recognizes floating point number in a byte string and returns a f64 -+#[cfg(feature = "std")] -+pub fn double(input: &[u8]) -> IResult<&[u8],f64> { -+ flat_map!(input, -+ recognize!( -+ tuple!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ alt!( -+ delimited!(digit, tag!("."), opt!(digit)) -+ | delimited!(opt!(digit), tag!("."), digit) -+ ), -+ opt!(complete!(tuple!( -+ alt!(tag!("e") | tag!("E")), -+ opt!(alt!(tag!("+") | tag!("-"))), -+ digit -+ ) -+ )) -+ ) -+ ), -+ parse_to!(f64) -+ ) -+} -+ -+/// Recognizes floating point number in a string and returns a f64 -+#[cfg(feature = "std")] -+pub fn double_s(input: &str) -> IResult<&str,f64> { -+ flat_map!(input, -+ recognize!( -+ tuple!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ alt!( -+ delimited!(digit, tag!("."), opt!(digit)) -+ | delimited!(opt!(digit), tag!("."), digit) -+ ), -+ opt!(complete!(tuple!( -+ alt!(tag!("e") | tag!("E")), -+ opt!(alt!(tag!("+") | tag!("-"))), -+ digit -+ ) -+ )) -+ ) -+ ), -+ parse_to!(f64) -+ ) -+} -+ - #[cfg(test)] - mod tests { - use super::*; - use internal::{Needed,IResult}; -- use internal::IResult::*; -- use internal::Err::*; - use util::ErrorKind; - - #[test] -@@ -578,7 +744,7 @@ mod tests { - assert_eq!(r, Done(&b"abcdefgh"[..], &b"abcd"[..])); - - let r2 = x(&b"abcefgh"[..]); -- assert_eq!(r2, Error(Position(ErrorKind::TagClosure, &b"abcefgh"[..]))); -+ assert_eq!(r2, Error(error_position!(ErrorKind::TagClosure, &b"abcefgh"[..]))); - } - - #[test] -@@ -590,22 +756,22 @@ mod tests { - let d: &[u8] = "azé12".as_bytes(); - let e: &[u8] = b" "; - assert_eq!(alpha(a), Done(empty, a)); -- assert_eq!(alpha(b), Error(Position(ErrorKind::Alpha,b))); -+ assert_eq!(alpha(b), Error(error_position!(ErrorKind::Alpha,b))); - assert_eq!(alpha(c), Done(&c[1..], &b"a"[..])); - assert_eq!(alpha(d), Done("é12".as_bytes(), &b"az"[..])); -- assert_eq!(digit(a), Error(Position(ErrorKind::Digit,a))); -+ assert_eq!(digit(a), Error(error_position!(ErrorKind::Digit,a))); - assert_eq!(digit(b), Done(empty, b)); -- assert_eq!(digit(c), Error(Position(ErrorKind::Digit,c))); -- assert_eq!(digit(d), Error(Position(ErrorKind::Digit,d))); -+ assert_eq!(digit(c), Error(error_position!(ErrorKind::Digit,c))); -+ assert_eq!(digit(d), Error(error_position!(ErrorKind::Digit,d))); - assert_eq!(hex_digit(a), Done(empty, a)); - assert_eq!(hex_digit(b), Done(empty, b)); - assert_eq!(hex_digit(c), Done(empty, c)); - assert_eq!(hex_digit(d), Done("zé12".as_bytes(), &b"a"[..])); -- assert_eq!(hex_digit(e), Error(Position(ErrorKind::HexDigit,e))); -- assert_eq!(oct_digit(a), Error(Position(ErrorKind::OctDigit,a))); -+ assert_eq!(hex_digit(e), Error(error_position!(ErrorKind::HexDigit,e))); -+ assert_eq!(oct_digit(a), Error(error_position!(ErrorKind::OctDigit,a))); - assert_eq!(oct_digit(b), Done(empty, b)); -- assert_eq!(oct_digit(c), Error(Position(ErrorKind::OctDigit,c))); -- assert_eq!(oct_digit(d), Error(Position(ErrorKind::OctDigit,d))); -+ assert_eq!(oct_digit(c), Error(error_position!(ErrorKind::OctDigit,c))); -+ assert_eq!(oct_digit(d), Error(error_position!(ErrorKind::OctDigit,d))); - assert_eq!(alphanumeric(a), Done(empty, a)); - assert_eq!(fix_error!(b,(), alphanumeric), Done(empty, b)); - assert_eq!(alphanumeric(c), Done(empty, c)); -@@ -622,22 +788,22 @@ mod tests { - let d = "azé12"; - let e = " "; - assert_eq!(alpha(a), Done(empty, a)); -- assert_eq!(alpha(b), Error(Position(ErrorKind::Alpha,b))); -+ assert_eq!(alpha(b), Error(error_position!(ErrorKind::Alpha,b))); - assert_eq!(alpha(c), Done(&c[1..], &"a"[..])); - assert_eq!(alpha(d), Done("12", &"azé"[..])); -- assert_eq!(digit(a), Error(Position(ErrorKind::Digit,a))); -+ assert_eq!(digit(a), Error(error_position!(ErrorKind::Digit,a))); - assert_eq!(digit(b), Done(empty, b)); -- assert_eq!(digit(c), Error(Position(ErrorKind::Digit,c))); -- assert_eq!(digit(d), Error(Position(ErrorKind::Digit,d))); -+ assert_eq!(digit(c), Error(error_position!(ErrorKind::Digit,c))); -+ assert_eq!(digit(d), Error(error_position!(ErrorKind::Digit,d))); - assert_eq!(hex_digit(a), Done(empty, a)); - assert_eq!(hex_digit(b), Done(empty, b)); - assert_eq!(hex_digit(c), Done(empty, c)); - assert_eq!(hex_digit(d), Done("zé12", &"a"[..])); -- assert_eq!(hex_digit(e), Error(Position(ErrorKind::HexDigit,e))); -- assert_eq!(oct_digit(a), Error(Position(ErrorKind::OctDigit,a))); -+ assert_eq!(hex_digit(e), Error(error_position!(ErrorKind::HexDigit,e))); -+ assert_eq!(oct_digit(a), Error(error_position!(ErrorKind::OctDigit,a))); - assert_eq!(oct_digit(b), Done(empty, b)); -- assert_eq!(oct_digit(c), Error(Position(ErrorKind::OctDigit,c))); -- assert_eq!(oct_digit(d), Error(Position(ErrorKind::OctDigit,d))); -+ assert_eq!(oct_digit(c), Error(error_position!(ErrorKind::OctDigit,c))); -+ assert_eq!(oct_digit(d), Error(error_position!(ErrorKind::OctDigit,d))); - assert_eq!(alphanumeric(a), Done(empty, a)); - assert_eq!(fix_error!(b,(), alphanumeric), Done(empty, b)); - assert_eq!(alphanumeric(c), Done(empty, c)); -@@ -645,7 +811,7 @@ mod tests { - assert_eq!(space(e), Done(&""[..], &" "[..])); - } - -- use util::HexDisplay; -+ use util::Offset; - #[test] - fn offset() { - let a = &b"abcd"[..]; -@@ -686,18 +852,48 @@ mod tests { - } - - #[test] -- fn is_not() { -+ fn is_not_line_ending_bytes() { - let a: &[u8] = b"ab12cd\nefgh"; - assert_eq!(not_line_ending(a), Done(&b"\nefgh"[..], &b"ab12cd"[..])); - - let b: &[u8] = b"ab12cd\nefgh\nijkl"; - assert_eq!(not_line_ending(b), Done(&b"\nefgh\nijkl"[..], &b"ab12cd"[..])); - -- let c: &[u8] = b"ab12cd"; -- assert_eq!(not_line_ending(c), Done(&b""[..], c)); -+ let c: &[u8] = b"ab12cd\r\nefgh\nijkl"; -+ assert_eq!(not_line_ending(c), Done(&b"\r\nefgh\nijkl"[..], &b"ab12cd"[..])); -+ -+ let d: &[u8] = b"ab12cd"; -+ assert_eq!(not_line_ending(d), Done(&b""[..], d)); - } - - #[test] -+ fn is_not_line_ending_str() { -+ /* -+ let a: &str = "ab12cd\nefgh"; -+ assert_eq!(not_line_ending(a), Done(&"\nefgh"[..], &"ab12cd"[..])); -+ -+ let b: &str = "ab12cd\nefgh\nijkl"; -+ assert_eq!(not_line_ending(b), Done(&"\nefgh\nijkl"[..], &"ab12cd"[..])); -+ -+ let c: &str = "ab12cd\r\nefgh\nijkl"; -+ assert_eq!(not_line_ending(c), Done(&"\r\nefgh\nijkl"[..], &"ab12cd"[..])); -+ -+ let d = "βèƒôřè\nÂßÇáƒƭèř"; -+ assert_eq!(not_line_ending(d), Done(&"\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])); -+ -+ let e = "βèƒôřè\r\nÂßÇáƒƭèř"; -+ assert_eq!(not_line_ending(e), Done(&"\r\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])); -+ */ -+ -+ let f = "βèƒôřè\rÂßÇáƒƭèř"; -+ assert_eq!(not_line_ending(f), Error(error_position!(ErrorKind::Tag,f))); -+ -+ let g: &str = "ab12cd"; -+ assert_eq!(not_line_ending(g), Done("", g)); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] - fn buffer_with_size() { - let i:Vec = vec![7,8]; - let o:Vec = vec![4,5,6]; -@@ -716,26 +912,6 @@ mod tests { - assert_eq!(res, Done(&v2[..], ())); - }*/ - -- #[test] -- fn length_value_test() { -- let i1 = vec![7,8]; -- let o1 = vec![4, 5, 6]; -- let arr1:[u8; 6usize] = [3, 4, 5, 6, 7, 8]; -- let res1 = length_value(&arr1); -- assert_eq!(Done(&i1[..], &o1[..]), res1); -- -- let i2:Vec = vec![4,5,6,7,8]; -- let o2: &[u8] = b""; -- let arr2:[u8; 6usize] = [0, 4, 5, 6, 7, 8]; -- let res2 = length_value(&arr2); -- assert_eq!(Done(&i2[..], o2), res2); -- -- let arr3:[u8; 7usize] = [8, 4, 5, 6, 7, 8, 9]; -- let res3 = length_value(&arr3); -- //FIXME: should be incomplete -- assert_eq!(Incomplete(Needed::Size(9)), res3); -- } -- - #[test] - fn i8_tests() { - assert_eq!(be_i8(&[0x00]), Done(&b""[..], 0)); -@@ -752,6 +928,20 @@ mod tests { - assert_eq!(be_i16(&[0x80, 0x00]), Done(&b""[..], -32768_i16)); - } - -+ #[test] -+ fn u24_tests() { -+ assert_eq!(be_u24(&[0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(be_u24(&[0x00, 0xFF, 0xFF]), Done(&b""[..], 65535_u32)); -+ assert_eq!(be_u24(&[0x12, 0x34, 0x56]), Done(&b""[..], 1193046_u32)); -+ } -+ -+ #[test] -+ fn i24_tests() { -+ assert_eq!(be_i24(&[0xFF, 0xFF, 0xFF]), Done(&b""[..], -1_i32)); -+ assert_eq!(be_i24(&[0xFF, 0x00, 0x00]), Done(&b""[..], -65536_i32)); -+ assert_eq!(be_i24(&[0xED, 0xCB, 0xAA]), Done(&b""[..], -1193046_i32)); -+ } -+ - #[test] - fn i32_tests() { - assert_eq!(be_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -@@ -784,6 +974,20 @@ mod tests { - assert_eq!(le_i16(&[0x00, 0x80]), Done(&b""[..], -32768_i16)); - } - -+ #[test] -+ fn le_u24_tests() { -+ assert_eq!(le_u24(&[0x00, 0x00, 0x00]), Done(&b""[..], 0)); -+ assert_eq!(le_u24(&[0xFF, 0xFF, 0x00]), Done(&b""[..], 65535_u32)); -+ assert_eq!(le_u24(&[0x56, 0x34, 0x12]), Done(&b""[..], 1193046_u32)); -+ } -+ -+ #[test] -+ fn le_i24_tests() { -+ assert_eq!(le_i24(&[0xFF, 0xFF, 0xFF]), Done(&b""[..], -1_i32)); -+ assert_eq!(le_i24(&[0x00, 0x00, 0xFF]), Done(&b""[..], -65536_i32)); -+ assert_eq!(le_i24(&[0xAA, 0xCB, 0xED]), Done(&b""[..], -1193046_i32)); -+ } -+ - #[test] - fn le_i32_tests() { - assert_eq!(le_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0)); -@@ -830,6 +1034,7 @@ mod tests { - assert_eq!(hex_u32(&b"ff"[..]), Done(&b""[..], 255)); - assert_eq!(hex_u32(&b"1be2"[..]), Done(&b""[..], 7138)); - assert_eq!(hex_u32(&b"c5a31be2"[..]), Done(&b""[..], 3315801058)); -+ assert_eq!(hex_u32(&b"C5A31be2"[..]), Done(&b""[..], 3315801058)); - assert_eq!(hex_u32(&b"00c5a31be2"[..]), Done(&b"e2"[..], 12952347)); - assert_eq!(hex_u32(&b"c5a31be201"[..]), Done(&b"01"[..], 3315801058)); - assert_eq!(hex_u32(&b"ffffffff"[..]), Done(&b""[..], 4294967295)); -@@ -840,49 +1045,51 @@ mod tests { - fn end_of_input() { - let not_over = &b"Hello, world!"[..]; - let is_over = &b""[..]; -+ named!(eof_test, eof!()); - -- let res_not_over = eof(not_over); -- assert_eq!(res_not_over, Error(Position(ErrorKind::Eof, not_over))); -+ let res_not_over = eof_test(not_over); -+ assert_eq!(res_not_over, Error(error_position!(ErrorKind::Eof, not_over))); - -- let res_over = eof(is_over); -+ let res_over = eof_test(is_over); - assert_eq!(res_over, Done(is_over, is_over)); - } - - #[test] - fn configurable_endianness() { -- named!(be_tst16, u16!(true)); -- named!(le_tst16, u16!(false)); -+ named!(be_tst16, u16!(Endianness::Big)); -+ named!(le_tst16, u16!(Endianness::Little)); - assert_eq!(be_tst16(&[0x80, 0x00]), Done(&b""[..], 32768_u16)); - assert_eq!(le_tst16(&[0x80, 0x00]), Done(&b""[..], 128_u16)); - -- named!(be_tst32, u32!(true)); -- named!(le_tst32, u32!(false)); -+ named!(be_tst32, u32!(Endianness::Big)); -+ named!(le_tst32, u32!(Endianness::Little)); - assert_eq!(be_tst32(&[0x12, 0x00, 0x60, 0x00]), Done(&b""[..], 302014464_u32)); - assert_eq!(le_tst32(&[0x12, 0x00, 0x60, 0x00]), Done(&b""[..], 6291474_u32)); - -- named!(be_tst64, u64!(true)); -- named!(le_tst64, u64!(false)); -+ named!(be_tst64, u64!(Endianness::Big)); -+ named!(le_tst64, u64!(Endianness::Little)); - assert_eq!(be_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 1297142246100992000_u64)); - assert_eq!(le_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 36028874334666770_u64)); - -- named!(be_tsti16, i16!(true)); -- named!(le_tsti16, i16!(false)); -+ named!(be_tsti16, i16!(Endianness::Big)); -+ named!(le_tsti16, i16!(Endianness::Little)); - assert_eq!(be_tsti16(&[0x00, 0x80]), Done(&b""[..], 128_i16)); - assert_eq!(le_tsti16(&[0x00, 0x80]), Done(&b""[..], -32768_i16)); - -- named!(be_tsti32, i32!(true)); -- named!(le_tsti32, i32!(false)); -+ named!(be_tsti32, i32!(Endianness::Big)); -+ named!(le_tsti32, i32!(Endianness::Little)); - assert_eq!(be_tsti32(&[0x00, 0x12, 0x60, 0x00]), Done(&b""[..], 1204224_i32)); - assert_eq!(le_tsti32(&[0x00, 0x12, 0x60, 0x00]), Done(&b""[..], 6296064_i32)); - -- named!(be_tsti64, i64!(true)); -- named!(le_tsti64, i64!(false)); -+ named!(be_tsti64, i64!(Endianness::Big)); -+ named!(le_tsti64, i64!(Endianness::Little)); - assert_eq!(be_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 71881672479506432_i64)); - assert_eq!(le_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]), Done(&b""[..], 36028874334732032_i64)); - - } - - #[test] -+ #[cfg(feature = "std")] - fn manual_configurable_endianness_test() { - let x = 1; - let int_parse: Box IResult<&[u8], u16> > = if x == 2 { -@@ -907,10 +1114,10 @@ mod tests { - assert_eq!(hex_digit(i), Done(empty, i)); - - let i = &b"g"[..]; -- assert_eq!(hex_digit(i), Error(Position(ErrorKind::HexDigit,i))); -+ assert_eq!(hex_digit(i), Error(error_position!(ErrorKind::HexDigit,i))); - - let i = &b"G"[..]; -- assert_eq!(hex_digit(i), Error(Position(ErrorKind::HexDigit,i))); -+ assert_eq!(hex_digit(i), Error(error_position!(ErrorKind::HexDigit,i))); - - assert!(is_hex_digit(b'0')); - assert!(is_hex_digit(b'9')); -@@ -934,7 +1141,7 @@ mod tests { - assert_eq!(oct_digit(i), Done(empty, i)); - - let i = &b"8"[..]; -- assert_eq!(oct_digit(i), Error(Position(ErrorKind::OctDigit,i))); -+ assert_eq!(oct_digit(i), Error(error_position!(ErrorKind::OctDigit,i))); - - assert!(is_oct_digit(b'0')); - assert!(is_oct_digit(b'7')); -@@ -947,4 +1154,72 @@ mod tests { - assert!(!is_oct_digit(b'@')); - assert!(!is_oct_digit(b'\x60')); - } -+ -+ #[test] -+ fn full_line_windows() { -+ named!(take_full_line<(&[u8], &[u8])>, tuple!(not_line_ending, line_ending)); -+ let input = b"abc\r\n"; -+ let output = take_full_line(input); -+ assert_eq!(output, Done(&b""[..], (&b"abc"[..], &b"\r\n"[..]))); -+ } -+ -+ #[test] -+ fn full_line_unix() { -+ named!(take_full_line<(&[u8], &[u8])>, tuple!(not_line_ending, line_ending)); -+ let input = b"abc\n"; -+ let output = take_full_line(input); -+ assert_eq!(output, Done(&b""[..], (&b"abc"[..], &b"\n"[..]))); -+ } -+ -+ #[test] -+ fn check_windows_lineending() { -+ let input = b"\r\n"; -+ let output = line_ending(&input[..]); -+ assert_eq!(output, Done(&b""[..], &b"\r\n"[..])); -+ } -+ -+ #[test] -+ fn check_unix_lineending() { -+ let input = b"\n"; -+ let output = line_ending(&input[..]); -+ assert_eq!(output, Done(&b""[..], &b"\n"[..])); -+ } -+ -+ #[test] -+ fn cr_lf() { -+ assert_eq!(crlf(&b"\r\na"[..]), Done(&b"a"[..], &b"\r\n"[..])); -+ assert_eq!(crlf(&b"\r"[..]), Incomplete(Needed::Size(2))); -+ assert_eq!(crlf(&b"\ra"[..]), Error(error_position!(ErrorKind::CrLf, &b"\ra"[..]))); -+ -+ assert_eq!(crlf("\r\na"), Done("a", "\r\n")); -+ assert_eq!(crlf("\r"), Incomplete(Needed::Size(2))); -+ assert_eq!(crlf("\ra"), Error(error_position!(ErrorKind::CrLf, "\ra"))); -+ } -+ -+ #[test] -+ fn end_of_line() { -+ assert_eq!(eol(&b"\na"[..]), Done(&b"a"[..], &b"\n"[..])); -+ assert_eq!(eol(&b"\r\na"[..]), Done(&b"a"[..], &b"\r\n"[..])); -+ assert_eq!(eol(&b"\r"[..]), Incomplete(Needed::Size(2))); -+ assert_eq!(eol(&b"\ra"[..]), Error(error_position!(ErrorKind::CrLf, &b"\ra"[..]))); -+ -+ assert_eq!(eol("\na"), Done("a", "\n")); -+ assert_eq!(eol("\r\na"), Done("a", "\r\n")); -+ assert_eq!(eol("\r"), Incomplete(Needed::Size(2))); -+ assert_eq!(eol("\ra"), Error(error_position!(ErrorKind::CrLf, "\ra"))); -+ } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn float_test() { -+ assert_eq!(float(&b"+3.14"[..]), Done(&b""[..], 3.14)); -+ assert_eq!(float_s(&"3.14"[..]), Done(&""[..], 3.14)); -+ assert_eq!(double(&b"3.14"[..]), Done(&b""[..], 3.14)); -+ assert_eq!(double_s(&"3.14"[..]), Done(&""[..], 3.14)); -+ -+ assert_eq!(float(&b"-1.234E-12"[..]), Done(&b""[..], -1.234E-12)); -+ assert_eq!(float_s(&"-1.234E-12"[..]), Done(&""[..], -1.234E-12)); -+ assert_eq!(double(&b"-1.234E-12"[..]), Done(&b""[..], -1.234E-12)); -+ assert_eq!(double_s(&"-1.234E-12"[..]), Done(&""[..], -1.234E-12)); -+ } - } -diff --git third_party/rust/nom/src/regexp.rs third_party/rust/nom/src/regexp.rs -index 17f8ede1a3f7..b4a90f448cb2 100644 ---- third_party/rust/nom/src/regexp.rs -+++ third_party/rust/nom/src/regexp.rs -@@ -28,11 +28,13 @@ macro_rules! re_match ( - ($i:expr, $re:expr) => ( - { - use $crate::InputLength; -+ use $crate::Slice; - let re = ::regex::Regex::new($re).unwrap(); - if re.is_match($i) { -- $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ $crate::IResult::Done($i.slice($i.input_len()..), $i) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatch)); -+ res - } - } - ) -@@ -48,11 +50,13 @@ macro_rules! re_match_static ( - ($i:expr, $re:expr) => ( - { - use $crate::InputLength; -+ use $crate::Slice; - regex!(RE, $re); - if RE.is_match($i) { -- $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ $crate::IResult::Done($i.slice($i.input_len()..), $i) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatch)); -+ res - } - } - ) -@@ -67,11 +71,13 @@ macro_rules! re_bytes_match ( - ($i:expr, $re:expr) => ( - { - use $crate::InputLength; -+ use $crate::Slice; - let re = ::regex::bytes::Regex::new($re).unwrap(); - if re.is_match($i) { -- $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ $crate::IResult::Done($i.slice($i.input_len()..), $i) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatch)); -+ res - } - } - ) -@@ -87,11 +93,13 @@ macro_rules! re_bytes_match_static ( - ($i:expr, $re:expr) => ( - { - use $crate::InputLength; -+ use $crate::Slice; - regex_bytes!(RE, $re); - if RE.is_match($i) { -- $crate::IResult::Done(&$i[$i.input_len()..], $i) -+ $crate::IResult::Done($i.slice($i.input_len()..), $i) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatch)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatch)); -+ res - } - } - ) -@@ -105,11 +113,13 @@ macro_rules! re_bytes_match_static ( - macro_rules! re_find ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::Regex::new($re).unwrap(); -- if let Some((begin, end)) = re.find($i) { -- $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ if let Some(m) = re.find($i) { -+ $crate::IResult::Done($i.slice(m.end()..), $i.slice(m.start()..m.end())) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpFind)); -+ res - } - } - ) -@@ -124,11 +134,13 @@ macro_rules! re_find ( - macro_rules! re_find_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex!(RE, $re); -- if let Some((begin, end)) = RE.find($i) { -- $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ if let Some(m) = RE.find($i) { -+ $crate::IResult::Done($i.slice(m.end()..), $i.slice(m.start()..m.end())) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpFind)); -+ res - } - } - -@@ -143,11 +155,13 @@ macro_rules! re_find_static ( - macro_rules! re_bytes_find ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::bytes::Regex::new($re).unwrap(); -- if let Some((begin, end)) = re.find($i) { -- $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ if let Some(m) = re.find($i) { -+ $crate::IResult::Done($i.slice(m.end()..), $i.slice(m.start()..m.end())) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpFind)); -+ res - } - } - ) -@@ -162,11 +176,13 @@ macro_rules! re_bytes_find ( - macro_rules! re_bytes_find_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex_bytes!(RE, $re); -- if let Some((begin, end)) = RE.find($i) { -- $crate::IResult::Done(&$i[end..], &$i[begin..end]) -+ if let Some(m) = RE.find($i) { -+ $crate::IResult::Done($i.slice(m.end()..), $i.slice(m.start()..m.end())) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpFind)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpFind)); -+ res - } - } - -@@ -181,16 +197,18 @@ macro_rules! re_bytes_find_static ( - macro_rules! re_matches ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::Regex::new($re).unwrap(); -- let v: Vec<&str> = re.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v: Vec<&str> = re.find_iter($i).map(|m| $i.slice(m.start()..m.end())).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatches)); -+ res - } - } - ) -@@ -205,16 +223,18 @@ macro_rules! re_matches ( - macro_rules! re_matches_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex!(RE, $re); -- let v: Vec<&str> = RE.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v: Vec<&str> = RE.find_iter($i).map(|m| $i.slice(m.start()..m.end())).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatches)); -+ res - } - } - ) -@@ -228,16 +248,18 @@ macro_rules! re_matches_static ( - macro_rules! re_bytes_matches ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::bytes::Regex::new($re).unwrap(); -- let v: Vec<&[u8]> = re.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v: Vec<&[u8]> = re.find_iter($i).map(|m| $i.slice(m.start()..m.end())).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatches)); -+ res - } - } - ) -@@ -252,16 +274,18 @@ macro_rules! re_bytes_matches ( - macro_rules! re_bytes_matches_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex_bytes!(RE, $re); -- let v: Vec<&[u8]> = RE.find_iter($i).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v: Vec<&[u8]> = RE.find_iter($i).map(|m| $i.slice(m.start()..m.end())).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpMatches)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpMatches)); -+ res - } - } - ) -@@ -275,16 +299,18 @@ macro_rules! re_bytes_matches_static ( - macro_rules! re_capture ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::Regex::new($re).unwrap(); - if let Some(c) = re.captures($i) { -- let v:Vec<&str> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v:Vec<&str> = c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect(); - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -299,16 +325,18 @@ macro_rules! re_capture ( - macro_rules! re_capture_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex!(RE, $re); - if let Some(c) = RE.captures($i) { -- let v:Vec<&str> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v:Vec<&str> = c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect(); - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -322,16 +350,18 @@ macro_rules! re_capture_static ( - macro_rules! re_bytes_capture ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::bytes::Regex::new($re).unwrap(); - if let Some(c) = re.captures($i) { -- let v:Vec<&[u8]> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v:Vec<&[u8]> = c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect(); - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -346,16 +376,18 @@ macro_rules! re_bytes_capture ( - macro_rules! re_bytes_capture_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex_bytes!(RE, $re); - if let Some(c) = RE.captures($i) { -- let v:Vec<&[u8]> = c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect(); -+ let v:Vec<&[u8]> = c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect(); - let offset = { - let end = v.last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -369,16 +401,18 @@ macro_rules! re_bytes_capture_static ( - macro_rules! re_captures ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::Regex::new($re).unwrap(); -- let v:Vec> = re.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ let v:Vec> = re.captures_iter($i).map(|c| c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect()).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap().last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -393,16 +427,18 @@ macro_rules! re_captures ( - macro_rules! re_captures_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex!(RE, $re); -- let v:Vec> = RE.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ let v:Vec> = RE.captures_iter($i).map(|c| c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect()).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap().last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -416,16 +452,18 @@ macro_rules! re_captures_static ( - macro_rules! re_bytes_captures ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - let re = ::regex::bytes::Regex::new($re).unwrap(); -- let v:Vec> = re.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ let v:Vec> = re.captures_iter($i).map(|c| c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect()).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap().last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -440,16 +478,18 @@ macro_rules! re_bytes_captures ( - macro_rules! re_bytes_captures_static ( - ($i:expr, $re:expr) => ( - { -+ use $crate::Slice; - regex_bytes!(RE, $re); -- let v:Vec> = RE.captures_iter($i).map(|c| c.iter_pos().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|(begin,end)| &$i[begin..end]).collect()).collect(); -+ let v:Vec> = RE.captures_iter($i).map(|c| c.iter().filter(|el| el.is_some()).map(|el| el.unwrap()).map(|m| $i.slice(m.start()..m.end())).collect()).collect(); - if v.len() != 0 { - let offset = { - let end = v.last().unwrap().last().unwrap(); - end.as_ptr() as usize + end.len() - $i.as_ptr() as usize - }; -- $crate::IResult::Done(&$i[offset..], v) -+ $crate::IResult::Done($i.slice(offset..), v) - } else { -- $crate::IResult::Error($crate::Err::Code($crate::ErrorKind::RegexpCapture)) -+ let res: $crate::IResult<_,_> = $crate::IResult::Error(error_code!($crate::ErrorKind::RegexpCapture)); -+ res - } - } - ) -@@ -457,14 +497,13 @@ macro_rules! re_bytes_captures_static ( - #[cfg(test)] - mod tests { - use internal::IResult::*; -- use internal::Err::*; - use util::ErrorKind; - - #[test] - fn re_match() { - named!(rm<&str,&str>, re_match!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpMatch))); - assert_eq!(rm("2015-09-07blah"), Done("", "2015-09-07blah")); - } - -@@ -473,7 +512,7 @@ mod tests { - fn re_match_static() { - named!(rm<&str,&str>, re_match_static!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpMatch))); - assert_eq!(rm("2015-09-07blah"), Done("", "2015-09-07blah")); - } - -@@ -481,7 +520,7 @@ mod tests { - fn re_find() { - named!(rm<&str,&str>, re_find!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpFind))); - assert_eq!(rm("2015-09-07blah"), Done("blah", "2015-09-07")); - } - -@@ -490,7 +529,7 @@ mod tests { - fn re_find_static() { - named!(rm<&str,&str>, re_find_static!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", "2015-09-07")); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpFind))); - assert_eq!(rm("2015-09-07blah"), Done("blah", "2015-09-07")); - } - -@@ -498,7 +537,7 @@ mod tests { - fn re_matches() { - named!(rm< &str,Vec<&str> >, re_matches!(r"\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", vec!["2015-09-07"])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpMatches))); - assert_eq!(rm("aaa2015-09-07blah2015-09-09pouet"), Done("pouet", vec!["2015-09-07", "2015-09-09"])); - } - -@@ -507,32 +546,32 @@ mod tests { - fn re_matches_static() { - named!(rm< &str,Vec<&str> >, re_matches_static!(r"\d{4}-\d{2}-\d{2}")); - assert_eq!(rm("2015-09-07"), Done("", vec!["2015-09-07"])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpMatches))); - assert_eq!(rm("aaa2015-09-07blah2015-09-09pouet"), Done("pouet", vec!["2015-09-07", "2015-09-09"])); - } - - #[test] - fn re_capture() { -- named!(rm< &str,Vec<&str> >, re_capture!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< &str,Vec<&str> >, re_capture!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41"), Done(" world regex 0.1.41", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); - } - - #[cfg(feature = "regexp_macros")] - #[test] - fn re_capture_static() { -- named!(rm< &str,Vec<&str> >, re_capture_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< &str,Vec<&str> >, re_capture_static!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41"), Done(" world regex 0.1.41", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"])); - } - - #[test] - fn re_captures() { -- named!(rm< &str,Vec> >, re_captures!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< &str,Vec> >, re_captures!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41 aaa"), Done(" aaa", vec![ - vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"], - vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"], -@@ -542,9 +581,9 @@ mod tests { - #[cfg(feature = "regexp_macros")] - #[test] - fn re_captures_static() { -- named!(rm< &str,Vec> >, re_captures_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< &str,Vec> >, re_captures_static!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm("blah nom 0.3.11pouet"), Done("pouet", vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]])); -- assert_eq!(rm("blah"), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm("blah"), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm("hello nom 0.3.11 world regex 0.1.41 aaa"), Done(" aaa", vec![ - vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"], - vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"], -@@ -555,7 +594,7 @@ mod tests { - fn re_bytes_match() { - named!(rm, re_bytes_match!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpMatch))); - assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b""[..], &b"2015-09-07blah"[..])); - } - -@@ -564,7 +603,7 @@ mod tests { - fn re_bytes_match_static() { - named!(rm, re_bytes_match_static!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatch))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpMatch))); - assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b""[..], &b"2015-09-07blah"[..])); - } - -@@ -572,7 +611,7 @@ mod tests { - fn re_bytes_find() { - named!(rm, re_bytes_find!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpFind))); - assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b"blah"[..], &b"2015-09-07"[..])); - } - -@@ -581,7 +620,7 @@ mod tests { - fn re_bytes_find_static() { - named!(rm, re_bytes_find_static!(r"^\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], &b"2015-09-07"[..])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpFind))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpFind))); - assert_eq!(rm(&b"2015-09-07blah"[..]), Done(&b"blah"[..], &b"2015-09-07"[..])); - } - -@@ -589,7 +628,7 @@ mod tests { - fn re_bytes_matches() { - named!(rm >, re_bytes_matches!(r"\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], vec![&b"2015-09-07"[..]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpMatches))); - assert_eq!(rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]), Done(&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]])); - } - -@@ -598,32 +637,32 @@ mod tests { - fn re_bytes_matches_static() { - named!(rm >, re_bytes_matches_static!(r"\d{4}-\d{2}-\d{2}")); - assert_eq!(rm(&b"2015-09-07"[..]), Done(&b""[..], vec![&b"2015-09-07"[..]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpMatches))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpMatches))); - assert_eq!(rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]), Done(&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]])); - } - - #[test] - fn re_bytes_capture() { -- named!(rm >, re_bytes_capture!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm >, re_bytes_capture!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]), Done(&b" world regex 0.1.41"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); - } - - #[cfg(feature = "regexp_macros")] - #[test] - fn re_bytes_capture_static() { -- named!(rm< Vec<&[u8]> >, re_bytes_capture_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< Vec<&[u8]> >, re_bytes_capture_static!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]), Done(&b" world regex 0.1.41"[..], vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]])); - } - - #[test] - fn re_bytes_captures() { -- named!(rm< Vec> >, re_bytes_captures!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< Vec> >, re_bytes_captures!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]), Done(&b" aaa"[..], vec![ - vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]], - vec![&b"regex 0.1.41"[..], &b"regex"[..], &b"0.1.41"[..], &b"0"[..], &b"1"[..], &b"41"[..]], -@@ -633,9 +672,9 @@ mod tests { - #[cfg(feature = "regexp_macros")] - #[test] - fn re_bytes_captures_static() { -- named!(rm< Vec> >, re_bytes_captures_static!(r"([:alpha:]+)\s+((\d+).(\d+).(\d+))")); -+ named!(rm< Vec> >, re_bytes_captures_static!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")); - assert_eq!(rm(&b"blah nom 0.3.11pouet"[..]), Done(&b"pouet"[..], vec![vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]]])); -- assert_eq!(rm(&b"blah"[..]), Error(Code(ErrorKind::RegexpCapture))); -+ assert_eq!(rm(&b"blah"[..]), Error(error_code!(ErrorKind::RegexpCapture))); - assert_eq!(rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]), Done(&b" aaa"[..], vec![ - vec![&b"nom 0.3.11"[..], &b"nom"[..], &b"0.3.11"[..], &b"0"[..], &b"3"[..], &b"11"[..]], - vec![&b"regex 0.1.41"[..], &b"regex"[..], &b"0.1.41"[..], &b"0"[..], &b"1"[..], &b"41"[..]], -diff --git third_party/rust/nom/src/sequence.rs third_party/rust/nom/src/sequence.rs -new file mode 100644 -index 000000000000..0bbefe009aa2 ---- /dev/null -+++ third_party/rust/nom/src/sequence.rs -@@ -0,0 +1,889 @@ -+/// `tuple!(I->IResult, I->IResult, ... I->IResult) => I -> IResult` -+/// chains parsers and assemble the sub results in a tuple. -+/// -+/// The input type `I` must implement `nom::InputLength`. -+/// -+/// This combinator will count how much data is consumed by every child parser -+/// and take it into account if there is not enough data -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Error}; -+/// # #[cfg(feature = "verbose-errors")] -+/// # use nom::Err::Position; -+/// # use nom::ErrorKind; -+/// # use nom::be_u16; -+/// // the return type depends of the children parsers -+/// named!(parser<&[u8], (u16, &[u8], &[u8]) >, -+/// tuple!( -+/// be_u16 , -+/// take!(3), -+/// tag!("fg") -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// assert_eq!( -+/// parser(&b"abcdefgh"[..]), -+/// Done( -+/// &b"h"[..], -+/// (0x6162u16, &b"cde"[..], &b"fg"[..]) -+/// ) -+/// ); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tuple ( -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ tuple_parser!($i, 0usize, (), $($rest)*) -+ } -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! tuple_parser ( -+ ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => ( -+ tuple_parser!($i, $consumed, ($($parsed),*), call!($e), $($rest)*); -+ ); -+ ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(e) => -+ $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ let i_ = i.clone(); -+ tuple_parser!(i_, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), (o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(e) => -+ $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ let i_ = i.clone(); -+ tuple_parser!(i_, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), ($($parsed)* , o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:tt),*), $e:ident) => ( -+ tuple_parser!($i, $consumed, ($($parsed),*), call!($e)); -+ ); -+ ($i:expr, $consumed:expr, (), $submac:ident!( $($args:tt)* )) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(e) => -+ $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, (o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => -+ $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, ($($parsed),* , o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $consumed:expr, ($($parsed:expr),*)) => ( -+ { -+ $crate::IResult::Done($i, ($($parsed),*)) -+ } -+ ); -+); -+ -+/// `pair!(I -> IResult, I -> IResult) => I -> IResult` -+/// pair(X,Y), returns (x,y) -+/// -+#[macro_export] -+macro_rules! pair( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ pair!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ pair!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ pair!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `separated_pair!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` -+/// separated_pair(X,sep,Y) returns (x,y) -+#[macro_export] -+macro_rules! separated_pair( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -+ { -+ match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1, (o1, _, o2)) => { -+ $crate::IResult::Done(i1, (o1, o2)) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $f:expr, $($rest:tt)+) => ( -+ separated_pair!($i, call!($f), $($rest)*); -+ ); -+); -+ -+/// `preceded!(I -> IResult, I -> IResult) => I -> IResult` -+/// preceded(opening, X) returns X -+#[macro_export] -+macro_rules! preceded( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (_,o)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ preceded!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ preceded!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ preceded!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `terminated!(I -> IResult, I -> IResult) => I -> IResult` -+/// terminated(X, closing) returns X -+#[macro_export] -+macro_rules! terminated( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (o,_)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ terminated!($i, $submac!($($args)*), call!($g)); -+ ); -+ -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ terminated!($i, call!($f), $submac!($($args)*)); -+ ); -+ -+ ($i:expr, $f:expr, $g:expr) => ( -+ terminated!($i, call!($f), call!($g)); -+ ); -+); -+ -+/// `delimited!(I -> IResult, I -> IResult, I -> IResult) => I -> IResult` -+/// delimited(opening, X, closing) returns X -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done}; -+/// named!(bracketed, -+/// delimited!( -+/// tag!("("), -+/// take_until!(")"), -+/// tag!(")") -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// let input = &b"(test)"[..]; -+/// assert_eq!(bracketed(input), Done(&b""[..], &b"test"[..])); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! delimited( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => ( -+ { -+ match tuple_parser!($i, 0usize, (), $submac!($($args)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1, (_, o, _)) => { -+ $crate::IResult::Done(i1, o) -+ } -+ } -+ } -+ ); -+ -+ ($i:expr, $f:expr, $($rest:tt)+) => ( -+ delimited!($i, call!($f), $($rest)*); -+ ); -+); -+ -+/// `do_parse!(I->IResult >> I->IResult >> ... I->IResult , ( O ) ) => I -> IResult` -+/// do_parse applies sub parsers in a sequence. -+/// it can store intermediary results and make them available -+/// for later parsers -+/// -+/// The input type `I` must implement `nom::InputLength`. -+/// -+/// This combinator will count how much data is consumed by every child parser -+/// and take it into account if there is not enough data -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Incomplete}; -+/// # use nom::Needed; -+/// use nom::be_u8; -+/// -+/// // this parser implements a common pattern in binary formats, -+/// // the TAG-LENGTH-VALUE, where you first recognize a specific -+/// // byte slice, then the next bytes indicate the length of -+/// // the data, then you take that slice and return it -+/// // -+/// // here, we match the tag 42, take the length in the next byte -+/// // and store it in `length`, then use `take!` with `length` -+/// // to obtain the subslice that we store in `bytes`, then return -+/// // `bytes` -+/// named!(tag_length_value, -+/// do_parse!( -+/// tag!( &[ 42u8 ][..] ) >> -+/// length: be_u8 >> -+/// bytes: take!(length) >> -+/// (bytes) -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// let a: Vec = vec!(42, 2, 3, 4, 5); -+/// let result_a: Vec = vec!(3, 4); -+/// let rest_a: Vec = vec!(5); -+/// assert_eq!(tag_length_value(&a[..]), Done(&rest_a[..], &result_a[..])); -+/// -+/// // here, the length is 5, but there are only 3 bytes afterwards (3, 4 and 5), -+/// // so the parser will tell you that you need 7 bytes: one for the tag, -+/// // one for the length, then 5 bytes -+/// let b: Vec = vec!(42, 5, 3, 4, 5); -+/// assert_eq!(tag_length_value(&b[..]), Incomplete(Needed::Size(7))); -+/// # } -+/// ``` -+/// -+/// the result is a tuple, so you can return multiple sub results, like -+/// this: -+/// `do_parse!(I->IResult >> I->IResult >> ... I->IResult , ( O, P ) ) => I -> IResult` -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self, Done, Incomplete}; -+/// # use nom::Needed; -+/// use nom::be_u8; -+/// named!(tag_length_value<(u8, &[u8])>, -+/// do_parse!( -+/// tag!( &[ 42u8 ][..] ) >> -+/// length: be_u8 >> -+/// bytes: take!(length) >> -+/// (length, bytes) -+/// ) -+/// ); -+/// -+/// # fn main() { -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! do_parse ( -+ (__impl $i:expr, $consumed:expr, ( $($rest:expr),* )) => ( -+ $crate::IResult::Done($i, ( $($rest),* )) -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ) => ( -+ do_parse!(__impl $i, $consumed, $submac!( $($args)* )) -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ) => ( -+ compiler_error!("do_parse is missing the return value. A do_parse call must end -+ with a return value between parenthesis, as follows: -+ -+ do_parse!( -+ a: tag!(\"abcd\") >> -+ b: tag!(\"efgh\") >> -+ -+ ( Value { a: a, b: b } ) -+ "); -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)* ) => ( -+ compiler_error!("do_parse uses >> as separator, not ~"); -+ ); -+ (__impl $i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) ~ $($rest:tt)* ) => ( -+ compiler_error!("do_parse uses >> as separator, not ~"); -+ ); -+ (__impl $i:expr, $consumed:expr, $field:ident : $e:ident ~ $($rest:tt)*) => ( -+ do_parse!(__impl $i, $consumed, $field: call!($e) ~ $($rest)*); -+ ); -+ (__impl $i:expr, $consumed:expr, $e:ident ~ $($rest:tt)*) => ( -+ do_parse!(__impl $i, $consumed, call!($e) ~ $($rest)*); -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $e:ident >> $($rest:tt)*) => ( -+ do_parse!(__impl $i, $consumed, call!($e) >> $($rest)*); -+ ); -+ (__impl $i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,_) => { -+ let i_ = i.clone(); -+ do_parse!(__impl i_, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), $($rest)*) -+ }, -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $e:ident >> $($rest:tt)*) => ( -+ do_parse!(__impl $i, $consumed, $field: call!($e) >> $($rest)*); -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => ( -+ { -+ let i_ = $i.clone(); -+ match $submac!(i_, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ let i_ = i.clone(); -+ do_parse!(__impl i_, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), $($rest)*) -+ }, -+ } -+ } -+ ); -+ -+ // ending the chain -+ (__impl $i:expr, $consumed:expr, $e:ident >> ( $($rest:tt)* )) => ( -+ do_parse!(__impl $i, $consumed, call!($e) >> ( $($rest)* )); -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,_) => { -+ $crate::IResult::Done(i, ( $($rest)* )) -+ }, -+ } -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $e:ident >> ( $($rest:tt)* )) => ( -+ do_parse!(__impl $i, $consumed, $field: call!($e) >> ( $($rest)* ) ); -+ ); -+ -+ (__impl $i:expr, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ( -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => { -+ let (needed,overflowed) = $consumed.overflowing_add(i); -+ match overflowed { -+ true => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ false => $crate::IResult::Incomplete($crate::Needed::Size(needed)), -+ } -+ }, -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ $crate::IResult::Done(i, ( $($rest)* )) -+ }, -+ } -+ ); -+ -+ ($i:expr, $($rest:tt)*) => ( -+ { -+ do_parse!(__impl $i, 0usize, $($rest)*) -+ } -+ ); -+ ($submac:ident!( $($args:tt)* ) >> $($rest:tt)* ) => ( -+ compiler_error!("if you are using do_parse outside of a named! macro, you must -+ pass the input data as first argument, like this: -+ -+ let res = do_parse!(input, -+ a: tag!(\"abcd\") >> -+ b: tag!(\"efgh\") >> -+ ( Value { a: a, b: b } ) -+ );"); -+ ); -+ ($e:ident! >> $($rest:tt)* ) => ( -+ do_parse!( call!($e) >> $($rest)*); -+ ); -+); -+ -+#[cfg(test)] -+mod tests { -+ use internal::{Needed,IResult}; -+ use internal::IResult::*; -+ use util::ErrorKind; -+ use nom::be_u16; -+ -+ #[cfg(feature = "verbose-errors")] -+ use verbose_errors::Err; -+ -+ // reproduce the tag and take macros, because of module import order -+ macro_rules! tag ( -+ ($i:expr, $inp: expr) => ( -+ { -+ #[inline(always)] -+ fn as_bytes(b: &T) -> &[u8] { -+ b.as_bytes() -+ } -+ -+ let expected = $inp; -+ let bytes = as_bytes(&expected); -+ -+ tag_bytes!($i,bytes) -+ } -+ ); -+ ); -+ -+ macro_rules! tag_bytes ( -+ ($i:expr, $bytes: expr) => ( -+ { -+ use std::cmp::min; -+ let len = $i.len(); -+ let blen = $bytes.len(); -+ let m = min(len, blen); -+ let reduced = &$i[..m]; -+ let b = &$bytes[..m]; -+ -+ let res: $crate::IResult<_,_> = if reduced != b { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Tag, $i)) -+ } else if m < blen { -+ $crate::IResult::Incomplete($crate::Needed::Size(blen)) -+ } else { -+ $crate::IResult::Done(&$i[blen..], reduced) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ macro_rules! take ( -+ ($i:expr, $count:expr) => ( -+ { -+ let cnt = $count as usize; -+ let res:$crate::IResult<&[u8],&[u8]> = if $i.len() < cnt { -+ $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -+ } else { -+ $crate::IResult::Done(&$i[cnt..],&$i[0..cnt]) -+ }; -+ res -+ } -+ ); -+ ); -+ -+ #[derive(PartialEq,Eq,Debug)] -+ struct B { -+ a: u8, -+ b: u8 -+ } -+ -+ #[derive(PartialEq,Eq,Debug)] -+ struct C { -+ a: u8, -+ b: Option -+ } -+ -+ #[cfg(feature = "verbose-errors")] -+ use util::{error_to_list, add_error_pattern, print_error}; -+ -+ #[cfg(feature = "verbose-errors")] -+ fn error_to_string

(e: &Err

) -> &'static str { -+ let v:Vec = error_to_list(e); -+ // do it this way if you can use slice patterns -+ /* -+ match &v[..] { -+ [ErrorKind::Custom(42), ErrorKind::Tag] => "missing `ijkl` tag", -+ [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] => "missing `mnop` tag after `ijkl`", -+ _ => "unrecognized error" -+ } -+ */ -+ if &v[..] == [ErrorKind::Custom(42),ErrorKind::Tag] { -+ "missing `ijkl` tag" -+ } else if &v[..] == [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] { -+ "missing `mnop` tag after `ijkl`" -+ } else { -+ "unrecognized error" -+ } -+ } -+ -+ // do it this way if you can use box patterns -+ /*use std::str; -+ fn error_to_string(e:Err) -> String -+ match e { -+ NodePosition(ErrorKind::Custom(42), i1, box Position(ErrorKind::Tag, i2)) => { -+ format!("missing `ijkl` tag, found '{}' instead", str::from_utf8(i2).unwrap()) -+ }, -+ NodePosition(ErrorKind::Custom(42), i1, box NodePosition(ErrorKind::Custom(128), i2, box Position(ErrorKind::Tag, i3))) => { -+ format!("missing `mnop` tag after `ijkl`, found '{}' instead", str::from_utf8(i3).unwrap()) -+ }, -+ _ => "unrecognized error".to_string() -+ } -+ }*/ -+ -+ #[cfg(feature = "verbose-errors")] -+ use std::collections; -+ -+ #[cfg(feature = "verbose-errors")] -+ #[test] -+ fn err() { -+ named!(err_test, alt!( -+ tag!("abcd") | -+ preceded!(tag!("efgh"), return_error!(ErrorKind::Custom(42), -+ do_parse!( -+ tag!("ijkl") >> -+ res: return_error!(ErrorKind::Custom(128), tag!("mnop")) >> -+ (res) -+ ) -+ ) -+ ) -+ )); -+ let a = &b"efghblah"[..]; -+ let b = &b"efghijklblah"[..]; -+ let c = &b"efghijklmnop"[..]; -+ -+ let blah = &b"blah"[..]; -+ -+ let res_a = err_test(a); -+ let res_b = err_test(b); -+ let res_c = err_test(c); -+ assert_eq!(res_a, Error(error_node_position!(ErrorKind::Custom(42), blah, error_position!(ErrorKind::Tag, blah)))); -+ assert_eq!(res_b, Error(error_node_position!(ErrorKind::Custom(42), &b"ijklblah"[..], error_node_position!(ErrorKind::Custom(128), blah, error_position!(ErrorKind::Tag, blah))))); -+ assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -+ -+ // Merr-like error matching -+ let mut err_map = collections::HashMap::new(); -+ assert!(add_error_pattern(&mut err_map, err_test(&b"efghpouet"[..]), "missing `ijkl` tag")); -+ assert!(add_error_pattern(&mut err_map, err_test(&b"efghijklpouet"[..]), "missing `mnop` tag after `ijkl`")); -+ -+ let res_a2 = res_a.clone(); -+ match res_a { -+ Error(e) => { -+ assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Tag]); -+ assert_eq!(error_to_string(&e), "missing `ijkl` tag"); -+ assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `ijkl` tag")); -+ }, -+ _ => panic!() -+ }; -+ -+ let res_b2 = res_b.clone(); -+ match res_b { -+ Error(e) => { -+ assert_eq!(error_to_list(&e), [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag]); -+ assert_eq!(error_to_string(&e), "missing `mnop` tag after `ijkl`"); -+ assert_eq!(err_map.get(&error_to_list(&e)), Some(&"missing `mnop` tag after `ijkl`")); -+ }, -+ _ => panic!() -+ }; -+ -+ print_error(a, res_a2); -+ print_error(b, res_b2); -+ } -+ -+ #[allow(unused_variables)] -+ #[test] -+ fn add_err() { -+ named!(err_test, -+ preceded!(tag!("efgh"), add_return_error!(ErrorKind::Custom(42), -+ do_parse!( -+ tag!("ijkl") >> -+ res: add_return_error!(ErrorKind::Custom(128), tag!("mnop")) >> -+ (res) -+ ) -+ ) -+ )); -+ let a = &b"efghblah"[..]; -+ let b = &b"efghijklblah"[..]; -+ let c = &b"efghijklmnop"[..]; -+ -+ let blah = &b"blah"[..]; -+ -+ let res_a = err_test(a); -+ let res_b = err_test(b); -+ let res_c = err_test(c); -+ assert_eq!(res_a, Error(error_node_position!(ErrorKind::Custom(42), blah, error_position!(ErrorKind::Tag, blah)))); -+ assert_eq!(res_b, Error(error_node_position!(ErrorKind::Custom(42), &b"ijklblah"[..], error_node_position!(ErrorKind::Custom(128), blah, error_position!(ErrorKind::Tag, blah))))); -+ assert_eq!(res_c, Done(&b""[..], &b"mnop"[..])); -+ } -+ -+ #[test] -+ fn complete() { -+ named!(err_test, -+ do_parse!( -+ tag!("ijkl") >> -+ res: complete!(tag!("mnop")) >> -+ (res) -+ ) -+ ); -+ let a = &b"ijklmn"[..]; -+ -+ let res_a = err_test(a); -+ assert_eq!(res_a, Error(error_position!(ErrorKind::Complete, &b"mn"[..]))); -+ } -+ -+ #[test] -+ fn pair() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( pair_abc_def<&[u8],(&[u8], &[u8])>, pair!(tag_abc, tag_def) ); -+ -+ assert_eq!(pair_abc_def(&b"abcdefghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -+ assert_eq!(pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(pair_abc_def(&b"abcd"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(pair_abc_def(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(pair_abc_def(&b"xxxdef"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxdef"[..]))); -+ assert_eq!(pair_abc_def(&b"abcxxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn separated_pair() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( tag_separator, tag!(",") ); -+ named!( sep_pair_abc_def<&[u8],(&[u8], &[u8])>, separated_pair!(tag_abc, tag_separator, tag_def) ); -+ -+ assert_eq!(sep_pair_abc_def(&b"abc,defghijkl"[..]), Done(&b"ghijkl"[..], (&b"abc"[..], &b"def"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(sep_pair_abc_def(&b"abc,d"[..]), Incomplete(Needed::Size(7))); -+ assert_eq!(sep_pair_abc_def(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"xxx,def"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx,def"[..]))); -+ assert_eq!(sep_pair_abc_def(&b"abc,xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn preceded() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_efgh, tag!("efgh") ); -+ named!( preceded_abcd_efgh<&[u8], &[u8]>, preceded!(tag_abcd, tag_efgh) ); -+ -+ assert_eq!(preceded_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"efgh"[..])); -+ assert_eq!(preceded_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(preceded_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(preceded_abcd_efgh(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(preceded_abcd_efgh(&b"xxxxdef"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxxdef"[..]))); -+ assert_eq!(preceded_abcd_efgh(&b"abcdxxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn terminated() { -+ named!( tag_abcd, tag!("abcd") ); -+ named!( tag_efgh, tag!("efgh") ); -+ named!( terminated_abcd_efgh<&[u8], &[u8]>, terminated!(tag_abcd, tag_efgh) ); -+ -+ assert_eq!(terminated_abcd_efgh(&b"abcdefghijkl"[..]), Done(&b"ijkl"[..], &b"abcd"[..])); -+ assert_eq!(terminated_abcd_efgh(&b"ab"[..]), Incomplete(Needed::Size(4))); -+ assert_eq!(terminated_abcd_efgh(&b"abcde"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(terminated_abcd_efgh(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(terminated_abcd_efgh(&b"xxxxdef"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxxdef"[..]))); -+ assert_eq!(terminated_abcd_efgh(&b"abcdxxxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxx"[..]))); -+ } -+ -+ #[test] -+ fn delimited() { -+ named!( tag_abc, tag!("abc") ); -+ named!( tag_def, tag!("def") ); -+ named!( tag_ghi, tag!("ghi") ); -+ named!( delimited_abc_def_ghi<&[u8], &[u8]>, delimited!(tag_abc, tag_def, tag_ghi) ); -+ -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefghijkl"[..]), Done(&b"jkl"[..], &b"def"[..])); -+ assert_eq!(delimited_abc_def_ghi(&b"ab"[..]), Incomplete(Needed::Size(3))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcde"[..]), Incomplete(Needed::Size(6))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefgh"[..]), Incomplete(Needed::Size(9))); -+ assert_eq!(delimited_abc_def_ghi(&b"xxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"xxxdefghi"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxdefghi"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcxxxghi"[..]), Error(error_position!(ErrorKind::Tag, &b"xxxghi"[..]))); -+ assert_eq!(delimited_abc_def_ghi(&b"abcdefxxx"[..]), Error(error_position!(ErrorKind::Tag, &b"xxx"[..]))); -+ } -+ -+ #[test] -+ fn tuple_test() { -+ named!(tuple_3<&[u8], (u16, &[u8], &[u8]) >, -+ tuple!( be_u16 , take!(3), tag!("fg") ) ); -+ -+ assert_eq!(tuple_3(&b"abcdefgh"[..]), Done(&b"h"[..], (0x6162u16, &b"cde"[..], &b"fg"[..]))); -+ assert_eq!(tuple_3(&b"abcd"[..]), Incomplete(Needed::Size(5))); -+ assert_eq!(tuple_3(&b"abcde"[..]), Incomplete(Needed::Size(7))); -+ assert_eq!(tuple_3(&b"abcdejk"[..]), Error(error_position!(ErrorKind::Tag, &b"jk"[..]))); -+ } -+ -+ #[test] -+ fn do_parse() { -+ fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -+ fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -+ -+ //trace_macros!(true); -+ named!(do_parser<&[u8], (u8, u8)>, -+ do_parse!( -+ tag!("abcd") >> -+ opt!(tag!("abcd")) >> -+ aa: ret_int1 >> -+ tag!("efgh") >> -+ bb: ret_int2 >> -+ tag!("efgh") >> -+ (aa, bb) -+ ) -+ ); -+ //named!(do_parser<&[u8], (u8, u8)>, -+ // do_parse!( -+ // tag!("abcd") >> aa: ret_int1 >> tag!("efgh") >> bb: ret_int2 >> tag!("efgh") >> (aa, bb) -+ // ) -+ //); -+ -+ //trace_macros!(false); -+ -+ assert_eq!(do_parser(&b"abcdabcdefghefghX"[..]), Done(&b"X"[..], (1, 2))); -+ assert_eq!(do_parser(&b"abcdefghefghX"[..]), Done(&b"X"[..], (1, 2))); -+ assert_eq!(do_parser(&b"abcdab"[..]), Incomplete(Needed::Size(8))); -+ assert_eq!(do_parser(&b"abcdefghef"[..]), Incomplete(Needed::Size(12))); -+ } -+ -+ #[test] -+ fn do_parse_dependency() { -+ use nom::be_u8; -+ -+ named!(length_value, -+ do_parse!( -+ length: be_u8 >> -+ bytes: take!(length) >> -+ (bytes) -+ ) -+ ); -+ -+ let a = [2u8, 3, 4, 5]; -+ let res_a = [3u8, 4]; -+ assert_eq!(length_value(&a[..]), Done(&a[3..], &res_a[..])); -+ let b = [5u8, 3, 4, 5]; -+ assert_eq!(length_value(&b[..]), Incomplete(Needed::Size(6))); -+ } -+ -+ /* -+ named!(does_not_compile, -+ do_parse!( -+ length: be_u8 >> -+ bytes: take!(length) -+ ) -+ ); -+ named!(does_not_compile_either, -+ do_parse!( -+ length: be_u8 ~ -+ bytes: take!(length) ~ -+ ( () ) -+ ) -+ ); -+ fn still_does_not_compile() { -+ let data = b"abcd"; -+ -+ let res = do_parse!( -+ tag!("abcd") >> -+ tag!("efgh") >> -+ ( () ) -+ ); -+ } -+ */ -+} -diff --git third_party/rust/nom/src/simple_errors.rs third_party/rust/nom/src/simple_errors.rs -new file mode 100644 -index 000000000000..04bddd4309bf ---- /dev/null -+++ third_party/rust/nom/src/simple_errors.rs -@@ -0,0 +1,153 @@ -+//! Error management -+//! -+//! there are two ways to handle errors in nom. The first one, -+//! activated by default, uses the `nom::ErrorKind` enum -+//! in the error branch of `IResult`. This enum can hold either -+//! a parser specific error code, or a custom error type you -+//! specify. -+//! -+//! If you need more advanced error management, you can activate -+//! the "verbose-errors" compilation feature, which will give you -+//! the error system available in nom 1.0. The verbose errors -+//! accumulate error codes and positions as you backtrack through -+//! the parser tree. From there, you can precisely identify which -+//! parts of the input triggered the error case. -+//! -+//! Please note that the verbose error management is a bit slower -+//! than the simple one. -+use util::ErrorKind; -+use internal::{IResult, IError}; -+use internal::IResult::*; -+ -+pub type Err = ErrorKind; -+ -+impl IResult { -+ /// Maps a `IResult` to `IResult` by appling a function -+ /// to a contained `Error` value, leaving `Done` and `Incomplete` value -+ /// untouched. -+ #[inline] -+ pub fn map_err(self, f: F) -> IResult -+ where F: FnOnce(Err) -> Err { -+ match self { -+ Error(e) => Error(f(e)), -+ Incomplete(n) => Incomplete(n), -+ Done(i, o) => Done(i, o), -+ } -+ } -+ -+ /// Unwrap the contained `Error(E)` value, or panic if the `IResult` is not -+ /// `Error`. -+ pub fn unwrap_err(self) -> Err { -+ match self { -+ Error(e) => e, -+ Done(_, _) => panic!("unwrap_err() called on an IResult that is Done"), -+ Incomplete(_) => panic!("unwrap_err() called on an IResult that is Incomplete"), -+ } -+ } -+ -+ /// Convert the IResult to a std::result::Result -+ pub fn to_full_result(self) -> Result> { -+ match self { -+ Done(_, o) => Ok(o), -+ Incomplete(n) => Err(IError::Incomplete(n)), -+ Error(e) => Err(IError::Error(e)) -+ } -+ } -+ -+ /// Convert the IResult to a std::result::Result, or panic if the `IResult` is `Incomplete` -+ pub fn to_result(self) -> Result> { -+ match self { -+ Done(_, o) => Ok(o), -+ Error(e) => Err(e), -+ Incomplete(_) => panic!("to_result() called on an IResult that is Incomplete") -+ } -+ } -+} -+ -+#[cfg(feature = "std")] -+use std::any::Any; -+#[cfg(feature = "std")] -+use std::{error,fmt}; -+#[cfg(feature = "std")] -+impl error::Error for Err { -+ fn description(&self) -> &str { -+ self.description() -+ } -+} -+ -+#[cfg(feature = "std")] -+impl fmt::Display for Err { -+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -+ write!(f, "{}", self.description()) -+ } -+} -+ -+/// translate parser result from IResult to IResult with a custom type -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// // will add a Custom(42) error to the error chain -+/// named!(err_test, add_return_error!(ErrorKind::Custom(42), tag!("abcd"))); -+/// // Convert to IREsult<&[u8], &[u8], &str> -+/// named!(parser<&[u8], &[u8], &str>, add_return_error!(ErrorKind::Custom("custom error message"), fix_error!(&str, err_test))); -+/// -+/// let a = &b"efghblah"[..]; -+/// let res_a = parser(a); -+/// assert_eq!(res_a, Error(error_node_position!( ErrorKind::Custom("custom error message"), a, Position(ErrorKind::Fix, a)))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fix_error ( -+ ($i:expr, $t:ty, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(_) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::IResult::Error(e) -+ } -+ } -+ } -+ ); -+ ($i:expr, $t:ty, $f:expr) => ( -+ fix_error!($i, $t, call!($f)); -+ ); -+); -+ -+/// `flat_map!(R -> IResult, S -> IResult) => R -> IResult` -+/// -+/// combines a parser R -> IResult and -+/// a parser S -> IResult to return another -+/// parser R -> IResult -+#[macro_export] -+macro_rules! flat_map( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(ref i2)) => $crate::IResult::Incomplete($crate::Needed::Size(*i2)), -+ $crate::IResult::Done(_, o2) => $crate::IResult::Done(i, o2) -+ } -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ flat_map!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ flat_map!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ flat_map!($i, call!($f), $submac!($($args)*)); -+ ); -+); -diff --git third_party/rust/nom/src/str.rs third_party/rust/nom/src/str.rs -index 768786edaba1..4f8643bd3e68 100644 ---- third_party/rust/nom/src/str.rs -+++ third_party/rust/nom/src/str.rs -@@ -21,15 +21,32 @@ - macro_rules! tag_s ( - ($i:expr, $tag: expr) => ( - { -- let res: $crate::IResult<_,_> = if $tag.len() > $i.len() { -- $crate::IResult::Incomplete($crate::Needed::Size($tag.len())) -- //} else if &$i[0..$tag.len()] == $tag { -- } else if ($i).starts_with($tag) { -- $crate::IResult::Done(&$i[$tag.len()..], &$i[0..$tag.len()]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TagStr, $i)) -- }; -- res -+ tag!($i, $tag) -+ } -+ ); -+); -+ -+/// `tag_no_case_s!(&str) => &str -> IResult<&str, &str>` -+/// declares a case-insensitive string as a suite to recognize -+/// -+/// consumes the recognized characters -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::{self,Done}; -+/// # fn main() { -+/// fn test(input: &str) -> IResult<&str, &str> { -+/// tag_no_case_s!(input, "ABcd") -+/// } -+/// let r = test("aBCdefgh"); -+/// assert_eq!(r, Done("efgh", "aBCd")); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! tag_no_case_s ( -+ ($i:expr, $tag: expr) => ( -+ { -+ tag_no_case!($i, $tag) - } - ); - ); -@@ -47,28 +64,19 @@ macro_rules! tag_s ( - /// let a = "abcdefgh"; - /// - /// assert_eq!(take5(a), Done("fgh", "abcde")); -+/// -+/// let b = "12345"; -+/// -+/// assert_eq!(take5(b), Done("", "12345")); - /// # } - /// ``` - #[macro_export] - macro_rules! take_s ( - ($i:expr, $count:expr) => ( - { -+ let input = $i; - let cnt = $count as usize; -- let res: $crate::IResult<_,_> = if $i.chars().count() < cnt { -- $crate::IResult::Incomplete($crate::Needed::Size(cnt)) -- } else { -- let mut offset = $i.len(); -- let mut count = 0; -- for (o, _) in $i.char_indices() { -- if count == cnt { -- offset = o; -- break; -- } -- count += 1; -- } -- $crate::IResult::Done(&$i[offset..], &$i[..offset]) -- }; -- res -+ take!(input, cnt) - } - ); - ); -@@ -91,22 +99,7 @@ macro_rules! take_s ( - macro_rules! is_not_s ( - ($input:expr, $arr:expr) => ( - { -- use std::collections::HashSet; -- let set: HashSet = $arr.chars().collect(); -- let mut offset = $input.len(); -- for (o, c) in $input.char_indices() { -- if set.contains(&c) { -- offset = o; -- break; -- } -- } -- if offset == 0 { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsAStr,$input)) -- } else if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -+ is_not!($input, $arr) - } - ); - ); -@@ -131,22 +124,7 @@ macro_rules! is_not_s ( - macro_rules! is_a_s ( - ($input:expr, $arr:expr) => ( - { -- use std::collections::HashSet; -- let set: HashSet = $arr.chars().collect(); -- let mut offset = $input.len(); -- for (o, c) in $input.char_indices() { -- if !set.contains(&c) { -- offset = o; -- break; -- } -- } -- if offset == 0 { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::IsAStr,$input)) -- } else if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -+ is_a!($input, $arr) - } - ); - ); -@@ -173,18 +151,7 @@ macro_rules! is_a_s ( - macro_rules! take_while_s ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( - { -- let mut offset = $input.len(); -- for (o, c) in $input.char_indices() { -- if !$submac!(c, $($args)*) { -- offset = o; -- break; -- } -- } -- if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -+ take_while!($input, $submac!($($args)*)) - } - ); - ($input:expr, $f:expr) => ( -@@ -211,22 +178,7 @@ macro_rules! take_while_s ( - #[macro_export] - macro_rules! take_while1_s ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( -- { -- let mut offset = $input.len(); -- for (o, c) in $input.char_indices() { -- if !$submac!(c, $($args)*) { -- offset = o; -- break; -- } -- } -- if offset == 0 { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeWhile1Str,$input)) -- } else if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -- } -+ take_while1!($input, $submac!($($args)*)) - ); - ($input:expr, $f:expr) => ( - take_while1_s!($input, call!($f)); -@@ -234,27 +186,15 @@ macro_rules! take_while1_s ( - ); - - --/// `take_till_s!(&str -> bool) => &str -> IResult<&str, &str>` -+/// `take_till_s!(char -> bool) => &str -> IResult<&str, &str>` - /// returns the longest list of characters until the provided function succeeds - /// - /// The argument is either a function `char -> bool` or a macro returning a `bool - #[macro_export] - macro_rules! take_till_s ( - ($input:expr, $submac:ident!( $($args:tt)* )) => ( -- - { -- let mut offset = $input.len(); -- for (o, c) in $input.char_indices() { -- if $submac!(c, $($args)*) { -- offset = o; -- break; -- } -- } -- if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -+ take_till!($input, $submac!($($args)*)) - } - ); - ($input:expr, $f:expr) => ( -@@ -262,48 +202,29 @@ macro_rules! take_till_s ( - ); - ); - -+/// `take_till1_s!(char -> bool) => &str -> IResult<&str, &str>` -+/// returns the longest non empty list of characters until the provided function succeeds -+/// -+/// The argument is either a function `char -> bool` or a macro returning a `bool -+#[macro_export] -+macro_rules! take_till1_s ( -+ ($input:expr, $submac:ident!( $($args:tt)* )) => ( -+ { -+ take_till1!($input, $submac!($($args)*)) -+ } -+ ); -+ ($input:expr, $f:expr) => ( -+ take_till1_s!($input, call!($f)); -+ ); -+); -+ - /// `take_until_and_consume_s!(&str) => &str -> IResult<&str, &str>` - /// generates a parser consuming all chars until the specified string is found and consumes it - #[macro_export] - macro_rules! take_until_and_consume_s ( - ($input:expr, $substr:expr) => ( - { -- #[inline(always)] -- fn shift_window_and_cmp(window: & mut ::std::vec::Vec, c: char, substr_vec: & ::std::vec::Vec) -> bool { -- window.push(c); -- if window.len() > substr_vec.len() { -- window.remove(0); -- } -- window == substr_vec -- } -- let res: $crate::IResult<_, _> = if $substr.len() > $input.len() { -- $crate::IResult::Incomplete($crate::Needed::Size($substr.len())) -- } else { -- let substr_vec: ::std::vec::Vec = $substr.chars().collect(); -- let mut window: ::std::vec::Vec = vec![]; -- let mut offset = $input.len(); -- let mut parsed = false; -- for (o, c) in $input.char_indices() { -- if parsed { -- // The easiest way to get the byte offset of the char after the found string -- offset = o; -- break; -- } -- if shift_window_and_cmp(& mut window, c, &substr_vec) { -- parsed = true; -- } -- } -- if parsed { -- if offset < $input.len() { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Done("", $input) -- } -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilAndConsumeStr,$input)) -- } -- }; -- res -+ take_until_and_consume!($input, $substr) - } - ); - ); -@@ -314,39 +235,7 @@ macro_rules! take_until_and_consume_s ( - macro_rules! take_until_s ( - ($input:expr, $substr:expr) => ( - { -- #[inline(always)] -- fn shift_window_and_cmp(window: & mut Vec, c: char, substr_vec: &Vec) -> bool { -- window.push(c); -- if window.len() > substr_vec.len() { -- window.remove(0); -- } -- window == substr_vec -- } -- let res: $crate::IResult<&str, &str> = if $substr.len() > $input.len() { -- $crate::IResult::Incomplete($crate::Needed::Size($substr.len())) -- } else { -- let substr_vec: Vec = $substr.chars().collect(); -- let mut window: Vec = vec![]; -- let mut offset = $input.len(); -- let mut parsed = false; -- for (o, c) in $input.char_indices() { -- if shift_window_and_cmp(& mut window, c, &substr_vec) { -- parsed = true; -- window.pop(); -- let window_len: usize = window.iter() -- .map(|x| x.len_utf8()) -- .fold(0, |x, y| x + y); -- offset = o - window_len; -- break; -- } -- } -- if parsed { -- $crate::IResult::Done(&$input[offset..], &$input[..offset]) -- } else { -- $crate::IResult::Error($crate::Err::Position($crate::ErrorKind::TakeUntilStr,$input)) -- } -- }; -- res -+ take_until!($input, $substr) - } - ); - ); -@@ -451,8 +340,8 @@ mod test { - } - } - -- use internal::IResult::{Done, Error}; -- use internal::Err::Position; -+ use internal::IResult::{Done, Error, Incomplete}; -+ use internal::Needed; - use util::ErrorKind; - - pub fn is_alphabetic(c:char) -> bool { -@@ -480,10 +369,10 @@ mod test { - let c = "abcd123"; - let d = "123"; - -- assert_eq!(f(&a[..]), Error(Position(ErrorKind::TakeWhile1Str, &""[..]))); -+ assert_eq!(f(&a[..]), Incomplete(Needed::Size(1))); - assert_eq!(f(&b[..]), Done(&a[..], &b[..])); - assert_eq!(f(&c[..]), Done(&"123"[..], &b[..])); -- assert_eq!(f(&d[..]), Error(Position(ErrorKind::TakeWhile1Str, &d[..]))); -+ assert_eq!(f(&d[..]), Error(error_position!(ErrorKind::TakeWhile1, &d[..]))); - } - - #[test] -@@ -557,16 +446,16 @@ mod test { - fn take_until_and_consume_s_succeed() { - const INPUT: &'static str = "βèƒôřèÂßÇáƒƭèř"; - const FIND: &'static str = "ÂßÇ"; -- const CONSUMED: &'static str = "βèƒôřèÂßÇ"; -+ const OUTPUT: &'static str = "βèƒôřè"; - const LEFTOVER: &'static str = "áƒƭèř"; - - match take_until_and_consume_s!(INPUT, FIND) { - IResult::Done(extra, output) => { - assert!(extra == LEFTOVER, "Parser `take_until_and_consume_s`\ - consumed leftover input. Leftover `{}`.", extra); -- assert!(output == CONSUMED, "Parser `take_until_and_consume_s`\ -- doens't return the string it consumed on success. Expected `{}`, got `{}`.", -- CONSUMED, output); -+ assert!(output == OUTPUT, "Parser `take_until_and_consume_s`\ -+ doens't return the string it selected on success. Expected `{}`, got `{}`.", -+ OUTPUT, output); - } - other => panic!("Parser `take_until_and_consume_s` didn't succeed when it should have. \ - Got `{:?}`.", other), -@@ -731,4 +620,39 @@ mod test { - Got `{:?}`.", other), - }; - } -+ -+ #[test] -+ #[cfg(feature = "std")] -+ fn recognize_is_a_s() { -+ let a = "aabbab"; -+ let b = "ababcd"; -+ -+ named!(f <&str,&str>, recognize!(many1!(alt!( tag_s!("a") | tag_s!("b") )))); -+ -+ assert_eq!(f(&a[..]), Done(&a[6..], &a[..])); -+ assert_eq!(f(&b[..]), Done(&b[4..], &b[..4])); -+ -+ } -+ -+ #[test] -+ fn utf8_indexing() { -+ named!(dot(&str) -> &str, -+ tag_s!(".") -+ ); -+ -+ dot("點"); -+ } -+ -+ #[test] -+ fn case_insensitive() { -+ named!(test<&str,&str>, tag_no_case!("ABcd")); -+ assert_eq!(test("aBCdefgh"), Done("efgh", "aBCd")); -+ assert_eq!(test("abcdefgh"), Done("efgh", "abcd")); -+ assert_eq!(test("ABCDefgh"), Done("efgh", "ABCD")); -+ -+ named!(test2<&str,&str>, tag_no_case!("ABcd")); -+ assert_eq!(test2("aBCdefgh"), Done("efgh", "aBCd")); -+ assert_eq!(test2("abcdefgh"), Done("efgh", "abcd")); -+ assert_eq!(test2("ABCDefgh"), Done("efgh", "ABCD")); -+ } - } -diff --git third_party/rust/nom/src/stream.rs third_party/rust/nom/src/stream.rs -index 38d5c870c938..4d92bed75c8e 100644 ---- third_party/rust/nom/src/stream.rs -+++ third_party/rust/nom/src/stream.rs -@@ -212,9 +212,11 @@ impl<'x,'b> Producer<'b,&'x[u8],Move> for MemProducer<'x> { - } - } - { -- use std::cmp; -- let end = cmp::min(self.index + self.chunk_size, self.length); -- consumer.handle(Input::Element(&self.buffer[self.index..end])) -+ if self.index + self.chunk_size > self.length { -+ consumer.handle(Input::Eof(Some(&self.buffer[self.index..self.length]))) -+ } else { -+ consumer.handle(Input::Element(&self.buffer[self.index..self.index + self.chunk_size])) -+ } - } else { - consumer.state() - } -@@ -259,7 +261,15 @@ impl FileProducer { - shift(&mut self.v, self.start, self.end); - self.end = self.end - self.start; - self.start = 0; -- match self.file.read(&mut self.v[self.end..]) { -+ -+ let remaining = &mut self.v[self.end..]; -+ -+ // already full, prevents erroneous Eof below -+ if remaining.is_empty() { -+ return Some(0); -+ } -+ -+ match self.file.read(remaining) { - Err(_) => { - self.state = FileProducerState::Error; - None -@@ -494,7 +504,7 @@ macro_rules! consumer_from_parser ( - - impl $crate::Consumer<$input, $output, (), $crate::Move> for $name { - fn handle(&mut self, input: $crate::Input<$input>) -> & $crate::ConsumerState<$output, (), $crate::Move> { -- use $crate::HexDisplay; -+ use $crate::Offset; - match input { - $crate::Input::Empty | $crate::Input::Eof(None) => &self.state, - $crate::Input::Element(sl) | $crate::Input::Eof(Some(sl)) => { -@@ -537,7 +547,7 @@ macro_rules! consumer_from_parser ( - - impl<'a> $crate::Consumer<&'a[u8], $output, (), $crate::Move> for $name { - fn handle(&mut self, input: $crate::Input<&'a[u8]>) -> & $crate::ConsumerState<$output, (), $crate::Move> { -- use $crate::HexDisplay; -+ use $crate::Offset; - match input { - $crate::Input::Empty | $crate::Input::Eof(None) => &self.state, - $crate::Input::Element(sl) | $crate::Input::Eof(Some(sl)) => { -@@ -577,7 +587,7 @@ macro_rules! consumer_from_parser ( - mod tests { - use super::*; - use internal::IResult; -- use util::HexDisplay; -+ use util::Offset; - use std::str::from_utf8; - use std::io::SeekFrom; - -@@ -897,8 +907,8 @@ mod tests { - } - }*/ - -- fn lf(i:& u8) -> bool { -- *i == '\n' as u8 -+ fn lf(i:u8) -> bool { -+ i == '\n' as u8 - } - fn to_utf8_string(input:&[u8]) -> String { - String::from(from_utf8(input).unwrap()) -@@ -938,6 +948,27 @@ mod tests { - //assert!(false); - } - -+ #[test] -+ fn small_buffer() { -+ let mut f = FileProducer::new("LICENSE", 10 /* smaller than a line */).unwrap(); -+ let mut a = LineConsumer::new(); -+ -+ for i in 0..2 { -+ match f.apply(&mut a) { -+ &ConsumerState::Continue(Move::Await(_)) => {} -+ _ => assert!(false, "LineConsumer should be awaiting more input: {}", i), -+ } -+ assert_eq!(FileProducerState::Normal, f.state()); -+ } -+ -+ f.resize(200 /* large enough for a line */); -+ match f.apply(&mut a) { -+ &ConsumerState::Done(..) => {} -+ _ => assert!(false, "LineConsumer should have succeeded"), -+ } -+ assert_eq!(FileProducerState::Normal, f.state()); -+ } -+ - #[derive(Debug,Clone,Copy,PartialEq,Eq)] - enum SeekState { - Begin, -diff --git third_party/rust/nom/src/traits.rs third_party/rust/nom/src/traits.rs -new file mode 100644 -index 000000000000..e8103336b147 ---- /dev/null -+++ third_party/rust/nom/src/traits.rs -@@ -0,0 +1,623 @@ -+//! Traits input types have to implement to work with nom combinators -+//! -+use std::ops::{Range,RangeTo,RangeFrom,RangeFull}; -+use std::iter::Enumerate; -+use std::slice::Iter; -+ -+use std::str::Chars; -+use std::str::CharIndices; -+use std::str::FromStr; -+use std::str::from_utf8; -+ -+use memchr; -+ -+ -+/// abstract method to calculate the input length -+pub trait InputLength { -+ /// calculates the input length, as indicated by its name, -+ /// and the name of the trait itself -+ #[inline] -+ fn input_len(&self) -> usize; -+} -+ -+impl<'a, T> InputLength for &'a[T] { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+} -+ -+impl<'a> InputLength for &'a str { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+} -+ -+impl<'a> InputLength for (&'a [u8], usize) { -+ #[inline] -+ fn input_len(&self) -> usize { -+ //println!("bit input length for ({:?}, {}):", self.0, self.1); -+ let res = self.0.len() * 8 - self.1; -+ //println!("-> {}", res); -+ res -+ } -+} -+ -+/// transforms common types to a char for basic token parsing -+pub trait AsChar { -+ /// makes a char from self -+ #[inline] -+ fn as_char(self) -> char; -+ -+ /// tests that self is an alphabetic character -+ /// -+ /// warning: for `&str` it recognizes alphabetic -+ /// characters outside of the 52 ASCII letters -+ #[inline] -+ fn is_alpha(self) -> bool; -+ -+ /// tests that self is an alphabetic character -+ /// or a decimal digit -+ #[inline] -+ fn is_alphanum(self) -> bool; -+ /// tests that self is a decimal digit -+ #[inline] -+ fn is_dec_digit(self) -> bool; -+ /// tests that self is an hex digit -+ #[inline] -+ fn is_hex_digit(self) -> bool; -+ /// tests that self is an octal digit -+ #[inline] -+ fn is_oct_digit(self) -> bool; -+ /// gets the len in bytes for self -+ #[inline] -+ fn len(self) -> usize; -+} -+ -+impl AsChar for u8 { -+ #[inline] -+ fn as_char(self) -> char { self as char } -+ #[inline] -+ fn is_alpha(self) -> bool { -+ (self >= 0x41 && self <= 0x5A) || (self >= 0x61 && self <= 0x7A) -+ } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_dec_digit() } -+ #[inline] -+ fn is_dec_digit(self) -> bool { -+ self >= 0x30 && self <= 0x39 -+ } -+ #[inline] -+ fn is_hex_digit(self) -> bool { -+ (self >= 0x30 && self <= 0x39) || -+ (self >= 0x41 && self <= 0x46) || -+ (self >= 0x61 && self <= 0x66) -+ } -+ #[inline] -+ fn is_oct_digit(self) -> bool { -+ self >= 0x30 && self <= 0x37 -+ } -+ #[inline] -+ fn len(self) -> usize { -+ 1 -+ } -+} -+impl<'a> AsChar for &'a u8 { -+ #[inline] -+ fn as_char(self) -> char { *self as char } -+ #[inline] -+ fn is_alpha(self) -> bool { -+ (*self >= 0x41 && *self <= 0x5A) || (*self >= 0x61 && *self <= 0x7A) -+ } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_dec_digit() } -+ #[inline] -+ fn is_dec_digit(self) -> bool { -+ *self >= 0x30 && *self <= 0x39 -+ } -+ #[inline] -+ fn is_hex_digit(self) -> bool { -+ (*self >= 0x30 && *self <= 0x39) || -+ (*self >= 0x41 && *self <= 0x46) || -+ (*self >= 0x61 && *self <= 0x66) -+ } -+ #[inline] -+ fn is_oct_digit(self) -> bool { -+ *self >= 0x30 && *self <= 0x37 -+ } -+ #[inline] -+ fn len(self) -> usize { -+ 1 -+ } -+} -+ -+impl AsChar for char { -+ #[inline] -+ fn as_char(self) -> char { self } -+ #[inline] -+ fn is_alpha(self) -> bool { self.is_alphabetic() } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_dec_digit() } -+ #[inline] -+ fn is_dec_digit(self) -> bool { self.is_digit(10) } -+ #[inline] -+ fn is_hex_digit(self) -> bool { self.is_digit(16) } -+ #[inline] -+ fn is_oct_digit(self) -> bool { self.is_digit(8) } -+ #[inline] -+ fn len(self) -> usize { self.len_utf8() } -+} -+ -+impl<'a> AsChar for &'a char { -+ #[inline] -+ fn as_char(self) -> char { self.clone() } -+ #[inline] -+ fn is_alpha(self) -> bool { self.is_alphabetic() } -+ #[inline] -+ fn is_alphanum(self) -> bool { self.is_alpha() || self.is_dec_digit() } -+ #[inline] -+ fn is_dec_digit(self) -> bool { self.is_digit(10) } -+ #[inline] -+ fn is_hex_digit(self) -> bool { self.is_digit(16) } -+ #[inline] -+ fn is_oct_digit(self) -> bool { self.is_digit(8) } -+ #[inline] -+ fn len(self) -> usize { self.len_utf8() } -+} -+ -+/// abstracts common iteration operations on the input type -+/// -+/// it needs a distinction between `Item` and `RawItem` because -+/// `&[T]` iterates on references -+pub trait InputIter { -+ type Item; -+ type RawItem; -+ type Iter : Iterator; -+ type IterElem : Iterator; -+ -+ /// returns an iterator over the elements and their byte offsets -+ fn iter_indices(&self) -> Self::Iter; -+ /// returns an iterator over the elements -+ fn iter_elements(&self) -> Self::IterElem; -+ /// finds the byte position of the element -+ fn position

(&self, predicate: P) -> Option where P: Fn(Self::RawItem) -> bool; -+ /// get the byte offset from the element's position in the stream -+ fn slice_index(&self, count:usize) -> Option; -+} -+ -+/// abstracts slicing operations -+pub trait InputTake { -+ /// returns a slice of `count` bytes -+ fn take

(&self, count: usize) -> Option<&Self>; -+ /// split the stream at the `count` byte offset -+ fn take_split

(&self, count: usize) -> Option<(&Self,&Self)>; -+} -+ -+impl<'a> InputIter for &'a [u8] { -+ type Item = &'a u8; -+ type RawItem = u8; -+ type Iter = Enumerate>; -+ type IterElem = Iter<'a, Self::RawItem>; -+ -+ #[inline] -+ fn iter_indices(&self) -> Self::Iter { -+ self.iter().enumerate() -+ } -+ #[inline] -+ fn iter_elements(&self) -> Self::IterElem { -+ self.iter() -+ } -+ #[inline] -+ fn position

(&self, predicate: P) -> Option where P: Fn(Self::RawItem) -> bool { -+ self.iter().position(|b| predicate(*b)) -+ } -+ #[inline] -+ fn slice_index(&self, count:usize) -> Option { -+ if self.len() >= count { -+ Some(count) -+ } else { -+ None -+ } -+ } -+} -+ -+impl InputTake for [u8] { -+ #[inline] -+ fn take

(&self, count: usize) -> Option<&Self> { -+ if self.len() >= count { -+ Some(&self[0..count]) -+ } else { -+ None -+ } -+ } -+ #[inline] -+ fn take_split

(&self, count: usize) -> Option<(&Self,&Self)> { -+ if self.len() >= count { -+ Some((&self[count..],&self[..count])) -+ } else { -+ None -+ } -+ } -+} -+ -+impl<'a> InputIter for &'a str { -+ type Item = char; -+ type RawItem = char; -+ type Iter = CharIndices<'a>; -+ type IterElem = Chars<'a>; -+ #[inline] -+ fn iter_indices(&self) -> Self::Iter { -+ self.char_indices() -+ } -+ #[inline] -+ fn iter_elements(&self) -> Self::IterElem { -+ self.chars() -+ } -+ fn position

(&self, predicate: P) -> Option where P: Fn(Self::RawItem) -> bool { -+ for (o,c) in self.char_indices() { -+ if predicate(c) { -+ return Some(o) -+ } -+ } -+ None -+ } -+ #[inline] -+ fn slice_index(&self, count:usize) -> Option { -+ let mut cnt = 0; -+ for (index, _) in self.char_indices() { -+ if cnt == count { -+ return Some(index) -+ } -+ cnt += 1; -+ } -+ if cnt == count { -+ return Some(self.len()) -+ } -+ None -+ } -+} -+ -+impl InputTake for str { -+ #[inline] -+ fn take

(&self, count: usize) -> Option<&Self> { -+ let mut cnt = 0; -+ for (index, _) in self.char_indices() { -+ if cnt == count { -+ return Some(&self[..index]) -+ } -+ cnt += 1; -+ } -+ None -+ } -+ -+ // return byte index -+ #[inline] -+ fn take_split

(&self, count: usize) -> Option<(&Self,&Self)> { -+ let mut cnt = 0; -+ for (index, _) in self.char_indices() { -+ if cnt == count { -+ return Some((&self[index..],&self[..index])) -+ } -+ cnt += 1; -+ } -+ None -+ } -+} -+ -+/// indicates wether a comparison was successful, an error, or -+/// if more data was needed -+#[derive(Debug,PartialEq)] -+pub enum CompareResult { -+ Ok, -+ Incomplete, -+ Error -+} -+ -+/// abstracts comparison operations -+pub trait Compare { -+ /// compares self to another value for equality -+ fn compare(&self, t:T) -> CompareResult; -+ /// compares self to another value for equality -+ /// independently of the case. -+ /// -+ /// warning: for `&str`, the comparison is done -+ /// by lowercasing both strings and comparing -+ /// the result. This is a temporary solution until -+ /// a better one appears -+ fn compare_no_case(&self, t:T) -> CompareResult; -+} -+ -+impl<'a,'b> Compare<&'b[u8]> for &'a [u8] { -+ #[inline(always)] -+ fn compare(&self, t: &'b[u8]) -> CompareResult { -+ let len = self.len(); -+ let blen = t.len(); -+ let m = if len < blen { len } else { blen }; -+ let reduced = &self[..m]; -+ let b = &t[..m]; -+ -+ if reduced != b { -+ CompareResult::Error -+ } else if m < blen { -+ CompareResult::Incomplete -+ } else { -+ CompareResult::Ok -+ } -+ } -+ -+ #[inline(always)] -+ fn compare_no_case(&self, t: &'b[u8]) -> CompareResult { -+ let len = self.len(); -+ let blen = t.len(); -+ let m = if len < blen { len } else { blen }; -+ let reduced = &self[..m]; -+ let other = &t[..m]; -+ -+ if !reduced.iter().zip(other).all(|(a, b)| { -+ match (*a,*b) { -+ (0...64, 0...64) | (91...96, 91...96) | (123...255, 123...255) => a == b, -+ (65...90, 65...90) | (97...122, 97...122) | (65...90, 97...122 ) |(97...122, 65...90) => { -+ *a | 0b00100000 == *b | 0b00100000 -+ } -+ _ => false -+ } -+ }) { -+ CompareResult::Error -+ } else if m < blen { -+ CompareResult::Incomplete -+ } else { -+ CompareResult::Ok -+ } -+ } -+} -+ -+impl<'a,'b> Compare<&'b str> for &'a [u8] { -+ #[inline(always)] -+ fn compare(&self, t: &'b str) -> CompareResult { -+ self.compare(str::as_bytes(t)) -+ } -+ #[inline(always)] -+ fn compare_no_case(&self, t: &'b str) -> CompareResult { -+ self.compare_no_case(str::as_bytes(t)) -+ } -+} -+ -+impl<'a,'b> Compare<&'b str> for &'a str { -+ #[inline(always)] -+ fn compare(&self, t: &'b str) -> CompareResult { -+ let pos = self.chars().zip(t.chars()).position(|(a,b)| a != b); -+ -+ match pos { -+ Some(_) => CompareResult::Error, -+ None => if self.len() >= t.len() { -+ CompareResult::Ok -+ } else { -+ CompareResult::Incomplete -+ } -+ } -+ } -+ -+ //FIXME: this version is too simple and does not use the current locale -+ #[inline(always)] -+ fn compare_no_case(&self, t: &'b str) -> CompareResult { -+ let pos = self.to_lowercase().chars().zip(t.to_lowercase().chars()).position(|(a,b)| a != b); -+ -+ match pos { -+ Some(_) => CompareResult::Error, -+ None => if self.len() >= t.len() { -+ CompareResult::Ok -+ } else { -+ CompareResult::Incomplete -+ } -+ } -+ } -+} -+ -+/// look for self in the given input stream -+pub trait FindToken { -+ fn find_token(&self, input: T) -> bool; -+} -+ -+impl<'a> FindToken<&'a[u8]> for u8 { -+ fn find_token(&self, input: &[u8]) -> bool { -+ memchr::memchr(*self, input).is_some() -+ } -+} -+ -+impl<'a> FindToken<&'a str> for u8 { -+ fn find_token(&self, input: &str) -> bool { -+ self.find_token(str::as_bytes(input)) -+ } -+} -+ -+impl<'a,'b> FindToken<&'a[u8]> for &'b u8 { -+ fn find_token(&self, input: &[u8]) -> bool { -+ memchr::memchr(**self, input).is_some() -+ } -+} -+ -+impl<'a,'b> FindToken<&'a str> for &'b u8 { -+ fn find_token(&self, input: &str) -> bool { -+ self.find_token(str::as_bytes(input)) -+ } -+} -+ -+impl<'a> FindToken<&'a str> for char { -+ fn find_token(&self, input: &str) -> bool { -+ for i in input.chars() { -+ if *self == i { return true } -+ } -+ false -+ } -+} -+ -+/// look for a substring in self -+pub trait FindSubstring { -+ fn find_substring(&self, substr: T) -> Option; -+} -+ -+impl<'a,'b> FindSubstring<&'b [u8]> for &'a[u8] { -+ fn find_substring(&self, substr: &'b[u8]) -> Option { -+ let substr_len = substr.len(); -+ -+ if substr_len == 0 { -+ None -+ } else if substr_len == 1 { -+ memchr::memchr(substr[0], self) -+ } else { -+ let max = self.len() - substr_len; -+ let mut offset = 0; -+ let mut haystack = &self[..]; -+ -+ while let Some(position) = memchr::memchr(substr[0], haystack) { -+ offset += position; -+ -+ if offset > max { -+ return None -+ } -+ -+ if &haystack[position..position + substr_len] == substr { -+ return Some(offset) -+ } -+ -+ haystack = &haystack[position + 1..]; -+ offset += 1; -+ } -+ -+ None -+ } -+ } -+} -+ -+impl<'a,'b> FindSubstring<&'b str> for &'a[u8] { -+ fn find_substring(&self, substr: &'b str) -> Option { -+ self.find_substring(str::as_bytes(substr)) -+ } -+} -+ -+impl<'a,'b> FindSubstring<&'b str> for &'a str { -+ //returns byte index -+ fn find_substring(&self, substr: &'b str) -> Option { -+ self.find(substr) -+ } -+} -+ -+/// used to integrate str's parse() method -+pub trait ParseTo { -+ fn parse_to(&self) -> Option; -+} -+ -+impl<'a,R: FromStr> ParseTo for &'a[u8] { -+ fn parse_to(&self) -> Option { -+ from_utf8(self).ok().and_then(|s| s.parse().ok()) -+ } -+} -+ -+impl<'a,R:FromStr> ParseTo for &'a str { -+ fn parse_to(&self) -> Option { -+ self.parse().ok() -+ } -+} -+ -+/// slicing operations using ranges -+/// -+/// this trait is loosely based on -+/// `Index`, but can actually return -+/// something else than a `&[T]` or `&str` -+pub trait Slice { -+ #[inline(always)] -+ fn slice(&self, range: R) -> Self; -+} -+ -+macro_rules! impl_fn_slice { -+ ( $ty:ty ) => { -+ fn slice(&self, range:$ty) -> Self { -+ &self[range] -+ } -+ } -+} -+ -+macro_rules! slice_range_impl { -+ ( [ $for_type:ident ], $ty:ty ) => { -+ impl<'a, $for_type> Slice<$ty> for &'a [$for_type] { -+ impl_fn_slice!( $ty ); -+ } -+ }; -+ ( $for_type:ty, $ty:ty ) => { -+ impl<'a> Slice<$ty> for &'a $for_type { -+ impl_fn_slice!( $ty ); -+ } -+ } -+} -+ -+macro_rules! slice_ranges_impl { -+ ( [ $for_type:ident ] ) => { -+ slice_range_impl! {[$for_type], Range} -+ slice_range_impl! {[$for_type], RangeTo} -+ slice_range_impl! {[$for_type], RangeFrom} -+ slice_range_impl! {[$for_type], RangeFull} -+ }; -+ ( $for_type:ty ) => { -+ slice_range_impl! {$for_type, Range} -+ slice_range_impl! {$for_type, RangeTo} -+ slice_range_impl! {$for_type, RangeFrom} -+ slice_range_impl! {$for_type, RangeFull} -+ } -+} -+ -+slice_ranges_impl! {str} -+slice_ranges_impl! {[T]} -+ -+ -+macro_rules! array_impls { -+ ($($N:expr)+) => { -+ $( -+ impl InputLength for [u8; $N] { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+ } -+ -+ impl<'a> InputLength for &'a [u8; $N] { -+ #[inline] -+ fn input_len(&self) -> usize { -+ self.len() -+ } -+ } -+ -+ impl<'a> Compare<[u8; $N]> for &'a [u8] { -+ #[inline(always)] -+ fn compare(&self, t: [u8; $N]) -> CompareResult { -+ self.compare(&t[..]) -+ } -+ -+ #[inline(always)] -+ fn compare_no_case(&self, t: [u8;$N]) -> CompareResult { -+ self.compare_no_case(&t[..]) -+ } -+ } -+ -+ impl<'a,'b> Compare<&'b [u8; $N]> for &'a [u8] { -+ #[inline(always)] -+ fn compare(&self, t: &'b [u8; $N]) -> CompareResult { -+ self.compare(&t[..]) -+ } -+ -+ #[inline(always)] -+ fn compare_no_case(&self, t: &'b [u8;$N]) -> CompareResult { -+ self.compare_no_case(&t[..]) -+ } -+ } -+ )+ -+ }; -+} -+ -+ -+array_impls! { -+ 0 1 2 3 4 5 6 7 8 9 -+ 10 11 12 13 14 15 16 17 18 19 -+ 20 21 22 23 24 25 26 27 28 29 -+ 30 31 32 -+} -diff --git third_party/rust/nom/src/util.rs third_party/rust/nom/src/util.rs -index e2428ead0a4d..75663b958284 100644 ---- third_party/rust/nom/src/util.rs -+++ third_party/rust/nom/src/util.rs -@@ -1,19 +1,27 @@ --use internal::{IResult,Err}; - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "verbose-errors")] -+use internal::IResult; -+ -+#[cfg(feature = "verbose-errors")] -+use verbose_errors::Err; -+ -+#[cfg(feature = "std")] - use std::collections::HashMap; - --#[cfg(feature = "core")] -+#[cfg(not(feature = "std"))] - use std::prelude::v1::*; -+ - use std::vec::Vec; - use std::string::ToString; - - /// useful functions to calculate the offset between slices and show a hexdump of a slice --#[cfg(not(feature = "core"))] --pub trait HexDisplay { -+pub trait Offset { - /// offset between the first byte of self and the first byte of the argument -- fn offset(&self, second:&[u8]) -> usize;// OFFSET SHOULD GO TO ITS OWN TRAIT -+ fn offset(&self, second:&Self) -> usize; -+} - -+#[cfg(feature = "std")] -+pub trait HexDisplay { - /// Converts the value of `self` to a hex dump, returning the owned - /// string. - fn to_hex(&self, chunk_size: usize) -> String; -@@ -23,130 +31,28 @@ pub trait HexDisplay { - fn to_hex_from(&self, chunk_size: usize, from: usize) -> String; - } - --pub trait InputLength { -- #[inline] -- fn input_len(&self) -> usize; --} -- --impl<'a, T> InputLength for &'a[T] { -- #[inline] -- fn input_len(&self) -> usize { -- self.len() -- } --} -+static CHARS: &'static[u8] = b"0123456789abcdef"; - --impl<'a> InputLength for &'a str { -- #[inline] -- fn input_len(&self) -> usize { -- self.len() -- } --} -+impl Offset for [u8] { -+ fn offset(&self, second:&[u8]) -> usize { -+ let fst = self.as_ptr(); -+ let snd = second.as_ptr(); - --impl<'a> InputLength for (&'a [u8], usize) { -- #[inline] -- fn input_len(&self) -> usize { -- //println!("bit input length for ({:?}, {}):", self.0, self.1); -- let res = self.0.len() * 8 - self.1; -- //println!("-> {}", res); -- res -+ snd as usize - fst as usize - } - } - --use std::iter::Enumerate; --#[cfg(not(feature = "core"))] --use std::str::CharIndices; -- --pub trait AsChar { -- #[inline] -- fn as_char(self) -> char; -- #[inline] -- fn is_alpha(self) -> bool; -- #[inline] -- fn is_alphanum(self) -> bool; -- #[inline] -- fn is_0_to_9(self) -> bool; -- #[inline] -- fn is_hex_digit(self) -> bool; -- #[inline] -- fn is_oct_digit(self) -> bool; --} -+impl Offset for str { -+ fn offset(&self, second: &Self) -> usize { -+ let fst = self.as_ptr(); -+ let snd = second.as_ptr(); - --impl<'a> AsChar for &'a u8 { -- #[inline] -- fn as_char(self) -> char { *self as char } -- #[inline] -- fn is_alpha(self) -> bool { -- (*self >= 0x41 && *self <= 0x5A) || (*self >= 0x61 && *self <= 0x7A) -- } -- #[inline] -- fn is_alphanum(self) -> bool { self.is_alpha() || self.is_0_to_9() } -- #[inline] -- fn is_0_to_9(self) -> bool { -- *self >= 0x30 && *self <= 0x39 -+ snd as usize - fst as usize - } -- #[inline] -- fn is_hex_digit(self) -> bool { -- (*self >= 0x30 && *self <= 0x39) || -- (*self >= 0x41 && *self <= 0x46) || -- (*self >= 0x61 && *self <= 0x66) -- } -- #[inline] -- fn is_oct_digit(self) -> bool { -- *self >= 0x30 && *self <= 0x37 -- } --} -- --impl AsChar for char { -- #[inline] -- fn as_char(self) -> char { self } -- #[inline] -- fn is_alpha(self) -> bool { self.is_alphabetic() } -- #[inline] -- fn is_alphanum(self) -> bool { self.is_alpha() || self.is_0_to_9() } -- #[inline] -- fn is_0_to_9(self) -> bool { self.is_digit(10) } -- #[inline] -- fn is_hex_digit(self) -> bool { self.is_digit(16) } -- #[inline] -- fn is_oct_digit(self) -> bool { self.is_digit(8) } - } - --pub trait IterIndices { -- type Item: AsChar; -- type Iter : Iterator; -- fn iter_indices(self) -> Self::Iter; --} -- --impl<'a> IterIndices for &'a [u8] { -- type Item = &'a u8; -- type Iter = Enumerate<::std::slice::Iter<'a, u8>>; -- #[inline] -- fn iter_indices(self) -> Enumerate<::std::slice::Iter<'a, u8>> { -- self.iter().enumerate() -- } --} -- --#[cfg(not(feature = "core"))] --impl<'a> IterIndices for &'a str { -- type Item = char; -- type Iter = CharIndices<'a>; -- #[inline] -- fn iter_indices(self) -> CharIndices<'a> { -- self.char_indices() -- } --} -- --static CHARS: &'static[u8] = b"0123456789abcdef"; -- --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] - impl HexDisplay for [u8] { -- fn offset(&self, second:&[u8]) -> usize { -- let fst = self.as_ptr(); -- let snd = second.as_ptr(); -- -- snd as usize - fst as usize -- } -- - #[allow(unused_variables)] - fn to_hex(&self, chunk_size: usize) -> String { - self.to_hex_from(chunk_size, 0) -@@ -241,7 +147,7 @@ macro_rules! dbg ( - /// - /// It also displays the input in hexdump format - /// --/// ``` -+/// ```ignore - /// # #[macro_use] extern crate nom; - /// # fn main() { - /// named!(f, dbg_dmp!( tag!( "abcd" ) ) ); -@@ -278,32 +184,44 @@ macro_rules! dbg_dmp ( - ); - ); - -+#[cfg(feature = "verbose-errors")] - pub fn error_to_list(e:&Err) -> Vec> { - let mut v:Vec> = Vec::new(); -- let mut err = e; -- loop { -- match *err { -- Err::Code(ref i) | Err::Position(ref i,_) => { -+ match e { -+ &Err::Code(ref i) | &Err::Position(ref i,_) => { - v.push(i.clone()); - return v; -- }, -- Err::Node(ref i, ref next) | Err::NodePosition(ref i, _, ref next) => { -- v.push(i.clone()); -- err = &*next; -- } -- } -+ }, -+ &Err::Node(ref i, ref next) | &Err::NodePosition(ref i, _, ref next) => { -+ //v.push(i.clone()); -+ for error in next.iter() { -+ if let &Err::Code(ref i2) = error { -+ v.push(i2.clone()); -+ } -+ if let &Err::Position(ref i2,_) = error { -+ v.push(i2.clone()); -+ } -+ } -+ v.push(i.clone()); -+ v.reverse() -+ } - } -+ -+ v - } - -+#[cfg(feature = "verbose-errors")] - pub fn compare_error_paths(e1:&Err, e2:&Err) -> bool { - error_to_list(e1) == error_to_list(e2) - } - - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - use std::hash::Hash; - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - pub fn add_error_pattern<'a,I,O,E: Clone+Hash+Eq>(h: &mut HashMap>, &'a str>, res: IResult, message: &'a str) -> bool { - if let IResult::Error(e) = res { - h.insert(error_to_list(&e), message); -@@ -320,32 +238,33 @@ pub fn slice_to_offsets(input: &[u8], s: &[u8]) -> (usize, usize) { - (off1, off2) - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - pub fn prepare_errors(input: &[u8], res: IResult<&[u8],O,E>) -> Option, usize, usize)> > { - if let IResult::Error(e) = res { - let mut v:Vec<(ErrorKind, usize, usize)> = Vec::new(); -- let mut err = e.clone(); -- loop { -- match err { -- Err::Position(i,s) => { -- let (o1, o2) = slice_to_offsets(input, s); -- v.push((i, o1, o2)); -- //println!("v is: {:?}", v); -- break; -- }, -- Err::NodePosition(i, s, next) => { -- let (o1, o2) = slice_to_offsets(input, s); -+ -+ match e { -+ Err::Code(_) => {}, -+ Err::Position(i, p) => { -+ let (o1, o2) = slice_to_offsets(input, p); - v.push((i, o1, o2)); -- err = *next; -- }, -- Err::Node(_, next) => { -- err = *next; -- }, -- Err::Code(_) => { -- break; -- } -- } -+ }, -+ Err::Node(_, _) => {}, -+ Err::NodePosition(i, p, next) => { -+ //v.push(i.clone()); -+ for error in next.iter() { -+ if let &Err::Position(ref i2, ref p2) = error { -+ let (o1, o2) = slice_to_offsets(input, p2); -+ v.push((i2.clone(), o1, o2)); -+ } -+ } -+ let (o1, o2) = slice_to_offsets(input, p); -+ v.push((i, o1, o2)); -+ v.reverse() -+ } - } -+ - v.sort_by(|a, b| a.1.cmp(&b.1)); - Some(v) - } else { -@@ -353,7 +272,8 @@ pub fn prepare_errors(input: &[u8], res: IResult<&[u8],O,E>) -> Opti - } - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - pub fn print_error(input: &[u8], res: IResult<&[u8],O,E>) { - if let Some(v) = prepare_errors(input, res) { - let colors = generate_colors(&v); -@@ -365,7 +285,8 @@ pub fn print_error(input: &[u8], res: IResult<&[u8],O,E>) { - } - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - pub fn generate_colors(v: &[(ErrorKind, usize, usize)]) -> HashMap { - let mut h: HashMap = HashMap::new(); - let mut color = 0; -@@ -417,7 +338,7 @@ pub fn write_color(v: &mut Vec, color: u8) { - v.push('m' as u8); - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] - pub fn print_codes(colors: HashMap, names: HashMap) -> String { - let mut v = Vec::new(); - for (code, &color) in &colors { -@@ -439,7 +360,8 @@ pub fn print_codes(colors: HashMap, names: HashMap) -> Strin - String::from_utf8_lossy(&v[..]).into_owned() - } - --#[cfg(not(feature = "core"))] -+#[cfg(feature = "std")] -+#[cfg(feature = "verbose-errors")] - pub fn print_offsets(input: &[u8], from: usize, offsets: &[(ErrorKind, usize, usize)]) -> String { - let mut v = Vec::with_capacity(input.len() * 3); - let mut i = from; -@@ -599,6 +521,7 @@ pub enum ErrorKind { - SeparatedNonEmptyList, - Many0, - Many1, -+ ManyTill, - Count, - TakeUntilAndConsume, - TakeUntil, -@@ -642,7 +565,10 @@ pub enum ErrorKind { - ManyMN, - TakeUntilAndConsumeStr, - TakeUntilStr, -- Not -+ Not, -+ Permutation, -+ Verify, -+ TakeTill1, - } - - pub fn error_to_u32(e: &ErrorKind) -> u32 { -@@ -702,6 +628,10 @@ pub fn error_to_u32(e: &ErrorKind) -> u32 { - ErrorKind::OctDigit => 61, - ErrorKind::Many0 => 62, - ErrorKind::Not => 63, -+ ErrorKind::Permutation => 64, -+ ErrorKind::ManyTill => 65, -+ ErrorKind::Verify => 66, -+ ErrorKind::TakeTill1 => 67, - } - } - -@@ -763,7 +693,46 @@ pub fn error_to_u32(e: &ErrorKind) -> u32 { - ErrorKind::TakeUntilStr => "Take until on strings", - ErrorKind::OctDigit => "Octal digit", - ErrorKind::Not => "Negation", -+ ErrorKind::Permutation => "Permutation", -+ ErrorKind::ManyTill => "ManyTill", -+ ErrorKind::Verify => "predicate verification", -+ ErrorKind::TakeTill1 => "TakeTill1", - } - - } -+ /// Convert Err into an ErrorKind. -+ /// -+ /// This allows application code to use ErrorKind and stay independent from the `verbose-errors` features activation. -+ pub fn into_error_kind(self) -> ErrorKind { -+ self -+ } - } -+ -+#[cfg(test)] -+mod tests { -+ use super::*; -+ -+ #[test] -+ fn test_offset_u8() { -+ let s = b"abcd123"; -+ let a = &s[..]; -+ let b = &a[2..]; -+ let c = &a[..4]; -+ let d = &a[3..5]; -+ assert_eq!(a.offset(b), 2); -+ assert_eq!(a.offset(c), 0); -+ assert_eq!(a.offset(d), 3); -+ } -+ -+ #[test] -+ fn test_offset_str() { -+ let s = "abcřèÂßÇd123"; -+ let a = &s[..]; -+ let b = &a[7..]; -+ let c = &a[..5]; -+ let d = &a[5..9]; -+ assert_eq!(a.offset(b), 7); -+ assert_eq!(a.offset(c), 0); -+ assert_eq!(a.offset(d), 5); -+ } -+} -diff --git third_party/rust/nom/src/verbose_errors.rs third_party/rust/nom/src/verbose_errors.rs -new file mode 100644 -index 000000000000..fe236b6c930a ---- /dev/null -+++ third_party/rust/nom/src/verbose_errors.rs -@@ -0,0 +1,227 @@ -+//! Error management -+//! -+//! there are two ways to handle errors in nom. The first one, -+//! activated by default, uses the `nom::ErrorKind` enum -+//! in the error branch of `IResult`. This enum can hold either -+//! a parser specific error code, or a custom error type you -+//! specify. -+//! -+//! If you need more advanced error management, you can activate -+//! the "verbose-errors" compilation feature, which will give you -+//! the error system available in nom 1.0. The verbose errors -+//! accumulate error codes and positions as you backtrack through -+//! the parser tree. From there, you can precisely identify which -+//! parts of the input triggered the error case. -+//! -+//! Please note that the verbose error management is a bit slower -+//! than the simple one. -+use util::ErrorKind; -+use internal::{IResult, IError}; -+use internal::IResult::*; -+ -+/// Contains the error that a parser can return -+/// -+/// If you use the `verbose-errors` compilation feature, -+/// `nom::Err` will be the enum defined here, -+/// otherwise, it will amount to a `ErrorKind`. -+/// -+/// It can represent a linked list of errors, indicating the path taken in the parsing tree, with corresponding position in the input data. -+/// It depends on P, the input position (for a &[u8] parser, it would be a &[u8]), and E, the custom error type (by default, u32) -+#[derive(Debug,PartialEq,Eq,Clone)] -+pub enum Err{ -+ /// An error code, represented by an ErrorKind, which can contain a custom error code represented by E -+ Code(ErrorKind), -+ /// An error code, and the next error -+ Node(ErrorKind, Vec>), -+ /// An error code, and the input position -+ Position(ErrorKind, P), -+ /// An error code, the input position and the next error -+ NodePosition(ErrorKind, P, Vec>) -+} -+ -+impl Err { -+ /// Convert Err into ErrorKind. -+ /// -+ /// This allows application code to use ErrorKind and stay independent from the verbose-errors features activation. -+ pub fn into_error_kind(self) -> ErrorKind { -+ match self { -+ Err::Code(kind) => kind, -+ Err::Node(kind, _) => kind, -+ Err::Position(kind, _) => kind, -+ Err::NodePosition(kind, _, _) => kind, -+ } -+ } -+} -+ -+impl IResult { -+ /// Maps a `IResult` to `IResult` by appling a function -+ /// to a contained `Error` value, leaving `Done` and `Incomplete` value -+ /// untouched. -+ #[inline] -+ pub fn map_err(self, f: F) -> IResult -+ where F: FnOnce(Err) -> Err { -+ match self { -+ Error(e) => Error(f(e)), -+ Incomplete(n) => Incomplete(n), -+ Done(i, o) => Done(i, o), -+ } -+ } -+ -+ /// Unwrap the contained `Error(I, E)` value, or panic if the `IResult` is not -+ /// `Error`. -+ pub fn unwrap_err(self) -> Err { -+ match self { -+ Error(e) => e, -+ Done(_, _) => panic!("unwrap_err() called on an IResult that is Done"), -+ Incomplete(_) => panic!("unwrap_err() called on an IResult that is Incomplete"), -+ } -+ } -+ -+ /// Convert the IResult to a std::result::Result -+ pub fn to_full_result(self) -> Result> { -+ match self { -+ Done(_, o) => Ok(o), -+ Incomplete(n) => Err(IError::Incomplete(n)), -+ Error(e) => Err(IError::Error(e)) -+ } -+ } -+ -+ /// Convert the IResult to a std::result::Result -+ pub fn to_result(self) -> Result> { -+ match self { -+ Done(_, o) => Ok(o), -+ Error(e) => Err(e), -+ Incomplete(_) => panic!("to_result() called on an IResult that is Incomplete") -+ } -+ } -+} -+ -+#[cfg(feature = "std")] -+use std::any::Any; -+#[cfg(feature = "std")] -+use std::{error,fmt}; -+#[cfg(feature = "std")] -+use std::fmt::Debug; -+#[cfg(feature = "std")] -+impl error::Error for Err { -+ fn description(&self) -> &str { -+ let kind = match *self { -+ Err::Code(ref e) | Err::Node(ref e, _) | Err::Position(ref e, _) | Err::NodePosition(ref e, _, _) => e -+ }; -+ kind.description() -+ } -+} -+ -+#[cfg(feature = "std")] -+impl fmt::Display for Err { -+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -+ match *self { -+ Err::Code(ref e) | Err::Node(ref e, _) => { -+ write!(f, "{:?}", e) -+ }, -+ Err::Position(ref e, ref p) | Err::NodePosition(ref e, ref p, _) => { -+ write!(f, "{:?}:{:?}", p, e) -+ } -+ } -+ } -+} -+ -+ -+/// translate parser result from IResult to IResult with a custom type -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use std::collections; -+/// # use nom::IResult::Error; -+/// # use nom::Err::{Position,NodePosition}; -+/// # use nom::ErrorKind; -+/// # fn main() { -+/// // will add a Custom(42) error to the error chain -+/// named!(err_test, add_return_error!(ErrorKind::Custom(42), tag!("abcd"))); -+/// // Convert to IREsult<&[u8], &[u8], &str> -+/// named!(parser<&[u8], &[u8], &str>, add_return_error!(ErrorKind::Custom("custom error message"), fix_error!(&str, err_test))); -+/// -+/// let a = &b"efghblah"[..]; -+/// let res_a = parser(a); -+/// assert_eq!(res_a, Error(NodePosition( ErrorKind::Custom("custom error message"), a, vec!(Position(ErrorKind::Fix, a))))); -+/// # } -+/// ``` -+#[macro_export] -+macro_rules! fix_error ( -+ ($i:expr, $t:ty, $submac:ident!( $($args:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o), -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code($crate::ErrorKind::Custom(_)) | -+ $crate::Err::Node($crate::ErrorKind::Custom(_), _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Code(e) -+ }, -+ $crate::Err::Position($crate::ErrorKind::Custom(_), p) | -+ $crate::Err::NodePosition($crate::ErrorKind::Custom(_), p, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Position(e, p) -+ }, -+ $crate::Err::Code(_) | -+ $crate::Err::Node(_, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Code(e) -+ }, -+ $crate::Err::Position(_, p) | -+ $crate::Err::NodePosition(_, p, _) => { -+ let e: $crate::ErrorKind<$t> = $crate::ErrorKind::Fix; -+ $crate::Err::Position(e, p) -+ }, -+ }; -+ $crate::IResult::Error(err) -+ } -+ } -+ } -+ ); -+ ($i:expr, $t:ty, $f:expr) => ( -+ fix_error!($i, $t, call!($f)); -+ ); -+); -+ -+/// `flat_map!(R -> IResult, S -> IResult) => R -> IResult` -+/// -+/// combines a parser R -> IResult and -+/// a parser S -> IResult to return another -+/// parser R -> IResult -+#[macro_export] -+macro_rules! flat_map( -+ ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ { -+ match $submac!($i, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)), -+ $crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) { -+ $crate::IResult::Error(e) => { -+ let err = match e { -+ $crate::Err::Code(k) | $crate::Err::Node(k, _) | $crate::Err::Position(k, _) | $crate::Err::NodePosition(k, _, _) => { -+ $crate::Err::Position(k, $i) -+ } -+ }; -+ $crate::IResult::Error(err) -+ }, -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(ref i2)) => $crate::IResult::Incomplete($crate::Needed::Size(*i2)), -+ $crate::IResult::Done(_, o2) => $crate::IResult::Done(i, o2) -+ } -+ } -+ } -+ ); -+ ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ flat_map!($i, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $f:expr, $g:expr) => ( -+ flat_map!($i, call!($f), call!($g)); -+ ); -+ ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ flat_map!($i, call!($f), $submac!($($args)*)); -+ ); -+); -diff --git third_party/rust/nom/src/whitespace.rs third_party/rust/nom/src/whitespace.rs -new file mode 100644 -index 000000000000..3b8f7bd5bdae ---- /dev/null -+++ third_party/rust/nom/src/whitespace.rs -@@ -0,0 +1,1056 @@ -+//! Support for whitespace delimited formats -+//! -+//! a lot of textual formats allows spaces and other -+//! types of separators between tokens. Handling it -+//! manually with nom means wrapping all parsers -+//! like this: -+//! -+//! ```ignore -+//! named!(token, delimited!(space, tk, space)); -+//! ``` -+//! -+//! To ease the development of such parsers, you -+//! can use the whitespace parsing facility, which works -+//! as follows: -+//! -+//! ``` -+//! # #[macro_use] extern crate nom; -+//! # use nom::IResult::Done; -+//! # fn main() { -+//! named!(tuple<&[u8], (&[u8], &[u8]) >, -+//! ws!(tuple!( take!(3), tag!("de") )) -+//! ); -+//! -+//! assert_eq!( -+//! tuple(&b" \t abc de fg"[..]), -+//! Done(&b"fg"[..], (&b"abc"[..], &b"de"[..])) -+//! ); -+//! # } -+//! ``` -+//! -+//! The `ws!` combinator will modify the parser to -+//! intersperse space parsers everywhere. By default, -+//! it will consume the following characters: " \t\r\n". -+//! -+//! If you want to modify that behaviour, you can make -+//! your own whitespace wrapper. As an example, if -+//! you don't want to consume ends of lines, only -+//! spaces and tabs, you can do it like this: -+//! -+//! ``` -+//! # #[macro_use] extern crate nom; -+//! # use nom::IResult::Done; -+//! named!(pub space, eat_separator!(&b" \t"[..])); -+//! -+//! #[macro_export] -+//! macro_rules! sp ( -+//! ($i:expr, $($args:tt)*) => ( -+//! { -+//! sep!($i, space, $($args)*) -+//! } -+//! ) -+//! ); -+//! -+//! # fn main() { -+//! named!(tuple<&[u8], (&[u8], &[u8]) >, -+//! sp!(tuple!( take!(3), tag!("de") )) -+//! ); -+//! -+//! assert_eq!( -+//! tuple(&b" \t abc de fg"[..]), -+//! Done(&b"fg"[..], (&b"abc"[..], &b"de"[..])) -+//! ); -+//! # } -+//! ``` -+//! -+//! This combinator works by replacing each combinator with -+//! a version that supports wrapping with separator parsers. -+//! It will not support the combinators you wrote in your -+//! own code. You can still manually wrap them with the separator -+//! you want, or you can copy the macros defined in src/whitespace.rs -+//! and modify them to support a new combinator: -+//! * copy the combinator's code here, add the _sep suffix -+//! * add the `$separator:expr` as second argument -+//! * wrap any sub parsers with sep!($separator, $submac!($($args)*)) -+//! * reference it in the definition of `sep!` as follows: -+//! -+//! ```ignore -+//! ($i:expr, $separator:ident, my_combinator ! ($($rest:tt)*) ) => { -+//! wrap_sep!($i, -+//! $separator, -+//! my_combinator_sep!($separator, $($rest)*) -+//! ) -+//! }; -+//! ``` -+//! -+ -+#[macro_export] -+macro_rules! wrap_sep ( -+ ($i:expr, $separator:expr, $submac:ident!( $($args:tt)* )) => ( -+ match ($separator)($i) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i1,_) => { -+ match $submac!(i1, $($args)*) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i1)))), -+ $crate::IResult::Done(i2,o) => { -+ match ($separator)(i2) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i2)))), -+ $crate::IResult::Done(i3,_) => $crate::IResult::Done(i3, o) -+ } -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:expr, $f:expr) => ( -+ wrap_sep!($i, $separator, call!($f)) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! pair_sep ( -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ tuple!( -+ $i, -+ sep!($separator, $submac!($($args)*)), -+ sep!($separator, $submac2!($($args2)*)) -+ ) -+ ); -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ pair_sep!($i, $separator, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ pair_sep!($i, $separator, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $g:expr) => ( -+ pair_sep!($i, $separator, call!($f), call!($g)); -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! delimited_sep ( -+ ($i:expr, $separator:ident, $submac1:ident!( $($args1:tt)* ), $($rest:tt)+) => ( -+ match tuple_sep!($i, $separator, 0usize, (), $submac1!($($args1)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (_,o,_)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $f:expr, $($rest:tt)+) => ( -+ delimited_sep!($i, $separator, call!($f), $($rest)*); -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! separated_pair_sep ( -+ ($i:expr, $separator:ident, $submac1:ident!( $($args1:tt)* ), $($rest:tt)+) => ( -+ match tuple_sep!($i, $separator, 0usize, (), $submac1!($($args1)*), $($rest)*) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (o1,_,o2)) => { -+ $crate::IResult::Done(remaining, (o1,o2)) -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $f:expr, $($rest:tt)+) => ( -+ separated_pair_sep!($i, $separator, call!($f), $($rest)*); -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! preceded_sep ( -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ match pair_sep!($i, $separator, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (_,o)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ preceded_sep!($i, $separator, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ preceded_sep!($i, $separator, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $g:expr) => ( -+ preceded_sep!($i, $separator, call!($f), call!($g)); -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! terminated_sep ( -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ match pair_sep!($i, $separator, $submac!($($args)*), $submac2!($($args2)*)) { -+ $crate::IResult::Error(a) => $crate::IResult::Error(a), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(remaining, (o,_)) => { -+ $crate::IResult::Done(remaining, o) -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ terminated_sep!($i, $separator, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ terminated_sep!($i, $separator, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $g:expr) => ( -+ terminated_sep!($i, $separator, call!($f), call!($g)); -+ ); -+); -+ -+/// Internal parser, do not use directly -+#[doc(hidden)] -+#[macro_export] -+macro_rules! tuple_sep ( -+ ($i:expr, $separator:ident, $consumed:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => ( -+ tuple_sep!($i, $separator, $consumed, ($($parsed),*), call!($e), $($rest)*); -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ tuple_sep!(i, $separator, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), (o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ tuple_sep!(i, $separator, $consumed + ($crate::InputLength::input_len(&($i)) - $crate::InputLength::input_len(&i)), ($($parsed)* , o), $($rest)*) -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, ($($parsed:tt),*), $e:ident) => ( -+ tuple_sep!($i, $separator, $consumed, ($($parsed),*), call!($e)); -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, (), $submac:ident!( $($args:tt)* )) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, (o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ $crate::IResult::Done(i, ($($parsed),* , o)) -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $consumed:expr, ($($parsed:expr),*)) => ( -+ { -+ $crate::IResult::Done($i, ($($parsed),*)) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! do_parse_sep ( -+ (__impl $i:expr, $separator:ident, $consumed:expr, ( $($rest:expr),* )) => ( -+ $crate::IResult::Done($i, ( $($rest),* )) -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $e:ident >> $($rest:tt)*) => ( -+ do_parse_sep!(__impl $i, $separator, $consumed, call!($e) >> $($rest)*); -+ ); -+ (__impl $i:expr, $separator:ident, $consumed:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => -+ $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,_) => { -+ do_parse_sep!(__impl i, $separator, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), $($rest)*) -+ }, -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $field:ident : $e:ident >> $($rest:tt)*) => ( -+ do_parse_sep!(__impl $i, $separator, $consumed, $field: call!($e) >> $($rest)*); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => -+ $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ do_parse_sep!(__impl i, $separator, -+ $consumed + ($crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&i)), $($rest)*) -+ }, -+ } -+ } -+ ); -+ -+ // ending the chain -+ (__impl $i:expr, $separator:ident, $consumed:expr, $e:ident >> ( $($rest:tt)* )) => ( -+ do_parse_sep!(__impl $i, $separator, $consumed, call!($e) >> ( $($rest)* )); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ( -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => -+ $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,_) => { -+ $crate::IResult::Done(i, ( $($rest)* )) -+ }, -+ } -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $field:ident : $e:ident >> ( $($rest:tt)* )) => ( -+ do_parse_sep!(__impl $i, $separator, $consumed, $field: call!($e) >> ( $($rest)* ) ); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $consumed:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ( -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(e), -+ $crate::IResult::Incomplete($crate::Needed::Unknown) => -+ $crate::IResult::Incomplete($crate::Needed::Unknown), -+ $crate::IResult::Incomplete($crate::Needed::Size(i)) => -+ $crate::IResult::Incomplete($crate::Needed::Size($consumed + i)), -+ $crate::IResult::Done(i,o) => { -+ let $field = o; -+ $crate::IResult::Done(i, ( $($rest)* )) -+ }, -+ } -+ ); -+ -+ ($i:expr, $separator:ident, $($rest:tt)*) => ( -+ { -+ do_parse_sep!(__impl $i, $separator, 0usize, $($rest)*) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! permutation_sep ( -+ ($i:expr, $separator:ident, $($rest:tt)*) => ( -+ { -+ let mut res = permutation_init!((), $($rest)*); -+ let mut input = $i; -+ let mut error = ::std::option::Option::None; -+ let mut needed = ::std::option::Option::None; -+ -+ loop { -+ let mut all_done = true; -+ permutation_iterator_sep!(0, input, $separator, all_done, needed, res, $($rest)*); -+ -+ //if we reach that part, it means none of the parsers were able to read anything -+ if !all_done { -+ //FIXME: should wrap the error returned by the child parser -+ error = ::std::option::Option::Some(error_position!($crate::ErrorKind::Permutation, input)); -+ } -+ break; -+ } -+ -+ if let ::std::option::Option::Some(need) = needed { -+ if let $crate::Needed::Size(sz) = need { -+ $crate::IResult::Incomplete( -+ $crate::Needed::Size( -+ $crate::InputLength::input_len(&($i)) - -+ $crate::InputLength::input_len(&input) + -+ sz -+ ) -+ ) -+ } else { -+ $crate::IResult::Incomplete($crate::Needed::Unknown) -+ } -+ } else if let ::std::option::Option::Some(e) = error { -+ $crate::IResult::Error(e) -+ } else { -+ let unwrapped_res = permutation_unwrap!(0, (), res, $($rest)*); -+ $crate::IResult::Done(input, unwrapped_res) -+ } -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! permutation_iterator_sep ( -+ ($it:tt,$i:expr, $separator:ident, $all_done:expr, $needed:expr, $res:expr, $e:ident, $($rest:tt)*) => ( -+ permutation_iterator_sep!($it, $i, $separator, $all_done, $needed, $res, call!($e), $($rest)*); -+ ); -+ ($it:tt, $i:expr, $separator:ident, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => { -+ if acc!($it, $res) == ::std::option::Option::None { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Done(i,o) => { -+ $i = i; -+ acc!($it, $res) = ::std::option::Option::Some(o); -+ continue; -+ }, -+ $crate::IResult::Error(_) => { -+ $all_done = false; -+ }, -+ $crate::IResult::Incomplete(i) => { -+ $needed = ::std::option::Option::Some(i); -+ break; -+ } -+ }; -+ } -+ succ!($it, permutation_iterator_sep!($i, $separator, $all_done, $needed, $res, $($rest)*)); -+ }; -+ ($it:tt,$i:expr, $separator:ident, $all_done:expr, $needed:expr, $res:expr, $e:ident) => ( -+ permutation_iterator_sep!($it, $i, $separator, $all_done, $res, call!($e)); -+ ); -+ ($it:tt, $i:expr, $separator:ident, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* )) => { -+ if acc!($it, $res) == ::std::option::Option::None { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Done(i,o) => { -+ $i = i; -+ acc!($it, $res) = ::std::option::Option::Some(o); -+ continue; -+ }, -+ $crate::IResult::Error(_) => { -+ $all_done = false; -+ }, -+ $crate::IResult::Incomplete(i) => { -+ $needed = ::std::option::Option::Some(i); -+ break; -+ } -+ }; -+ } -+ }; -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! alt_sep ( -+ (__impl $i:expr, $separator:ident, $e:ident | $($rest:tt)*) => ( -+ alt_sep!(__impl $i, $separator, call!($e) | $($rest)*); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let res = sep!($i, $separator, $subrule!($($args)*)); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ $crate::IResult::Incomplete(_) => res, -+ _ => alt_sep!(__impl $i, $separator, $($rest)*) -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $separator:ident, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -+ { -+ match sep!($i, $separator, $subrule!( $($args)* )) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ alt_sep!(__impl $i, $separator, $($rest)*) -+ } -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $separator:ident, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt_sep!(__impl $i, $separator, call!($e) => { $gen } | $($rest)*); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $e:ident => { $gen:expr }) => ( -+ alt_sep!(__impl $i, $separator, call!($e) => { $gen }); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -+ { -+ match sep!($i, $separator, $subrule!( $($args)* )) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Alt,$i)) -+ } -+ } -+ } -+ ); -+ -+ (__impl $i:expr, $separator:ident, $e:ident) => ( -+ alt_sep!(__impl $i, $separator, call!($e)); -+ ); -+ -+ (__impl $i:expr, $separator:ident, $subrule:ident!( $($args:tt)*)) => ( -+ { -+ match sep!($i, $separator, $subrule!( $($args)* )) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,o), -+ $crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x), -+ $crate::IResult::Error(_) => { -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Alt,$i)) -+ } -+ } -+ } -+ ); -+ -+ (__impl $i:expr) => ( -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Alt,$i)) -+ ); -+ -+ (__impl $i:expr, $separator:ident) => ( -+ $crate::IResult::Error(error_position!($crate::ErrorKind::Alt,$i)) -+ ); -+ -+ ($i:expr, $separator:ident, $($rest:tt)*) => ( -+ { -+ alt_sep!(__impl $i, $separator, $($rest)*) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! alt_complete_sep ( -+ ($i:expr, $separator:ident, $e:ident | $($rest:tt)*) => ( -+ alt_complete_sep!($i, $separator, complete!(call!($e)) | $($rest)*); -+ ); -+ -+ ($i:expr, $separator:ident, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => ( -+ { -+ let res = complete!($i, sep!($separator, $subrule!($($args)*))); -+ match res { -+ $crate::IResult::Done(_,_) => res, -+ _ => alt_complete_sep!($i, $separator, $($rest)*), -+ } -+ } -+ ); -+ -+ ($i:expr, $separator:ident, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => ( -+ { -+ match complete!($i, sep!($separator, $subrule!($($args)*))) { -+ $crate::IResult::Done(i,o) => $crate::IResult::Done(i,$gen(o)), -+ _ => alt_complete_sep!($i, $separator, $($rest)*), -+ } -+ } -+ ); -+ -+ ($i:expr, $separator:ident, $e:ident => { $gen:expr } | $($rest:tt)*) => ( -+ alt_complete_sep!($i, $separator, complete!(call!($e)) => { $gen } | $($rest)*); -+ ); -+ -+ // Tail (non-recursive) rules -+ -+ ($i:expr, $separator:ident, $e:ident => { $gen:expr }) => ( -+ alt_complete_sep!($i, $separator, call!($e) => { $gen }); -+ ); -+ -+ ($i:expr, $separator:ident, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => ( -+ alt_sep!(__impl $i, $separator, $subrule!($($args)*) => { $gen }) -+ ); -+ -+ ($i:expr, $separator:ident, $e:ident) => ( -+ alt_complete_sep!($i, $separator, call!($e)); -+ ); -+ -+ ($i:expr, $separator:ident, $subrule:ident!( $($args:tt)*)) => ( -+ alt_sep!(__impl $i, $separator, $subrule!($($args)*)) -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! switch_sep ( -+ (__impl $i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => ( -+ { -+ match sep!($i, $separator, $submac!($($args)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(error_node_position!( -+ $crate::ErrorKind::Switch, $i, e -+ )), -+ $crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i), -+ $crate::IResult::Done(i, o) => { -+ match o { -+ $($p => match sep!(i, $separator, $subrule!($($args2)*)) { -+ $crate::IResult::Error(e) => $crate::IResult::Error(error_node_position!( -+ $crate::ErrorKind::Switch, $i, e -+ )), -+ a => a, -+ }),*, -+ _ => $crate::IResult::Error(error_position!($crate::ErrorKind::Switch,$i)) -+ } -+ } -+ } -+ } -+ ); -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)*), $($rest:tt)*) => ( -+ { -+ switch_sep!(__impl $i, $separator, $submac!($($args)*), $($rest)*) -+ } -+ ); -+ ($i:expr, $separator:ident, $e:ident, $($rest:tt)*) => ( -+ { -+ switch_sep!(__impl $i, $separator, call!($e), $($rest)*) -+ } -+ ); -+); -+ -+#[doc(hidden)] -+#[macro_export] -+macro_rules! separated_list_sep ( -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => ( -+ separated_list!( -+ $i, -+ sep!($separator, $submac!($($args)*)), -+ sep!($separator, $submac2!($($args2)*)) -+ ) -+ ); -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* ), $g:expr) => ( -+ separated_list_sep!($i, $separator, $submac!($($args)*), call!($g)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $submac:ident!( $($args:tt)* )) => ( -+ separated_list_sep!($i, $separator, call!($f), $submac!($($args)*)); -+ ); -+ ($i:expr, $separator:ident, $f:expr, $g:expr) => ( -+ separated_list_sep!($i, $separator, call!($f), call!($g)); -+ ); -+); -+ -+/// helper macros to build a separator parser -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// named!(pub space, eat_separator!(&b" \t"[..])); -+/// # fn main() {} -+/// ``` -+#[macro_export] -+macro_rules! eat_separator ( -+ ($i:expr, $arr:expr) => ( -+ { -+ use $crate::{AsChar,InputLength,InputIter,Slice}; -+ if ($i).input_len() == 0 { -+ $crate::IResult::Done(($i).slice(0..), ($i).slice(0..0)) -+ } else { -+ match ($i).iter_indices().position(|(_, item)| { -+ let i = item.as_char(); -+ for (_,c) in ($arr).iter_indices() { -+ if c.as_char() == i { return false; } -+ } -+ true -+ }) { -+ ::std::option::Option::Some(index) => { -+ $crate::IResult::Done(($i).slice(index..), ($i).slice(..index)) -+ }, -+ ::std::option::Option::None => { -+ $crate::IResult::Done(($i).slice(($i).input_len()..), ($i)) -+ } -+ } -+ } -+ } -+ ); -+); -+ -+/// sep is the parser rewriting macro for whitespace separated formats -+/// -+/// it takes as argument a space eating function and a parser tree, -+/// and will intersperse the space parser everywhere -+/// -+/// ```ignore -+/// #[macro_export] -+/// macro_rules! ws ( -+/// ($i:expr, $($args:tt)*) => ( -+/// { -+/// use $crate::sp; -+/// sep!($i, sp, $($args)*) -+/// } -+/// ) -+/// ); -+/// ``` -+#[macro_export] -+macro_rules! sep ( -+ ($i:expr, $separator:ident, tuple ! ($($rest:tt)*) ) => { -+ tuple_sep!($i, $separator, 0usize, (), $($rest)*) -+ }; -+ ($i:expr, $separator:ident, pair ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ pair_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, delimited ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ delimited_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, separated_pair ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ separated_pair_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, preceded ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ preceded_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, terminated ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ terminated_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, do_parse ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ do_parse_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, permutation ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ permutation_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, alt ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ alt_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, alt_complete ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ alt_complete_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, switch ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ switch_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, separated_list ! ($($rest:tt)*) ) => { -+ wrap_sep!($i, -+ $separator, -+ separated_list_sep!($separator, $($rest)*) -+ ) -+ }; -+ ($i:expr, $separator:ident, many0 ! ($($rest:tt)*) ) => { -+ many0!($i, wrap_sep!($separator, $($rest)*)) -+ }; -+ ($i:expr, $separator:ident, many1 ! ($($rest:tt)*) ) => { -+ many1!($i, wrap_sep!($separator, $($rest)*)) -+ }; -+//FIXME: missing separated_nonempty_list, -+// many_till, many_m_n, count, count_fixed, fold_many0, fold_many1, -+// fold_many_m_n -+ ($i:expr, $separator:ident, $submac:ident!( $($args:tt)* )) => { -+ wrap_sep!($i, $separator, $submac!($($args)*)) -+ }; -+ ($i:expr, $separator:ident, $f:expr) => { -+ wrap_sep!($i, $separator, call!($f)) -+ }; -+); -+ -+use std::ops::{Range,RangeFrom,RangeTo}; -+use internal::IResult; -+#[allow(unused_imports)] -+pub fn sp<'a,T>(input:T) -> IResult where -+ T: ::traits::Slice>+::traits::Slice>+::traits::Slice>, -+ T: ::traits::InputIter+::traits::InputLength, -+ ::Item: ::traits::AsChar { -+ eat_separator!(input, &b" \t\r\n"[..]) -+} -+ -+/// `ws!(I -> IResult) => I -> IResult` -+/// -+/// transforms a parser to automatically consume -+/// whitespace between each token. By default, -+/// it takes the following characters: " \t\r\n". -+/// -+/// If you need a whitespace parser consuming a -+/// different set of characters, you can make -+/// your own by reusing the `sep!` combinator. -+/// -+/// To use `ws!`, pass your parser as argument: -+/// -+/// ``` -+/// # #[macro_use] extern crate nom; -+/// # use nom::IResult::Done; -+/// # fn main() { -+/// named!(tuple<&[u8], (&[u8], &[u8]) >, -+/// ws!(tuple!( take!(3), tag!("de") )) -+/// ); -+/// -+/// assert_eq!( -+/// tuple(&b" \t abc de fg"[..]), -+/// Done(&b"fg"[..], (&b"abc"[..], &b"de"[..])) -+/// ); -+/// # } -+/// ``` -+/// -+#[macro_export] -+macro_rules! ws ( -+ ($i:expr, $($args:tt)*) => ( -+ { -+ use $crate::sp; -+ sep!($i, sp, $($args)*) -+ } -+ ) -+); -+ -+#[cfg(test)] -+#[allow(dead_code)] -+mod tests { -+ use internal::IResult::*; -+ use internal::{IResult,Needed}; -+ use super::sp; -+ use util::ErrorKind; -+ -+ #[test] -+ fn spaaaaace() { -+ assert_eq!(sp(&b" \t abc "[..]), Done(&b"abc "[..], &b" \t "[..])); -+ } -+ -+ #[test] -+ fn tag() { -+ named!(abc, ws!(tag!("abc"))); -+ -+ assert_eq!(abc(&b" \t abc def"[..]), Done(&b"def"[..], &b"abc"[..])); -+ } -+ -+ #[test] -+ fn pair() { -+ named!(pair_2<&[u8], (&[u8], &[u8]) >, -+ ws!(pair!( take!(3), tag!("de") )) -+ ); -+ -+ assert_eq!(pair_2(&b" \t abc de fg"[..]), Done(&b"fg"[..], (&b"abc"[..], &b"de"[..]))); -+ } -+ -+ #[test] -+ fn preceded() { -+ named!(prec<&[u8], &[u8] >, -+ ws!(preceded!( take!(3), tag!("de") )) -+ ); -+ -+ assert_eq!(prec(&b" \t abc de fg"[..]), Done(&b"fg"[..], &b"de"[..])); -+ } -+ -+ #[test] -+ fn terminated() { -+ named!(term<&[u8], &[u8] >, -+ ws!(terminated!( take!(3), tag!("de") )) -+ ); -+ -+ assert_eq!(term(&b" \t abc de fg"[..]), Done(&b"fg"[..], &b"abc"[..])); -+ } -+ -+ #[test] -+ fn tuple() { -+ //trace_macros!(true); -+ named!(tuple_2<&[u8], (&[u8], &[u8]) >, -+ ws!(tuple!( take!(3), tag!("de") )) -+ ); -+ //trace_macros!(false); -+ -+ assert_eq!(tuple_2(&b" \t abc de fg"[..]), Done(&b"fg"[..], (&b"abc"[..], &b"de"[..]))); -+ } -+ -+ #[test] -+ fn levels() { -+ //trace_macros!(true); -+ named!(level_2<&[u8], (&[u8], (&[u8], &[u8])) >, -+ ws!(pair!(take!(3), tuple!( tag!("de"), tag!("fg ") ))) -+ ); -+ //trace_macros!(false); -+ -+ assert_eq!(level_2(&b" \t abc de fg \t hi "[..]), Done(&b"hi "[..], (&b"abc"[..], (&b"de"[..], &b"fg "[..])))); -+ } -+ -+ #[test] -+ fn do_parse() { -+ fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Done(i,1) }; -+ fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Done(i,2) }; -+ -+ //trace_macros!(true); -+ named!(do_parser<&[u8], (u8, u8)>, -+ ws!(do_parse!( -+ tag!("abcd") >> -+ opt!(tag!("abcd")) >> -+ aa: ret_int1 >> -+ tag!("efgh") >> -+ bb: ret_int2 >> -+ tag!("efgh") >> -+ (aa, bb) -+ )) -+ ); -+ -+ //trace_macros!(false); -+ -+ assert_eq!(do_parser(&b"abcd abcd\tefghefghX"[..]), Done(&b"X"[..], (1, 2))); -+ assert_eq!(do_parser(&b"abcd\tefgh efgh X"[..]), Done(&b"X"[..], (1, 2))); -+ assert_eq!(do_parser(&b"abcd ab"[..]), Incomplete(Needed::Size(10))); -+ assert_eq!(do_parser(&b" abcd\tefgh\tef"[..]), Incomplete(Needed::Size(15))); -+ } -+ -+ #[test] -+ fn permutation() { -+ //trace_macros!(true); -+ named!(perm<(&[u8], &[u8], &[u8])>, -+ ws!(permutation!(tag!("abcd"), tag!("efg"), tag!("hi"))) -+ ); -+ //trace_macros!(false); -+ -+ let expected = (&b"abcd"[..], &b"efg"[..], &b"hi"[..]); -+ -+ let a = &b"abcd\tefg \thijk"[..]; -+ assert_eq!(perm(a), Done(&b"jk"[..], expected)); -+ let b = &b" efg \tabcdhi jk"[..]; -+ assert_eq!(perm(b), Done(&b"jk"[..], expected)); -+ let c = &b" hi efg\tabcdjk"[..]; -+ assert_eq!(perm(c), Done(&b"jk"[..], expected)); -+ -+ let d = &b"efg xyzabcdefghi"[..]; -+ assert_eq!(perm(d), Error(error_position!(ErrorKind::Permutation, &b"xyzabcdefghi"[..]))); -+ -+ let e = &b" efg \tabc"[..]; -+ assert_eq!(perm(e), Incomplete(Needed::Size(10))); -+ } -+ -+ #[test] -+ fn alt() { -+ fn work(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(&b""[..], input) -+ } -+ -+ #[allow(unused_variables)] -+ fn dont_work(input: &[u8]) -> IResult<&[u8],&[u8],&'static str> { -+ Error(error_code!(ErrorKind::Custom("abcd"))) -+ } -+ -+ fn work2(input: &[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ Done(input, &b""[..]) -+ } -+ -+ fn alt1(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work) -+ } -+ fn alt2(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | work) -+ } -+ fn alt3(i:&[u8]) -> IResult<&[u8],&[u8], &'static str> { -+ alt!(i, dont_work | dont_work | work2 | dont_work) -+ } -+ -+ let a = &b"\tabcd"[..]; -+ assert_eq!(alt1(a), Error(error_position!(ErrorKind::Alt, a))); -+ assert_eq!(alt2(a), Done(&b""[..], a)); -+ assert_eq!(alt3(a), Done(a, &b""[..])); -+ -+ named!(alt4, ws!(alt!(tag!("abcd") | tag!("efgh")))); -+ let b = &b" efgh "[..]; -+ assert_eq!(alt4(a), Done(&b""[..], &b"abcd"[..])); -+ assert_eq!(alt4(b), Done(&b""[..], &b"efgh"[..])); -+ -+ // test the alternative syntax -+ named!(alt5, ws!(alt!(tag!("abcd") => { |_| false } | tag!("efgh") => { |_| true }))); -+ assert_eq!(alt5(a), Done(&b""[..], false)); -+ assert_eq!(alt5(b), Done(&b""[..], true)); -+ } -+ -+ #[test] -+ fn alt_complete() { -+ named!(ac<&[u8], &[u8]>, -+ ws!(alt_complete!(tag!("abcd") | tag!("ef") | tag!("ghi") | tag!("kl"))) -+ ); -+ -+ let a = &b""[..]; -+ assert_eq!(ac(a), Incomplete(Needed::Size(2))); -+ let a = &b" \tef "[..]; -+ assert_eq!(ac(a), Done(&b""[..], &b"ef"[..])); -+ let a = &b" cde"[..]; -+ assert_eq!(ac(a), Error(error_position!(ErrorKind::Alt, &a[1..]))); -+ } -+ -+ #[allow(unused_variables)] -+ #[test] -+ fn switch() { -+ named!(sw, -+ ws!(switch!(take!(4), -+ b"abcd" => take!(2) | -+ b"efgh" => take!(4) -+ )) -+ ); -+ -+ let a = &b" abcd ef gh"[..]; -+ assert_eq!(sw(a), Done(&b"gh"[..], &b"ef"[..])); -+ -+ let b = &b"\tefgh ijkl "[..]; -+ assert_eq!(sw(b), Done(&b""[..], &b"ijkl"[..])); -+ let c = &b"afghijkl"[..]; -+ assert_eq!(sw(c), Error(error_position!(ErrorKind::Switch, &b"afghijkl"[..]))); -+ } -+ -+ named!(str_parse(&str) -> &str, ws!(tag!("test"))); -+ #[allow(unused_variables)] -+ #[test] -+ fn str_test() { -+ assert_eq!(str_parse(" \n test\t a\nb"), Done("a\nb", "test")); -+ } -+ -+ // test whitespace parser generation for alt -+ named!(space, tag!(" ")); -+ named!(pipeline_statement<&[u8], ()>, -+ ws!( -+ do_parse!( -+ tag!("pipeline") >> -+ attributes: delimited!(char!('{'), -+ separated_list!(char!(','), alt!( -+ space | -+ space -+ )), -+ char!('}')) >> -+ -+ ( () ) -+ ) -+ ) -+ ); -+ -+} -diff --git third_party/rust/nom/tests/arithmetic.rs third_party/rust/nom/tests/arithmetic.rs -index eea990fb07cf..40ffc8cbfdcc 100644 ---- third_party/rust/nom/tests/arithmetic.rs -+++ third_party/rust/nom/tests/arithmetic.rs -@@ -1,22 +1,24 @@ - #[macro_use] - extern crate nom; - --use nom::{IResult,digit, multispace}; -+use nom::{IResult,digit}; -+ -+// Parser definition - - use std::str; - use std::str::FromStr; - --named!(parens, delimited!( -- delimited!(opt!(multispace), tag!("("), opt!(multispace)), -- expr, -- delimited!(opt!(multispace), tag!(")"), opt!(multispace)) -- ) --); -+// We parse any expr surrounded by parens, ignoring all whitespaces around those -+named!(parens, ws!(delimited!( tag!("("), expr, tag!(")") )) ); - -+// We transform an integer string into a i64, ignoring surrounding whitespaces -+// We look for a digit suite, and try to convert it. -+// If either str::from_utf8 or FromStr::from_str fail, -+// we fallback to the parens parser defined above - named!(factor, alt!( - map_res!( - map_res!( -- delimited!(opt!(multispace), digit, opt!(multispace)), -+ ws!(digit), - str::from_utf8 - ), - FromStr::from_str -@@ -25,27 +27,32 @@ named!(factor, alt!( - ) - ); - --named!(term , chain!( -- mut acc: factor ~ -- many0!( -- alt!( -- tap!(mul: preceded!(tag!("*"), factor) => acc = acc * mul) | -- tap!(div: preceded!(tag!("/"), factor) => acc = acc / div) -- ) -- ), -- || { return acc } -+// We read an initial factor and for each time we find -+// a * or / operator followed by another factor, we do -+// the math by folding everything -+named!(term , do_parse!( -+ init: factor >> -+ res: fold_many0!( -+ pair!(alt!(tag!("*") | tag!("/")), factor), -+ init, -+ |acc, (op, val): (&[u8], i64)| { -+ if (op[0] as char) == '*' { acc * val } else { acc / val } -+ } -+ ) >> -+ (res) - ) - ); - --named!(expr , chain!( -- mut acc: term ~ -- many0!( -- alt!( -- tap!(add: preceded!(tag!("+"), term) => acc = acc + add) | -- tap!(sub: preceded!(tag!("-"), term) => acc = acc - sub) -- ) -- ), -- || { return acc } -+named!(expr , do_parse!( -+ init: term >> -+ res: fold_many0!( -+ pair!(alt!(tag!("+") | tag!("-")), term), -+ init, -+ |acc, (op, val): (&[u8], i64)| { -+ if (op[0] as char) == '+' { acc + val } else { acc - val } -+ } -+ ) >> -+ (res) - ) - ); - -diff --git third_party/rust/nom/tests/arithmetic_ast.rs third_party/rust/nom/tests/arithmetic_ast.rs -index 9a8956936ff8..d48b9028b9f7 100644 ---- third_party/rust/nom/tests/arithmetic_ast.rs -+++ third_party/rust/nom/tests/arithmetic_ast.rs -@@ -86,27 +86,27 @@ fn fold_exprs(initial: Expr, remainder: Vec<(Oper, Expr)>) -> Expr { - }) - } - --named!(term< Expr >, chain!( -- initial: factor ~ -+named!(term< Expr >, do_parse!( -+ initial: factor >> - remainder: many0!( - alt!( -- chain!(tag!("*") ~ mul: factor, || { (Oper::Mul, mul) }) | -- chain!(tag!("/") ~ div: factor, || { (Oper::Div, div) }) -+ do_parse!(tag!("*") >> mul: factor >> (Oper::Mul, mul)) | -+ do_parse!(tag!("/") >> div: factor >> (Oper::Div, div)) - ) -- ), -- || fold_exprs(initial, remainder)) --); -+ ) >> -+ (fold_exprs(initial, remainder)) -+)); - --named!(expr< Expr >, chain!( -- initial: term ~ -+named!(expr< Expr >, do_parse!( -+ initial: term >> - remainder: many0!( - alt!( -- chain!(tag!("+") ~ add: term, || { (Oper::Add, add) }) | -- chain!(tag!("-") ~ sub: term, || { (Oper::Sub, sub) }) -+ do_parse!(tag!("+") >> add: term >> (Oper::Add, add)) | -+ do_parse!(tag!("-") >> sub: term >> (Oper::Sub, sub)) - ) -- ), -- || fold_exprs(initial, remainder)) --); -+ ) >> -+ (fold_exprs(initial, remainder)) -+)); - - #[test] - fn factor_test() { -diff --git third_party/rust/nom/tests/blockbuf-arithmetic.rs third_party/rust/nom/tests/blockbuf-arithmetic.rs -new file mode 100644 -index 000000000000..fe655185df54 ---- /dev/null -+++ third_party/rust/nom/tests/blockbuf-arithmetic.rs -@@ -0,0 +1,321 @@ -+/* -+#[macro_use] -+extern crate nom; -+extern crate bytes; -+ -+use nom::{Compare,CompareResult,InputLength,InputIter,Slice,HexDisplay}; -+ -+use std::str; -+use std::str::FromStr; -+use bytes::{Buf,MutBuf}; -+use bytes::buf::{BlockBuf,BlockBufCursor}; -+use std::ops::{Range,RangeTo,RangeFrom,RangeFull}; -+use std::iter::{Enumerate,Iterator}; -+use std::fmt; -+use std::cmp::{min,PartialEq}; -+ -+#[derive(Clone,Copy)] -+#[repr(C)] -+pub struct BlockSlice<'a> { -+ buf: &'a BlockBuf, -+ start: usize, -+ end: usize, -+} -+ -+impl<'a> BlockSlice<'a> { -+ fn cursor(&self) -> WrapCursor<'a> { -+ let mut cur = self.buf.buf(); -+ cur.advance(self.start); -+ WrapCursor { -+ cursor: cur, -+ length: self.end - self.start, -+ } -+ } -+} -+ -+impl<'a> fmt::Debug for BlockSlice<'a> { -+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -+ write!(f, "BlockSlice {{ start: {}, end: {}, data:\n{}\n}}", self.start, self.end, self.buf.bytes().unwrap_or(&b""[..]).to_hex(16)) -+ } -+} -+ -+impl<'a> PartialEq for BlockSlice<'a> { -+ fn eq(&self, other: &BlockSlice<'a>) -> bool { -+ let bufs = (self.buf as *const BlockBuf) == (other.buf as *const BlockBuf); -+ self.start == other.start && self.end == other.end && bufs -+ } -+} -+ -+impl<'a> Slice> for BlockSlice<'a> { -+ fn slice(&self, range:Range) -> Self { -+ BlockSlice { -+ buf: self.buf, -+ start: self.start + range.start, -+ //FIXME: check for valid end here -+ end: self.start + range.end, -+ } -+ } -+} -+ -+impl<'a> Slice> for BlockSlice<'a> { -+ fn slice(&self, range:RangeTo) -> Self { -+ self.slice(0..range.end) -+ } -+} -+ -+impl<'a> Slice> for BlockSlice<'a> { -+ fn slice(&self, range:RangeFrom) -> Self { -+ self.slice(range.start..self.end - self.start) -+ } -+} -+ -+impl<'a> Slice for BlockSlice<'a> { -+ fn slice(&self, _:RangeFull) -> Self { -+ BlockSlice { -+ buf: self.buf, -+ start: self.start, -+ end: self.end, -+ } -+ } -+} -+ -+ -+impl<'a> InputIter for BlockSlice<'a> { -+ type Item = u8; -+ type RawItem = u8; -+ type Iter = Enumerate>; -+ type IterElem = WrapCursor<'a>; -+ -+ fn iter_indices(&self) -> Self::Iter { -+ self.cursor().enumerate() -+ } -+ fn iter_elements(&self) -> Self::IterElem { -+ self.cursor() -+ } -+ fn position

(&self, predicate: P) -> Option where P: Fn(Self::RawItem) -> bool { -+ self.cursor().position(|b| predicate(b)) -+ } -+ fn slice_index(&self, count:usize) -> Option { -+ if self.end - self.start >= count { -+ Some(count) -+ } else { -+ None -+ } -+ } -+} -+ -+ -+impl<'a> InputLength for BlockSlice<'a> { -+ fn input_len(&self) -> usize { -+ self.end - self.start -+ } -+} -+ -+impl<'a,'b> Compare<&'b[u8]> for BlockSlice<'a> { -+ fn compare(&self, t: &'b[u8]) -> CompareResult { -+ let len = self.end - self.start; -+ let blen = t.len(); -+ let m = if len < blen { len } else { blen }; -+ let reduced = self.slice(..m); -+ let b = &t[..m]; -+ -+ for (a,b) in reduced.cursor().zip(b.iter()) { -+ if a != *b { -+ return CompareResult::Error; -+ } -+ } -+ if m < blen { -+ CompareResult::Incomplete -+ } else { -+ CompareResult::Ok -+ } -+ } -+ -+ -+ #[inline(always)] -+ fn compare_no_case(&self, t: &'b[u8]) -> CompareResult { -+ let len = self.end - self.start; -+ let blen = t.len(); -+ let m = if len < blen { len } else { blen }; -+ let reduced = self.slice(..m); -+ let other = &t[..m]; -+ -+ if !reduced.cursor().zip(other).all(|(a, b)| { -+ match (a,*b) { -+ (0...64, 0...64) | (91...96, 91...96) | (123...255, 123...255) => a == *b, -+ (65...90, 65...90) | (97...122, 97...122) | (65...90, 97...122 ) |(97...122, 65...90) => { -+ a & 0b01000000 == *b & 0b01000000 -+ } -+ _ => false -+ } -+ }) { -+ CompareResult::Error -+ } else if m < blen { -+ CompareResult::Incomplete -+ } else { -+ CompareResult::Ok -+ } -+ } -+} -+ -+impl<'a,'b> Compare<&'b str> for BlockSlice<'a> { -+ fn compare(&self, t: &'b str) -> CompareResult { -+ self.compare(str::as_bytes(t)) -+ } -+ fn compare_no_case(&self, t: &'b str) -> CompareResult { -+ self.compare_no_case(str::as_bytes(t)) -+ } -+} -+ -+//Wrapper to implement Iterator on BlockBufCursor -+pub struct WrapCursor<'a> { -+ pub cursor: BlockBufCursor<'a>, -+ pub length: usize, -+} -+ -+impl<'a> Iterator for WrapCursor<'a> { -+ type Item = u8; -+ fn next(&mut self) -> Option { -+ //println!("NEXT: length={}, remaining={}", self.length, self.cursor.remaining()); -+ if min(self.length, self.cursor.remaining()) > 0 { -+ self.length -=1; -+ Some(self.cursor.read_u8()) -+ } else { -+ None -+ } -+ } -+} -+ -+//Reimplement eat_separator instead of fixing iterators -+#[macro_export] -+macro_rules! block_eat_separator ( -+ ($i:expr, $arr:expr) => ( -+ { -+ use nom::{InputLength,InputIter,Slice}; -+ if ($i).input_len() == 0 { -+ nom::IResult::Done($i, ($i).slice(0..0)) -+ } else { -+ match ($i).iter_indices().position(|(_, item)| { -+ for (_,c) in ($arr).iter_indices() { -+ if *c == item { return false; } -+ } -+ true -+ }) { -+ Some(index) => { -+ nom::IResult::Done(($i).slice(index..), ($i).slice(..index)) -+ }, -+ None => { -+ nom::IResult::Done(($i).slice(($i).input_len()..), $i) -+ } -+ } -+ } -+ } -+ ) -+); -+ -+#[macro_export] -+macro_rules! block_named ( -+ ($name:ident, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( i: BlockSlice<'a> ) -> nom::IResult, BlockSlice<'a>, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+ ($name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => ( -+ fn $name<'a>( i: BlockSlice<'a> ) -> nom::IResult, $o, u32> { -+ $submac!(i, $($args)*) -+ } -+ ); -+); -+ -+block_named!(sp, block_eat_separator!(&b" \t\r\n"[..])); -+ -+macro_rules! block_ws ( -+ ($i:expr, $($args:tt)*) => ( -+ { -+ sep!($i, sp, $($args)*) -+ } -+ ) -+); -+ -+block_named!(digit, is_a!("0123456789")); -+ -+block_named!(parens, block_ws!(delimited!( tag!("("), expr, tag!(")") )) ); -+ -+ -+block_named!(factor, alt!( -+ map_res!( -+ block_ws!(digit), -+ to_i64 -+ ) -+ | parens -+ ) -+); -+ -+block_named!(term , do_parse!( -+ init: factor >> -+ res: fold_many0!( -+ pair!(alt!(tag!("*") | tag!("/")), factor), -+ init, -+ |acc, (op, val): (BlockSlice, i64)| { -+ if (op.cursor().next().unwrap() as char) == '*' { acc * val } else { acc / val } -+ } -+ ) >> -+ (res) -+ ) -+); -+ -+block_named!(expr , do_parse!( -+ init: term >> -+ res: fold_many0!( -+ pair!(alt!(tag!("+") | tag!("-")), term), -+ init, -+ |acc, (op, val): (BlockSlice, i64)| { -+ if (op.cursor().next().unwrap() as char) == '+' { acc + val } else { acc - val } -+ } -+ ) >> -+ (res) -+ ) -+); -+ -+ -+fn blockbuf_from(input: &[u8]) -> BlockBuf { -+ let mut b = BlockBuf::new(2, 100); -+ b.copy_from(input); -+ b -+} -+ -+ -+fn sl<'a>(input: &'a BlockBuf) -> BlockSlice<'a> { -+ BlockSlice { -+ buf: input, -+ start: 0, -+ end: input.len(), -+ } -+} -+ -+fn to_i64<'a>(input: BlockSlice<'a>) -> Result { -+ let v: Vec = input.cursor().collect(); -+ -+ match str::from_utf8(&v) { -+ Err(_) => Err(()), -+ Ok(s) => match FromStr::from_str(s) { -+ Err(_) => Err(()), -+ Ok(i) => Ok(i) -+ } -+ } -+} -+ -+#[test] -+fn factor_test() { -+ let a = blockbuf_from(&b"3"[..]); -+ println!("calculated: {:?}", factor(sl(&a))); -+} -+ -+#[test] -+fn parens_test() { -+ let input1 = blockbuf_from(&b" 2* ( 3 + 4 ) "[..]); -+ println!("calculated 1: {:?}", expr(sl(&input1))); -+ let input2 = blockbuf_from(&b" 2*2 / ( 5 - 1) + 3"[..]); -+ println!("calculated 2: {:?}", expr(sl(&input2))); -+} -+*/ -diff --git third_party/rust/nom/tests/cross_function_backtracking.rs third_party/rust/nom/tests/cross_function_backtracking.rs -index 592670c43999..3163037377a0 100644 ---- third_party/rust/nom/tests/cross_function_backtracking.rs -+++ third_party/rust/nom/tests/cross_function_backtracking.rs -@@ -5,9 +5,10 @@ - /// The solution here wraps `IResult` in a `Result`: a `Ok` indicates usual - /// backtracking, `Err` indicates that we must "cut". - --#[macro_use] --extern crate nom; -+#[allow(unused_imports)] -+#[macro_use] extern crate nom; - -+#[cfg(feature = "verbose_errors")] - macro_rules! n ( - ($name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => ( - fn $name( i: $i ) -> std::result::Result, nom::Err<$i, u32>> { -@@ -61,6 +62,7 @@ macro_rules! n ( - ); - ); - -+#[cfg(feature = "verbose_errors")] - macro_rules! cut ( - ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => ( - { -@@ -82,6 +84,7 @@ macro_rules! cut ( - ); - ); - -+#[cfg(feature = "verbose_errors")] - macro_rules! c ( - ($i:expr, $f:expr) => ( - { -@@ -97,14 +100,16 @@ macro_rules! c ( - ); - ); - -+#[cfg(feature = "verbose_errors")] - n!(pub foo< bool >, -- chain!( -- tag!("a") ~ -- cut!(nom::ErrorKind::Custom(42),dbg_dmp!(tag!("b"))) , -- || { true } -+ do_parse!( -+ tag!("a") >> -+ cut!(nom::ErrorKind::Custom(42),dbg_dmp!(tag!("b"))) >> -+ (true) - ) - ); - -+#[cfg(feature = "verbose_errors")] - n!(pub foos< Vec >, - delimited!( - tag!("("), -@@ -113,6 +118,7 @@ n!(pub foos< Vec >, - ) - ); - -+#[cfg(feature = "verbose_errors")] - #[test] - fn test_ok() { - let r = foos(b"(abab)"); -@@ -123,6 +129,7 @@ fn test_ok() { - } - } - -+#[cfg(feature = "verbose_errors")] - #[test] - fn test_err() { - let input = b"(ac)"; -diff --git third_party/rust/nom/tests/float.rs third_party/rust/nom/tests/float.rs -new file mode 100644 -index 000000000000..5710e260365b ---- /dev/null -+++ third_party/rust/nom/tests/float.rs -@@ -0,0 +1,46 @@ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,digit}; -+ -+use std::str; -+use std::str::FromStr; -+ -+named!(unsigned_float , map_res!( -+ map_res!( -+ recognize!( -+ alt!( -+ delimited!(digit, tag!("."), opt!(complete!(digit))) | -+ delimited!(opt!(digit), tag!("."), digit) -+ ) -+ ), -+ str::from_utf8 -+ ), -+ FromStr::from_str -+)); -+ -+named!(float , map!( -+ pair!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ unsigned_float -+ ), -+ |(sign, value): (Option<&[u8]>, f32)| { -+ sign.and_then(|s| if s[0] == ('-' as u8) { Some(-1f32) } else { None }).unwrap_or(1f32) * value -+ } -+)); -+ -+#[test] -+fn unsigned_float_test() { -+ assert_eq!(unsigned_float(&b"123.456"[..]), IResult::Done(&b""[..], 123.456)); -+ assert_eq!(unsigned_float(&b"0.123"[..]), IResult::Done(&b""[..], 0.123)); -+ assert_eq!(unsigned_float(&b"123.0"[..]), IResult::Done(&b""[..], 123.0)); -+ assert_eq!(unsigned_float(&b"123."[..]), IResult::Done(&b""[..], 123.0)); -+ assert_eq!(unsigned_float(&b".123"[..]), IResult::Done(&b""[..], 0.123)); -+} -+ -+#[test] -+fn float_test() { -+ assert_eq!(float(&b"123.456"[..]), IResult::Done(&b""[..], 123.456)); -+ assert_eq!(float(&b"+123.456"[..]), IResult::Done(&b""[..], 123.456)); -+ assert_eq!(float(&b"-123.456"[..]), IResult::Done(&b""[..], -123.456)); -+} -diff --git third_party/rust/nom/tests/ini.rs third_party/rust/nom/tests/ini.rs -index a3a33431bf02..c72177071697 100644 ---- third_party/rust/nom/tests/ini.rs -+++ third_party/rust/nom/tests/ini.rs -@@ -1,83 +1,68 @@ -- - #[macro_use] - extern crate nom; - --use nom::{IResult,not_line_ending, space, alphanumeric, multispace}; -+use nom::{IResult, space, alphanumeric, multispace}; - - use std::str; - use std::collections::HashMap; - - named!(category<&str>, map_res!( -- terminated!( -- delimited!(tag!("["), take_until!("]"), tag!("]")), -- opt!(multispace) -+ delimited!( -+ char!('['), -+ take_while!(call!(|c| c != ']' as u8)), -+ char!(']') - ), - str::from_utf8 - )); - - named!(key_value <&[u8],(&str,&str)>, -- chain!( -- key: map_res!(alphanumeric, std::str::from_utf8) ~ -- space? ~ -- tag!("=") ~ -- space? ~ -- val: map_res!( -- take_until_either!("\n;"), -+ do_parse!( -+ key: map_res!(alphanumeric, str::from_utf8) -+ >> opt!(space) -+ >> char!('=') -+ >> opt!(space) -+ >> val: map_res!( -+ take_while!(call!(|c| c != '\n' as u8 && c != ';' as u8)), - str::from_utf8 -- ) ~ -- space? ~ -- chain!( -- tag!(";") ~ -- not_line_ending , -- ||{} -- ) ? ~ -- multispace? , -- ||{(key, val)} -+ ) -+ >> opt!(pair!(char!(';'), take_while!(call!(|c| c != '\n' as u8)))) -+ >> (key, val) - ) - ); - - --named!(keys_and_values_aggregator<&[u8], Vec<(&str,&str)> >, many0!(key_value)); -+named!(keys_and_values<&[u8], HashMap<&str, &str> >, -+ map!( -+ many0!(terminated!(key_value, opt!(multispace))), -+ |vec: Vec<_>| vec.into_iter().collect() -+ ) -+); - --fn keys_and_values(input:&[u8]) -> IResult<&[u8], HashMap<&str, &str> > { -- let mut h: HashMap<&str, &str> = HashMap::new(); -- -- match keys_and_values_aggregator(input) { -- IResult::Done(i,tuple_vec) => { -- for &(k,v) in &tuple_vec { -- h.insert(k, v); -- } -- IResult::Done(i, h) -- }, -- IResult::Incomplete(a) => IResult::Incomplete(a), -- IResult::Error(a) => IResult::Error(a) -- } --} - - named!(category_and_keys<&[u8],(&str,HashMap<&str,&str>)>, -- chain!( -- category: category ~ -- keys: keys_and_values , -- move ||{(category, keys)} -+ do_parse!( -+ category: category >> -+ opt!(multispace) >> -+ keys: keys_and_values >> -+ (category, keys) - ) - ); - --named!(categories_aggregator<&[u8], Vec<(&str, HashMap<&str,&str>)> >, many0!(category_and_keys)); -- --fn categories(input: &[u8]) -> IResult<&[u8], HashMap<&str, HashMap<&str, &str> > > { -- let mut h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -- -- match categories_aggregator(input) { -- IResult::Done(i,tuple_vec) => { -- for &(k,ref v) in &tuple_vec { -- h.insert(k, v.clone()); -- } -- IResult::Done(i, h) -- }, -- IResult::Incomplete(a) => IResult::Incomplete(a), -- IResult::Error(a) => IResult::Error(a) -- } --} -+named!(categories<&[u8], HashMap<&str, HashMap<&str,&str> > >, -+ map!( -+ many0!( -+ separated_pair!( -+ category, -+ opt!(multispace), -+ map!( -+ many0!(terminated!(key_value, opt!(multispace))), -+ |vec: Vec<_>| vec.into_iter().collect() -+ ) -+ ) -+ ), -+ |vec: Vec<_>| vec.into_iter().collect() -+ ) -+); - - #[test] - fn parse_category_test() { -@@ -86,7 +71,7 @@ fn parse_category_test() { - parameter=value - key = value2"[..]; - -- let ini_without_category = &b"parameter=value -+ let ini_without_category = &b"\n\nparameter=value - key = value2"[..]; - - let res = category(ini_file); -@@ -104,7 +89,7 @@ fn parse_key_value_test() { - let ini_file = &b"parameter=value - key = value2"[..]; - -- let ini_without_key_value = &b"key = value2"[..]; -+ let ini_without_key_value = &b"\nkey = value2"[..]; - - let res = key_value(ini_file); - println!("{:?}", res); -@@ -122,7 +107,7 @@ fn parse_key_value_with_space_test() { - let ini_file = &b"parameter = value - key = value2"[..]; - -- let ini_without_key_value = &b"key = value2"[..]; -+ let ini_without_key_value = &b"\nkey = value2"[..]; - - let res = key_value(ini_file); - println!("{:?}", res); -@@ -139,7 +124,7 @@ fn parse_key_value_with_comment_test() { - let ini_file = &b"parameter=value;abc - key = value2"[..]; - -- let ini_without_key_value = &b"key = value2"[..]; -+ let ini_without_key_value = &b"\nkey = value2"[..]; - - let res = key_value(ini_file); - println!("{:?}", res); -diff --git third_party/rust/nom/tests/ini_str.rs third_party/rust/nom/tests/ini_str.rs -index c69756dc2aca..330e4901f58a 100644 ---- third_party/rust/nom/tests/ini_str.rs -+++ third_party/rust/nom/tests/ini_str.rs -@@ -1,4 +1,3 @@ -- - #[macro_use] - extern crate nom; - -@@ -36,40 +35,35 @@ fn right_bracket(c:char) -> bool { - } - - named!(category <&str, &str>, -- chain!( -- tag_s!("[") ~ -- name: take_till_s!(right_bracket) ~ -- tag_s!("]") ~ -- space_or_line_ending? , -- ||{ name } -+ do_parse!( -+ tag_s!("[") >> -+ name: take_till_s!(right_bracket) >> -+ tag_s!("]") >> -+ opt!(space_or_line_ending) >> -+ (name) - ) - ); - - named!(key_value <&str,(&str,&str)>, -- chain!( -- key: alphanumeric ~ -- space? ~ -- tag_s!("=") ~ -- space? ~ -- val: take_till_s!(is_line_ending_or_comment) ~ -- space? ~ -- pair!(tag_s!(";"), not_line_ending)? ~ -- space_or_line_ending? , -- ||{(key, val)} -+ do_parse!( -+ key: alphanumeric >> -+ opt!(space) >> -+ tag_s!("=") >> -+ opt!(space) >> -+ val: take_till_s!(is_line_ending_or_comment) >> -+ opt!(space) >> -+ opt!(pair!(tag_s!(";"), not_line_ending)) >> -+ opt!(space_or_line_ending) >> -+ (key, val) - ) - ); - - named!(keys_and_values_aggregator<&str, Vec<(&str,&str)> >, many0!(key_value)); - - fn keys_and_values(input:&str) -> IResult<&str, HashMap<&str, &str> > { -- let mut h: HashMap<&str, &str> = HashMap::new(); -- - match keys_and_values_aggregator(input) { - IResult::Done(i,tuple_vec) => { -- for &(k,v) in &tuple_vec { -- h.insert(k, v); -- } -- IResult::Done(i, h) -+ IResult::Done(i, tuple_vec.into_iter().collect()) - }, - IResult::Incomplete(a) => IResult::Incomplete(a), - IResult::Error(a) => IResult::Error(a) -@@ -84,14 +78,9 @@ named!(category_and_keys<&str,(&str,HashMap<&str,&str>)>, - named!(categories_aggregator<&str, Vec<(&str, HashMap<&str,&str>)> >, many0!(category_and_keys)); - - fn categories(input: &str) -> IResult<&str, HashMap<&str, HashMap<&str, &str> > > { -- let mut h: HashMap<&str, HashMap<&str, &str>> = HashMap::new(); -- - match categories_aggregator(input) { - IResult::Done(i,tuple_vec) => { -- for &(k,ref v) in &tuple_vec { -- h.insert(k, v.clone()); -- } -- IResult::Done(i, h) -+ IResult::Done(i, tuple_vec.into_iter().collect()) - }, - IResult::Incomplete(a) => IResult::Incomplete(a), - IResult::Error(a) => IResult::Error(a) -diff --git third_party/rust/nom/tests/issues.rs third_party/rust/nom/tests/issues.rs -index 6466d7f2e069..7a726dc0591b 100644 ---- third_party/rust/nom/tests/issues.rs -+++ third_party/rust/nom/tests/issues.rs -@@ -1,9 +1,10 @@ - //#![feature(trace_macros)] -+#![allow(dead_code)] -+ - #[macro_use] - extern crate nom; - --use nom::{IResult,Needed,HexDisplay,space,digit,be_u16}; --use std::str; -+use nom::{IResult,Needed,space,be_u16,le_u64}; - - #[allow(dead_code)] - struct Range { -@@ -24,23 +25,21 @@ pub fn take_char(input: &[u8]) -> IResult<&[u8], char> { - #[allow(dead_code)] - named!(range<&[u8], Range>, - alt!( -- chain!( -- start: take_char ~ -- tag!("-") ~ -- end: take_char, -- || { -- Range { -- start: start, -- end: end, -- } -- } -+ do_parse!( -+ start: take_char >> -+ tag!("-") >> -+ end: take_char >> -+ (Range { -+ start: start, -+ end: end, -+ }) - ) | - map!( - take_char, - |c| { - Range { - start: c, -- end: c, -+ end: c, - } - } - ) -@@ -66,35 +65,43 @@ fn issue_58() { - - //trace_macros!(false); - --named!(parse_ints< Vec >, many0!(spaces_or_int)); -- --fn spaces_or_int(input: &[u8]) -> IResult<&[u8], i32>{ -- println!("{}", input.to_hex(8)); -- chain!(input, -- opt!(space) ~ -- x: digit, -- || { -- println!("x: {:?}", x); -- let result = str::from_utf8(x).unwrap(); -- println!("Result: {}", result); -- println!("int is empty?: {}", x.is_empty()); -- match result.parse(){ -- Ok(i) => i, -- Err(_) => panic!("UH OH! NOT A DIGIT!") -- } -- } -- ) --} -+#[cfg(feature = "std")] -+mod parse_int { -+ use nom::HexDisplay; -+ use nom::{IResult,space,digit}; -+ use std::str; -+ -+ named!(parse_ints< Vec >, many0!(spaces_or_int)); -+ -+ fn spaces_or_int(input: &[u8]) -> IResult<&[u8], i32>{ -+ println!("{}", input.to_hex(8)); -+ do_parse!(input, -+ opt!(complete!(space)) >> -+ res: map!(complete!(digit), -+ |x| { -+ println!("x: {:?}", x); -+ let result = str::from_utf8(x).unwrap(); -+ println!("Result: {}", result); -+ println!("int is empty?: {}", x.is_empty()); -+ match result.parse(){ -+ Ok(i) => i, -+ Err(_) => panic!("UH OH! NOT A DIGIT!") -+ } -+ }) >> -+ (res) -+ ) -+ } - --#[test] --fn issue_142(){ -- let subject = parse_ints(&b"12 34 5689"[..]); -- let expected = IResult::Done(&b""[..], vec![12, 34, 5689]); -- assert_eq!(subject, expected); -- -- let subject = parse_ints(&b"12 34 5689 "[..]); -- let expected = IResult::Done(&b" "[..], vec![12, 34, 5689]); -- assert_eq!(subject, expected) -+ #[test] -+ fn issue_142(){ -+ let subject = parse_ints(&b"12 34 5689"[..]); -+ let expected = IResult::Done(&b""[..], vec![12, 34, 5689]); -+ assert_eq!(subject, expected); -+ -+ let subject = parse_ints(&b"12 34 5689 "[..]); -+ let expected = IResult::Done(&b" "[..], vec![12, 34, 5689]); -+ assert_eq!(subject, expected) -+ } - } - - #[test] -@@ -129,3 +136,22 @@ fn take_till_issue() { - assert_eq!(nothing(b""), IResult::Done(&b""[..], &b""[..])); - assert_eq!(nothing(b"abc"), IResult::Done(&b"abc"[..], &b""[..])); - } -+ -+named!(issue_498< Vec<&[u8]> >, separated_nonempty_list!( opt!(space), tag!("abcd") )); -+ -+named!(issue_308(&str) -> bool, -+ do_parse! ( -+ tag_s! ("foo") >> -+ b: alt_complete! ( -+ map! (tag_s! ("1"), |_: &str|->bool {true}) | -+ value! (false) -+ ) >> -+ (b) )); -+ -+ -+fn issue_302(input: &[u8]) -> IResult<&[u8], Option> > { -+ do_parse!(input, -+ entries: cond!(true, count!(le_u64, 3)) >> -+ ( entries ) -+ ) -+} -diff --git third_party/rust/nom/tests/json.rs third_party/rust/nom/tests/json.rs -new file mode 100644 -index 000000000000..b0369166c3b1 ---- /dev/null -+++ third_party/rust/nom/tests/json.rs -@@ -0,0 +1,130 @@ -+//#![feature(trace_macros)] -+ -+#[macro_use] -+extern crate nom; -+ -+use nom::{digit, alphanumeric}; -+ -+use std::str::{self,FromStr}; -+use std::collections::HashMap; -+ -+#[derive(Debug,PartialEq)] -+pub enum JsonValue { -+ Str(String), -+ Num(f32), -+ Array(Vec), -+ Object(HashMap) -+} -+ -+// FIXME: since we already parsed a serie of digits and dots, -+// we know it is correct UTF-8. no need to use from_utf8 to -+// verify it is correct -+// FIXME: use alt_complete (implement ws for alt_complete) -+named!(unsigned_float , map_res!( -+ map_res!( -+ recognize!( -+ alt_complete!( -+ delimited!(digit, tag!("."), opt!(complete!(digit))) | -+ delimited!(opt!(digit), tag!("."), digit) | -+ digit -+ ) -+ ), -+ str::from_utf8 -+ ), -+ FromStr::from_str -+)); -+named!(float, map!( -+ pair!( -+ opt!(alt!(tag!("+") | tag!("-"))), -+ unsigned_float -+ ), -+ |(sign, value): (Option<&[u8]>, f32)| { -+ sign.and_then(|s| if s[0] == ('-' as u8) { Some(-1f32) } else { None }).unwrap_or(1f32) * value -+ } -+)); -+ -+//FIXME: verify how json strings are formatted -+named!(string<&str>, -+ delimited!( -+ tag!("\""), -+ map_res!(escaped!(call!(alphanumeric), '\\', is_a!("\"n\\")), str::from_utf8), -+ tag!("\"") -+ ) -+); -+ -+named!(array < Vec >, -+ ws!( -+ delimited!( -+ tag!("["), -+ separated_list!(tag!(","), value), -+ tag!("]") -+ ) -+ ) -+); -+ -+named!(key_value<(&str,JsonValue)>, -+ ws!( -+ separated_pair!( -+ string, -+ tag!(":"), -+ value -+ ) -+ ) -+); -+ -+named!(hash< HashMap >, -+ ws!( -+ map!( -+ delimited!( -+ tag!("{"), -+ separated_list!(tag!(","), key_value), -+ tag!("}") -+ ), -+ |tuple_vec| { -+ let mut h: HashMap = HashMap::new(); -+ for (k, v) in tuple_vec { -+ h.insert(String::from(k), v); -+ } -+ h -+ } -+ ) -+ ) -+); -+ -+named!(value, -+ ws!( -+ alt!( -+ hash => { |h| JsonValue::Object(h) } | -+ array => { |v| JsonValue::Array(v) } | -+ string => { |s| JsonValue::Str(String::from(s)) } | -+ float => { |num| JsonValue::Num(num) } -+ ) -+ ) -+); -+ -+ -+ -+#[test] -+fn hash_test() { -+ let test = &b" { \"a\"\t: 42, -+ \"b\": \"x\" -+ }"; -+ -+//FIXME: top level value must be an object? -+ println!("{:?}", value(&test[..])); -+ //assert!(false); -+} -+ -+#[test] -+fn parse_example_test() { -+ let test = &b" { \"a\"\t: 42, -+ \"b\": [ \"x\", \"y\", 12 ] , -+ \"c\": { \"hello\" : \"world\" -+ } -+ }"; -+ -+//FIXME: top level value must be an object? -+ println!("{:?}", value(&test[..])); -+ //assert!(false); -+} -+ -diff --git third_party/rust/nom/tests/mp4.rs third_party/rust/nom/tests/mp4.rs -index 8c128f57a928..e6d5c9fce7c0 100644 ---- third_party/rust/nom/tests/mp4.rs -+++ third_party/rust/nom/tests/mp4.rs -@@ -4,10 +4,9 @@ - #[macro_use] - extern crate nom; - --use nom::{HexDisplay,Needed,IResult,be_u16,be_u32,be_u64,be_f32,ErrorKind}; -+use nom::{HexDisplay,Offset,Needed,IResult,be_u16,be_u32,be_u64,be_f32,ErrorKind}; - use nom::{Consumer,ConsumerState,Move,Input,Producer,FileProducer,FileProducerState}; - use nom::IResult::*; --use nom::Err::*; - - use std::str; - use std::io::SeekFrom; -@@ -94,30 +93,30 @@ pub struct Mvhd64 { - - #[allow(non_snake_case)] - named!(mvhd32 <&[u8], MvhdBox>, -- chain!( -- version_flags: be_u32 ~ -- created_date: be_u32 ~ -- modified_date: be_u32 ~ -- scale: be_u32 ~ -- duration: be_u32 ~ -- speed: be_f32 ~ -- volume: be_u16 ~ // actually a 2 bytes decimal -- take!(10) ~ -- scale_a: be_f32 ~ -- rotate_b: be_f32 ~ -- angle_u: be_f32 ~ -- rotate_c: be_f32 ~ -- scale_d: be_f32 ~ -- angle_v: be_f32 ~ -- position_x: be_f32 ~ -- position_y: be_f32 ~ -- scale_w: be_f32 ~ -- preview: be_u64 ~ -- poster: be_u32 ~ -- selection: be_u64 ~ -- current_time: be_u32 ~ -- track_id: be_u32, -- ||{ -+ do_parse!( -+ version_flags: be_u32 >> -+ created_date: be_u32 >> -+ modified_date: be_u32 >> -+ scale: be_u32 >> -+ duration: be_u32 >> -+ speed: be_f32 >> -+ volume: be_u16 >> // actually a 2 bytes decimal -+ take!(10) >> -+ scale_a: be_f32 >> -+ rotate_b: be_f32 >> -+ angle_u: be_f32 >> -+ rotate_c: be_f32 >> -+ scale_d: be_f32 >> -+ angle_v: be_f32 >> -+ position_x: be_f32 >> -+ position_y: be_f32 >> -+ scale_w: be_f32 >> -+ preview: be_u64 >> -+ poster: be_u32 >> -+ selection: be_u64 >> -+ current_time: be_u32 >> -+ track_id: be_u32 >> -+ ( - MvhdBox::M32(Mvhd32 { - version_flags: version_flags, - created_date: created_date, -@@ -141,36 +140,35 @@ named!(mvhd32 <&[u8], MvhdBox>, - current_time: current_time, - track_id: track_id - }) -- } -- ) -+ )) - ); - - #[allow(non_snake_case)] - named!(mvhd64 <&[u8], MvhdBox>, -- chain!( -- version_flags: be_u32 ~ -- created_date: be_u64 ~ -- modified_date: be_u64 ~ -- scale: be_u32 ~ -- duration: be_u64 ~ -- speed: be_f32 ~ -- volume: be_u16 ~ // actually a 2 bytes decimal -- take!(10) ~ -- scale_a: be_f32 ~ -- rotate_b: be_f32 ~ -- angle_u: be_f32 ~ -- rotate_c: be_f32 ~ -- scale_d: be_f32 ~ -- angle_v: be_f32 ~ -- position_x: be_f32 ~ -- position_y: be_f32 ~ -- scale_w: be_f32 ~ -- preview: be_u64 ~ -- poster: be_u32 ~ -- selection: be_u64 ~ -- current_time: be_u32 ~ -- track_id: be_u32, -- ||{ -+ do_parse!( -+ version_flags: be_u32 >> -+ created_date: be_u64 >> -+ modified_date: be_u64 >> -+ scale: be_u32 >> -+ duration: be_u64 >> -+ speed: be_f32 >> -+ volume: be_u16 >> // actually a 2 bytes decimal -+ take!(10) >> -+ scale_a: be_f32 >> -+ rotate_b: be_f32 >> -+ angle_u: be_f32 >> -+ rotate_c: be_f32 >> -+ scale_d: be_f32 >> -+ angle_v: be_f32 >> -+ position_x: be_f32 >> -+ position_y: be_f32 >> -+ scale_w: be_f32 >> -+ preview: be_u64 >> -+ poster: be_u32 >> -+ selection: be_u64 >> -+ current_time: be_u32 >> -+ track_id: be_u32 >> -+ ( - MvhdBox::M64(Mvhd64 { - version_flags: version_flags, - created_date: created_date, -@@ -194,8 +192,7 @@ named!(mvhd64 <&[u8], MvhdBox>, - current_time: current_time, - track_id: track_id - }) -- } -- ) -+ )) - ); - - #[derive(Debug,Clone)] -@@ -246,11 +243,11 @@ struct MP4BoxHeader { - named!(brand_name<&[u8],&str>, map_res!(take!(4), str::from_utf8)); - - named!(filetype_parser<&[u8], FileType>, -- chain!( -- m: brand_name ~ -- v: take!(4) ~ -- c: many0!(brand_name) , -- ||{ FileType{ major_brand: m, major_brand_version:v, compatible_brands: c } } -+ do_parse!( -+ m: brand_name >> -+ v: take!(4) >> -+ c: many0!(brand_name) >> -+ (FileType{ major_brand: m, major_brand_version:v, compatible_brands: c }) - ) - ); - -@@ -262,7 +259,7 @@ fn mvhd_box(input:&[u8]) -> IResult<&[u8],MvhdBox> { - } else if input.len() == 112 { - mvhd64(input) - } else { -- Error(Position(ErrorKind::Custom(32),input)) -+ Error(error_position!(ErrorKind::Custom(32),input)) - }; - println!("res: {:?}", res); - res -@@ -303,18 +300,18 @@ named!(moov_type<&[u8], MP4BoxType>, - ); - - named!(box_header<&[u8],MP4BoxHeader>, -- chain!( -- length: be_u32 ~ -- tag: box_type , -- || { MP4BoxHeader{ length: length, tag: tag} } -+ do_parse!( -+ length: be_u32 >> -+ tag: box_type >> -+ (MP4BoxHeader{ length: length, tag: tag}) - ) - ); - - named!(moov_header<&[u8],MP4BoxHeader>, -- chain!( -- length: be_u32 ~ -- tag: moov_type , -- || { MP4BoxHeader{ length: length, tag: tag} } -+ do_parse!( -+ length: be_u32 >> -+ tag: moov_type >> -+ (MP4BoxHeader{ length: length, tag: tag}) - ) - ); - -diff --git third_party/rust/nom/tests/multiline.rs third_party/rust/nom/tests/multiline.rs -new file mode 100644 -index 000000000000..90164729f46a ---- /dev/null -+++ third_party/rust/nom/tests/multiline.rs -@@ -0,0 +1,21 @@ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,alphanumeric,eol}; -+ -+use std::str; -+ -+named!(end_of_line, alt!(eof!() | eol)); -+named!(read_line <&str>, map_res!( -+ terminated!(alphanumeric, end_of_line), -+ str::from_utf8 -+)); -+named!(read_lines >, many0!(read_line)); -+ -+#[test] -+fn read_lines_test() { -+ let res = IResult::Done(&b""[..], vec!["Duck", "Dog", "Cow"]); -+ -+ assert_eq!(read_lines(&b"Duck\nDog\nCow\n"[..]), res); -+ assert_eq!(read_lines(&b"Duck\nDog\nCow"[..]), res); -+} -diff --git third_party/rust/nom/tests/named_args.rs third_party/rust/nom/tests/named_args.rs -new file mode 100644 -index 000000000000..e998a0845d45 ---- /dev/null -+++ third_party/rust/nom/tests/named_args.rs -@@ -0,0 +1,108 @@ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,digit}; -+ -+// Parser definition -+ -+use std::str; -+use std::str::FromStr; -+ -+use self::Operator::*; -+ -+enum Operator { -+ Slash, -+ Star, -+} -+ -+impl Operator { -+ fn to_str(&self) -> &'static str { -+ match *self { -+ Slash => "/", -+ Star => "*", -+ } -+ } -+} -+ -+// Parse the specified `Operator`. -+named_args!(operator(op: Operator) <&[u8]>, -+ tag!(op.to_str()) -+); -+ -+// We parse any expr surrounded by the tags `open_tag` and `close_tag`, ignoring all whitespaces around those -+named_args!(brackets<'a>(open_tag: &str, close_tag: &str) , ws!(delimited!( tag!(open_tag), expr, tag!(close_tag) )) ); -+ -+// We transform an integer string into a i64, ignoring surrounding whitespaces -+// We look for a digit suite, and try to convert it. -+// If either str::from_utf8 or FromStr::from_str fail, -+// we fallback to the brackets parser defined above -+named!(factor, alt!( -+ map_res!( -+ map_res!( -+ ws!(digit), -+ str::from_utf8 -+ ), -+ FromStr::from_str -+ ) -+ | call!(brackets, "(", ")") -+ ) -+); -+ -+// We read an initial factor and for each time we find -+// a * or / operator followed by another factor, we do -+// the math by folding everything -+named!(term , do_parse!( -+ init: factor >> -+ res: fold_many0!( -+ pair!(alt!(call!(operator, Star) | call!(operator, Slash)), factor), -+ init, -+ |acc, (op, val): (&[u8], i64)| { -+ if (op[0] as char) == '*' { acc * val } else { acc / val } -+ } -+ ) >> -+ (res) -+ ) -+); -+ -+named!(expr , do_parse!( -+ init: term >> -+ res: fold_many0!( -+ pair!(alt!(tag!("+") | tag!("-")), term), -+ init, -+ |acc, (op, val): (&[u8], i64)| { -+ if (op[0] as char) == '+' { acc + val } else { acc - val } -+ } -+ ) >> -+ (res) -+ ) -+); -+ -+#[test] -+fn factor_test() { -+ assert_eq!(factor(&b"3"[..]), IResult::Done(&b""[..], 3)); -+ assert_eq!(factor(&b" 12"[..]), IResult::Done(&b""[..], 12)); -+ assert_eq!(factor(&b"537 "[..]), IResult::Done(&b""[..], 537)); -+ assert_eq!(factor(&b" 24 "[..]), IResult::Done(&b""[..], 24)); -+} -+ -+ -+#[test] -+fn term_test() { -+ assert_eq!(term(&b" 12 *2 / 3"[..]), IResult::Done(&b""[..], 8)); -+ assert_eq!(term(&b" 2* 3 *2 *2 / 3"[..]), IResult::Done(&b""[..], 8)); -+ assert_eq!(term(&b" 48 / 3/2"[..]), IResult::Done(&b""[..], 8)); -+} -+ -+#[test] -+fn expr_test() { -+ assert_eq!(expr(&b" 1 + 2 "[..]), IResult::Done(&b""[..], 3)); -+ assert_eq!(expr(&b" 12 + 6 - 4+ 3"[..]), IResult::Done(&b""[..], 17)); -+ assert_eq!(expr(&b" 1 + 2*3 + 4"[..]), IResult::Done(&b""[..], 11)); -+} -+ -+#[test] -+fn parens_test() { -+ assert_eq!(expr(&b" ( 2 )"[..]), IResult::Done(&b""[..], 2)); -+ assert_eq!(expr(&b" 2* ( 3 + 4 ) "[..]), IResult::Done(&b""[..], 14)); -+ assert_eq!(expr(&b" 2*2 / ( 5 - 1) + 3"[..]), IResult::Done(&b""[..], 4)); -+} -diff --git third_party/rust/nom/tests/omnom.rs third_party/rust/nom/tests/omnom.rs -index b8cfa04fb7e4..f90b37919120 100644 ---- third_party/rust/nom/tests/omnom.rs -+++ third_party/rust/nom/tests/omnom.rs -@@ -3,7 +3,7 @@ - #[macro_use] - extern crate nom; - --use nom::{Producer,Consumer,ConsumerState,Input,Move,MemProducer,IResult,HexDisplay}; -+use nom::{Producer,Consumer,ConsumerState,Input,Move,MemProducer,IResult,Offset}; - - #[derive(PartialEq,Eq,Debug)] - enum State { -diff --git third_party/rust/nom/tests/overflow.rs third_party/rust/nom/tests/overflow.rs -new file mode 100644 -index 000000000000..d20099fe42ed ---- /dev/null -+++ third_party/rust/nom/tests/overflow.rs -@@ -0,0 +1,99 @@ -+#[macro_use] -+extern crate nom; -+ -+use nom::{IResult,Needed,be_u8,be_u64}; -+ -+// Parser definition -+ -+// We request a length that would trigger an overflow if computing consumed + requested -+named!(parser01<&[u8],()>, -+ do_parse!( -+ hdr: take!(1) >> -+ data: take!(18446744073709551615) >> -+ ( () ) -+ ) -+); -+ -+// We request a length that would trigger an overflow if computing consumed + requested -+named!(parser02<&[u8],(&[u8],&[u8])>, -+ tuple!(take!(1),take!(18446744073709551615)) -+); -+ -+#[test] -+fn overflow_incomplete_do_parse() { -+ assert_eq!(parser01(&b"3"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_tuple() { -+ assert_eq!(parser02(&b"3"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_length_bytes() { -+ named!(multi<&[u8], Vec<&[u8]> >, many0!( length_bytes!(be_u64) ) ); -+ -+ // Trigger an overflow in length_bytes -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xff\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_many0() { -+ named!(multi<&[u8], Vec<&[u8]> >, many0!( length_bytes!(be_u64) ) ); -+ -+ // Trigger an overflow in many0 -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+#[cfg(feature = "std")] -+fn overflow_incomplete_many1() { -+ named!(multi<&[u8], Vec<&[u8]> >, many1!( length_bytes!(be_u64) ) ); -+ -+ // Trigger an overflow in many1 -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_many_till() { -+ named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( length_bytes!(be_u64), tag!("abc") ) ); -+ -+ // Trigger an overflow in many_till -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_many_m_n() { -+ named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, length_bytes!(be_u64) ) ); -+ -+ // Trigger an overflow in many_m_n -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_count() { -+ named!(counter<&[u8], Vec<&[u8]> >, count!( length_bytes!(be_u64), 2 ) ); -+ -+ assert_eq!(counter(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_count_fixed() { -+ named!(counter< [&[u8]; 2] >, count_fixed!( &[u8], length_bytes!(be_u64), 2 ) ); -+ -+ assert_eq!(counter(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_length_count() { -+ named!(multi<&[u8], Vec<&[u8]> >, length_count!( be_u8, length_bytes!(be_u64) ) ); -+ -+ assert_eq!(multi(&b"\x04\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xee\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -+ -+#[test] -+fn overflow_incomplete_length_data() { -+ named!(multi<&[u8], Vec<&[u8]> >, many0!( length_data!(be_u64) ) ); -+ -+ assert_eq!(multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xff\xaa"[..]), IResult::Incomplete(Needed::Unknown)); -+} -diff --git third_party/rust/nom/tests/reborrow_fold.rs third_party/rust/nom/tests/reborrow_fold.rs -new file mode 100644 -index 000000000000..0527cb2c83ee ---- /dev/null -+++ third_party/rust/nom/tests/reborrow_fold.rs -@@ -0,0 +1,16 @@ -+#![allow(dead_code)] -+#![allow(unused_variables)] -+ -+ -+#[macro_use] -+extern crate nom; -+ -+use std::str; -+ -+ -+named_args!(atom<'a>(tomb: &'a mut ()), -+ map!(map_res!(is_not_s!(" \t\r\n()"), str::from_utf8), ToString::to_string)); -+ -+ -+named_args!(list<'a>(tomb: &'a mut ()), -+ delimited!(char!('('), fold_many0!(call!(atom, tomb), "".to_string(), |acc: String, next: String| acc + next.as_str()), char!(')'))); diff --git a/mail/thunderbird/files/patch-z-bug1436911 b/mail/thunderbird/files/patch-z-bug1436911 deleted file mode 100644 index 921940d5e167..000000000000 --- a/mail/thunderbird/files/patch-z-bug1436911 +++ /dev/null @@ -1,1136 +0,0 @@ -commit 6b81d0b99f20 -Author: Nicholas Nethercote -Date: Thu Mar 8 15:47:24 2018 +1100 - - Bug 1436911 - Avoid the early/late prefs split. r=glandium - - All prefs that need to be sent to a new content process are now put into the - shared memory segment, and they are identified by the pref name instead of an - index into a list. The old IPC used at process startup (in XPCOMInitData) is - removed. - - Benefits: - - - It removes the need for the early prefs list - (dom/ipc/ContentProcesses.{h,cpp}) and the associated checking, which is ugly - and often trips people up (e.g. bug 1432979, bug 1439406). - - - Using prefnames instead of indices fixes some fragility (fixing bug 1419432). - - - It fixes the problem of early prefs being installed as unlocked default - values even if they are locked and/or have user values. - - MozReview-Commit-ID: FRIzHF8Tjd ---- - dom/ipc/ContentChild.cpp | 2 - - dom/ipc/ContentParent.cpp | 4 +- - dom/ipc/ContentPrefs.cpp | 357 ------------------------------ - dom/ipc/ContentPrefs.h | 27 --- - dom/ipc/ContentProcess.cpp | 5 +- - dom/ipc/PContent.ipdl | 7 +- - dom/ipc/moz.build | 2 - - layout/style/nsCSSProps.h | 2 +- - modules/libpref/Preferences.cpp | 470 ++++++++++++++++++++++------------------ - modules/libpref/Preferences.h | 15 +- - 10 files changed, 278 insertions(+), 613 deletions(-) - -diff --git dom/ipc/ContentChild.cpp dom/ipc/ContentChild.cpp -index f61ab07b81e2..af1ef9cf4c7e 100644 ---- dom/ipc/ContentChild.cpp -+++ dom/ipc/ContentChild.cpp -@@ -1094,8 +1094,6 @@ void ContentChild::InitGraphicsDeviceData(const Conten - void ContentChild::InitXPCOM( - const XPCOMInitData& aXPCOMInit, - const mozilla::dom::ipc::StructuredCloneData& aInitialData) { -- Preferences::SetLatePreferences(&aXPCOMInit.prefs()); -- - // Do this as early as possible to get the parent process to initialize the - // background thread since we'll likely need database information very soon. - BackgroundChild::Startup(); -diff --git dom/ipc/ContentParent.cpp dom/ipc/ContentParent.cpp -index 208bb47a970b..4ce5c6bf23d5 100644 ---- dom/ipc/ContentParent.cpp -+++ dom/ipc/ContentParent.cpp -@@ -197,7 +197,6 @@ - - #include "nsLayoutStylesheetCache.h" - --#include "ContentPrefs.h" - #include "mozilla/Sprintf.h" - - #ifdef MOZ_WEBRTC -@@ -1863,7 +1862,7 @@ bool ContentParent::LaunchSubprocess( - - // Serialize the early prefs. - nsAutoCStringN<1024> prefs; -- Preferences::SerializeEarlyPreferences(prefs); -+ Preferences::SerializePreferences(prefs); - - // Set up the shared memory. - base::SharedMemory shm; -@@ -2034,7 +2033,6 @@ void ContentParent::InitInternal(ProcessPriority aInit - - XPCOMInitData xpcomInit; - -- Preferences::GetPreferences(&xpcomInit.prefs()); - nsCOMPtr io(do_GetIOService()); - MOZ_ASSERT(io, "No IO service?"); - DebugOnly rv = io->GetOffline(&xpcomInit.isOffline()); -diff --git dom/ipc/ContentPrefs.cpp dom/ipc/ContentPrefs.cpp -deleted file mode 100644 -index 808b797d9bee..000000000000 ---- dom/ipc/ContentPrefs.cpp -+++ /dev/null -@@ -1,361 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=8 sts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include "ContentPrefs.h" -- --/****************************************************************************** -- * -- * DO NOT ADD PREFS TO THIS LIST WITHOUT DOM PEER REVIEW -- * -- * This is the list of preferences that are sent to the content process on -- * startup. Only prefs that are required immediately upon startup should be -- * listed here. The first IPC message received in the content process will -- * contain all the other prefs. Prefs should only be listed here if they must be -- * read before the first IPC message is received. -- * -- ******************************************************************************/ -- --const char* mozilla::dom::ContentPrefs::gEarlyPrefs[] = { -- "accessibility.monoaudio.enable", -- "accessibility.mouse_focuses_formcontrol", -- "accessibility.tabfocus_applies_to_xul", -- "app.update.channel", -- "browser.autofocus", -- "browser.dom.window.dump.enabled", -- "browser.sessionhistory.max_entries", -- "browser.sessionhistory.max_total_viewers", --#if defined(NIGHTLY_BUILD) || defined(DEBUG) -- "browser.startup.record", --#endif --#if defined(ANDROID) -- "consoleservice.logcat", --#endif -- "content.cors.disable", -- "content.cors.no_private_data", -- "content.notify.backoffcount", -- "content.notify.interval", -- "content.notify.ontimer", -- "content.sink.enable_perf_mode", -- "content.sink.event_probe_rate", -- "content.sink.initial_perf_time", -- "content.sink.interactive_deflect_count", -- "content.sink.interactive_parse_time", -- "content.sink.interactive_time", -- "content.sink.pending_event_mode", -- "content.sink.perf_deflect_count", -- "content.sink.perf_parse_time", -- "device.storage.prompt.testing", -- "device.storage.writable.name", -- "devtools.enabled", -- "dom.allow_XUL_XBL_for_file", -- "dom.allow_cut_copy", -- "dom.animations-api.core.enabled", -- "dom.animations-api.element-animate.enabled", -- "dom.animations-api.pending-member.enabled", -- "dom.enable_frame_timing", -- "dom.enable_performance", -- "dom.enable_performance_navigation_timing", -- "dom.enable_resource_timing", -- "dom.event.handling-user-input-time-limit", -- "dom.event.touch.coalescing.enabled", -- "dom.forms.autocomplete.formautofill", -- "dom.forms.inputmode", -- "dom.input.skip_cursor_move_for_same_value_set", -- "dom.ipc.processPriorityManager.backgroundGracePeriodMS", -- "dom.ipc.processPriorityManager.backgroundPerceivableGracePeriodMS", -- "dom.ipc.useNativeEventProcessing.content", -- "dom.max_chrome_script_run_time", -- "dom.max_ext_content_script_run_time", -- "dom.max_script_run_time", -- "dom.mozBrowserFramesEnabled", -- "dom.performance.enable_notify_performance_timing", -- "dom.performance.enable_user_timing_logging", -- "dom.placeholder.show_on_focus", -- "dom.requestIdleCallback.enabled", -- "dom.script_loader.bytecode_cache.enabled", -- "dom.script_loader.bytecode_cache.strategy", -- "dom.storage.testing", -- "dom.url.encode_decode_hash", -- "dom.url.getters_decode_hash", -- "dom.use_watchdog", -- "dom.vibrator.enabled", -- "dom.vibrator.max_vibrate_list_len", -- "dom.vibrator.max_vibrate_ms", -- "dom.webcomponents.customelements.enabled", -- "dom.webcomponents.shadowdom.enabled", -- "focusmanager.testmode", -- "font.size.inflation.disabledInMasterProcess", -- "font.size.inflation.emPerLine", -- "font.size.inflation.forceEnabled", -- "font.size.inflation.lineThreshold", -- "font.size.inflation.mappingIntercept", -- "font.size.inflation.maxRatio", -- "font.size.inflation.minTwips", -- "font.size.systemFontScale", -- "full-screen-api.allow-trusted-requests-only", -- "full-screen-api.enabled", -- "full-screen-api.unprefix.enabled", --#ifdef FUZZING -- "fuzzing.enabled", --#endif -- "gfx.font_rendering.opentype_svg.enabled", -- "hangmonitor.timeout", -- "html5.flushtimer.initialdelay", -- "html5.flushtimer.subsequentdelay", -- "html5.offmainthread", -- "intl.charset.fallback.tld", -- "intl.charset.fallback.utf8_for_file", -- "intl.ime.hack.on_ime_unaware_apps.fire_key_events_for_composition", -- "javascript.enabled", -- "javascript.options.array_prototype_values", -- "javascript.options.asmjs", -- "javascript.options.asyncstack", -- "javascript.options.baselinejit", -- "javascript.options.baselinejit.threshold", -- "javascript.options.baselinejit.unsafe_eager_compilation", -- "javascript.options.discardSystemSource", -- "javascript.options.dump_stack_on_debuggee_would_run", -- "javascript.options.gczeal", -- "javascript.options.gczeal.frequency", -- "javascript.options.ion", -- "javascript.options.ion.offthread_compilation", -- "javascript.options.ion.threshold", -- "javascript.options.ion.unsafe_eager_compilation", -- "javascript.options.jit.full_debug_checks", -- "javascript.options.native_regexp", -- "javascript.options.parallel_parsing", -- "javascript.options.shared_memory", -- "javascript.options.spectre.index_masking", -- "javascript.options.spectre.jit_to_C++_calls", -- "javascript.options.spectre.object_mitigations.barriers", -- "javascript.options.spectre.object_mitigations.misc", -- "javascript.options.spectre.string_mitigations", -- "javascript.options.spectre.value_masking", -- "javascript.options.streams", -- "javascript.options.strict", -- "javascript.options.strict.debug", -- "javascript.options.throw_on_asmjs_validation_failure", -- "javascript.options.throw_on_debuggee_would_run", -- "javascript.options.unboxed_objects", -- "javascript.options.wasm", -- "javascript.options.wasm_baselinejit", -- "javascript.options.wasm_ionjit", -- "javascript.options.werror", -- "javascript.use_us_english_locale", -- "jsloader.shareGlobal", -- "layout.css.all-shorthand.enabled", -- "layout.css.background-blend-mode.enabled", -- "layout.css.box-decoration-break.enabled", -- "layout.css.color-adjust.enabled", -- "layout.css.column-span.enabled", -- "layout.css.contain.enabled", -- "layout.css.control-characters.visible", -- "layout.css.emulate-moz-box-with-flex", -- "layout.css.expensive-style-struct-assertions.enabled", -- "layout.css.float-logical-values.enabled", -- "layout.css.font-display.enabled", -- "layout.css.font-variations.enabled", -- "layout.css.frames-timing.enabled", -- "layout.css.getBoxQuads.enabled", -- "layout.css.grid-template-subgrid-value.enabled", -- "layout.css.grid.enabled", -- "layout.css.image-orientation.enabled", -- "layout.css.individual-transform.enabled", -- "layout.css.initial-letter.enabled", -- "layout.css.isolation.enabled", -- "layout.css.mix-blend-mode.enabled", -- "layout.css.moz-document.content.enabled", -- "layout.css.osx-font-smoothing.enabled", -- "layout.css.overflow-clip-box.enabled", -- "layout.css.overscroll-behavior.enabled", -- "layout.css.prefixes.animations", -- "layout.css.prefixes.border-image", -- "layout.css.prefixes.box-sizing", -- "layout.css.prefixes.device-pixel-ratio-webkit", -- "layout.css.prefixes.font-features", -- "layout.css.prefixes.gradients", -- "layout.css.prefixes.transforms", -- "layout.css.prefixes.transitions", -- "layout.css.prefixes.webkit", -- "layout.css.scope-pseudo.enabled", -- "layout.css.scoped-style.enabled", -- "layout.css.scroll-behavior.property-enabled", -- "layout.css.scroll-snap.enabled", --#ifdef MOZ_STYLO -- "layout.css.servo.chrome.enabled", -- "layout.css.servo.enabled", --#endif -- "layout.css.shape-outside.enabled", -- "layout.css.text-align-unsafe-value.enabled", -- "layout.css.text-combine-upright-digits.enabled", -- "layout.css.text-combine-upright.enabled", -- "layout.css.text-justify.enabled", -- "layout.css.touch_action.enabled", -- "layout.css.visited_links_enabled", -- "layout.idle_period.required_quiescent_frames", -- "layout.idle_period.time_limit", -- "layout.interruptible-reflow.enabled", -- "mathml.disabled", -- "media.audio-max-decode-error", -- "media.cache_readahead_limit", -- "media.cache_resume_threshold", -- "media.cache_size", -- "media.clearkey.persistent-license.enabled", -- "media.cubeb.backend", -- "media.cubeb.sandbox", -- "media.cubeb_latency_msg_frames", -- "media.cubeb_latency_playback_ms", -- "media.decoder-doctor.wmf-disabled-is-failure", -- "media.decoder.recycle.enabled", -- "media.decoder.skip-to-next-key-frame.enabled", -- "media.dormant-on-pause-timeout-ms", -- "media.eme.audio.blank", -- "media.eme.chromium-api.video-shmems", -- "media.eme.enabled", -- "media.eme.video.blank", -- "media.ffmpeg.enabled", -- "media.ffmpeg.low-latency.enabled", -- "media.ffvpx.enabled", -- "media.ffvpx.low-latency.enabled", -- "media.flac.enabled", -- "media.forcestereo.enabled", -- "media.gmp.decoder.enabled", -- "media.gmp.insecure.allow", -- "media.gpu-process-decoder", -- "media.hls.enabled", -- "media.libavcodec.allow-obsolete", -- "media.memory_cache_max_size", -- "media.memory_caches_combined_limit_kb", -- "media.memory_caches_combined_limit_pc_sysmem", -- "media.mp4.enabled", -- "media.navigator.mediadatadecoder_enabled", -- "media.ogg.enabled", -- "media.ogg.flac.enabled", -- "media.playback.warnings-as-errors", -- "media.playback.warnings-as-errors.stagefright-vs-rust", -- "media.resampling.enabled", -- "media.resume-bkgnd-video-on-tabhover", -- "media.ruin-av-sync.enabled", -- "media.rust.mp4parser", -- "media.rust.test_mode", -- "media.seamless-looping", -- "media.suspend-bkgnd-video.delay-ms", -- "media.suspend-bkgnd-video.enabled", -- "media.use-blank-decoder", -- "media.video-max-decode-error", -- "media.video_stats.enabled", -- "media.videocontrols.lock-video-orientation", -- "media.volume_scale", -- "media.webspeech.recognition.enable", -- "media.webspeech.recognition.force_enable", -- "media.webspeech.synth.force_global_queue", -- "media.webspeech.test.enable", -- "media.webspeech.test.fake_fsm_events", -- "media.webspeech.test.fake_recognition_service", -- "media.wmf.allow-unsupported-resolutions", -- "media.wmf.enabled", -- "media.wmf.skip-blacklist", -- "media.wmf.vp9.enabled", -- "network.IDN.blacklist_chars", -- "network.IDN.restriction_profile", -- "network.IDN.use_whitelist", -- "network.IDN_show_punycode", -- "network.buffer.cache.count", -- "network.buffer.cache.size", -- "network.captive-portal-service.enabled", -- "network.cookie.cookieBehavior", -- "network.cookie.lifetimePolicy", -- "network.dns.disablePrefetch", -- "network.dns.disablePrefetchFromHTTPS", -- "network.file.disable_unc_paths", -- "network.file.path_blacklist", -- "network.http.tailing.enabled", -- "network.jar.block-remote-files", -- "network.loadinfo.skip_type_assertion", -- "network.notify.changed", -- "network.offline-mirrors-connectivity", -- "network.protocol-handler.external.jar", -- "network.proxy.type", -- "network.security.ports.banned", -- "network.security.ports.banned.override", -- "network.standard-url.enable-rust", -- "network.standard-url.max-length", -- "network.standard-url.punycode-host", -- "network.sts.max_time_for_events_between_two_polls", -- "network.sts.max_time_for_pr_close_during_shutdown", -- "network.tcp.keepalive.enabled", -- "network.tcp.keepalive.idle_time", -- "network.tcp.keepalive.probe_count", -- "network.tcp.keepalive.retry_interval", -- "network.tcp.sendbuffer", -- "nglayout.debug.invalidation", -- "privacy.donottrackheader.enabled", -- "privacy.firstparty.isolate", -- "privacy.firstparty.isolate.restrict_opener_access", -- "privacy.reduceTimerPrecision", -- "privacy.resistFingerprinting", -- "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", -- "privacy.resistFingerprinting.reduceTimerPrecision.jitter", -- "privacy.resistFingerprinting.reduceTimerPrecision.microseconds", -- "privacy.resistFingerprinting.target_video_res", -- "privacy.resistFingerprinting.video_dropped_ratio", -- "privacy.resistFingerprinting.video_frames_per_sec", -- "privacy.spoof_english", -- "privacy.trackingprotection.lower_network_priority", -- "privacy.window.maxInnerHeight", -- "privacy.window.maxInnerWidth", -- "security.csp.enable", -- "security.data_uri.block_toplevel_data_uri_navigations", -- "security.data_uri.unique_opaque_origin", -- "security.fileuri.strict_origin_policy", -- "security.mixed_content.block_active_content", -- "security.mixed_content.block_display_content", -- "security.mixed_content.block_object_subrequest", -- "security.mixed_content.hsts_priming_cache_timeout", -- "security.mixed_content.send_hsts_priming", -- "security.mixed_content.upgrade_display_content", -- "security.mixed_content.use_hsts", -- "security.sandbox.content.level", -- "security.sandbox.content.tempDirSuffix", -- "security.sandbox.logging.enabled", -- "security.sandbox.mac.track.violations", -- "security.sandbox.windows.log.stackTraceDepth", -- "svg.disabled", -- "svg.display-lists.hit-testing.enabled", -- "svg.display-lists.painting.enabled", -- "svg.new-getBBox.enabled", -- "svg.path-caching.enabled", -- "svg.transform-box.enabled", -- "toolkit.asyncshutdown.crash_timeout", -- "toolkit.asyncshutdown.log", -- "toolkit.osfile.log", -- "toolkit.osfile.log.redirect", -- "toolkit.telemetry.enabled", -- "toolkit.telemetry.idleTimeout", -- "toolkit.telemetry.initDelay", -- "toolkit.telemetry.log.dump", -- "toolkit.telemetry.log.level", -- "toolkit.telemetry.minSubsessionLength", -- "toolkit.telemetry.scheduler.idleTickInterval", -- "toolkit.telemetry.scheduler.tickInterval", -- "toolkit.telemetry.testing.overridePreRelease", -- "toolkit.telemetry.unified", -- "ui.key.menuAccessKeyFocuses", -- "ui.popup.disable_autohide", -- "ui.use_activity_cursor", -- "view_source.editor.external", -- "zoom.maxPercent", -- "zoom.minPercent"}; -- --const char** mozilla::dom::ContentPrefs::GetEarlyPrefs(size_t* aCount) { -- *aCount = ArrayLength(ContentPrefs::gEarlyPrefs); -- return gEarlyPrefs; --} -- --const char* mozilla::dom::ContentPrefs::GetEarlyPref(size_t aIndex) { -- MOZ_ASSERT(aIndex < ArrayLength(ContentPrefs::gEarlyPrefs)); -- return gEarlyPrefs[aIndex]; --} -diff --git dom/ipc/ContentPrefs.h dom/ipc/ContentPrefs.h -deleted file mode 100644 -index 72ce8d236c11..000000000000 ---- dom/ipc/ContentPrefs.h -+++ /dev/null -@@ -1,27 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=8 sts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#ifndef mozilla_dom_ContentPrefs_h --#define mozilla_dom_ContentPrefs_h -- --// See the comment in ContentPrefs.cpp for more information. -- --namespace mozilla { --namespace dom { -- --class ContentPrefs { -- public: -- static const char** GetEarlyPrefs(size_t* aCount); -- static const char* GetEarlyPref(size_t aIndex); -- -- private: -- static const char* gEarlyPrefs[]; --}; -- --} // namespace dom --} // namespace mozilla -- --#endif -diff --git dom/ipc/ContentProcess.cpp dom/ipc/ContentProcess.cpp -index 2441c8cb9224..c00283dc5084 100644 ---- dom/ipc/ContentProcess.cpp -+++ dom/ipc/ContentProcess.cpp -@@ -7,7 +7,6 @@ - #include "mozilla/ipc/IOThreadChild.h" - - #include "ContentProcess.h" --#include "ContentPrefs.h" - #include "base/shared_memory.h" - #include "mozilla/Preferences.h" - #include "mozilla/Scheduler.h" -@@ -212,8 +211,8 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) { - NS_ERROR("failed to map shared memory in the child"); - return false; - } -- Preferences::DeserializeEarlyPreferences(static_cast(shm.memory()), -- prefsLen); -+ Preferences::DeserializePreferences(static_cast(shm.memory()), -+ prefsLen); - - Scheduler::SetPrefs(schedulerPrefs); - mContent.Init(IOThreadChild::message_loop(), ParentPid(), -diff --git dom/ipc/PContent.ipdl dom/ipc/PContent.ipdl -index 5d077976569a..fb967ffc53a9 100644 ---- dom/ipc/PContent.ipdl -+++ dom/ipc/PContent.ipdl -@@ -155,6 +155,12 @@ union MaybePrefValue { - null_t; - }; - -+// This serialization form mirrors that used in mozilla::Pref in -+// Preferences.cpp. The two should be kept in sync, e.g. if something is added -+// to one it should also be added to the other. -+// -+// Note: there is no need to pass the isSticky attribute because that's an -+// immutable attribute obtained from file at startup. - struct Pref { - nsCString name; - bool isLocked; -@@ -273,7 +279,6 @@ struct XPCOMInitData - ClipboardCapabilities clipboardCaps; - DomainPolicyClone domainPolicy; - OptionalURIParams userContentSheetURL; -- Pref[] prefs; - GfxVarUpdate[] gfxNonDefaultVarUpdates; - ContentDeviceData contentDeviceData; - GfxInfoFeatureStatus[] gfxFeatureStatus; -diff --git dom/ipc/moz.build dom/ipc/moz.build -index 3c5541c7791b..5e92a0d52b5d 100644 ---- dom/ipc/moz.build -+++ dom/ipc/moz.build -@@ -26,7 +26,6 @@ EXPORTS.mozilla.dom += [ - 'ContentBridgeParent.h', - 'ContentChild.h', - 'ContentParent.h', -- 'ContentPrefs.h', - 'ContentProcess.h', - 'ContentProcessHost.h', - 'ContentProcessManager.h', -@@ -59,7 +58,6 @@ UNIFIED_SOURCES += [ - 'ContentBridgeChild.cpp', - 'ContentBridgeParent.cpp', - 'ContentParent.cpp', -- 'ContentPrefs.cpp', - 'ContentProcess.cpp', - 'ContentProcessHost.cpp', - 'ContentProcessManager.cpp', -diff --git layout/style/nsCSSProps.h layout/style/nsCSSProps.h -index dce44bf61b35..80288336a08b 100644 ---- layout/style/nsCSSProps.h -+++ layout/style/nsCSSProps.h -@@ -640,7 +640,7 @@ class nsCSSProps { - // In the child process, assert that we're not trying to parse stylesheets - // before we've gotten all our prefs. - MOZ_ASSERT_IF(!XRE_IsParentProcess(), -- mozilla::Preferences::AreAllPrefsSetInContentProcess()); -+ mozilla::Preferences::ArePrefsInitedInContentProcess()); - return gPropertyEnabled[aProperty]; - } - -diff --git modules/libpref/Preferences.cpp modules/libpref/Preferences.cpp -index fe780686f2eb..488095f49236 100644 ---- modules/libpref/Preferences.cpp -+++ modules/libpref/Preferences.cpp -@@ -15,7 +15,6 @@ - #include "mozilla/ArenaAllocator.h" - #include "mozilla/ArrayUtils.h" - #include "mozilla/Attributes.h" --#include "mozilla/dom/ContentPrefs.h" - #include "mozilla/dom/PContent.h" - #include "mozilla/HashFunctions.h" - #include "mozilla/Logging.h" -@@ -129,6 +128,25 @@ enum class PrefType : uint8_t { - Bool = 3, - }; - -+// This is used for pref names and string pref values. We encode the string -+// length, then a '/', then the string chars. This encoding means there are no -+// special chars that are forbidden or require escaping. -+static void SerializeAndAppendString(const char* aChars, nsCString& aStr) { -+ aStr.AppendInt(uint32_t(strlen(aChars))); -+ aStr.Append('/'); -+ aStr.Append(aChars); -+} -+ -+static char* DeserializeString(char* aChars, nsCString& aStr) { -+ char* p = aChars; -+ uint32_t length = strtol(p, &p, 10); -+ MOZ_ASSERT(p[0] == '/'); -+ p++; // move past the '/' -+ aStr.Assign(p, length); -+ p += length; // move past the string itself -+ return p; -+} -+ - // Keep this in sync with PrefValue in prefs_parser/src/lib.rs. - union PrefValue { - const char* mStringVal; -@@ -215,6 +233,61 @@ union PrefValue { - MOZ_CRASH(); - } - } -+ -+ void SerializeAndAppend(PrefType aType, nsCString& aStr) { -+ switch (aType) { -+ case PrefType::Bool: -+ aStr.Append(mBoolVal ? 'T' : 'F'); -+ break; -+ -+ case PrefType::Int: -+ aStr.AppendInt(mIntVal); -+ break; -+ -+ case PrefType::String: { -+ SerializeAndAppendString(mStringVal, aStr); -+ break; -+ } -+ -+ case PrefType::None: -+ default: -+ MOZ_CRASH(); -+ } -+ } -+ -+ static char* Deserialize(PrefType aType, char* aStr, -+ dom::MaybePrefValue* aDomValue) { -+ char* p = aStr; -+ -+ switch (aType) { -+ case PrefType::Bool: -+ if (*p == 'T') { -+ *aDomValue = true; -+ } else if (*p == 'F') { -+ *aDomValue = false; -+ } else { -+ *aDomValue = false; -+ NS_ERROR("bad bool pref value"); -+ } -+ p++; -+ return p; -+ -+ case PrefType::Int: { -+ *aDomValue = int32_t(strtol(p, &p, 10)); -+ return p; -+ } -+ -+ case PrefType::String: { -+ nsCString str; -+ p = DeserializeString(p, str); -+ *aDomValue = str; -+ return p; -+ } -+ -+ default: -+ MOZ_CRASH(); -+ } -+ } - }; - - #ifdef DEBUG -@@ -656,6 +729,157 @@ class Pref { - return false; - } - -+ // Prefs are serialized in a manner that mirrors dom::Pref. The two should be -+ // kept in sync. E.g. if something is added to one it should also be added to -+ // the other. (It would be nice to be able to use the code generated from -+ // IPDL for serializing dom::Pref here instead of writing by hand this -+ // serialization/deserialization. Unfortunately, that generated code is -+ // difficult to use directly, outside of the IPDL IPC code.) -+ // -+ // The grammar for the serialized prefs has the following form. -+ // -+ // = ':' ':' ? ':' ? '\n' -+ // = 'B' | 'I' | 'S' -+ // = 'L' | '-' -+ // = -+ // = | | -+ // = 'T' | 'F' -+ // = an integer literal accepted by strtol() -+ // = '/' -+ // = any char sequence of length dictated by the preceding -+ // . -+ // -+ // No whitespace is tolerated between tokens. must match the types of -+ // the values. -+ // -+ // The serialization is text-based, rather than binary, for the following -+ // reasons. -+ // -+ // - The size difference wouldn't be much different between text-based and -+ // binary. Most of the space is for strings (pref names and string pref -+ // values), which would be the same in both styles. And other differences -+ // would be minimal, e.g. small integers are shorter in text but long -+ // integers are longer in text. -+ // -+ // - Likewise, speed differences should be negligible. -+ // -+ // - It's much easier to debug a text-based serialization. E.g. you can -+ // print it and inspect it easily in a debugger. -+ // -+ // Examples of unlocked boolean prefs: -+ // - "B-:8/my.bool1:F:T\n" -+ // - "B-:8/my.bool2:F:\n" -+ // - "B-:8/my.bool3::T\n" -+ // -+ // Examples of locked integer prefs: -+ // - "IL:7/my.int1:0:1\n" -+ // - "IL:7/my.int2:123:\n" -+ // - "IL:7/my.int3::-99\n" -+ // -+ // Examples of unlocked string prefs: -+ // - "S-:10/my.string1:3/abc:4/wxyz\n" -+ // - "S-:10/my.string2:5/1.234:\n" -+ // - "S-:10/my.string3::7/string!\n" -+ -+ void SerializeAndAppend(nsCString& aStr) { -+ switch (Type()) { -+ case PrefType::Bool: -+ aStr.Append('B'); -+ break; -+ -+ case PrefType::Int: -+ aStr.Append('I'); -+ break; -+ -+ case PrefType::String: { -+ aStr.Append('S'); -+ break; -+ } -+ -+ case PrefType::None: -+ default: -+ MOZ_CRASH(); -+ } -+ -+ aStr.Append(mIsLocked ? 'L' : '-'); -+ aStr.Append(':'); -+ -+ SerializeAndAppendString(mName, aStr); -+ aStr.Append(':'); -+ -+ if (mHasDefaultValue) { -+ mDefaultValue.SerializeAndAppend(Type(), aStr); -+ } -+ aStr.Append(':'); -+ -+ if (mHasUserValue) { -+ mUserValue.SerializeAndAppend(Type(), aStr); -+ } -+ aStr.Append('\n'); -+ } -+ -+ static char* Deserialize(char* aStr, dom::Pref* aDomPref) { -+ char* p = aStr; -+ -+ // The type. -+ PrefType type; -+ if (*p == 'B') { -+ type = PrefType::Bool; -+ } else if (*p == 'I') { -+ type = PrefType::Int; -+ } else if (*p == 'S') { -+ type = PrefType::String; -+ } else { -+ NS_ERROR("bad pref type"); -+ type = PrefType::None; -+ } -+ p++; // move past the type char -+ -+ // Locked? -+ bool isLocked; -+ if (*p == 'L') { -+ isLocked = true; -+ } else if (*p == '-') { -+ isLocked = false; -+ } else { -+ NS_ERROR("bad pref locked status"); -+ isLocked = false; -+ } -+ p++; // move past the isLocked char -+ -+ MOZ_ASSERT(*p == ':'); -+ p++; // move past the ':' -+ -+ // The pref name. -+ nsCString name; -+ p = DeserializeString(p, name); -+ -+ MOZ_ASSERT(*p == ':'); -+ p++; // move past the ':' preceding the default value -+ -+ dom::MaybePrefValue maybeDefaultValue; -+ if (*p != ':') { -+ dom::PrefValue defaultValue; -+ p = PrefValue::Deserialize(type, p, &maybeDefaultValue); -+ } -+ -+ MOZ_ASSERT(*p == ':'); -+ p++; // move past the ':' between the default and user values -+ -+ dom::MaybePrefValue maybeUserValue; -+ if (*p != '\n') { -+ dom::PrefValue userValue; -+ p = PrefValue::Deserialize(type, p, &maybeUserValue); -+ } -+ -+ MOZ_ASSERT(*p == '\n'); -+ p++; // move past the '\n' following the user value -+ -+ *aDomPref = dom::Pref(name, isLocked, maybeDefaultValue, maybeUserValue); -+ -+ return p; -+ } -+ - void AddSizeOfIncludingThis(MallocSizeOf aMallocSizeOf, PrefsSizes& aSizes) { - // Note: mName is allocated in gPrefNameArena, measured elsewhere. - aSizes.mPrefValues += aMallocSizeOf(this); -@@ -817,57 +1041,17 @@ static PrefSaveData pref_savePrefs() { - - #ifdef DEBUG - --// For content processes, what prefs have been initialized? --enum class ContentProcessPhase { -- eNoPrefsSet, -- eEarlyPrefsSet, -- eEarlyAndLatePrefsSet, --}; -- - // Note that this never changes in the parent process, and is only read in - // content processes. --static ContentProcessPhase gPhase = ContentProcessPhase::eNoPrefsSet; -+static bool gContentProcessPrefsAreInited = false; - --struct StringComparator { -- const char* mPrefName; -- -- explicit StringComparator(const char* aPrefName) : mPrefName(aPrefName) {} -- -- int operator()(const char* aPrefName) const { -- return strcmp(mPrefName, aPrefName); -- } --}; -- --static bool IsEarlyPref(const char* aPrefName) { -- size_t prefsLen; -- size_t found; -- const char** list = mozilla::dom::ContentPrefs::GetEarlyPrefs(&prefsLen); -- return BinarySearchIf(list, 0, prefsLen, StringComparator(aPrefName), &found); --} -- - #endif // DEBUG - - static PrefEntry* pref_HashTableLookupInner(const char* aPrefName) { - MOZ_ASSERT(NS_IsMainThread() || mozilla::ServoStyleSet::IsInServoTraversal()); - --#ifdef DEBUG -- if (!XRE_IsParentProcess()) { -- if (gPhase == ContentProcessPhase::eNoPrefsSet) { -- MOZ_CRASH_UNSAFE_PRINTF("accessing pref %s before early prefs are set", -- aPrefName); -- } -+ MOZ_ASSERT_IF(!XRE_IsParentProcess(), gContentProcessPrefsAreInited); - -- if (gPhase == ContentProcessPhase::eEarlyPrefsSet && -- !IsEarlyPref(aPrefName)) { -- // If you hit this crash, you have an early access of a non-early pref. -- // Consider moving the access later or add the pref to the whitelist of -- // early prefs in ContentPrefs.cpp and get review from a DOM peer. -- MOZ_CRASH_UNSAFE_PRINTF( -- "accessing non-early pref %s before late prefs are set", aPrefName); -- } -- } --#endif -- - return static_cast(gHashTable->Search(aPrefName)); - } - -@@ -2637,8 +2821,8 @@ class AddPreferencesMemoryReporterRunnable : public Ru - - } // namespace - --// A list of prefs sent early from the parent, via shared memory. --static InfallibleTArray* gEarlyDomPrefs; -+// A list of changed prefs sent from the parent via shared memory. -+static InfallibleTArray* gChangedDomPrefs; - - /* static */ already_AddRefed - Preferences::GetInstanceForService() { -@@ -2668,12 +2852,12 @@ Preferences::GetInstanceForService() { - } - - if (!XRE_IsParentProcess()) { -- MOZ_ASSERT(gEarlyDomPrefs); -- for (unsigned int i = 0; i < gEarlyDomPrefs->Length(); i++) { -- Preferences::SetPreference(gEarlyDomPrefs->ElementAt(i)); -+ MOZ_ASSERT(gChangedDomPrefs); -+ for (unsigned int i = 0; i < gChangedDomPrefs->Length(); i++) { -+ Preferences::SetPreference(gChangedDomPrefs->ElementAt(i)); - } -- delete gEarlyDomPrefs; -- gEarlyDomPrefs = nullptr; -+ delete gChangedDomPrefs; -+ gChangedDomPrefs = nullptr; - - } else { - // Check if there is a deployment configuration file. If so, set up the -@@ -2782,143 +2966,45 @@ Preferences::~Preferences() { - NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch, - nsISupportsWeakReference) - --/* static */ void Preferences::SerializeEarlyPreferences(nsCString& aStr) { -+/* static */ void Preferences::SerializePreferences(nsCString& aStr) { - MOZ_RELEASE_ASSERT(InitStaticMembers()); - -- nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs; -- size_t numEarlyPrefs; -- dom::ContentPrefs::GetEarlyPrefs(&numEarlyPrefs); -+ aStr.Truncate(); - -- for (unsigned int i = 0; i < numEarlyPrefs; i++) { -- const char* prefName = dom::ContentPrefs::GetEarlyPref(i); -- MOZ_ASSERT_IF(i > 0, -- strcmp(prefName, dom::ContentPrefs::GetEarlyPref(i - 1)) > 0); -- -- Pref* pref = pref_HashTableLookup(prefName); -- if (!pref || !pref->MustSendToContentProcesses()) { -- continue; -+ for (auto iter = gHashTable->Iter(); !iter.Done(); iter.Next()) { -+ Pref* pref = static_cast(iter.Get())->mPref; -+ if (pref->MustSendToContentProcesses() && pref->HasAdvisablySizedValues()) { -+ pref->SerializeAndAppend(aStr); - } -- -- switch (pref->Type()) { -- case PrefType::Bool: -- boolPrefs.Append( -- nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName))); -- break; -- case PrefType::Int: -- intPrefs.Append( -- nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName))); -- break; -- case PrefType::String: { -- nsAutoCString value; -- Preferences::GetCString(prefName, value); -- stringPrefs.Append( -- nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get())); -- } break; -- case PrefType::None: -- break; -- default: -- printf_stderr("preference type: %d\n", int(pref->Type())); -- MOZ_CRASH(); -- } - } - -- aStr.Truncate(); -- aStr.Append(boolPrefs); -- aStr.Append('\n'); -- aStr.Append(intPrefs); -- aStr.Append('\n'); -- aStr.Append(stringPrefs); -- aStr.Append('\n'); - aStr.Append('\0'); - } - --/* static */ void Preferences::DeserializeEarlyPreferences(char* aStr, -- size_t aStrLen) { -+/* static */ void Preferences::DeserializePreferences(char* aStr, -+ size_t aPrefsLen) { - MOZ_ASSERT(!XRE_IsParentProcess()); - -- MOZ_ASSERT(!gEarlyDomPrefs); -- gEarlyDomPrefs = new InfallibleTArray(); -+ MOZ_ASSERT(!gChangedDomPrefs); -+ gChangedDomPrefs = new InfallibleTArray(); - - char* p = aStr; -- -- // XXX: we assume these pref values are default values, which may not be -- // true. We also assume they are unlocked. Fortunately, these prefs get reset -- // properly by the first IPC message. -- -- // Get the bool prefs. -- while (*p != '\n') { -- int32_t index = strtol(p, &p, 10); -- MOZ_ASSERT(p[0] == ':'); -- p++; -- int v = strtol(p, &p, 10); -- MOZ_ASSERT(v == 0 || v == 1); -- dom::MaybePrefValue value(dom::PrefValue(!!v)); -- MOZ_ASSERT(p[0] == '|'); -- p++; -- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, dom::MaybePrefValue()); -- gEarlyDomPrefs->AppendElement(pref); -+ while (*p != '\0') { -+ dom::Pref pref; -+ p = Pref::Deserialize(p, &pref); -+ gChangedDomPrefs->AppendElement(pref); - } -- p++; - -- // Get the int prefs. -- while (*p != '\n') { -- int32_t index = strtol(p, &p, 10); -- MOZ_ASSERT(p[0] == ':'); -- p++; -- dom::MaybePrefValue value( -- dom::PrefValue(static_cast(strtol(p, &p, 10)))); -- MOZ_ASSERT(p[0] == '|'); -- p++; -- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, dom::MaybePrefValue()); -- gEarlyDomPrefs->AppendElement(pref); -- } -- p++; -- -- // Get the string prefs. -- while (*p != '\n') { -- int32_t index = strtol(p, &p, 10); -- MOZ_ASSERT(p[0] == ':'); -- p++; -- int32_t length = strtol(p, &p, 10); -- MOZ_ASSERT(p[0] == ';'); -- p++; -- dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length))); -- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)), -- /* isLocked */ false, value, dom::MaybePrefValue()); -- gEarlyDomPrefs->AppendElement(pref); -- p += length + 1; -- MOZ_ASSERT(*(p - 1) == '|'); -- } -- p++; -- -- MOZ_ASSERT(*p == '\0'); -- - // We finished parsing on a '\0'. That should be the last char in the shared -- // memory. -- MOZ_ASSERT(aStr + aStrLen - 1 == p); -+ // memory. (aPrefsLen includes the '\0'.) -+ MOZ_ASSERT(p == aStr + aPrefsLen - 1); - - #ifdef DEBUG -- MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet); -- gPhase = ContentProcessPhase::eEarlyPrefsSet; -+ MOZ_ASSERT(!gContentProcessPrefsAreInited); -+ gContentProcessPrefsAreInited = true; - #endif - } - --/* static */ void Preferences::SetLatePreferences( -- const nsTArray* aDomPrefs) { -- MOZ_ASSERT(!XRE_IsParentProcess()); -- -- for (unsigned int i = 0; i < aDomPrefs->Length(); i++) { -- Preferences::SetPreference(aDomPrefs->ElementAt(i)); -- } -- --#ifdef DEBUG -- MOZ_ASSERT(gPhase == ContentProcessPhase::eEarlyPrefsSet); -- gPhase = ContentProcessPhase::eEarlyAndLatePrefsSet; --#endif --} -- - /* static */ void Preferences::InitializeUserPrefs() { - MOZ_ASSERT(XRE_IsParentProcess()); - MOZ_ASSERT(!sPreferences->mCurrentFile, "Should only initialize prefs once"); -@@ -3133,32 +3219,10 @@ Preferences::SavePrefFile(nsIFile* aFile) { - } - } - --void Preferences::GetPreferences(InfallibleTArray* aDomPrefs) { -- MOZ_ASSERT(XRE_IsParentProcess()); -- MOZ_ASSERT(NS_IsMainThread()); -- -- aDomPrefs->SetCapacity(gHashTable->EntryCount()); -- for (auto iter = gHashTable->Iter(); !iter.Done(); iter.Next()) { -- Pref* pref = static_cast(iter.Get())->mPref; -- -- if (!pref->MustSendToContentProcesses()) { -- // The pref value hasn't changed since it was initialized at startup. -- // Don't bother sending it, because the content process will initialize -- // it the same way. -- continue; -- } -- -- if (pref->HasAdvisablySizedValues()) { -- dom::Pref* setting = aDomPrefs->AppendElement(); -- pref->ToDomPref(setting); -- } -- } --} -- - #ifdef DEBUG --bool Preferences::AreAllPrefsSetInContentProcess() { -+bool Preferences::ArePrefsInitedInContentProcess() { - MOZ_ASSERT(!XRE_IsParentProcess()); -- return gPhase == ContentProcessPhase::eEarlyAndLatePrefsSet; -+ return gContentProcessPrefsAreInited; - } - #endif - -diff --git modules/libpref/Preferences.h modules/libpref/Preferences.h -index 0d976483daae..901425b5b663 100644 ---- modules/libpref/Preferences.h -+++ modules/libpref/Preferences.h -@@ -277,15 +277,10 @@ class Preferences final : public nsIPrefService, - static nsresult AddFloatVarCache(float* aVariable, const char* aPref, - float aDefault = 0.0f); - -- // When a content process is created these methods are used to pass prefs in -- // bulk from the parent process. "Early" preferences are ones that are needed -- // very early on in the content process's lifetime; they are passed via a -- // special shared memory segment. "Late" preferences are the remainder, which -- // are passed via a standard IPC message. -- static void SerializeEarlyPreferences(nsCString& aStr); -- static void DeserializeEarlyPreferences(char* aStr, size_t aStrLen); -- static void GetPreferences(InfallibleTArray* aSettings); -- static void SetLatePreferences(const nsTArray* aSettings); -+ // When a content process is created these methods are used to pass changed -+ // prefs in bulk from the parent process, via shared memory. -+ static void SerializePreferences(nsCString& aStr); -+ static void DeserializePreferences(char* aStr, size_t aPrefsLen); - - // When a single pref is changed in the parent process, these methods are - // used to pass the update to content processes. -@@ -293,7 +288,7 @@ class Preferences final : public nsIPrefService, - static void SetPreference(const dom::Pref& aPref); - - #ifdef DEBUG -- static bool AreAllPrefsSetInContentProcess(); -+ static bool ArePrefsInitedInContentProcess(); - #endif - - static void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf, -- cgit From 4e6043c368c626f7a7ff6b93d49fbed12b9a3e8f Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 05:05:45 +0000 Subject: net/waypipe: update to 0.5.0 Changes: https://gitlab.freedesktop.org/mstoeckl/waypipe/compare/v0.4.0...v0.5.0 MFH: 2019Q3 (better OpenGL support on Intel) --- net/waypipe/Makefile | 16 ++++++++-- net/waypipe/distinfo | 6 ++-- net/waypipe/files/patch-neon-freebsd11 | 55 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 net/waypipe/files/patch-neon-freebsd11 diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile index ea6d54a2290d..f2af29eecf66 100644 --- a/net/waypipe/Makefile +++ b/net/waypipe/Makefile @@ -2,8 +2,7 @@ PORTNAME= waypipe DISTVERSIONPREFIX= v -DISTVERSION= 0.4.0 -PORTREVISION= 1 +DISTVERSION= 0.5.0 CATEGORIES= net MAINTAINER= jbeich@FreeBSD.org @@ -19,8 +18,19 @@ USES= compiler:c11 localbase:ldflags meson pkgconfig USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= mstoeckl -GL_COMMIT= 039bd9acb20fe423f6c3b068bb08c6e6935f0d2b +GL_COMMIT= e66f42444d81633f5b413cfe158809efd9c437f0 PLIST_FILES= bin/${PORTNAME} +# XXX armv6 needs https://github.com/mesonbuild/meson/commit/147d3f752c41 +CONFIGURE_ENV= UNAME_m=${ARCH} + +# XXX Drop after FreeBSD 12.0 EOL +.if exists(/usr/lib/clang/6.0.0) || exists(/usr/lib/clang/6.0.1) +.if ${CC} == cc && (${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386) +USES:= ${USES:Ncompiler*} # silence warning +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +.endif +.endif OPTIONS_DEFINE= FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD OPTIONS_DEFAULT=FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo index 6b9634ec8037..f69c8907b141 100644 --- a/net/waypipe/distinfo +++ b/net/waypipe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564420188 -SHA256 (mstoeckl-waypipe-039bd9acb20fe423f6c3b068bb08c6e6935f0d2b_GL0.tar.gz) = 8ab2f3898ad50910576f3f63cc9ea4182a106aab83e191139c0d3f95325a6eb8 -SIZE (mstoeckl-waypipe-039bd9acb20fe423f6c3b068bb08c6e6935f0d2b_GL0.tar.gz) = 124271 +TIMESTAMP = 1565392944 +SHA256 (mstoeckl-waypipe-e66f42444d81633f5b413cfe158809efd9c437f0_GL0.tar.gz) = 4a78dd943b617e2d39a34f4908f7acd0d0d59e838a83f739effcbf4d452bcec0 +SIZE (mstoeckl-waypipe-e66f42444d81633f5b413cfe158809efd9c437f0_GL0.tar.gz) = 135515 diff --git a/net/waypipe/files/patch-neon-freebsd11 b/net/waypipe/files/patch-neon-freebsd11 new file mode 100644 index 000000000000..bcdbcb8bb45a --- /dev/null +++ b/net/waypipe/files/patch-neon-freebsd11 @@ -0,0 +1,55 @@ +- Implement NEON runtime detection on FreeBSD 11.* armv6 + +--- src/kernel.c.orig 2019-08-09 23:22:24 UTC ++++ src/kernel.c +@@ -36,8 +36,36 @@ + #include + #include + #elif defined(__FreeBSD__) && defined(__arm__) ++#if __FreeBSD__ >= 12 + #include ++#else ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned long getauxval(unsigned long type) { ++ Elf_Auxinfo auxv[AT_COUNT]; ++ size_t len = sizeof(auxv); ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_AUXV, ++ getpid(), ++ }; ++ ++ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) { ++ for (size_t i = 0; i < nitems(auxv); i++) ++ if ((unsigned long)auxv[i].a_type == type) ++ return auxv[i].a_un.a_val; ++ ++ errno = ENOENT; ++ } ++ return 0; ++} + #endif ++#endif + + size_t run_interval_diff_C(const int diff_window_size, + const void *__restrict__ imod, void *__restrict__ ibase, +@@ -127,9 +155,13 @@ static bool neon_available(void) + #if defined(__linux__) && defined(__arm__) + return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0; + #elif defined(__FreeBSD__) && defined(__arm__) ++#if __FreeBSD__ < 12 ++ return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0; ++#else + unsigned long hwcap = 0; + elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); + return (hwcap & HWCAP_NEON) != 0; ++#endif + #endif + return true; + } -- cgit From 36a7892f32dcbbb24b5c5f4c161ce89c7735b390 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 05:34:39 +0000 Subject: graphics/drm_info: add new port Small utility to dump info about DRM devices. Suports JSON output. Dumps can be shared on https://drmdb.emersion.fr/ --- graphics/Makefile | 1 + graphics/drm_info/Makefile | 22 ++++++++++++++++++++++ graphics/drm_info/distinfo | 3 +++ graphics/drm_info/pkg-descr | 3 +++ 4 files changed, 29 insertions(+) create mode 100644 graphics/drm_info/Makefile create mode 100644 graphics/drm_info/distinfo create mode 100644 graphics/drm_info/pkg-descr diff --git a/graphics/Makefile b/graphics/Makefile index 1154ccc1c62a..5f991827fd8c 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -143,6 +143,7 @@ SUBDIR += drm-fbsd12.0-kmod SUBDIR += drm-kmod SUBDIR += drm-legacy-kmod + SUBDIR += drm_info SUBDIR += dspdfviewer SUBDIR += duhdraw SUBDIR += dynamechs diff --git a/graphics/drm_info/Makefile b/graphics/drm_info/Makefile new file mode 100644 index 000000000000..69738e9b6319 --- /dev/null +++ b/graphics/drm_info/Makefile @@ -0,0 +1,22 @@ +# $FreeBSD$ + +PORTNAME= drm_info +DISTVERSIONPREFIX= v +DISTVERSION= 2.1.0 +CATEGORIES= graphics + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Small utility to dump info about DRM devices + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libdrm.so:graphics/libdrm + +USES= compiler:c11 meson pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= ascent12 +PLIST_FILES= bin/${PORTNAME} + +.include diff --git a/graphics/drm_info/distinfo b/graphics/drm_info/distinfo new file mode 100644 index 000000000000..11eb5dc27f4e --- /dev/null +++ b/graphics/drm_info/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1559573555 +SHA256 (ascent12-drm_info-v2.1.0_GH0.tar.gz) = eb5158f93815e4a30b0e10c98fbe3e0b5422dbd8c6d6ff8b9490f92b80993612 +SIZE (ascent12-drm_info-v2.1.0_GH0.tar.gz) = 12947 diff --git a/graphics/drm_info/pkg-descr b/graphics/drm_info/pkg-descr new file mode 100644 index 000000000000..bfddbf994084 --- /dev/null +++ b/graphics/drm_info/pkg-descr @@ -0,0 +1,3 @@ +Small utility to dump info about DRM devices. Suports JSON output. + +WWW: https://github.com/ascent12/drm_info -- cgit From 3042b3ae901b14051d34ddca31c55e80186c572c Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 06:14:28 +0000 Subject: textproc/nuspell: rename DOCS to MANPAGES for consistency --- textproc/nuspell/Makefile | 6 ++++-- textproc/nuspell/pkg-plist | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile index e9f5d1728729..9628ea986298 100644 --- a/textproc/nuspell/Makefile +++ b/textproc/nuspell/Makefile @@ -19,9 +19,11 @@ USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -OPTIONS_DEFINE= DOCS TEST +OPTIONS_DEFINE= MANPAGES TEST +OPTIONS_DEFAULT=MANPAGES -DOCS_BUILD_DEPENDS= ronn:textproc/rubygem-ronn +MANPAGES_BUILD_DEPENDS= ronn:textproc/rubygem-ronn +MANPAGES_PLIST_FILES= man/man1/nuspell.1.gz TEST_BUILD_DEPENDS= catch>0:devel/catch \ bash:shells/bash diff --git a/textproc/nuspell/pkg-plist b/textproc/nuspell/pkg-plist index eae1f11bbf5a..9db488739b9b 100644 --- a/textproc/nuspell/pkg-plist +++ b/textproc/nuspell/pkg-plist @@ -13,4 +13,3 @@ lib/libnuspell.so lib/libnuspell.so.2 lib/libnuspell.so.2.3.0 libdata/pkgconfig/nuspell.pc -%%PORTDOCS%%man/man1/nuspell.1.gz -- cgit From c3559a9eb97fd26417bcfbf233c54a6447f23829 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 06:40:40 +0000 Subject: graphics/kanshi: add new port kanshi allows you to define output profiles that are automatically enabled and disabled on hotplug. For instance, this can be used to turn a laptop's internal screen off when docked. This is a Wayland equivalent for tools like autorandr. kanshi can be used on Wayland compositors supporting wlr-output-management protocol. Sway users: kanshi requires Sway 1.2 or later. https://wayland.emersion.fr/kanshi/ --- x11/Makefile | 1 + x11/kanshi/Makefile | 30 ++++++++++++++++++++++++++++++ x11/kanshi/distinfo | 3 +++ x11/kanshi/pkg-descr | 10 ++++++++++ 4 files changed, 44 insertions(+) create mode 100644 x11/kanshi/Makefile create mode 100644 x11/kanshi/distinfo create mode 100644 x11/kanshi/pkg-descr diff --git a/x11/Makefile b/x11/Makefile index 2bcb68257876..460bce8816ab 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -112,6 +112,7 @@ SUBDIR += innerspace SUBDIR += ipager SUBDIR += j4-dmenu-desktop + SUBDIR += kanshi SUBDIR += kb2mb2 SUBDIR += kde-baseapps SUBDIR += kde5 diff --git a/x11/kanshi/Makefile b/x11/kanshi/Makefile new file mode 100644 index 000000000000..57bb9bbeba2b --- /dev/null +++ b/x11/kanshi/Makefile @@ -0,0 +1,30 @@ +# $FreeBSD$ + +PORTNAME= kanshi +PORTVERSION= s20190607 +CATEGORIES= x11 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Dynamic display configuration for Wayland + +LICENSE= MIT +# https://github.com/emersion/kanshi/issues/45 +#LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libwayland-client.so:graphics/wayland + +USES= meson pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= emersion +GH_TAGNAME= 76e9f41 +PLIST_FILES= bin/${PORTNAME} + +OPTIONS_DEFINE= MANPAGES +OPTIONS_DEFAULT=MANPAGES + +MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc +MANPAGES_MESON_ENABLED= man-pages +MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz \ + man/man5/${PORTNAME}.5.gz + +.include diff --git a/x11/kanshi/distinfo b/x11/kanshi/distinfo new file mode 100644 index 000000000000..8373400ce69d --- /dev/null +++ b/x11/kanshi/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1559470039 +SHA256 (emersion-kanshi-s20190607-76e9f41_GH0.tar.gz) = c80184b5a2f1208af06f4953fbba7dc7fcd6d35cd7feb0afe2e1c9f46b5a9adb +SIZE (emersion-kanshi-s20190607-76e9f41_GH0.tar.gz) = 13834 diff --git a/x11/kanshi/pkg-descr b/x11/kanshi/pkg-descr new file mode 100644 index 000000000000..69ce82dc08a8 --- /dev/null +++ b/x11/kanshi/pkg-descr @@ -0,0 +1,10 @@ +kanshi allows you to define output profiles that are automatically +enabled and disabled on hotplug. For instance, this can be used to +turn a laptop's internal screen off when docked. + +This is a Wayland equivalent for tools like autorandr. kanshi can be +used on Wayland compositors supporting wlr-output-management protocol. + +Sway users: kanshi requires Sway 1.2 or later. + +WWW: https://wayland.emersion.fr/kanshi/ -- cgit From 84effe87f4b2aa08250108e529fd4e7fa21e3a5f Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 06:40:50 +0000 Subject: x11/kanshi: unbreak on GCC architectures cc1: warnings being treated as errors ../parser.c: In function 'parse_config': ../parser.c:266: warning: 'key' may be used uninitialized in this function ../parser.c:266: note: 'key' was declared here --- x11/kanshi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11/kanshi/Makefile b/x11/kanshi/Makefile index 57bb9bbeba2b..9da53eba26bb 100644 --- a/x11/kanshi/Makefile +++ b/x11/kanshi/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libwayland-client.so:graphics/wayland -USES= meson pkgconfig +USES= compiler:c11 meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= emersion GH_TAGNAME= 76e9f41 -- cgit From d909d47da488ac49d2d67101e05fa88e8d478278 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 06:58:19 +0000 Subject: textproc/nuspell: consistently use PORTNAME in PLIST_FILES --- textproc/nuspell/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile index 9628ea986298..95042ea7a4ad 100644 --- a/textproc/nuspell/Makefile +++ b/textproc/nuspell/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= MANPAGES TEST OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= ronn:textproc/rubygem-ronn -MANPAGES_PLIST_FILES= man/man1/nuspell.1.gz +MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz TEST_BUILD_DEPENDS= catch>0:devel/catch \ bash:shells/bash -- cgit From 341cdb0b6bb41ff709d8f723125135dec81564ef Mon Sep 17 00:00:00 2001 From: tobik Date: Sun, 11 Aug 2019 07:17:39 +0000 Subject: graphics/netpbm: Update to 10.87.01 Changes: https://gitlab.com/tobiask/netpbm/raw/v10.87.01/doc/HISTORY --- graphics/netpbm/Makefile | 4 ++-- graphics/netpbm/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 95a14a24d2e6..1de8f7e3eacd 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= netpbm -DISTVERSION= 10.87.00 +DISTVERSION= 10.87.01 CATEGORIES= graphics MASTER_SITES= https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \ - https://gitlab.com/tobiask/netpbm/uploads/125945b95a7de7dfaf6a3906315e8908/ \ + https://gitlab.com/tobiask/netpbm/uploads/aa50c2aa391a8aedb35d5e914b88c4d0/ \ LOCAL/tobik MAINTAINER= tobik@FreeBSD.org diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 35a8048c7bf3..e27abab91e34 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561997100 -SHA256 (netpbm-10.87.00.tar.gz) = fd7d30b5c88dd003c17e120618393152e4d54a1d737500d4ca560f3812fc6e54 -SIZE (netpbm-10.87.00.tar.gz) = 3336539 +TIMESTAMP = 1565471255 +SHA256 (netpbm-10.87.01.tar.gz) = 29c4c6a5588ca45c9598678a4e71e579be3d38fcf61dd7629195c77f4ec5adf6 +SIZE (netpbm-10.87.01.tar.gz) = 3336887 -- cgit From 1905436b0a65ad6bc30897abb52cef37c7be1281 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 07:39:30 +0000 Subject: sysutils/crate: Update 0.1.2 -> 0.1.3 Fixes 11.3 build. Reported by: jbeich (11.3 breakage) --- sysutils/crate/Makefile | 2 +- sysutils/crate/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index 732499d758ae..d4b92c9a573f 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= crate -DISTVERSION= 0.1.2 +DISTVERSION= 0.1.3 CATEGORIES= sysutils emulators MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/crate/distinfo b/sysutils/crate/distinfo index d96824e1b817..7e5025ab3063 100644 --- a/sysutils/crate/distinfo +++ b/sysutils/crate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565462236 -SHA256 (yurivict-crate-0.1.2_GH0.tar.gz) = 43aaef93ecfce4ba7890123f1b284ae7d5ffde29781985e6cd2bae3db8039a47 -SIZE (yurivict-crate-0.1.2_GH0.tar.gz) = 33137 +TIMESTAMP = 1565507333 +SHA256 (yurivict-crate-0.1.3_GH0.tar.gz) = cd7f2e1ffb7f120b70a39984e0d7ac991639b679f7f89e8bae8f61ab7fa3678f +SIZE (yurivict-crate-0.1.3_GH0.tar.gz) = 34076 -- cgit From 4fbce44021667fa1ee9f5b1e90c44ff8aecb773a Mon Sep 17 00:00:00 2001 From: linimon Date: Sun, 11 Aug 2019 08:30:38 +0000 Subject: These ports now build on aarch64. Approved by: portmgr (tier-2 blanket) --- cad/ngspice_rework/Makefile | 2 -- lang/gauche/Makefile | 1 - 2 files changed, 3 deletions(-) diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile index 39c2abd1cc74..46b0010340f4 100644 --- a/cad/ngspice_rework/Makefile +++ b/cad/ngspice_rework/Makefile @@ -15,8 +15,6 @@ LICENSE= BSD3CLAUSE BSD4CLAUSE LGPL21+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= Fails to link: missing sbrk - LIB_DEPENDS= libfftw3.so:math/fftw3 FLAVORS= x11 shlib diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 2cfb6590f056..240cc63ec10f 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -13,7 +13,6 @@ COMMENT= Scheme script interpreter with multibyte character handling LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= Fails to link: missing sbrk BROKEN_mips= Fails to build: redefinition of GC_register_dynamic_libraries BROKEN_mips64= Fails to build: redefinition of GC_register_dynamic_libraries -- cgit From c194a544bf43bff6061e653358fb8734cefa29cf Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Sun, 11 Aug 2019 09:02:31 +0000 Subject: - Update WWW Approved by: portmgr blanket --- devel/coursier/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/coursier/pkg-descr b/devel/coursier/pkg-descr index a0c63c3dcfdd..4f9880d5d259 100644 --- a/devel/coursier/pkg-descr +++ b/devel/coursier/pkg-descr @@ -1,4 +1,4 @@ Coursier can fetch, launch, and create tiny bootstrap launchers from apps distributed via Maven / Ivy repositories. -WWW: http://get-coursier.io +WWW: https://get-coursier.io/ -- cgit From e99a5569b6a8eeb761a5980ab0b6c7d957f4456f Mon Sep 17 00:00:00 2001 From: gerald Date: Sun, 11 Aug 2019 09:27:25 +0000 Subject: Update to the 20180803 snapshot of GCC 9.1.1. This brings a larger number of backports for the testsuite, a fix for Fortran, one for rs6000 (aka powerpc*) and most importantly now longer has _GNU_SOURCE defined on powerpc64 (which was a regression from the GCC 8 series [1]). PR: 239648 [1] --- lang/gcc9-devel/Makefile | 2 +- lang/gcc9-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index dcec09b9fce8..d1f0941e5475 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 9.1.1.s20190803 +PORTVERSION= 9.1.1.s20190810 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo index 4e9c72609a9c..6b93c61e2c3e 100644 --- a/lang/gcc9-devel/distinfo +++ b/lang/gcc9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564876898 -SHA256 (gcc-9-20190803.tar.xz) = 546e521ea2de1e4a7377165eb89782004d0fda9fae2eadfe392a35ba84a3e5bc -SIZE (gcc-9-20190803.tar.xz) = 68799188 +TIMESTAMP = 1565511023 +SHA256 (gcc-9-20190810.tar.xz) = 7bdebde0c6d4389499aff4886f5608234dad340bbcd256ebdbdb96dbd20a0815 +SIZE (gcc-9-20190810.tar.xz) = 68858948 -- cgit From 3162641ac1144b2afc55860f23ad014be7fab3a1 Mon Sep 17 00:00:00 2001 From: novel Date: Sun, 11 Aug 2019 10:36:45 +0000 Subject: net/py-pyzmq: update to 18.1.0 --- net/py-pyzmq/Makefile | 2 +- net/py-pyzmq/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile index 986f32d58af3..5142af8ad7a6 100644 --- a/net/py-pyzmq/Makefile +++ b/net/py-pyzmq/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyzmq -PORTVERSION= 18.0.2 +PORTVERSION= 18.1.0 CATEGORIES= net devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyzmq/distinfo b/net/py-pyzmq/distinfo index c93da17663e7..a7256a90a5e9 100644 --- a/net/py-pyzmq/distinfo +++ b/net/py-pyzmq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561804779 -SHA256 (pyzmq-18.0.2.tar.gz) = 31a11d37ac73107363b47e14c94547dbfc6a550029c3fe0530be443199026fc2 -SIZE (pyzmq-18.0.2.tar.gz) = 1157787 +TIMESTAMP = 1565407880 +SHA256 (pyzmq-18.1.0.tar.gz) = 93f44739db69234c013a16990e43db1aa0af3cf5a4b8b377d028ff24515fbeb3 +SIZE (pyzmq-18.1.0.tar.gz) = 1158509 -- cgit From e84dd3c8a0c3a4021dc89ddafbbdb447fad004ba Mon Sep 17 00:00:00 2001 From: novel Date: Sun, 11 Aug 2019 10:54:43 +0000 Subject: devel/libvirt: update to 5.6.0 --- devel/libvirt/Makefile | 5 ++--- devel/libvirt/distinfo | 6 +++--- devel/libvirt/pkg-plist | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index bb0349542e87..7a885b93f03d 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 5.5.0 -PORTREVISION= 1 +PORTVERSION= 5.6.0 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -106,7 +105,7 @@ USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check -SHLIB_VER= 0.5005.0 +SHLIB_VER= 0.5006.0 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PORTDOCS= * SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo index 808cbdb57218..4d66b2e96ee5 100644 --- a/devel/libvirt/distinfo +++ b/devel/libvirt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562203494 -SHA256 (libvirt-5.5.0.tar.xz) = 2306ef0947a594f91ec9da4b8b0307bdb54b897f17de19f48e8ecdca08ff35e8 -SIZE (libvirt-5.5.0.tar.xz) = 12930224 +TIMESTAMP = 1565100131 +SHA256 (libvirt-5.6.0.tar.xz) = 65f4f9924e10135aa694ca8bcb0b55725883d08e0b32c42111603d573aabb9b4 +SIZE (libvirt-5.6.0.tar.xz) = 13147976 diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist index 867f7facb5d8..1c22f59727bc 100644 --- a/devel/libvirt/pkg-plist +++ b/devel/libvirt/pkg-plist @@ -41,6 +41,7 @@ etc/logrotate.d/libvirtd.qemu etc/logrotate.d/libvirtd.libxl include/libvirt/libvirt-admin.h include/libvirt/libvirt-common.h +include/libvirt/libvirt-domain-checkpoint.h include/libvirt/libvirt-domain-snapshot.h include/libvirt/libvirt-domain.h include/libvirt/libvirt-event.h @@ -102,6 +103,7 @@ share/gtk-doc/html/libvirt/home.png share/gtk-doc/html/libvirt/index.html share/gtk-doc/html/libvirt/left.png share/gtk-doc/html/libvirt/libvirt-libvirt-common.html +share/gtk-doc/html/libvirt/libvirt-libvirt-domain-checkpoint.html share/gtk-doc/html/libvirt/libvirt-libvirt-domain-snapshot.html share/gtk-doc/html/libvirt/libvirt-libvirt-domain.html share/gtk-doc/html/libvirt/libvirt-libvirt-event.html @@ -185,6 +187,7 @@ share/gtk-doc/html/libvirt/up.png %%DATADIR%%/schemas/cputypes.rng %%DATADIR%%/schemas/domain.rng %%DATADIR%%/schemas/domaincaps.rng +%%DATADIR%%/schemas/domaincheckpoint.rng %%DATADIR%%/schemas/domaincommon.rng %%DATADIR%%/schemas/domainsnapshot.rng %%DATADIR%%/schemas/interface.rng -- cgit From bffd763d6ecbe54269ecc65e31fe3b94b4b18eb6 Mon Sep 17 00:00:00 2001 From: novel Date: Sun, 11 Aug 2019 10:55:27 +0000 Subject: devel/py-libvirt: update to 5.6.0 --- devel/py-libvirt/Makefile | 2 +- devel/py-libvirt/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-libvirt/Makefile b/devel/py-libvirt/Makefile index 10287b7f92fa..ea3bcf6403d3 100644 --- a/devel/py-libvirt/Makefile +++ b/devel/py-libvirt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 5.5.0 +PORTVERSION= 5.6.0 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/python/ \ ftp://libvirt.org/libvirt/python/ diff --git a/devel/py-libvirt/distinfo b/devel/py-libvirt/distinfo index 809820bf2ce8..9260bbd79b46 100644 --- a/devel/py-libvirt/distinfo +++ b/devel/py-libvirt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563102228 -SHA256 (libvirt-python-5.5.0.tar.gz) = 561cafedb83e41880405905f6309f4a86981cfe05edbbc83c839f7c47d8ba603 -SIZE (libvirt-python-5.5.0.tar.gz) = 200364 +TIMESTAMP = 1565101118 +SHA256 (libvirt-python-5.6.0.tar.gz) = 4df13fed9528a7eec153ab70196dcd481f6377ae5bf9ef84e07dfa1515202486 +SIZE (libvirt-python-5.6.0.tar.gz) = 201352 -- cgit From d335263fb9d3a8703c880b4f9ee40ab39f0d27ad Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:21 +0000 Subject: Move devel/py-mimeparse to decel/py-python-mimeparse --- devel/Makefile | 2 +- devel/py-mimeparse/Makefile | 25 ------------------------- devel/py-mimeparse/distinfo | 3 --- devel/py-mimeparse/pkg-descr | 4 ---- devel/py-python-mimeparse/Makefile | 24 ++++++++++++++++++++++++ devel/py-python-mimeparse/distinfo | 3 +++ devel/py-python-mimeparse/pkg-descr | 4 ++++ 7 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 devel/py-mimeparse/Makefile delete mode 100644 devel/py-mimeparse/distinfo delete mode 100644 devel/py-mimeparse/pkg-descr create mode 100644 devel/py-python-mimeparse/Makefile create mode 100644 devel/py-python-mimeparse/distinfo create mode 100644 devel/py-python-mimeparse/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index 0b06b68e2a7d..c2955fcce5ac 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4620,7 +4620,6 @@ SUBDIR += py-memory_profiler SUBDIR += py-mercurialserver SUBDIR += py-microversion-parse - SUBDIR += py-mimeparse SUBDIR += py-minimongo SUBDIR += py-minio SUBDIR += py-mock @@ -4890,6 +4889,7 @@ SUBDIR += py-python-gitlab SUBDIR += py-python-jenkins SUBDIR += py-python-magic + SUBDIR += py-python-mimeparse SUBDIR += py-python-pcre SUBDIR += py-python-socketio SUBDIR += py-python-statsd diff --git a/devel/py-mimeparse/Makefile b/devel/py-mimeparse/Makefile deleted file mode 100644 index a63a0f249d41..000000000000 --- a/devel/py-mimeparse/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Created by: William Grzybowski -# $FreeBSD$ - -PORTNAME= mimeparse -PORTVERSION= 1.6.0 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= python-${PORTNAME}-${PORTVERSION} - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Basic functions for handling mime-types in Python - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= python -USE_PYTHON= autoplist concurrent distutils - -NO_ARCH= yes - -do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} python${PYTHON_VER} mimeparse_test.py - -.include diff --git a/devel/py-mimeparse/distinfo b/devel/py-mimeparse/distinfo deleted file mode 100644 index 8636cbc4afdb..000000000000 --- a/devel/py-mimeparse/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1531934853 -SHA256 (python-mimeparse-1.6.0.tar.gz) = 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 -SIZE (python-mimeparse-1.6.0.tar.gz) = 6541 diff --git a/devel/py-mimeparse/pkg-descr b/devel/py-mimeparse/pkg-descr deleted file mode 100644 index 90d933e98508..000000000000 --- a/devel/py-mimeparse/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This module provides basic functions for parsing mime-type names and matching -them against a list of media-ranges. - -WWW: http://code.google.com/p/mimeparse/ diff --git a/devel/py-python-mimeparse/Makefile b/devel/py-python-mimeparse/Makefile new file mode 100644 index 000000000000..86add5fd38f9 --- /dev/null +++ b/devel/py-python-mimeparse/Makefile @@ -0,0 +1,24 @@ +# Created by: William Grzybowski +# $FreeBSD$ + +PORTNAME= python-mimeparse +PORTVERSION= 1.6.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Basic functions for handling mime-types in Python + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +do-test: + cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} python${PYTHON_VER} mimeparse_test.py + +.include diff --git a/devel/py-python-mimeparse/distinfo b/devel/py-python-mimeparse/distinfo new file mode 100644 index 000000000000..8636cbc4afdb --- /dev/null +++ b/devel/py-python-mimeparse/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1531934853 +SHA256 (python-mimeparse-1.6.0.tar.gz) = 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 +SIZE (python-mimeparse-1.6.0.tar.gz) = 6541 diff --git a/devel/py-python-mimeparse/pkg-descr b/devel/py-python-mimeparse/pkg-descr new file mode 100644 index 000000000000..90d933e98508 --- /dev/null +++ b/devel/py-python-mimeparse/pkg-descr @@ -0,0 +1,4 @@ +This module provides basic functions for parsing mime-type names and matching +them against a list of media-ranges. + +WWW: http://code.google.com/p/mimeparse/ -- cgit From a6d2fa2d503b617c2596c392c6c437672eb91275 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:26 +0000 Subject: Add rubygem-google-cloud-storage 1.20.0 Google Cloud Storage (docs) allows you to store data on Google infrastructure with very high reliability, performance and availability, and can be used to distribute large data objects to users via direct download. WWW: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-storage --- net/Makefile | 1 + net/rubygem-google-cloud-storage/Makefile | 27 +++++++++++++++++++++++++++ net/rubygem-google-cloud-storage/distinfo | 3 +++ net/rubygem-google-cloud-storage/pkg-descr | 5 +++++ 4 files changed, 36 insertions(+) create mode 100644 net/rubygem-google-cloud-storage/Makefile create mode 100644 net/rubygem-google-cloud-storage/distinfo create mode 100644 net/rubygem-google-cloud-storage/pkg-descr diff --git a/net/Makefile b/net/Makefile index 3946b0cd0b98..280792d699b6 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1257,6 +1257,7 @@ SUBDIR += rubygem-gitlab_omniauth-ldap SUBDIR += rubygem-google-cloud-core SUBDIR += rubygem-google-cloud-env + SUBDIR += rubygem-google-cloud-storage SUBDIR += rubygem-grpc SUBDIR += rubygem-hangouts-chat SUBDIR += rubygem-http_parser.rb diff --git a/net/rubygem-google-cloud-storage/Makefile b/net/rubygem-google-cloud-storage/Makefile new file mode 100644 index 000000000000..a4e8dea4d84c --- /dev/null +++ b/net/rubygem-google-cloud-storage/Makefile @@ -0,0 +1,27 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= google-cloud-storage +PORTVERSION= 1.20.0 +CATEGORIES= net rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Official library for Google Cloud Storage + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-addressable>=2.5<3.0:www/rubygem-addressable \ + rubygem-digest-crc>=0.4<1.0:security/rubygem-digest-crc \ + rubygem-google-api-client>=0.26<1.0:devel/rubygem-google-api-client \ + rubygem-google-cloud-core>=1.2<2.0:net/rubygem-google-cloud-core \ + rubygem-googleauth>=0.6.2<0.10.0:security/rubygem-googleauth \ + rubygem-mini_mime>=1.0<2.0:mail/rubygem-mini_mime + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/net/rubygem-google-cloud-storage/distinfo b/net/rubygem-google-cloud-storage/distinfo new file mode 100644 index 000000000000..2698c101df5f --- /dev/null +++ b/net/rubygem-google-cloud-storage/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565514605 +SHA256 (rubygem/google-cloud-storage-1.20.0.gem) = c618e8f5e5b6ad87df82016012e0f450629421b879cc1b11be52fcaf0d969b77 +SIZE (rubygem/google-cloud-storage-1.20.0.gem) = 81920 diff --git a/net/rubygem-google-cloud-storage/pkg-descr b/net/rubygem-google-cloud-storage/pkg-descr new file mode 100644 index 000000000000..fff33eef6eb0 --- /dev/null +++ b/net/rubygem-google-cloud-storage/pkg-descr @@ -0,0 +1,5 @@ +Google Cloud Storage (docs) allows you to store data on Google infrastructure +with very high reliability, performance and availability, and can be used to +distribute large data objects to users via direct download. + +WWW: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-storage -- cgit From 90df05b7984c0be5323e18fdd768cbfef3f31e3f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:31 +0000 Subject: Use DISTVERSIONPREFIX instead of DISTNAME --- devel/protobuf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile index 7b79fa82dec4..9c9fb238f50f 100644 --- a/devel/protobuf/Makefile +++ b/devel/protobuf/Makefile @@ -3,10 +3,10 @@ PORTNAME= protobuf PORTVERSION= 3.9.1 +DISTVERSIONPREFIX= all- PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/ -DISTNAME= ${PORTNAME}-all-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Data interchange format library -- cgit From 8244228ab5d15cbf5b018a3c3b0878e5f809e8b3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:36 +0000 Subject: Cosmetic change --- devel/readline/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/readline/Makefile b/devel/readline/Makefile index d037470f8c14..374c4b4c3fe1 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -15,10 +15,6 @@ COMMENT= Library for editing command lines as they are typed LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= TERMCAP DOCS -OPTIONS_DEFAULT=TERMCAP -TERMCAP_DESC= Link against libtermcap - USES= cpe GNU_CONFIGURE= yes @@ -31,11 +27,15 @@ CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R} CPE_UPDATE= ${PATCHLEVEL} +OPTIONS_DEFINE= TERMCAP DOCS +OPTIONS_DEFAULT=TERMCAP +TERMCAP_DESC= Link against libtermcap + #PATCHES= 1 2 3 4 5 #PATCHLEVEL= ${PATCHES:O:[-1]} PATCHLEVEL= 0 #.for patch in ${PATCHES} -#PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:C|.*(...)$|\1|} +#PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|} #.endfor post-patch: -- cgit From cd5b512856f4375f1940da6cd7bd5faf97c82bcf Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:41 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/Compress-Raw-Bzip2 --- archivers/p5-Compress-Raw-Bzip2/Makefile | 2 +- archivers/p5-Compress-Raw-Bzip2/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-Compress-Raw-Bzip2/Makefile b/archivers/p5-Compress-Raw-Bzip2/Makefile index 9947087d410d..1f4f00c137be 100644 --- a/archivers/p5-Compress-Raw-Bzip2/Makefile +++ b/archivers/p5-Compress-Raw-Bzip2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Compress-Raw-Bzip2 -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-Compress-Raw-Bzip2/distinfo b/archivers/p5-Compress-Raw-Bzip2/distinfo index 98e6dc2d5288..859537c97170 100644 --- a/archivers/p5-Compress-Raw-Bzip2/distinfo +++ b/archivers/p5-Compress-Raw-Bzip2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149750 -SHA256 (Compress-Raw-Bzip2-2.086.tar.gz) = 46d3954a676d21cb10557dd3cc8140703b87bd8f14e49160120165586aa9f399 -SIZE (Compress-Raw-Bzip2-2.086.tar.gz) = 138150 +TIMESTAMP = 1565478461 +SHA256 (Compress-Raw-Bzip2-2.087.tar.gz) = 77bb0dfdda0475b9a2f5d463e4536a6f0ee480917b6743e72bfe31da8cf00cfb +SIZE (Compress-Raw-Bzip2-2.087.tar.gz) = 138176 -- cgit From 169c443511fe834f7d2a2becd570db4c28a37b0e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:46 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/Compress-Raw-Lzma --- archivers/p5-Compress-Raw-Lzma/Makefile | 2 +- archivers/p5-Compress-Raw-Lzma/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-Compress-Raw-Lzma/Makefile b/archivers/p5-Compress-Raw-Lzma/Makefile index ab23f521cfc6..4ddbbefd5845 100644 --- a/archivers/p5-Compress-Raw-Lzma/Makefile +++ b/archivers/p5-Compress-Raw-Lzma/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Compress-Raw-Lzma -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-Compress-Raw-Lzma/distinfo b/archivers/p5-Compress-Raw-Lzma/distinfo index 83725f373076..2c42588f146c 100644 --- a/archivers/p5-Compress-Raw-Lzma/distinfo +++ b/archivers/p5-Compress-Raw-Lzma/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149751 -SHA256 (Compress-Raw-Lzma-2.086.tar.gz) = 765fb8b228db060d0a5daa28c378c316af58be305d3b2168187cf6f9b2b448bb -SIZE (Compress-Raw-Lzma-2.086.tar.gz) = 115407 +TIMESTAMP = 1565478464 +SHA256 (Compress-Raw-Lzma-2.087.tar.gz) = 256c076f16538d07c109a3d37a96cf1154d2d1c215e85e81c4ee90ea19557568 +SIZE (Compress-Raw-Lzma-2.087.tar.gz) = 115421 -- cgit From 8c20e589b44e514f6c91bfb128a20770208508a1 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:51 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/Compress-Raw-Zlib --- archivers/p5-Compress-Raw-Zlib/Makefile | 2 +- archivers/p5-Compress-Raw-Zlib/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-Compress-Raw-Zlib/Makefile b/archivers/p5-Compress-Raw-Zlib/Makefile index a28e4af6e06e..ad2e3041ddac 100644 --- a/archivers/p5-Compress-Raw-Zlib/Makefile +++ b/archivers/p5-Compress-Raw-Zlib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Compress-Raw-Zlib -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-Compress-Raw-Zlib/distinfo b/archivers/p5-Compress-Raw-Zlib/distinfo index d19078867aee..96974cba4fd3 100644 --- a/archivers/p5-Compress-Raw-Zlib/distinfo +++ b/archivers/p5-Compress-Raw-Zlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149753 -SHA256 (Compress-Raw-Zlib-2.086.tar.gz) = 3f6dde715566b0cd8a41f6ae04f4da822614fe4a644c40b1a0e42293181f496d -SIZE (Compress-Raw-Zlib-2.086.tar.gz) = 245368 +TIMESTAMP = 1565478466 +SHA256 (Compress-Raw-Zlib-2.087.tar.gz) = 8c81c9e1e386b3620ea7aa4c393afe8c80d3587e4fde57b7f83106aea05bee8d +SIZE (Compress-Raw-Zlib-2.087.tar.gz) = 254083 -- cgit From fd6d84e6a95fbc12e156acde5dae7f26e9ae6d1c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:27:57 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/IO-Compress --- archivers/p5-IO-Compress/Makefile | 2 +- archivers/p5-IO-Compress/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile index 509add85b84e..c1fc5e8ac9d7 100644 --- a/archivers/p5-IO-Compress/Makefile +++ b/archivers/p5-IO-Compress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Compress -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-IO-Compress/distinfo b/archivers/p5-IO-Compress/distinfo index 1c5e36003200..b081ddbb6be1 100644 --- a/archivers/p5-IO-Compress/distinfo +++ b/archivers/p5-IO-Compress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149755 -SHA256 (IO-Compress-2.086.tar.gz) = 110a229aa02b701f9820f5e0c2e9c30db342ea241b2d01c03703ea4922b1ab53 -SIZE (IO-Compress-2.086.tar.gz) = 259563 +TIMESTAMP = 1565478469 +SHA256 (IO-Compress-2.087.tar.gz) = 94f792775d0496fffe862363c76637e74ff5b46c40cf47042547686d164e23cb +SIZE (IO-Compress-2.087.tar.gz) = 260022 -- cgit From fb270b799bff39909855dfe8d28cfbd928c711df Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:02 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/IO-Compress-Lzf --- archivers/p5-IO-Compress-Lzf/Makefile | 2 +- archivers/p5-IO-Compress-Lzf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-IO-Compress-Lzf/Makefile b/archivers/p5-IO-Compress-Lzf/Makefile index 80a49d0f2f51..aaee907685c3 100644 --- a/archivers/p5-IO-Compress-Lzf/Makefile +++ b/archivers/p5-IO-Compress-Lzf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Compress-Lzf -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-IO-Compress-Lzf/distinfo b/archivers/p5-IO-Compress-Lzf/distinfo index 0fb687e461ff..77510ae0e953 100644 --- a/archivers/p5-IO-Compress-Lzf/distinfo +++ b/archivers/p5-IO-Compress-Lzf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149757 -SHA256 (IO-Compress-Lzf-2.086.tar.gz) = 77dc878bdcfcf22755def53dba96d39bb304a152afd86fdd4264c90bdb5f9192 -SIZE (IO-Compress-Lzf-2.086.tar.gz) = 75468 +TIMESTAMP = 1565478472 +SHA256 (IO-Compress-Lzf-2.087.tar.gz) = e3aca6b4cc8298290dc459127bb8010ca8f7abac29026a53c6930bb5b3818a81 +SIZE (IO-Compress-Lzf-2.087.tar.gz) = 75491 -- cgit From 8dc5f873bc9a3fd4f2aea51858c8f0bcea4a88fc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:07 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/IO-Compress-Lzma --- archivers/p5-IO-Compress-Lzma/Makefile | 2 +- archivers/p5-IO-Compress-Lzma/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile index e8af598825e2..ad6b8c90a801 100644 --- a/archivers/p5-IO-Compress-Lzma/Makefile +++ b/archivers/p5-IO-Compress-Lzma/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Compress-Lzma -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-IO-Compress-Lzma/distinfo b/archivers/p5-IO-Compress-Lzma/distinfo index 3c221c164cf6..42956674b962 100644 --- a/archivers/p5-IO-Compress-Lzma/distinfo +++ b/archivers/p5-IO-Compress-Lzma/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149759 -SHA256 (IO-Compress-Lzma-2.086.tar.gz) = 1f940bd8a24fe88546d5818908dcce6b64179c954f5bd824be1be1e2cb524d87 -SIZE (IO-Compress-Lzma-2.086.tar.gz) = 95544 +TIMESTAMP = 1565478474 +SHA256 (IO-Compress-Lzma-2.087.tar.gz) = 34bffefa4bd294148938204a83a82f63c831c298432f61905f52666ea0dc7a60 +SIZE (IO-Compress-Lzma-2.087.tar.gz) = 95573 -- cgit From 750cca6df20757b45199a8d2f072f81089f502ee Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:12 +0000 Subject: Update to 2.087 Changes: https://metacpan.org/changes/distribution/IO-Compress-Lzop --- archivers/p5-IO-Compress-Lzop/Makefile | 2 +- archivers/p5-IO-Compress-Lzop/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivers/p5-IO-Compress-Lzop/Makefile b/archivers/p5-IO-Compress-Lzop/Makefile index a189da9062dd..901169bc338e 100644 --- a/archivers/p5-IO-Compress-Lzop/Makefile +++ b/archivers/p5-IO-Compress-Lzop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Compress-Lzop -PORTVERSION= 2.086 +PORTVERSION= 2.087 CATEGORIES= archivers perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/archivers/p5-IO-Compress-Lzop/distinfo b/archivers/p5-IO-Compress-Lzop/distinfo index b99378d6b884..4b5a450c9117 100644 --- a/archivers/p5-IO-Compress-Lzop/distinfo +++ b/archivers/p5-IO-Compress-Lzop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554149761 -SHA256 (IO-Compress-Lzop-2.086.tar.gz) = b4893a7c29b7eaf2169375ba16c21d4093cbab047569cd7b31173ce73eb4db39 -SIZE (IO-Compress-Lzop-2.086.tar.gz) = 80093 +TIMESTAMP = 1565478477 +SHA256 (IO-Compress-Lzop-2.087.tar.gz) = a6d0a7adeaea742b4b3c5899ce974a6d3c4410711a688df3eba204c605edbd29 +SIZE (IO-Compress-Lzop-2.087.tar.gz) = 80090 -- cgit From fbd048431ec9e57ad39dbedbe17b750d32921a39 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:16 +0000 Subject: Update WWW --- biology/p5-BioPerl/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biology/p5-BioPerl/pkg-descr b/biology/p5-BioPerl/pkg-descr index 93e2a521ae67..bfdb8ca5a5b9 100644 --- a/biology/p5-BioPerl/pkg-descr +++ b/biology/p5-BioPerl/pkg-descr @@ -8,4 +8,4 @@ genomics applications. (For an interesting aside on "How Perl saved the Human Genome Project", see http://www.bioperl.org/wiki/How_Perl_saved_human_genome) -WWW: http://bioperl.org/ +WWW: https://bioperl.org/ -- cgit From 8ab0c50c4fb287fa585842d5745e8117e0c9cdbd Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:21 +0000 Subject: Convert PORTDOCS and PORTEXAMPLES to PLIST entries --- devel/p5-Coro/Makefile | 7 ++----- devel/p5-Coro/pkg-plist | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile index 9e934ef882c6..1355e86d1b38 100644 --- a/devel/p5-Coro/Makefile +++ b/devel/p5-Coro/Makefile @@ -6,7 +6,7 @@ PORTEPOCH= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}-${PORTVERSION:C|0$||} +DISTNAME= ${PORTNAME}-${PORTVERSION:S|0$||} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Coroutine process abstraction for perl @@ -24,13 +24,10 @@ RUN_DEPENDS= p5-AnyEvent>=7:devel/p5-AnyEvent \ p5-IO-AIO>=3.1:devel/p5-IO-AIO \ p5-common-sense>=0:devel/p5-common-sense -OPTIONS_DEFINE= DOCS EXAMPLES - USES= perl5 shebangfix USE_PERL5= configure -PORTDOCS= * -PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EXAMPLES SHEBANG_FILES= Coro/*.pl eg/* perl_OLD_CMD= /.*/bin/perl diff --git a/devel/p5-Coro/pkg-plist b/devel/p5-Coro/pkg-plist index 074b834576f8..42d412e3d119 100644 --- a/devel/p5-Coro/pkg-plist +++ b/devel/p5-Coro/pkg-plist @@ -50,3 +50,13 @@ %%PERL5_MAN3%%/Coro::Storable.3.gz %%PERL5_MAN3%%/Coro::Timer.3.gz %%PERL5_MAN3%%/Coro::Util.3.gz +%%PORTDOCS%%%%DOCSDIR%%/cede-vs-schedule +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dns +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/event +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lwp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myhttpd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prodcons1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prodcons2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prodcons3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/readline -- cgit From adec529393b7e32a777493159ad4227a02ae9529 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:26 +0000 Subject: Update to 1.130 Changes: https://metacpan.org/changes/distribution/Geo-GeoNames --- misc/p5-Geo-GeoNames/Makefile | 7 ++++--- misc/p5-Geo-GeoNames/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/misc/p5-Geo-GeoNames/Makefile b/misc/p5-Geo-GeoNames/Makefile index 29572fd06816..8dab43192037 100644 --- a/misc/p5-Geo-GeoNames/Makefile +++ b/misc/p5-Geo-GeoNames/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Geo-GeoNames -PORTVERSION= 1.120 +PORTVERSION= 1.130 CATEGORIES= misc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -19,8 +19,9 @@ RUN_DEPENDS= p5-JSON>=1.14:converters/p5-JSON \ p5-Mojolicious>=0:www/p5-Mojolicious \ p5-XML-Simple>=2.13:textproc/p5-XML-Simple -NO_ARCH= yes -USE_PERL5= configure USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes .include diff --git a/misc/p5-Geo-GeoNames/distinfo b/misc/p5-Geo-GeoNames/distinfo index 1caa5bdde753..ffa135c05e3f 100644 --- a/misc/p5-Geo-GeoNames/distinfo +++ b/misc/p5-Geo-GeoNames/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492338239 -SHA256 (Geo-GeoNames-1.12.tar.gz) = 57ff3a38ff88f2d646a50a9628177f2367f5fe2892e2612b4871d834f67155f5 -SIZE (Geo-GeoNames-1.12.tar.gz) = 20800 +TIMESTAMP = 1565515537 +SHA256 (Geo-GeoNames-1.13.tar.gz) = 9afe12b554d8248fff1b1386dee065a8dde738039025706fe9bceb78a3384d39 +SIZE (Geo-GeoNames-1.13.tar.gz) = 20897 -- cgit From 630345951462c102eafc8ecf5d6a27a97f9179da Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:32 +0000 Subject: Update RUN_DEPENDS - Bump PORTREVISION for dependency change --- devel/py-testtools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile index 6788f2f9671b..cfeca8b11ab6 100644 --- a/devel/py-testtools/Makefile +++ b/devel/py-testtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= testtools PORTVERSION= 2.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=1.0.0:devel/py-extras@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mimeparse>=0:devel/py-mimeparse@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-mimeparse>=0:devel/py-python-mimeparse@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traceback2>=0:devel/py-traceback2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unittest2>=1.0.0:devel/py-unittest2@${PY_FLAVOR} -- cgit From 7a45f88999028f743b941709e3ac14b2cd549d81 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:36 +0000 Subject: Cosmetic change --- www/py-cssutils/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile index 208946be809d..d94e6adb1522 100644 --- a/www/py-cssutils/Makefile +++ b/www/py-cssutils/Makefile @@ -17,14 +17,15 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LESSER -OPTIONS_DEFINE= EXAMPLES +USES= python +USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils -USES= python PORTEXAMPLES= * +OPTIONS_DEFINE= EXAMPLES + post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/ -- cgit From 11ededda55bbcc969e64258f0079afd7bf93d20f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:41 +0000 Subject: Cosmetic change --- devel/rubygem-actionview5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-actionview5/Makefile b/devel/rubygem-actionview5/Makefile index 9905783d8d43..3245c6b9886b 100644 --- a/devel/rubygem-actionview5/Makefile +++ b/devel/rubygem-actionview5/Makefile @@ -19,11 +19,11 @@ RUN_DEPENDS= rubygem-activesupport5>=${PORTVERSION}:devel/rubygem-activesupport5 rubygem-rails-dom-testing-rails5>=2.0:textproc/rubygem-rails-dom-testing-rails5 \ rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer -PORTSCOUT= limit:^5\.1\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.1\. + .include -- cgit From 5b3b734124c5acc59d347eef0b04571797cee722 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:46 +0000 Subject: Cosmetic change --- devel/rubygem-actionview50/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-actionview50/Makefile b/devel/rubygem-actionview50/Makefile index a263cec27c68..9320b188680f 100644 --- a/devel/rubygem-actionview50/Makefile +++ b/devel/rubygem-actionview50/Makefile @@ -19,11 +19,11 @@ RUN_DEPENDS= rubygem-activesupport50>=${PORTVERSION}:devel/rubygem-activesupport rubygem-rails-dom-testing-rails50>=2.0:textproc/rubygem-rails-dom-testing-rails50 \ rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer -PORTSCOUT= limit:^5\.0\. - USES= gem USE_RUBY= yes NO_ARCH= yes +PORTSCOUT= limit:^5\.0\. + .include -- cgit From 0867f7839bc5f923bd54107317241852d081db88 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:51 +0000 Subject: Update version requirement of RUN_DEPENDS - Take maintainership --- textproc/rubygem-sass-rails-rails5/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/textproc/rubygem-sass-rails-rails5/Makefile b/textproc/rubygem-sass-rails-rails5/Makefile index 290756502979..22e51883ed5c 100644 --- a/textproc/rubygem-sass-rails-rails5/Makefile +++ b/textproc/rubygem-sass-rails-rails5/Makefile @@ -7,17 +7,17 @@ CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sass adapter for the Rails asset pipeline LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-railties5>=5.0.0:www/rubygem-railties5 \ - rubygem-sass>=3.1:textproc/rubygem-sass \ - rubygem-sprockets3>=3.0.3:devel/rubygem-sprockets3 \ - rubygem-sprockets-rails-rails5>=2.0:devel/rubygem-sprockets-rails-rails5 \ - rubygem-tilt>=1.1:devel/rubygem-tilt +RUN_DEPENDS= rubygem-railties5>=4.0.0<6:www/rubygem-railties5 \ + rubygem-sass>=3.1<4.0:textproc/rubygem-sass \ + rubygem-sprockets3>=2.8<4.0:devel/rubygem-sprockets3 \ + rubygem-sprockets-rails-rails5>=2.0<4.0:devel/rubygem-sprockets-rails-rails5 \ + rubygem-tilt>=1.1<3:devel/rubygem-tilt USES= gem USE_RUBY= yes -- cgit From bd3901caa3b41890ca990f7d9e9bd4a7292ad496 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:28:56 +0000 Subject: Update version requirement of RUN_DEPENDS - Take maintainership --- textproc/rubygem-sass-rails-rails50/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/textproc/rubygem-sass-rails-rails50/Makefile b/textproc/rubygem-sass-rails-rails50/Makefile index 00afe12787cf..702765038679 100644 --- a/textproc/rubygem-sass-rails-rails50/Makefile +++ b/textproc/rubygem-sass-rails-rails50/Makefile @@ -7,17 +7,17 @@ CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sass adapter for the Rails asset pipeline LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-railties50>=5.0.0:www/rubygem-railties50 \ - rubygem-sass>=3.1:textproc/rubygem-sass \ - rubygem-sprockets3>=3.0.3:devel/rubygem-sprockets3 \ - rubygem-sprockets-rails-rails50>=2.0:devel/rubygem-sprockets-rails-rails50 \ - rubygem-tilt>=1.1:devel/rubygem-tilt +RUN_DEPENDS= rubygem-railties50>=4.0.0<6:www/rubygem-railties50 \ + rubygem-sass>=3.1<4.0:textproc/rubygem-sass \ + rubygem-sprockets3>=2.8<4.0:devel/rubygem-sprockets3 \ + rubygem-sprockets-rails-rails50>=2.0<4.0:devel/rubygem-sprockets-rails-rails50 \ + rubygem-tilt>=1.1<3:devel/rubygem-tilt USES= gem USE_RUBY= yes -- cgit From 5a0188e0969a027753842caa0f62044949b0ce96 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:29:01 +0000 Subject: Update to 3.142.3 - Update WWW - Take maintainership Changes: https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES --- www/rubygem-selenium-webdriver/Makefile | 10 +++++----- www/rubygem-selenium-webdriver/distinfo | 6 +++--- www/rubygem-selenium-webdriver/pkg-descr | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile index 1cd067aa87cc..c557f065654a 100644 --- a/www/rubygem-selenium-webdriver/Makefile +++ b/www/rubygem-selenium-webdriver/Makefile @@ -2,22 +2,22 @@ # $FreeBSD$ PORTNAME= selenium-webdriver -PORTVERSION= 3.14.1 -PORTREVISION= 1 +PORTVERSION= 3.142.3 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Tool for writing automated tests of websites LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-childprocess>=0.5:devel/rubygem-childprocess \ - rubygem-rubyzip>=1.2.2:archivers/rubygem-rubyzip +RUN_DEPENDS= rubygem-childprocess>=0.5<2.0:devel/rubygem-childprocess \ + rubygem-rubyzip>=1.2.2<2.0:archivers/rubygem-rubyzip USES= gem USE_RUBY= yes + # do not strip files as this breaks the build of the port # for more details: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220330 STRIP_CMD= ${TRUE} diff --git a/www/rubygem-selenium-webdriver/distinfo b/www/rubygem-selenium-webdriver/distinfo index 9903005a34a5..686ebbef7c3b 100644 --- a/www/rubygem-selenium-webdriver/distinfo +++ b/www/rubygem-selenium-webdriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539103515 -SHA256 (rubygem/selenium-webdriver-3.14.1.gem) = 30fe111c1075348bdefa9cabc401ca8e6574aba07ce28c50b5edd53c8cf686dd -SIZE (rubygem/selenium-webdriver-3.14.1.gem) = 860672 +TIMESTAMP = 1565515541 +SHA256 (rubygem/selenium-webdriver-3.142.3.gem) = be57905cfbd466e696407304f36d8d8bfb97dce172c710988ee56d9631c91244 +SIZE (rubygem/selenium-webdriver-3.142.3.gem) = 865280 diff --git a/www/rubygem-selenium-webdriver/pkg-descr b/www/rubygem-selenium-webdriver/pkg-descr index bded17ceee51..0e2f76b6eef0 100644 --- a/www/rubygem-selenium-webdriver/pkg-descr +++ b/www/rubygem-selenium-webdriver/pkg-descr @@ -2,5 +2,5 @@ WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application. -WWW: http://www.seleniumhq.org/ +WWW: https://www.seleniumhq.org/ WWW: https://github.com/SeleniumHQ/selenium/tree/master/rb -- cgit From 2105b06dde911f9c0d265210f710375cf4d3cb43 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:29:06 +0000 Subject: Update RUN_DEPENDS - Bump PORTREVISION for dependency change --- www/py-django-tastypie/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile index 06c97f07ef26..58bf676d8bdd 100644 --- a/www/py-django-tastypie/Makefile +++ b/www/py-django-tastypie/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-tastypie PORTVERSION= 0.14.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,9 +13,9 @@ COMMENT= Create REST API for Django apps LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-mimeparse>=0.1.4:devel/py-python-mimeparse@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist -- cgit From 7a82c9b57c11d0e75a3078020246a8f03b278082 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:29:11 +0000 Subject: Update RUN_DEPENDS - While I'm here, sort *_DEPENDS - Bump PORTREVISION for dependency change --- www/py-falcon/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile index 83efebecd2d6..2ea67cd5c7d8 100644 --- a/www/py-falcon/Makefile +++ b/www/py-falcon/Makefile @@ -3,6 +3,7 @@ PORTNAME= falcon PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,13 +14,13 @@ COMMENT= High-performance Python framework for building cloud APIs LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-mimeparse>=1.5.2:devel/py-python-mimeparse@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mimeparse>=1.5.2:devel/py-mimeparse@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist cython -- cgit From 41e7e0c9189dee7a1336e71db050cd8eb8036f4b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 11:29:15 +0000 Subject: Update WWW Approved by: portmgr (blanket) --- www/py-selenium/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/py-selenium/pkg-descr b/www/py-selenium/pkg-descr index 25b496a8f67c..9dfbcf71ce62 100644 --- a/www/py-selenium/pkg-descr +++ b/www/py-selenium/pkg-descr @@ -5,4 +5,4 @@ Currently the remote protocol, Firefox and Chrome for Selenium 2.0 are supported, as well as the Selenium 1.0 bindings. As work will progresses we'll add more "native" drivers. -WWW: http://seleniumhq.org/ +WWW: https://www.seleniumhq.org/ -- cgit From aeed647288281a40ad5f1d54473b01b290e27bf9 Mon Sep 17 00:00:00 2001 From: riggs Date: Sun, 11 Aug 2019 13:16:01 +0000 Subject: Update to upstream release 2019.08.11 Details: - Upstream release 2019.08.11 adds new feature: demultiplexing support for MPEG Transport Streams --- net/liveMedia/Makefile | 2 +- net/liveMedia/distinfo | 6 +++--- net/liveMedia/pkg-plist | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile index 489d2b72215b..16189bbacd14 100644 --- a/net/liveMedia/Makefile +++ b/net/liveMedia/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= liveMedia -PORTVERSION= 2019.06.28 +PORTVERSION= 2019.08.11 PORTEPOCH= 2 CATEGORIES= net devel MASTER_SITES= http://www.live555.com/liveMedia/public/ \ diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo index 142edcdfd79e..405dbc422500 100644 --- a/net/liveMedia/distinfo +++ b/net/liveMedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561915026 -SHA256 (live.2019.06.28.tar.gz) = 59c086b8801b1ad060cb1aa980a79650154990df545c3879d50dfdd422fcc55e -SIZE (live.2019.06.28.tar.gz) = 637330 +TIMESTAMP = 1565528227 +SHA256 (live.2019.08.11.tar.gz) = 789bc236f1b271c5515925b91586ed348d902e689a77a9b699fd3c4478cfa1f5 +SIZE (live.2019.08.11.tar.gz) = 650670 diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist index 94a775649516..05b6854946e5 100644 --- a/net/liveMedia/pkg-plist +++ b/net/liveMedia/pkg-plist @@ -11,6 +11,8 @@ bin/testH264VideoStreamer bin/testH264VideoToTransportStream bin/testH265VideoStreamer bin/testH265VideoToTransportStream +bin/testMKVSplitter +bin/testMKVStreamer bin/testMP3Receiver bin/testMP3Streamer bin/testMPEG1or2AudioVideoStreamer @@ -19,10 +21,10 @@ bin/testMPEG1or2Splitter bin/testMPEG1or2VideoReceiver bin/testMPEG1or2VideoStreamer bin/testMPEG2TransportReceiver +bin/testMPEG2TransportStreamSplitter bin/testMPEG2TransportStreamTrickPlay bin/testMPEG2TransportStreamer bin/testMPEG4VideoStreamer -bin/testMKVStreamer bin/testOggStreamer bin/testOnDemandRTSPServer bin/testRTSPClient @@ -136,6 +138,7 @@ include/liveMedia/MPEG1or2VideoStreamFramer.hh include/liveMedia/MPEG2IndexFromTransportStream.hh include/liveMedia/MPEG2TransportFileServerMediaSubsession.hh include/liveMedia/MPEG2TransportStreamAccumulator.hh +include/liveMedia/MPEG2TransportStreamDemux.hh include/liveMedia/MPEG2TransportStreamFramer.hh include/liveMedia/MPEG2TransportStreamFromESSource.hh include/liveMedia/MPEG2TransportStreamFromPESSource.hh -- cgit From e429190ec85439b03d762272fb1b2b44f6414575 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 14:06:30 +0000 Subject: devel/py-PyExecJS: remove optional support for expired lang/phantomjs --- devel/py-PyExecJS/Makefile | 4 +--- devel/py-PyExecJS/pkg-descr | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/devel/py-PyExecJS/Makefile b/devel/py-PyExecJS/Makefile index 22323ee32109..0dc59b2a1b12 100644 --- a/devel/py-PyExecJS/Makefile +++ b/devel/py-PyExecJS/Makefile @@ -17,13 +17,11 @@ USES= python USE_PYTHON= distutils autoplist OPTIONS_GROUP= RUNTIME -OPTIONS_GROUP_RUNTIME= NODE SPIDERMONKEY PHANTOMJS +OPTIONS_GROUP_RUNTIME= NODE SPIDERMONKEY NODE_DESC= Use www/node as JavaScript backend NODE_RUN_DEPENDS= node>=0.8.0:www/node SPIDERMONKEY_DESC= Use lang/spidermonkey52 as JavaScript backend SPIDERMONKEY_RUN_DEPENDS= js52:lang/spidermonkey52 -PHANTOMJS_DESC= Use lang/phantomjs as JavaScript backend -PHANTOMJS_RUN_DEPENDS= phantomjs:lang/phantomjs OPTIONS_DEFAULT= NODE .include diff --git a/devel/py-PyExecJS/pkg-descr b/devel/py-PyExecJS/pkg-descr index 4ae49c8e69b0..f65b20053378 100644 --- a/devel/py-PyExecJS/pkg-descr +++ b/devel/py-PyExecJS/pkg-descr @@ -8,7 +8,6 @@ Supported runtimes * Mozilla SpiderMonkey * Microsoft Windows Script Host (JScript) * SlimerJS -* PhantomJS * Nashorn - Included with Oracle Java 8 WWW: https://pypi.org/project/PyExecJS/ -- cgit From 7038664eabe11489f644c69407f76eb0d9d2734a Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 14:11:44 +0000 Subject: www/grafana3: mark for removal on 2019-12-01 due to lang/phantomjs --- www/grafana3/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/grafana3/Makefile b/www/grafana3/Makefile index 3c478158e5cc..60721d8751de 100644 --- a/www/grafana3/Makefile +++ b/www/grafana3/Makefile @@ -12,6 +12,9 @@ COMMENT= Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB LICENSE= APACHE20 +DEPRECATED= Depends on expired lang/phantomjs +EXPIRATION_DATE=2019-12-01 + RUN_DEPENDS= ${LOCALBASE}/bin/phantomjs:lang/phantomjs \ webfonts>=0:x11-fonts/webfonts @@ -23,7 +26,7 @@ USES= compiler go USE_GITHUB= yes -GH_TUPLE= \ +GH_TUPLE \ BurntSushi:toml:v0.2.0:toml/src/github.com/BurntSushi/toml \ Unknwon:com:v1:com/src/github.com/Unknwon/com \ aws:aws-sdk-go:v1.1.36:aws_sdk_go/src/github.com/aws/aws-sdk-go \ -- cgit From e8644cd00c354b4265418e9f6568bafcd21b0014 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 14:13:49 +0000 Subject: www/p5-WWW-Mechanize-PhantomJS: mark for removal due to lang/phantomjs --- www/p5-WWW-Mechanize-PhantomJS/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/p5-WWW-Mechanize-PhantomJS/Makefile b/www/p5-WWW-Mechanize-PhantomJS/Makefile index f63a1cc738bc..fc9cd9d853ff 100644 --- a/www/p5-WWW-Mechanize-PhantomJS/Makefile +++ b/www/p5-WWW-Mechanize-PhantomJS/Makefile @@ -11,6 +11,9 @@ COMMENT= Automate interaction with javascript websites LICENSE= ARTPERL10 +DEPRECATED= uses expired lang/phantomjs +EXPIRATION_DATE=2019-12-01 + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= phantomjs:lang/phantomjs \ p5-WWW-Mechanize>=1.73:www/p5-WWW-Mechanize \ -- cgit From 1ae4254ece75ac19ae03fb4987bed3aa4e6ee130 Mon Sep 17 00:00:00 2001 From: db Date: Sun, 11 Aug 2019 14:19:28 +0000 Subject: Update to 3.8.0.0-rc2 # Changelog All notable changes to GNU Radio will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html), starting with version 3.7.12.0. Older Logs can be found in `docs/RELEASE-NOTES-*`. ## [3.8.0.0-rc2] - 2019-07-20 This is the second release candidate for GNU Radio 3.8. ### Fixed #### Project Scope - Last minute patch lead to SWIG libraries not getting installed into the right Python paths #### gr-utils - `gr_modtool`: Paths with spaces in them used to break ### Changed #### GRC - Copy & Paste behaviour now like on 3.7: appending numbers to block IDs only on conflicts ## [3.8.0.0-rc1] - 2019-07-17 This is the release candidate for GNU Radio 3.8. For brevity reasons, this document does NOT contain a complete CHANGELOG comparing 3.8.0.0 to 3.7.0, because the development model changed underway, and there's no human-feasible way to detangle the changes from more than six years of development. The major user-relevant changes will be noted here in the actual release. What we can do here is point out that we've got a glorious amount of 215 individual contributors that added at least one commit since 3.7.0. This is a **big** step towards the future of the world's most popular FOSS SDR framework. Let us ride eternal, shiny and chrome. Pet Portlint PR: ports/239345 Submitted by: mike.english@gmail.com --- comms/gnuradio/Makefile | 15 +++++---- comms/gnuradio/distinfo | 6 ++-- comms/gnuradio/pkg-plist | 82 +++++++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 45 deletions(-) diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index bec4dc753883..c3ea46032c40 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -2,10 +2,9 @@ PORTNAME= gnuradio #MASTER_SITES= http://gnuradio.org/releases/gnuradio/ -DISTVERSION= 3.8tech-preview-381 -DISTVERSIONSUFFIX= -g27dd99e49 -PORTREVISION= 2 +PORTVERSION= 3.8.0.0.r2 CATEGORIES= comms astro hamradio +DISTNAME= v3.8.0.0-rc2 MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio Software defined radio @@ -24,6 +23,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \ aconnect:audio/alsa-utils \ cheetah:devel/py-cheetah@${PY_FLAVOR} \ cppzmq>0:net/cppzmq \ @@ -55,23 +56,25 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints USES= cmake compiler:c11 desktop-file-utils fortran gnome iconv \ perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix +USE_GITHUB= yes +GH_TUPLE= gnuradio:gnuradio:${DISTNAME} \ + gnuradio:volk:d250816:volk/volk + SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \ gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \ gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx -USE_GITHUB= yes -GH_TUPLE= gnuradio:volk:d250816:volk/volk CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \ -DENABLE_GR_CTRLPORT="YES" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DLOCALBASE:STRING="${LOCALBASE}" \ + -DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \ -DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \ -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\ -DXMLTO_EXECUTABLE:STRING=minixmlto # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace -DOCSDIR= share/doc/${PORTNAME}-3.8git USE_GNOME= pygtk2 USE_PYQT= core gui opengl USE_WX= 3.0 diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo index a2b31e0ab11f..def6c489a0ff 100644 --- a/comms/gnuradio/distinfo +++ b/comms/gnuradio/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1559503341 -SHA256 (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = a07897ebf6d68588ca5b3635f87f0251be9234a8adc4b9e89c372caaecd9a737 -SIZE (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = 3386872 +TIMESTAMP = 1565477657 +SHA256 (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 0dc466017101f39aa903780fa510c3cdf3a29ce75d12148fc449b12fe6324304 +SIZE (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 3400475 SHA256 (gnuradio-volk-d250816_GH0.tar.gz) = 334da8910cfadc2e1487ef2a651f8eaa472262a4bfd3fa7c38d913c8fc32cbd8 SIZE (gnuradio-volk-d250816_GH0.tar.gz) = 252477 diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index cecfd1cc1d71..ed4ccd532478 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -21,6 +21,7 @@ bin/polar_channel_construction bin/volk-config-info bin/volk_modtool bin/volk_profile +%%ETCDIR%%/conf.d/00-grc-docs.conf %%ETCDIR%%/conf.d/gnuradio-runtime.conf %%ETCDIR%%/conf.d/gr-audio-alsa.conf %%ETCDIR%%/conf.d/gr-audio-jack.conf @@ -188,6 +189,7 @@ include/gnuradio/blocks/rms_ff.h include/gnuradio/blocks/rotator.h include/gnuradio/blocks/rotator_cc.h include/gnuradio/blocks/sample_and_hold.h +include/gnuradio/blocks/selector.h include/gnuradio/blocks/short_to_char.h include/gnuradio/blocks/short_to_float.h include/gnuradio/blocks/skiphead.h @@ -438,6 +440,7 @@ include/gnuradio/feval.h include/gnuradio/fft/api.h include/gnuradio/fft/ctrlport_probe_psd.h include/gnuradio/fft/fft.h +include/gnuradio/fft/fft_shift.h include/gnuradio/fft/fft_vcc.h include/gnuradio/fft/fft_vfc.h include/gnuradio/fft/goertzel.h @@ -994,59 +997,59 @@ lib/cmake/volk/VolkConfigVersion.cmake lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/volk/VolkTargets.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.3.8git -lib/libgnuradio-analog.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-analog.so.3.8.0 +lib/libgnuradio-analog.so.3.8.0.0-rc2 lib/libgnuradio-audio.so -lib/libgnuradio-audio.so.3.8git -lib/libgnuradio-audio.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-audio.so.3.8.0 +lib/libgnuradio-audio.so.3.8.0.0-rc2 lib/libgnuradio-blocks.so -lib/libgnuradio-blocks.so.3.8git -lib/libgnuradio-blocks.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-blocks.so.3.8.0 +lib/libgnuradio-blocks.so.3.8.0.0-rc2 lib/libgnuradio-channels.so -lib/libgnuradio-channels.so.3.8git -lib/libgnuradio-channels.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-channels.so.3.8.0 +lib/libgnuradio-channels.so.3.8.0.0-rc2 lib/libgnuradio-digital.so -lib/libgnuradio-digital.so.3.8git -lib/libgnuradio-digital.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-digital.so.3.8.0 +lib/libgnuradio-digital.so.3.8.0.0-rc2 lib/libgnuradio-dtv.so -lib/libgnuradio-dtv.so.3.8git -lib/libgnuradio-dtv.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-dtv.so.3.8.0 +lib/libgnuradio-dtv.so.3.8.0.0-rc2 lib/libgnuradio-fec.so -lib/libgnuradio-fec.so.3.8git -lib/libgnuradio-fec.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-fec.so.3.8.0 +lib/libgnuradio-fec.so.3.8.0.0-rc2 lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.3.8git -lib/libgnuradio-fft.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-fft.so.3.8.0 +lib/libgnuradio-fft.so.3.8.0.0-rc2 lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.3.8git -lib/libgnuradio-filter.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-filter.so.3.8.0 +lib/libgnuradio-filter.so.3.8.0.0-rc2 lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.3.8git -lib/libgnuradio-pmt.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-pmt.so.3.8.0 +lib/libgnuradio-pmt.so.3.8.0.0-rc2 lib/libgnuradio-qtgui.so -lib/libgnuradio-qtgui.so.3.8git -lib/libgnuradio-qtgui.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-qtgui.so.3.8.0 +lib/libgnuradio-qtgui.so.3.8.0.0-rc2 lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.3.8git -lib/libgnuradio-runtime.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-runtime.so.3.8.0 +lib/libgnuradio-runtime.so.3.8.0.0-rc2 lib/libgnuradio-trellis.so -lib/libgnuradio-trellis.so.3.8git -lib/libgnuradio-trellis.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-trellis.so.3.8.0 +lib/libgnuradio-trellis.so.3.8.0.0-rc2 %%UHD%%lib/libgnuradio-uhd.so -%%UHD%%lib/libgnuradio-uhd.so.3.8git -%%UHD%%lib/libgnuradio-uhd.so.v3.8-compat-xxx-xunknown +%%UHD%%lib/libgnuradio-uhd.so.3.8.0 +%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0-rc2 lib/libgnuradio-video-sdl.so -lib/libgnuradio-video-sdl.so.3.8git -lib/libgnuradio-video-sdl.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-video-sdl.so.3.8.0 +lib/libgnuradio-video-sdl.so.3.8.0.0-rc2 lib/libgnuradio-vocoder.so -lib/libgnuradio-vocoder.so.3.8git -lib/libgnuradio-vocoder.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-vocoder.so.3.8.0 +lib/libgnuradio-vocoder.so.3.8.0.0-rc2 lib/libgnuradio-wavelet.so -lib/libgnuradio-wavelet.so.3.8git -lib/libgnuradio-wavelet.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-wavelet.so.3.8.0 +lib/libgnuradio-wavelet.so.3.8.0.0-rc2 lib/libgnuradio-zeromq.so -lib/libgnuradio-zeromq.so.3.8git -lib/libgnuradio-zeromq.so.v3.8-compat-xxx-xunknown +lib/libgnuradio-zeromq.so.3.8.0 +lib/libgnuradio-zeromq.so.3.8.0.0-rc2 lib/libvolk.so lib/libvolk.so.1.4.1git %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py @@ -1415,6 +1418,12 @@ lib/libvolk.so.1.4.1git %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.py %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.pyc %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.py +%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.py +%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.pyo %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.pyo @@ -2475,6 +2484,7 @@ share/applications/gnuradio-grc.desktop %%DATADIR%%/grc/blocks/blocks_rms_xx.block.yml %%DATADIR%%/grc/blocks/blocks_rotator_cc.block.yml %%DATADIR%%/grc/blocks/blocks_sample_and_hold_xx.block.yml +%%DATADIR%%/grc/blocks/blocks_selector.block.yml %%DATADIR%%/grc/blocks/blocks_short_to_char.block.yml %%DATADIR%%/grc/blocks/blocks_short_to_float.block.yml %%DATADIR%%/grc/blocks/blocks_skiphead.block.yml -- cgit From 6a75992fd1550f82fffa330809e67e2b34c280e7 Mon Sep 17 00:00:00 2001 From: tobik Date: Sun, 11 Aug 2019 14:44:41 +0000 Subject: devel/ghidra: Fix build error caused by cache cleanup The issue seems to be caused by Gradle caches being cleaned up between build sessions [1]. It did not come up before because the cached files were not old enough to be deleted. Cleanup happens after a build session, so running the two build targets (yajswDevUnpack and buildGhidra) in the same session fixes the issue. [1] https://docs.gradle.org/current/userguide/directory_layout.html#dir:gradle_user_home:cache_cleanup) PR: 239472 Submitted by: Tamas Szakaly (maintainer) --- devel/ghidra/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/devel/ghidra/Makefile b/devel/ghidra/Makefile index 16248215250d..6fb675273b78 100644 --- a/devel/ghidra/Makefile +++ b/devel/ghidra/Makefile @@ -100,8 +100,7 @@ post-patch-JDK12-on: @${ECHO_CMD} "org.gradle.java.home=${LOCALBASE}/openjdk12" > ${WRKSRC}/gradle.properties do-build: - cd ${WRKSRC} && ${GRADLE_RUN} yajswDevUnpack - cd ${WRKSRC} && ${GRADLE_RUN} buildGhidra + cd ${WRKSRC} && ${GRADLE_RUN} yajswDevUnpack buildGhidra post-build: @${RM} ${GRADLE_HOME_BASE}/gradle-${PORTNAME} -- cgit From 36bb067af53b26ff311a248378e88f0dcbb0b29c Mon Sep 17 00:00:00 2001 From: dvl Date: Sun, 11 Aug 2019 15:34:08 +0000 Subject: Update to 2.8.2 * Support notifications for renewal: email, mailgun, sendgrid, IFTTT, pushover etc. https://github.com/Neilpang/acme.sh/wiki/notify * add deploy hook to docker containers: https://github.com/Neilpang/acme.sh/wiki/deploy-to-docker-containers * dns api: Schlundtech, NLnetLabs , acmeproxy, durabledns, Active24, MaraDNS, regru, jdcloud.com(?????????), Vultr, hexonet * Support cloudflare new dns api Token format * bug fixes. re https://github.com/Neilpang/acme.sh/releases/tag/2.8.2 --- security/acme.sh/Makefile | 3 +-- security/acme.sh/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile index 314a0fa7f075..312ea7e8f5bf 100644 --- a/security/acme.sh/Makefile +++ b/security/acme.sh/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= acme.sh -PORTVERSION= 2.8.1 -PORTREVISION= 2 +PORTVERSION= 2.8.2 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org diff --git a/security/acme.sh/distinfo b/security/acme.sh/distinfo index 5eed338d0c1c..2779edfd2afd 100644 --- a/security/acme.sh/distinfo +++ b/security/acme.sh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556568826 -SHA256 (Neilpang-acme.sh-2.8.1_GH0.tar.gz) = 4fc55b2112058e563616893fefb56c5ff4895a7e6327e9f8416797fdc44d98e3 -SIZE (Neilpang-acme.sh-2.8.1_GH0.tar.gz) = 130201 +TIMESTAMP = 1565537197 +SHA256 (Neilpang-acme.sh-2.8.2_GH0.tar.gz) = 9c97ae15db3fc65200db462b3304aa082b1367f1ba4af5a86693b014a991c990 +SIZE (Neilpang-acme.sh-2.8.2_GH0.tar.gz) = 161737 -- cgit From ef25e8dac4d483e2bc6b9c21609533b10ab8f4ba Mon Sep 17 00:00:00 2001 From: tobik Date: Sun, 11 Aug 2019 15:34:46 +0000 Subject: graphics/dataplot: Fix distinfo after r508362 => usnistgov-dataplot-20190426-7236db0_GH0.tar.gz is not in /usr/ports/graphics/dataplot/distinfo. => Either /usr/ports/graphics/dataplot/distinfo is out of date, or => usnistgov-dataplot-20190426-7236db0_GH0.tar.gz is spelled incorrectly. *** Error code 1 Pointy hat: pfg --- graphics/dataplot/distinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/dataplot/distinfo b/graphics/dataplot/distinfo index 9b25151fd332..a47b48927585 100644 --- a/graphics/dataplot/distinfo +++ b/graphics/dataplot/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1564981897 SHA256 (dpsnapsh.pdf) = 0a42cf4d2d11b608bfad4d9fd0acf6fa17d39b401f9507e0a8341c8b02b3a0c5 SIZE (dpsnapsh.pdf) = 122886 -SHA256 (usnistgov-dataplot-g20190426-7236db0_GH0.tar.gz) = a09916feff921436e0362a9302dd8673a9e0f3db176e4fb1ab5396b77b14ca7f -SIZE (usnistgov-dataplot-g20190426-7236db0_GH0.tar.gz) = 15253699 +SHA256 (usnistgov-dataplot-20190426-7236db0_GH0.tar.gz) = a09916feff921436e0362a9302dd8673a9e0f3db176e4fb1ab5396b77b14ca7f +SIZE (usnistgov-dataplot-20190426-7236db0_GH0.tar.gz) = 15253699 -- cgit From c8e5080e2688db0502aa02838db3229c36cb0379 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:03:28 +0000 Subject: Move devel/py-mimeparse to devel/py-python-mimeparse --- MOVED | 1 + 1 file changed, 1 insertion(+) diff --git a/MOVED b/MOVED index 7fae886ad359..164ff896ed5d 100644 --- a/MOVED +++ b/MOVED @@ -12858,3 +12858,4 @@ lang/cint|lang/cling|2019-07-31|Has expired: Abandonware; superseded by lang/cli emulators/pearpc||2019-08-01|Has expired: Abandonware sysutils/bbcp||2019-08-03|Has expired: the port is broken for more than a year multimedia/gnome-mpv|multimedia/celluloid|2019-08-08|Renamed upstream +devel/py-mimeparse|devel/py-python-mimeparse|2019-08-11|Rename to match upstream naming -- cgit From b558e89da56c0daed21ec2b4c2d2917932e16618 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 16:05:23 +0000 Subject: x11/waybar: add new port Waybar is highly customizable Wayland bar for Sway and wlroots based compositors providing the following features: - Sway (Workspaces, Binding mode, Focused window name) - Tray [#21](https://github.com/Alexays/Waybar/issues/21) - Local time - Battery (Linux-only) - Network (Linux-only) - Pulseaudio - Memory - Cpu load average - Temperature (Linux-only) - MPD - Custom scripts - Multiple output configuration - And much more customizations https://github.com/Alexays/Waybar --- x11/Makefile | 1 + x11/waybar/Makefile | 61 ++++++++++++++++++++++++++++++++++++++++++ x11/waybar/distinfo | 25 +++++++++++++++++ x11/waybar/files/patch-libc++6 | 61 ++++++++++++++++++++++++++++++++++++++++++ x11/waybar/pkg-descr | 18 +++++++++++++ 5 files changed, 166 insertions(+) create mode 100644 x11/waybar/Makefile create mode 100644 x11/waybar/distinfo create mode 100644 x11/waybar/files/patch-libc++6 create mode 100644 x11/waybar/pkg-descr diff --git a/x11/Makefile b/x11/Makefile index 460bce8816ab..eef9ef367b4b 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -331,6 +331,7 @@ SUBDIR += vdesk SUBDIR += viewres SUBDIR += virtualgl + SUBDIR += waybar SUBDIR += wbar SUBDIR += wbarconf SUBDIR += wdm diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile new file mode 100644 index 000000000000..dbc21152f03f --- /dev/null +++ b/x11/waybar/Makefile @@ -0,0 +1,61 @@ +# $FreeBSD$ + +PORTNAME= waybar +DISTVERSION= 0.7.2 +CATEGORIES= x11 + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +# https://github.com/Alexays/Waybar/pull/425 +PATCHFILES+= cff2704bfa73.patch:-p1 +PATCHFILES+= a85ae0da0580.patch:-p1 +PATCHFILES+= f0dfa34e651c.patch:-p1 +PATCHFILES+= 25d4420904bd.patch:-p1 +PATCHFILES+= bf0d2621504e.patch:-p1 +PATCHFILES+= 82844ce8a6f3.patch:-p1 +PATCHFILES+= f3ed50fa3364.patch:-p1 +PATCHFILES+= 964d7030f7af.patch:-p1 +PATCHFILES+= c73a8162a265.patch:-p1 +PATCHFILES+= 997f7787fdbe.patch:-p1 +PATCHFILES+= 726ba2cf79f1.patch:-p1 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= spdlog>0:devel/spdlog \ + wayland-protocols>0:graphics/wayland-protocols +LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \ + libfmt.so:devel/libfmt \ + libwayland-client.so:graphics/wayland + +USES= compiler:c++17-lang meson pkgconfig +USE_GITHUB= yes +USE_GNOME= gtkmm30 +GH_ACCOUNT= Alexays +GH_PROJECT= Waybar +CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL +PLIST_FILES= bin/${PORTNAME} \ + etc/xdg/${PORTNAME}/config \ + etc/xdg/${PORTNAME}/style.css + +OPTIONS_DEFINE= DBUS MPD PULSEAUDIO UDEV +OPTIONS_DEFAULT=DBUS MPD PULSEAUDIO UDEV + +DBUS_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu +DBUS_MESON_ENABLED= dbusmenu-gtk + +MPD_DESC= Music Player Daemon support +MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient +MPD_MESON_ENABLED= mpd + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_MESON_ENABLED= pulseaudio + +UDEV_DESC= Monitor backlight level via libudev +UDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ + libudev.so:devel/libudev-devd +UDEV_MESON_ENABLED= libepoll libudev + +.include diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo new file mode 100644 index 000000000000..aab34f8d7825 --- /dev/null +++ b/x11/waybar/distinfo @@ -0,0 +1,25 @@ +TIMESTAMP = 1565259931 +SHA256 (Alexays-Waybar-0.7.2_GH0.tar.gz) = 6996a7d6fbf5457ec42ba9ebc76bf1417618ed9103074490a0730d58161ffdb0 +SIZE (Alexays-Waybar-0.7.2_GH0.tar.gz) = 101206 +SHA256 (cff2704bfa73.patch) = af25c025ef10b55d0ee8a4ece1a92ed8bcdae5a32d19c530e1a9b8d3984cfe32 +SIZE (cff2704bfa73.patch) = 2367 +SHA256 (a85ae0da0580.patch) = f7d752ffecb166ddf4531cf988f0041f0d1f1977031eb7fe668e2803b705502a +SIZE (a85ae0da0580.patch) = 2686 +SHA256 (f0dfa34e651c.patch) = 7bc5fcdf745c243fdeec0caefa4f5f8cc4c20fbca818a23c453e0acdd21f0197 +SIZE (f0dfa34e651c.patch) = 1168 +SHA256 (25d4420904bd.patch) = 7cdb4854f272b36c78bfdcf06174f58ec23ecf320d6a96cf4b97e9557d1ed170 +SIZE (25d4420904bd.patch) = 1127 +SHA256 (bf0d2621504e.patch) = acb25d11fbd6ec03f3ca7845ff368cc9370ba2297298c522b8e998b9abc8bd4a +SIZE (bf0d2621504e.patch) = 4167 +SHA256 (82844ce8a6f3.patch) = 1c8ecbe8341e03f2ce0d27c68954b46bab890229f6d14e99f0c859422eb2c551 +SIZE (82844ce8a6f3.patch) = 1382 +SHA256 (f3ed50fa3364.patch) = 0a0d3cffc7820e61aec12b454e3560c0b4014bf98128be5333fe0713fd7961c6 +SIZE (f3ed50fa3364.patch) = 2813 +SHA256 (964d7030f7af.patch) = a01a384d998e6ff1e5a0002332b6aac1859d97577a61626579db8d379fa5e473 +SIZE (964d7030f7af.patch) = 2059 +SHA256 (c73a8162a265.patch) = 9857db78c8309f72f2f2a4a35a10843ee8e04e984ccbbf788043a19ef5303e40 +SIZE (c73a8162a265.patch) = 4012 +SHA256 (997f7787fdbe.patch) = 8a132e51767459e3d5eccba12ddafdfd2039b37033966afc52eb809c71964b50 +SIZE (997f7787fdbe.patch) = 2957 +SHA256 (726ba2cf79f1.patch) = db1698155b9052b9f00935625da9ec9a5d1117ae6f560cf7405b76b40c9392b2 +SIZE (726ba2cf79f1.patch) = 2150 diff --git a/x11/waybar/files/patch-libc++6 b/x11/waybar/files/patch-libc++6 new file mode 100644 index 000000000000..47df4d5da0fe --- /dev/null +++ b/x11/waybar/files/patch-libc++6 @@ -0,0 +1,61 @@ +Drop after FreeBSD 12.0 EOL. See https://reviews.llvm.org/rL333251 + +../src/modules/backlight.cpp:188:53: error: no viable constructor or deduction guide for deduction of template arguments of 'optional' + previous_best_ = best == nullptr ? std::nullopt : std::optional{*best}; + ^ +/usr/include/c++/v1/optional:683:41: note: candidate template ignored: couldn't infer template argument '_Tp' + _LIBCPP_INLINE_VISIBILITY constexpr optional(nullopt_t) noexcept {} + ^ +/usr/include/c++/v1/optional:689:24: note: candidate template ignored: couldn't infer template argument '_Tp' + constexpr explicit optional(in_place_t, _Args&&... __args) + ^ +/usr/include/c++/v1/optional:703:15: note: candidate template ignored: couldn't infer template argument '_Tp' + constexpr optional(_Up&& __v) + ^ +/usr/include/c++/v1/optional:710:24: note: candidate template ignored: couldn't infer template argument '_Tp' + constexpr explicit optional(_Up&& __v) + ^ +/usr/include/c++/v1/optional:579:7: note: candidate template ignored: could not match 'optional<_Tp>' against 'waybar::modules::Backlight::BacklightDev' +class optional + ^ +/usr/include/c++/v1/optional:681:41: note: candidate template ignored: could not match 'optional<_Tp>' against 'const waybar::modules::Backlight::BacklightDev' + _LIBCPP_INLINE_VISIBILITY constexpr optional(const optional&) = default; + ^ +/usr/include/c++/v1/optional:682:41: note: candidate template ignored: could not match 'optional<_Tp>' against 'const waybar::modules::Backlight::BacklightDev' + _LIBCPP_INLINE_VISIBILITY constexpr optional(optional&&) = default; + ^ +/usr/include/c++/v1/optional:718:5: note: candidate template ignored: could not match 'optional' against 'const waybar::modules::Backlight::BacklightDev' + optional(const optional<_Up>& __v) + ^ +/usr/include/c++/v1/optional:726:14: note: candidate template ignored: could not match 'optional' against 'const waybar::modules::Backlight::BacklightDev' + explicit optional(const optional<_Up>& __v) + ^ +/usr/include/c++/v1/optional:736:5: note: candidate template ignored: could not match 'optional' against 'const waybar::modules::Backlight::BacklightDev' + optional(optional<_Up>&& __v) + ^ +/usr/include/c++/v1/optional:744:14: note: candidate template ignored: could not match 'optional' against 'const waybar::modules::Backlight::BacklightDev' + explicit optional(optional<_Up>&& __v) + ^ +/usr/include/c++/v1/optional:680:41: note: candidate function template not viable: requires 0 arguments, but 1 was provided + _LIBCPP_INLINE_VISIBILITY constexpr optional() noexcept {} + ^ +/usr/include/c++/v1/optional:696:24: note: candidate function template not viable: requires at least 2 arguments, but 1 was provided + constexpr explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args) + ^ + +--- src/modules/backlight.cpp.orig 2019-08-08 10:25:31 UTC ++++ src/modules/backlight.cpp +@@ -11,6 +11,13 @@ + + #include + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 ++_LIBCPP_BEGIN_NAMESPACE_STD ++template ++ optional(T) -> optional; ++_LIBCPP_END_NAMESPACE_STD ++#endif ++ + namespace { + class FileDescriptor { + public: diff --git a/x11/waybar/pkg-descr b/x11/waybar/pkg-descr new file mode 100644 index 000000000000..1a4b4c21e780 --- /dev/null +++ b/x11/waybar/pkg-descr @@ -0,0 +1,18 @@ +Waybar is highly customizable Wayland bar for Sway and wlroots-based +compositors providing the following features: + +- Sway (Workspaces, Binding mode, Focused window name) +- Tray [#21](https://github.com/Alexays/Waybar/issues/21) +- Local time +- Battery (Linux-only) +- Network (Linux-only) +- Pulseaudio +- Memory +- Cpu load average +- Temperature (Linux-only) +- MPD +- Custom scripts +- Multiple output configuration +- And much more customizations + +WWW: https://github.com/Alexays/Waybar -- cgit From 8c50360886a563edb80ab0996957b844449ab3aa Mon Sep 17 00:00:00 2001 From: bofh Date: Sun, 11 Aug 2019 16:45:53 +0000 Subject: databases/freetds: Update version 1.1.11=>1.1.12 - Add https MASTER_SITES [1] PR: 239445 [1] Submitted by: p5B2E9A8F@t-online.de [1] --- databases/freetds/Makefile | 5 +++-- databases/freetds/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index ceb4dd193a5d..59143d352323 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= databases -MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ +MASTER_SITES= https://www.freetds.org/files/stable/ \ + ftp://ftp.freetds.org/pub/freetds/stable/ MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index 03e9f854463a..f6a6f006768f 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563626924 -SHA256 (freetds-1.1.11.tar.bz2) = f1d46dbaf49e48420f2f94bf5381b8329eb7dcf905ea98021eb9caf77c90c2c5 -SIZE (freetds-1.1.11.tar.bz2) = 2256754 +TIMESTAMP = 1565535253 +SHA256 (freetds-1.1.12.tar.bz2) = 27ca0796d255b4cfff706c6af1d4b0819f30f6ec0f01f9ae4007914a7d805ecd +SIZE (freetds-1.1.12.tar.bz2) = 2257451 -- cgit From 4b6ce3058567b5ed7bc76f6bf2b127a669b0d49a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:46:08 +0000 Subject: Add rubygem-dalli 2.7.10 Dalli is a high performance pure Ruby client for accessing memcached servers. It works with memcached 1.4+ only as it uses the newer binary protocol. It should be considered a replacement for the memcache-client gem. The name is a variant of Salvador Dali for his famous painting The Persistence of Memory. WWW: https://github.com/petergoldstein/dalli --- databases/Makefile | 1 + databases/rubygem-dalli/Makefile | 20 ++++++++++++++++++++ databases/rubygem-dalli/distinfo | 3 +++ databases/rubygem-dalli/pkg-descr | 8 ++++++++ 4 files changed, 32 insertions(+) create mode 100644 databases/rubygem-dalli/Makefile create mode 100644 databases/rubygem-dalli/distinfo create mode 100644 databases/rubygem-dalli/pkg-descr diff --git a/databases/Makefile b/databases/Makefile index 4f2c2017d66d..7c5956b63318 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -914,6 +914,7 @@ SUBDIR += rubygem-bdb1 SUBDIR += rubygem-bigrecord SUBDIR += rubygem-couchrest + SUBDIR += rubygem-dalli SUBDIR += rubygem-data_objects SUBDIR += rubygem-datamapper SUBDIR += rubygem-dbd-mysql diff --git a/databases/rubygem-dalli/Makefile b/databases/rubygem-dalli/Makefile new file mode 100644 index 000000000000..68c17734bbda --- /dev/null +++ b/databases/rubygem-dalli/Makefile @@ -0,0 +1,20 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= dalli +PORTVERSION= 2.7.10 +CATEGORIES= databases rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= High performance memcached client for Ruby + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/databases/rubygem-dalli/distinfo b/databases/rubygem-dalli/distinfo new file mode 100644 index 000000000000..432e57b54f75 --- /dev/null +++ b/databases/rubygem-dalli/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565536834 +SHA256 (rubygem/dalli-2.7.10.gem) = 91f4cea8e347b076ddbef2b1c2fb247e0c1924f088d20e4f681eb0660736267f +SIZE (rubygem/dalli-2.7.10.gem) = 35328 diff --git a/databases/rubygem-dalli/pkg-descr b/databases/rubygem-dalli/pkg-descr new file mode 100644 index 000000000000..dc689ba98c3a --- /dev/null +++ b/databases/rubygem-dalli/pkg-descr @@ -0,0 +1,8 @@ +Dalli is a high performance pure Ruby client for accessing memcached servers. It +works with memcached 1.4+ only as it uses the newer binary protocol. It should +be considered a replacement for the memcache-client gem. + +The name is a variant of Salvador Dali for his famous painting The Persistence +of Memory. + +WWW: https://github.com/petergoldstein/dalli -- cgit From 671147d7fe6c2a617b9771b3df8af22fa80bc441 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:46:15 +0000 Subject: Add rubygem-spring-watcher-listen 2.0.1 Listen watcher for Spring This gem makes Spring watch the filesystem for changes using Listen rather than by polling the filesystem. On larger projects this means spring will be more responsive, more accurate and use less cpu on local filesystems. WWW: https://github.com/jonleighton/spring-watcher-listen --- devel/Makefile | 1 + devel/rubygem-spring-watcher-listen/Makefile | 23 +++++++++++++++++++++++ devel/rubygem-spring-watcher-listen/distinfo | 3 +++ devel/rubygem-spring-watcher-listen/pkg-descr | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 devel/rubygem-spring-watcher-listen/Makefile create mode 100644 devel/rubygem-spring-watcher-listen/distinfo create mode 100644 devel/rubygem-spring-watcher-listen/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index c2955fcce5ac..9e6a87de3346 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5933,6 +5933,7 @@ SUBDIR += rubygem-spring SUBDIR += rubygem-spring-rails5 SUBDIR += rubygem-spring-rails50 + SUBDIR += rubygem-spring-watcher-listen SUBDIR += rubygem-sprockets SUBDIR += rubygem-sprockets-es6 SUBDIR += rubygem-sprockets-helpers diff --git a/devel/rubygem-spring-watcher-listen/Makefile b/devel/rubygem-spring-watcher-listen/Makefile new file mode 100644 index 000000000000..1f3e953f6df1 --- /dev/null +++ b/devel/rubygem-spring-watcher-listen/Makefile @@ -0,0 +1,23 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= spring-watcher-listen +PORTVERSION= 2.0.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Makes spring watch files using the listen gem + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-listen>=2.7<4.0:devel/rubygem-listen \ + rubygem-spring>=1.2<3.0:devel/rubygem-spring + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-spring-watcher-listen/distinfo b/devel/rubygem-spring-watcher-listen/distinfo new file mode 100644 index 000000000000..52cdc8767ea4 --- /dev/null +++ b/devel/rubygem-spring-watcher-listen/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565540812 +SHA256 (rubygem/spring-watcher-listen-2.0.1.gem) = df83906f5ec811ec0be4536a7a088618af58667b232ffbb6bee4bb67b54d7ff9 +SIZE (rubygem/spring-watcher-listen-2.0.1.gem) = 7680 diff --git a/devel/rubygem-spring-watcher-listen/pkg-descr b/devel/rubygem-spring-watcher-listen/pkg-descr new file mode 100644 index 000000000000..77299359b852 --- /dev/null +++ b/devel/rubygem-spring-watcher-listen/pkg-descr @@ -0,0 +1,9 @@ +Listen watcher for Spring + +This gem makes Spring watch the filesystem for changes using Listen rather than +by polling the filesystem. + +On larger projects this means spring will be more responsive, more accurate and +use less cpu on local filesystems. + +WWW: https://github.com/jonleighton/spring-watcher-listen -- cgit From 6d853670d3133d162ebd01eb52aeb7835bb97b9c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:47:27 +0000 Subject: Move devel/rubygem-web-console to devel/rubygem-web-console-rails5 --- devel/Makefile | 2 +- devel/rubygem-web-console-rails5/Makefile | 25 +++++++++++++++++++++++++ devel/rubygem-web-console-rails5/distinfo | 3 +++ devel/rubygem-web-console-rails5/pkg-descr | 3 +++ devel/rubygem-web-console/Makefile | 24 ------------------------ devel/rubygem-web-console/distinfo | 3 --- devel/rubygem-web-console/pkg-descr | 3 --- 7 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 devel/rubygem-web-console-rails5/Makefile create mode 100644 devel/rubygem-web-console-rails5/distinfo create mode 100644 devel/rubygem-web-console-rails5/pkg-descr delete mode 100644 devel/rubygem-web-console/Makefile delete mode 100644 devel/rubygem-web-console/distinfo delete mode 100644 devel/rubygem-web-console/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index 9e6a87de3346..c889d55932e4 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -6031,7 +6031,7 @@ SUBDIR += rubygem-warbler SUBDIR += rubygem-warden SUBDIR += rubygem-wdm - SUBDIR += rubygem-web-console + SUBDIR += rubygem-web-console-rails5 SUBDIR += rubygem-web-console-rails50 SUBDIR += rubygem-web-console2 SUBDIR += rubygem-webby diff --git a/devel/rubygem-web-console-rails5/Makefile b/devel/rubygem-web-console-rails5/Makefile new file mode 100644 index 000000000000..c68e359eaf7d --- /dev/null +++ b/devel/rubygem-web-console-rails5/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= web-console +PORTVERSION= 3.7.0 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -rails5 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= Debugging tool for your Ruby on Rails applications + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/MIT-LICENSE + +RUN_DEPENDS= rubygem-activemodel5>=5.0:databases/rubygem-activemodel5 \ + rubygem-actionview5>=5.0:devel/rubygem-actionview5 \ + rubygem-bindex>=0.4.0:devel/rubygem-bindex \ + rubygem-railties5>=5.0:www/rubygem-railties5 + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-web-console-rails5/distinfo b/devel/rubygem-web-console-rails5/distinfo new file mode 100644 index 000000000000..b5a5069e4013 --- /dev/null +++ b/devel/rubygem-web-console-rails5/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1535987407 +SHA256 (rubygem/web-console-3.7.0.gem) = cde97ef283953aa2710dd5a203077aeba513ef257b477af31d32578e9a283672 +SIZE (rubygem/web-console-3.7.0.gem) = 28160 diff --git a/devel/rubygem-web-console-rails5/pkg-descr b/devel/rubygem-web-console-rails5/pkg-descr new file mode 100644 index 000000000000..bde8f8c75ee5 --- /dev/null +++ b/devel/rubygem-web-console-rails5/pkg-descr @@ -0,0 +1,3 @@ +A debugging tool for your Ruby on Rails applications. + +WWW: https://github.com/rails/web-console diff --git a/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile deleted file mode 100644 index b542e9263f40..000000000000 --- a/devel/rubygem-web-console/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $FreeBSD$ - -PORTNAME= web-console -PORTVERSION= 3.7.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Debugging tool for your Ruby on Rails applications - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activemodel5>=5.0:databases/rubygem-activemodel5 \ - rubygem-actionview5>=5.0:devel/rubygem-actionview5 \ - rubygem-bindex>=0.4.0:devel/rubygem-bindex \ - rubygem-railties5>=5.0:www/rubygem-railties5 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -.include diff --git a/devel/rubygem-web-console/distinfo b/devel/rubygem-web-console/distinfo deleted file mode 100644 index b5a5069e4013..000000000000 --- a/devel/rubygem-web-console/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1535987407 -SHA256 (rubygem/web-console-3.7.0.gem) = cde97ef283953aa2710dd5a203077aeba513ef257b477af31d32578e9a283672 -SIZE (rubygem/web-console-3.7.0.gem) = 28160 diff --git a/devel/rubygem-web-console/pkg-descr b/devel/rubygem-web-console/pkg-descr deleted file mode 100644 index bde8f8c75ee5..000000000000 --- a/devel/rubygem-web-console/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A debugging tool for your Ruby on Rails applications. - -WWW: https://github.com/rails/web-console -- cgit From 8b5b4cd987ba75afa51888fc50bc244e2bda335f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:47:44 +0000 Subject: Move devel/rubygem-web-console to devel/rubygem-web-console-rails5 --- MOVED | 1 + 1 file changed, 1 insertion(+) diff --git a/MOVED b/MOVED index 164ff896ed5d..5fc149222f92 100644 --- a/MOVED +++ b/MOVED @@ -12859,3 +12859,4 @@ emulators/pearpc||2019-08-01|Has expired: Abandonware sysutils/bbcp||2019-08-03|Has expired: the port is broken for more than a year multimedia/gnome-mpv|multimedia/celluloid|2019-08-08|Renamed upstream devel/py-mimeparse|devel/py-python-mimeparse|2019-08-11|Rename to match upstream naming +devel/rubygem-web-console|devel/rubygem-web-console-rails5|2019-08-11|Rename to match our rubygem- port naming -- cgit From ebe980b1a1b71a17eb534bc822a864d75e4169fb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:49:24 +0000 Subject: Update to 1.007005 (1.7.5) - Fix DISTNAME - Bump PORTREVISION for package change Changes: https://metacpan.org/changes/distribution/BioPerl --- biology/p5-BioPerl/Makefile | 3 ++- biology/p5-BioPerl/distinfo | 6 +++--- biology/p5-BioPerl/pkg-plist | 16 ---------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/biology/p5-BioPerl/Makefile b/biology/p5-BioPerl/Makefile index 5c42404971b3..6147a19796cb 100644 --- a/biology/p5-BioPerl/Makefile +++ b/biology/p5-BioPerl/Makefile @@ -3,11 +3,12 @@ PORTNAME= BioPerl PORTVERSION= 1.007005 +PORTREVISION= 1 CATEGORIES= biology perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CDRAUG PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}-1.7.4 +DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E:S|00|.|g} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Collection of Perl modules for bioinformatics diff --git a/biology/p5-BioPerl/distinfo b/biology/p5-BioPerl/distinfo index 82cf73de6533..a7180cfa9733 100644 --- a/biology/p5-BioPerl/distinfo +++ b/biology/p5-BioPerl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550843244 -SHA256 (BioPerl-1.7.4.tar.gz) = 5a074947bba299cdb47cbf1c66689502db02c022fc138459e3393da45d7c707b -SIZE (BioPerl-1.7.4.tar.gz) = 7642013 +TIMESTAMP = 1565523237 +SHA256 (BioPerl-1.7.5.tar.gz) = 4a96472004e35e11eafd1fa3b3966f1d18622de3afde3e2fa6765a2dbedb3a0a +SIZE (BioPerl-1.7.5.tar.gz) = 7512326 diff --git a/biology/p5-BioPerl/pkg-plist b/biology/p5-BioPerl/pkg-plist index 97c4e41e39a4..244f0c123a1d 100644 --- a/biology/p5-BioPerl/pkg-plist +++ b/biology/p5-BioPerl/pkg-plist @@ -329,7 +329,6 @@ bin/bp_unflatten_seq %%SITE_PERL%%/Bio/Seq/SeqBuilder.pm %%SITE_PERL%%/Bio/Seq/SeqFactory.pm %%SITE_PERL%%/Bio/Seq/SeqFastaSpeedFactory.pm -%%SITE_PERL%%/Bio/Seq/SeqWithQuality.pm %%SITE_PERL%%/Bio/Seq/SequenceTrace.pm %%SITE_PERL%%/Bio/Seq/SimulatedRead.pm %%SITE_PERL%%/Bio/Seq/TraceI.pm @@ -412,13 +411,6 @@ bin/bp_unflatten_seq %%SITE_PERL%%/Bio/SimpleAlign.pm %%SITE_PERL%%/Bio/SimpleAnalysisI.pm %%SITE_PERL%%/Bio/Species.pm -%%SITE_PERL%%/Bio/Symbol/Alphabet.pm -%%SITE_PERL%%/Bio/Symbol/AlphabetI.pm -%%SITE_PERL%%/Bio/Symbol/DNAAlphabet.pm -%%SITE_PERL%%/Bio/Symbol/ProteinAlphabet.pm -%%SITE_PERL%%/Bio/Symbol/README.Symbol -%%SITE_PERL%%/Bio/Symbol/Symbol.pm -%%SITE_PERL%%/Bio/Symbol/SymbolI.pm %%SITE_PERL%%/Bio/Taxon.pm %%SITE_PERL%%/Bio/Tools/Alignment/Consed.pm %%SITE_PERL%%/Bio/Tools/Alignment/Trim.pm @@ -474,7 +466,6 @@ bin/bp_unflatten_seq %%SITE_PERL%%/Bio/Tools/Run/GenericParameters.pm %%SITE_PERL%%/Bio/Tools/Run/ParametersI.pm %%SITE_PERL%%/Bio/Tools/Run/Phylo/PhyloBase.pm -%%SITE_PERL%%/Bio/Tools/Run/README %%SITE_PERL%%/Bio/Tools/Run/WrapperBase.pm %%SITE_PERL%%/Bio/Tools/Run/WrapperBase/CommandExts.pm %%SITE_PERL%%/Bio/Tools/Seg.pm @@ -852,7 +843,6 @@ bin/bp_unflatten_seq %%PERL5_MAN3%%/Bio::Seq::SeqBuilder.3.gz %%PERL5_MAN3%%/Bio::Seq::SeqFactory.3.gz %%PERL5_MAN3%%/Bio::Seq::SeqFastaSpeedFactory.3.gz -%%PERL5_MAN3%%/Bio::Seq::SeqWithQuality.3.gz %%PERL5_MAN3%%/Bio::Seq::SequenceTrace.3.gz %%PERL5_MAN3%%/Bio::Seq::SimulatedRead.3.gz %%PERL5_MAN3%%/Bio::Seq::TraceI.3.gz @@ -935,12 +925,6 @@ bin/bp_unflatten_seq %%PERL5_MAN3%%/Bio::SimpleAlign.3.gz %%PERL5_MAN3%%/Bio::SimpleAnalysisI.3.gz %%PERL5_MAN3%%/Bio::Species.3.gz -%%PERL5_MAN3%%/Bio::Symbol::Alphabet.3.gz -%%PERL5_MAN3%%/Bio::Symbol::AlphabetI.3.gz -%%PERL5_MAN3%%/Bio::Symbol::DNAAlphabet.3.gz -%%PERL5_MAN3%%/Bio::Symbol::ProteinAlphabet.3.gz -%%PERL5_MAN3%%/Bio::Symbol::Symbol.3.gz -%%PERL5_MAN3%%/Bio::Symbol::SymbolI.3.gz %%PERL5_MAN3%%/Bio::Taxon.3.gz %%PERL5_MAN3%%/Bio::Tools::Alignment::Consed.3.gz %%PERL5_MAN3%%/Bio::Tools::Alignment::Trim.3.gz -- cgit From bb991f8ae416c3a444e8e1644b5d890457a90ffc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:49:51 +0000 Subject: Take maintainership --- textproc/rubygem-sass/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/textproc/rubygem-sass/Makefile b/textproc/rubygem-sass/Makefile index cbbbe1164efe..484c7d82ce77 100644 --- a/textproc/rubygem-sass/Makefile +++ b/textproc/rubygem-sass/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 3.5.7 CATEGORIES= textproc ruby MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sass is an extension of CSS3 LICENSE= MIT @@ -14,14 +14,16 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-sass-listen>=4.0.0:textproc/rubygem-sass-listen -# bin/sass bin/sass-convert bin/scss -CONFLICTS_INSTALL= rubygem-sass34 - -NO_ARCH= yes USES= gem shebangfix USE_RUBY= yes -SHEBANG_FILES= extra/sass-spec-ref.sh + +NO_ARCH= yes PLIST_FILES= bin/sass bin/sass-convert bin/scss +# bin/sass bin/sass-convert bin/scss +CONFLICTS_INSTALL= rubygem-sass34 + +SHEBANG_FILES= extra/sass-spec-ref.sh + .include -- cgit From 711f8a4be5860083d11bd50c8f3402f25bb1db94 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:49:56 +0000 Subject: Add LICENSE_FILE - Take maintainership --- textproc/rubygem-sass-listen/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/textproc/rubygem-sass-listen/Makefile b/textproc/rubygem-sass-listen/Makefile index 5c344ba4730e..f1c247e5bd5f 100644 --- a/textproc/rubygem-sass-listen/Makefile +++ b/textproc/rubygem-sass-listen/Makefile @@ -5,17 +5,18 @@ PORTVERSION= 4.0.0 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Listens to file modifications LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-rb-fsevent>=0.9.4:devel/rubygem-rb-fsevent \ rubygem-rb-inotify>=0.9.7:devel/rubygem-rb-inotify -NO_ARCH= yes - USES= gem USE_RUBY= yes +NO_ARCH= yes + .include -- cgit From 17dfebc60868fbdd2d006d002ea995ddff68fa48 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:50:01 +0000 Subject: Fix RUN_DEPENDS - Bump PORTREVISION for dependency change - Take maintainership --- www/rubygem-turbolinks/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/www/rubygem-turbolinks/Makefile b/www/rubygem-turbolinks/Makefile index ea4c4ca122a0..c53163a47f4d 100644 --- a/www/rubygem-turbolinks/Makefile +++ b/www/rubygem-turbolinks/Makefile @@ -2,20 +2,21 @@ PORTNAME= turbolinks PORTVERSION= 5.2.0 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Turbolinks makes following links in your web application faster LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-coffee-rails4>=4.0.1:devel/rubygem-coffee-rails4 \ - rubygem-turbolinks-source>=5.2:www/rubygem-turbolinks-source +RUN_DEPENDS= rubygem-turbolinks-source>=5.2:www/rubygem-turbolinks-source -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From 472184b0c45c84a9e2ccffa3700bc1f914ece8fc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:50:42 +0000 Subject: Take maintainership --- www/rubygem-turbolinks-source/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/rubygem-turbolinks-source/Makefile b/www/rubygem-turbolinks-source/Makefile index 5feb2bb8966b..5386d02bb4d1 100644 --- a/www/rubygem-turbolinks-source/Makefile +++ b/www/rubygem-turbolinks-source/Makefile @@ -6,14 +6,15 @@ PORTVERSION= 5.2.0 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Turbolinks JavaScript assets LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From 211eb4c78f17315e04b8d7821b9c3262337361e1 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:50:48 +0000 Subject: Add NO_ARCH --- devel/p5-MooseX-ArrayRef/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/p5-MooseX-ArrayRef/Makefile b/devel/p5-MooseX-ArrayRef/Makefile index 3bf7a59c2d9b..8c0aa5168cc3 100644 --- a/devel/p5-MooseX-ArrayRef/Makefile +++ b/devel/p5-MooseX-ArrayRef/Makefile @@ -19,4 +19,6 @@ RUN_DEPENDS= p5-Moose>=2.00:devel/p5-Moose USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From f67515e4be05bf75894a1e23c9a6c8a98f8a77fb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:50:53 +0000 Subject: Add NO_ARCH --- graphics/p5-SWF-File/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile index 054e2e11354c..e3a92ad5aaa9 100644 --- a/graphics/p5-SWF-File/Makefile +++ b/graphics/p5-SWF-File/Makefile @@ -18,4 +18,6 @@ RUN_DEPENDS= p5-Data-TemporaryBag>=0:devel/p5-Data-TemporaryBag USES= perl5 dos2unix USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From 5b23e5261cf4450c9d5dd575dc2ece7420833caa Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:50:58 +0000 Subject: Add NO_ARCH --- math/p5-Math-Bezier-Convert/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/math/p5-Math-Bezier-Convert/Makefile b/math/p5-Math-Bezier-Convert/Makefile index 8ab087caa4f7..3b554b38d172 100644 --- a/math/p5-Math-Bezier-Convert/Makefile +++ b/math/p5-Math-Bezier-Convert/Makefile @@ -14,4 +14,6 @@ COMMENT= Convert cubic and quadratic Bezier each other USES= perl5 dos2unix USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From d1491c303267104b88d560ac0fcb640e0cb9faab Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:02 +0000 Subject: Add NO_ARCH --- textproc/p5-XML-CommonNS/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/textproc/p5-XML-CommonNS/Makefile b/textproc/p5-XML-CommonNS/Makefile index 06aa82ac8f44..4d4370f916c0 100644 --- a/textproc/p5-XML-CommonNS/Makefile +++ b/textproc/p5-XML-CommonNS/Makefile @@ -20,4 +20,6 @@ RUN_DEPENDS= p5-XML-NamespaceFactory>=0:textproc/p5-XML-NamespaceFactory USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From c17b2095ea4bbbb98702987002fb09e3bddd9e91 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:07 +0000 Subject: Add NO_ARCH --- textproc/p5-XML-Namespace/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/textproc/p5-XML-Namespace/Makefile b/textproc/p5-XML-Namespace/Makefile index 21cdf1dc1865..5ac6803cb19a 100644 --- a/textproc/p5-XML-Namespace/Makefile +++ b/textproc/p5-XML-Namespace/Makefile @@ -17,4 +17,6 @@ LICENSE_COMB= dual USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From b20035c6bf7234c1fe53e86217531ad18b083c0f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:12 +0000 Subject: Add NO_ARCH --- textproc/p5-XML-NamespaceFactory/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/textproc/p5-XML-NamespaceFactory/Makefile b/textproc/p5-XML-NamespaceFactory/Makefile index a0f2954aa508..a0ab654a660d 100644 --- a/textproc/p5-XML-NamespaceFactory/Makefile +++ b/textproc/p5-XML-NamespaceFactory/Makefile @@ -16,4 +16,6 @@ LICENSE_COMB= dual USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From 62e32773fbc8bd05ea85770290c02105dc104c0c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:23 +0000 Subject: Update version requirement of RUN_DEPENDS --- www/rubygem-jquery-turbolinks/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/rubygem-jquery-turbolinks/Makefile b/www/rubygem-jquery-turbolinks/Makefile index 06fc486d819e..199ac972380b 100644 --- a/www/rubygem-jquery-turbolinks/Makefile +++ b/www/rubygem-jquery-turbolinks/Makefile @@ -12,11 +12,12 @@ COMMENT= jQuery plugin for drop-in fix binded events problem caused by Turbolink LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-railties4>=4.1.6:www/rubygem-railties4 \ +RUN_DEPENDS= rubygem-railties4>=3.1.0:www/rubygem-railties4 \ rubygem-turbolinks>=0:www/rubygem-turbolinks -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include -- cgit From e7a418839ae0cca48b792c185335870b24839f8d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:28 +0000 Subject: Update RUN_DEPENDS - Bump PORTREVISION for dependency change --- www/rubygem-rails5/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/rubygem-rails5/Makefile b/www/rubygem-rails5/Makefile index 7343fa9b9018..d7af8b788357 100644 --- a/www/rubygem-rails5/Makefile +++ b/www/rubygem-rails5/Makefile @@ -3,6 +3,7 @@ PORTNAME= rails PORTVERSION= 5.1.7 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 5 @@ -41,13 +42,13 @@ RUN_DEPENDS= rubygem-actioncable5>=${PORTVERSION}:www/rubygem-actioncable5 \ rubygem-sass-rails-rails5>=5.0.3:textproc/rubygem-sass-rails-rails5 \ rubygem-sass>=3.4.23:textproc/rubygem-sass \ rubygem-selenium-webdriver>=3.4.0:www/rubygem-selenium-webdriver \ - rubygem-spring-rails5>=2.0.1:devel/rubygem-spring-rails5 \ + rubygem-spring>=2.0.1:devel/rubygem-spring \ rubygem-sqlite3>=1.3.13:databases/rubygem-sqlite3 \ rubygem-tilt>=2.0.7:devel/rubygem-tilt \ + rubygem-turbolinks>=5:www/rubygem-turbolinks \ rubygem-turbolinks-source>=5.0.0:www/rubygem-turbolinks-source \ - rubygem-turbolinks-rails5>=5.0.1:www/rubygem-turbolinks-rails5 \ rubygem-uglifier>=3.2.0:www/rubygem-uglifier \ - rubygem-web-console>=3.5.0:devel/rubygem-web-console + rubygem-web-console-rails5>=3.5.0:devel/rubygem-web-console-rails5 USES= gem USE_RUBY= yes -- cgit From e5c999bd5193c917a8fbb80dbefc0d928c0cfa4d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:51:33 +0000 Subject: Update RUN_DEPENDS - Bump PORTREVISION for dependency change --- www/rubygem-rails50/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www/rubygem-rails50/Makefile b/www/rubygem-rails50/Makefile index e28d4d2bb96b..4f0ce8e24387 100644 --- a/www/rubygem-rails50/Makefile +++ b/www/rubygem-rails50/Makefile @@ -3,6 +3,7 @@ PORTNAME= rails PORTVERSION= 5.0.7.2 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 50 @@ -39,11 +40,11 @@ RUN_DEPENDS= rubygem-actioncable50>=${PORTVERSION}:www/rubygem-actioncable50 \ rubygem-sass-listen>=4.0.0:textproc/rubygem-sass-listen \ rubygem-sass-rails-rails50>=5.0.3:textproc/rubygem-sass-rails-rails50 \ rubygem-sass>=3.4.23:textproc/rubygem-sass \ - rubygem-spring-rails50>=2.0.1:devel/rubygem-spring-rails50 \ + rubygem-spring>=2.0.1:devel/rubygem-spring \ rubygem-sqlite3>=1.3.13:databases/rubygem-sqlite3 \ rubygem-tilt>=2.0.7:devel/rubygem-tilt \ + rubygem-turbolinks>=5:www/rubygem-turbolinks \ rubygem-turbolinks-source>=5.0.0:www/rubygem-turbolinks-source \ - rubygem-turbolinks-rails50>=5.0.1:www/rubygem-turbolinks-rails50 \ rubygem-uglifier>=3.2.0:www/rubygem-uglifier \ rubygem-web-console-rails50>=3.5.0:devel/rubygem-web-console-rails50 -- cgit From c5e5e768b12a72151496f49a033ff26563fab793 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:55:13 +0000 Subject: Remove devel/rubygem-spring-rails5 devel/rubygem-spring does not have rails version specific dependency after 2.1.0 update. --- devel/Makefile | 1 - devel/rubygem-spring-rails5/Makefile | 24 ------------------------ devel/rubygem-spring-rails5/distinfo | 3 --- devel/rubygem-spring-rails5/pkg-descr | 3 --- 4 files changed, 31 deletions(-) delete mode 100644 devel/rubygem-spring-rails5/Makefile delete mode 100644 devel/rubygem-spring-rails5/distinfo delete mode 100644 devel/rubygem-spring-rails5/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index c889d55932e4..de332f68f3ea 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5931,7 +5931,6 @@ SUBDIR += rubygem-soap4r SUBDIR += rubygem-solve SUBDIR += rubygem-spring - SUBDIR += rubygem-spring-rails5 SUBDIR += rubygem-spring-rails50 SUBDIR += rubygem-spring-watcher-listen SUBDIR += rubygem-sprockets diff --git a/devel/rubygem-spring-rails5/Makefile b/devel/rubygem-spring-rails5/Makefile deleted file mode 100644 index cb7a9961f410..000000000000 --- a/devel/rubygem-spring-rails5/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Steve Wills -# $FreeBSD$ - -PORTNAME= spring -PORTVERSION= 2.0.2 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails5 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Rails application preloader - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -RUN_DEPENDS= rubygem-activesupport5>0:devel/rubygem-activesupport5 - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -PLIST_FILES= bin/spring - -.include diff --git a/devel/rubygem-spring-rails5/distinfo b/devel/rubygem-spring-rails5/distinfo deleted file mode 100644 index d4b6ecc20bca..000000000000 --- a/devel/rubygem-spring-rails5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1495537591 -SHA256 (rubygem/spring-2.0.2.gem) = e574adc7f7f93905bab12e683ede8e634c9bd620f660140be3416c1758fa1e99 -SIZE (rubygem/spring-2.0.2.gem) = 38912 diff --git a/devel/rubygem-spring-rails5/pkg-descr b/devel/rubygem-spring-rails5/pkg-descr deleted file mode 100644 index ce87977c2fbd..000000000000 --- a/devel/rubygem-spring-rails5/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Rails application preloader - -WWW: https://github.com/rails/spring -- cgit From 6c68f6008eed8511bb0a1c0829c0a09b7349b582 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:55:37 +0000 Subject: Remove devel/rubygem-spring-rails5 devel/rubygem-spring does not have rails version specific dependency after 2.1.0 update. --- devel/Makefile | 1 - devel/rubygem-spring-rails50/Makefile | 24 ------------------------ devel/rubygem-spring-rails50/distinfo | 3 --- devel/rubygem-spring-rails50/pkg-descr | 3 --- 4 files changed, 31 deletions(-) delete mode 100644 devel/rubygem-spring-rails50/Makefile delete mode 100644 devel/rubygem-spring-rails50/distinfo delete mode 100644 devel/rubygem-spring-rails50/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index de332f68f3ea..bad99cb21ff2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5931,7 +5931,6 @@ SUBDIR += rubygem-soap4r SUBDIR += rubygem-solve SUBDIR += rubygem-spring - SUBDIR += rubygem-spring-rails50 SUBDIR += rubygem-spring-watcher-listen SUBDIR += rubygem-sprockets SUBDIR += rubygem-sprockets-es6 diff --git a/devel/rubygem-spring-rails50/Makefile b/devel/rubygem-spring-rails50/Makefile deleted file mode 100644 index b12d160f63f3..000000000000 --- a/devel/rubygem-spring-rails50/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Steve Wills -# $FreeBSD$ - -PORTNAME= spring -PORTVERSION= 2.0.2 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails50 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Rails application preloader - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -RUN_DEPENDS= rubygem-activesupport50>0:devel/rubygem-activesupport50 - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -PLIST_FILES= bin/spring - -.include diff --git a/devel/rubygem-spring-rails50/distinfo b/devel/rubygem-spring-rails50/distinfo deleted file mode 100644 index d4b6ecc20bca..000000000000 --- a/devel/rubygem-spring-rails50/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1495537591 -SHA256 (rubygem/spring-2.0.2.gem) = e574adc7f7f93905bab12e683ede8e634c9bd620f660140be3416c1758fa1e99 -SIZE (rubygem/spring-2.0.2.gem) = 38912 diff --git a/devel/rubygem-spring-rails50/pkg-descr b/devel/rubygem-spring-rails50/pkg-descr deleted file mode 100644 index ce87977c2fbd..000000000000 --- a/devel/rubygem-spring-rails50/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Rails application preloader - -WWW: https://github.com/rails/spring -- cgit From cb5bb3f6f3e8a8ecc0c8a7e8bede930a204fd678 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:55:45 +0000 Subject: Remove www/rubygem-turbolinks-rails5 www/rubygem-turbolinks does not have rails version specific dependency after RUN_DEPENDS fixed. --- www/Makefile | 1 - www/rubygem-turbolinks-rails5/Makefile | 22 ---------------------- www/rubygem-turbolinks-rails5/distinfo | 3 --- www/rubygem-turbolinks-rails5/pkg-descr | 4 ---- 4 files changed, 30 deletions(-) delete mode 100644 www/rubygem-turbolinks-rails5/Makefile delete mode 100644 www/rubygem-turbolinks-rails5/distinfo delete mode 100644 www/rubygem-turbolinks-rails5/pkg-descr diff --git a/www/Makefile b/www/Makefile index 21f6a7d3b87f..983ff18d5194 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2187,7 +2187,6 @@ SUBDIR += rubygem-totoridipjp SUBDIR += rubygem-tumblr_client SUBDIR += rubygem-turbolinks - SUBDIR += rubygem-turbolinks-rails5 SUBDIR += rubygem-turbolinks-rails50 SUBDIR += rubygem-turbolinks-source SUBDIR += rubygem-typhoeus diff --git a/www/rubygem-turbolinks-rails5/Makefile b/www/rubygem-turbolinks-rails5/Makefile deleted file mode 100644 index 2776e8004e77..000000000000 --- a/www/rubygem-turbolinks-rails5/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -PORTNAME= turbolinks -PORTVERSION= 5.2.0 -CATEGORIES= www rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails5 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Turbolinks makes following links in your web application faster - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-coffee-rails-rails5>=4.0.1:devel/rubygem-coffee-rails-rails5 \ - rubygem-turbolinks-source>=5.2:www/rubygem-turbolinks-source - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -.include diff --git a/www/rubygem-turbolinks-rails5/distinfo b/www/rubygem-turbolinks-rails5/distinfo deleted file mode 100644 index 6c16dd416b9e..000000000000 --- a/www/rubygem-turbolinks-rails5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1534866076 -SHA256 (rubygem/turbolinks-5.2.0.gem) = f94601b8d23f587b73bfd81b2dd054ce3a8bc6d70e8488f89dcd30f5975da149 -SIZE (rubygem/turbolinks-5.2.0.gem) = 6656 diff --git a/www/rubygem-turbolinks-rails5/pkg-descr b/www/rubygem-turbolinks-rails5/pkg-descr deleted file mode 100644 index c40955853c41..000000000000 --- a/www/rubygem-turbolinks-rails5/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Turbolinks makes following links in your web application faster (use with Rails -Asset Pipeline) - -WWW: https://github.com/turbolinks/turbolinks -- cgit From c51d51cf3992e96eb6297c7fe011b6926d9f7f12 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:56:03 +0000 Subject: Remove www/rubygem-turbolinks-rails5 www/rubygem-turbolinks does not have rails version specific dependency after RUN_DEPENDS fixed. --- www/Makefile | 1 - www/rubygem-turbolinks-rails50/Makefile | 22 ---------------------- www/rubygem-turbolinks-rails50/distinfo | 3 --- www/rubygem-turbolinks-rails50/pkg-descr | 4 ---- 4 files changed, 30 deletions(-) delete mode 100644 www/rubygem-turbolinks-rails50/Makefile delete mode 100644 www/rubygem-turbolinks-rails50/distinfo delete mode 100644 www/rubygem-turbolinks-rails50/pkg-descr diff --git a/www/Makefile b/www/Makefile index 983ff18d5194..1cf7da0e8ebe 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2187,7 +2187,6 @@ SUBDIR += rubygem-totoridipjp SUBDIR += rubygem-tumblr_client SUBDIR += rubygem-turbolinks - SUBDIR += rubygem-turbolinks-rails50 SUBDIR += rubygem-turbolinks-source SUBDIR += rubygem-typhoeus SUBDIR += rubygem-uglifier diff --git a/www/rubygem-turbolinks-rails50/Makefile b/www/rubygem-turbolinks-rails50/Makefile deleted file mode 100644 index 29152b51c782..000000000000 --- a/www/rubygem-turbolinks-rails50/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -PORTNAME= turbolinks -PORTVERSION= 5.2.0 -CATEGORIES= www rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails50 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Turbolinks makes following links in your web application faster - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-coffee-rails-rails50>=4.0.1:devel/rubygem-coffee-rails-rails50 \ - rubygem-turbolinks-source>=5.2:www/rubygem-turbolinks-source - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -.include diff --git a/www/rubygem-turbolinks-rails50/distinfo b/www/rubygem-turbolinks-rails50/distinfo deleted file mode 100644 index 6c16dd416b9e..000000000000 --- a/www/rubygem-turbolinks-rails50/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1534866076 -SHA256 (rubygem/turbolinks-5.2.0.gem) = f94601b8d23f587b73bfd81b2dd054ce3a8bc6d70e8488f89dcd30f5975da149 -SIZE (rubygem/turbolinks-5.2.0.gem) = 6656 diff --git a/www/rubygem-turbolinks-rails50/pkg-descr b/www/rubygem-turbolinks-rails50/pkg-descr deleted file mode 100644 index c40955853c41..000000000000 --- a/www/rubygem-turbolinks-rails50/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Turbolinks makes following links in your web application faster (use with Rails -Asset Pipeline) - -WWW: https://github.com/turbolinks/turbolinks -- cgit From 9df881e341a43e08e1b35b354cff9a895d2f7143 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 16:56:39 +0000 Subject: Document the removal of unnecessary ports - devel/rubygem-spring-rails5 - devel/rubygem-spring-rails50 - www/rubygem-turbolinks-rails5 - www/rubygem-turbolinks-rails50 --- MOVED | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MOVED b/MOVED index 5fc149222f92..3061f66ee4da 100644 --- a/MOVED +++ b/MOVED @@ -12860,3 +12860,7 @@ sysutils/bbcp||2019-08-03|Has expired: the port is broken for more than a year multimedia/gnome-mpv|multimedia/celluloid|2019-08-08|Renamed upstream devel/py-mimeparse|devel/py-python-mimeparse|2019-08-11|Rename to match upstream naming devel/rubygem-web-console|devel/rubygem-web-console-rails5|2019-08-11|Rename to match our rubygem- port naming +devel/rubygem-spring-rails5|devel/rubygem-spring|2019-08-11|Remove unnecessary port after devel/rubygem-spring update +devel/rubygem-spring-rails50|devel/rubygem-spring|2019-08-11|Remove unnecessary port after devel/rubygem-spring update +www/rubygem-turbolinks-rails5|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix +www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix -- cgit From 393d10ed01db9931b7c07d41ff8c0e2e63850b19 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Sun, 11 Aug 2019 17:10:07 +0000 Subject: Update to 2.1.0 - Take maintainership Changes: https://github.com/rails/spring/blob/master/CHANGELOG.md --- devel/rubygem-spring/Makefile | 9 ++++----- devel/rubygem-spring/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devel/rubygem-spring/Makefile b/devel/rubygem-spring/Makefile index 77d9777a8a93..acc344223bb9 100644 --- a/devel/rubygem-spring/Makefile +++ b/devel/rubygem-spring/Makefile @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= spring -PORTVERSION= 2.0.2 +PORTVERSION= 2.1.0 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Rails application preloader LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activesupport4>=4.2:devel/rubygem-activesupport4 +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem PLIST_FILES= bin/spring diff --git a/devel/rubygem-spring/distinfo b/devel/rubygem-spring/distinfo index 0aa09a40d11a..5adc368bdc62 100644 --- a/devel/rubygem-spring/distinfo +++ b/devel/rubygem-spring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495461501 -SHA256 (rubygem/spring-2.0.2.gem) = e574adc7f7f93905bab12e683ede8e634c9bd620f660140be3416c1758fa1e99 -SIZE (rubygem/spring-2.0.2.gem) = 38912 +TIMESTAMP = 1565540567 +SHA256 (rubygem/spring-2.1.0.gem) = cb2fd6655b7ef491226c6a49a0fa644457cada40d400365eaf63fdbeb1c211df +SIZE (rubygem/spring-2.1.0.gem) = 31232 -- cgit From ea419d19d7012690ef37e169477b7a9d3ec7a795 Mon Sep 17 00:00:00 2001 From: pi Date: Sun, 11 Aug 2019 17:29:10 +0000 Subject: biology/gperiodic: upgrade 2.0.10 -> 3.0.3 - new mastersite PR: 239642 Submitted by: Walter Schwarzenfeld Relnotes: https://sourceforge.net/p/gperiodic/code/HEAD/tree/branches/3.0.3/ChangeLog --- biology/gperiodic/Makefile | 24 +++++++++++++----------- biology/gperiodic/distinfo | 5 +++-- biology/gperiodic/pkg-plist | 33 +++++++++++++++++++++++---------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile index 75b7d2977301..4b689f08ac3b 100644 --- a/biology/gperiodic/Makefile +++ b/biology/gperiodic/Makefile @@ -3,10 +3,9 @@ # $MCom: ports/biology/gperiodic/Makefile,v 1.1 2006/09/29 23:42:13 ahze Exp $ PORTNAME= gperiodic -PORTVERSION= 2.0.10 -PORTREVISION= 8 +PORTVERSION= 3.0.3 CATEGORIES= biology -MASTER_SITES= http://www.frantz.fi/software/ +MASTER_SITES= https://sourceforge.net/projects/gperiodic/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Displays a periodic table of the elements @@ -14,15 +13,13 @@ COMMENT= Displays a periodic table of the elements LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/gpl.txt -BROKEN= unfetchable - -USE_GNOME= gtk20 USES= pkgconfig - -LANGS= da fr gl it pl ru sv tr +USE_GNOME= gtk20 PORTDOCS= AUTHORS ChangeLog README +LANGS= be cs da de es fi fr gl is it ms pl pt ru sv tr uk zh_CN + OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes @@ -39,9 +36,7 @@ do-build-NLS-on: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gperiodic ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/gperiodic.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - (cd ${WRKSRC} && ${INSTALL_DATA} gperiodic.png gperiodic-crystal.png \ + (cd ${WRKSRC}/icons && ${INSTALL_DATA} gperiodic-crystal.png gperiodic.png \ ${STAGEDIR}${PREFIX}/share/pixmaps) do-install-NLS-on: @@ -50,6 +45,13 @@ do-install-NLS-on: ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo .endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/gperiodic + ${INSTALL_DATA} ${WRKSRC}/table_data.h \ + ${STAGEDIR}${PREFIX}/share/locale/gperiodic + ${INSTALL_DATA} ${WRKSRC}/po/gperiodic.pot \ + ${STAGEDIR}${PREFIX}/share/locale/gperiodic + ${INSTALL_DATA} ${WRKSRC}/po/README \ + ${STAGEDIR}/${PREFIX}/share/locale/gperiodic do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/biology/gperiodic/distinfo b/biology/gperiodic/distinfo index 0b06be70ff6e..7789a2ab7434 100644 --- a/biology/gperiodic/distinfo +++ b/biology/gperiodic/distinfo @@ -1,2 +1,3 @@ -SHA256 (gperiodic-2.0.10.tar.gz) = 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096 -SIZE (gperiodic-2.0.10.tar.gz) = 131213 +TIMESTAMP = 1564926393 +SHA256 (gperiodic-3.0.3.tar.gz) = 5e70128f61a311bd6b4ad129bd726ccc0e3731573cb0050201293e2a5389b29a +SIZE (gperiodic-3.0.3.tar.gz) = 451559 diff --git a/biology/gperiodic/pkg-plist b/biology/gperiodic/pkg-plist index 22ba3a5d6e5c..b5d4271ba217 100644 --- a/biology/gperiodic/pkg-plist +++ b/biology/gperiodic/pkg-plist @@ -1,12 +1,25 @@ +@postexec chmod -R 770 /usr/local/share/locale/gperiodic bin/gperiodic -share/applications/gperiodic.desktop -%%NLS%%share/locale/da/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/fr/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/gl/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/it/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/pl/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/ru/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/sv/LC_MESSAGES/gperiodic.mo -%%NLS%%share/locale/tr/LC_MESSAGES/gperiodic.mo -share/pixmaps/gperiodic.png +share/locale/be/LC_MESSAGES/gperiodic.mo +share/locale/cs/LC_MESSAGES/gperiodic.mo +share/locale/da/LC_MESSAGES/gperiodic.mo +share/locale/de/LC_MESSAGES/gperiodic.mo +share/locale/es/LC_MESSAGES/gperiodic.mo +share/locale/fi/LC_MESSAGES/gperiodic.mo +share/locale/fr/LC_MESSAGES/gperiodic.mo +share/locale/gl/LC_MESSAGES/gperiodic.mo +share/locale/gperiodic/README +share/locale/gperiodic/gperiodic.pot +share/locale/gperiodic/table_data.h +share/locale/is/LC_MESSAGES/gperiodic.mo +share/locale/it/LC_MESSAGES/gperiodic.mo +share/locale/ms/LC_MESSAGES/gperiodic.mo +share/locale/pl/LC_MESSAGES/gperiodic.mo +share/locale/pt/LC_MESSAGES/gperiodic.mo +share/locale/ru/LC_MESSAGES/gperiodic.mo +share/locale/sv/LC_MESSAGES/gperiodic.mo +share/locale/tr/LC_MESSAGES/gperiodic.mo +share/locale/uk/LC_MESSAGES/gperiodic.mo +share/locale/zh_CN/LC_MESSAGES/gperiodic.mo share/pixmaps/gperiodic-crystal.png +share/pixmaps/gperiodic.png -- cgit From 2325e60cf87375baf5d7d115e0ed4996aa09cd4d Mon Sep 17 00:00:00 2001 From: adridg Date: Sun, 11 Aug 2019 17:37:57 +0000 Subject: Make devel/qt5-qdoc use LLVM_DEFAULT instead of hard-coded version Having the version hard-coded makes it hard to chase LLVM updates; having a different LLVM version from the rest of the stack -- in particular from what mesa uses -- means building an extra LLVM just for parsing documentation from Qt modules. linimon@ suggests using an easily-spotted variable in PR 239740 but we can go one better and just use the LLVM that's there. PR: 239740 Submitted by: linimon --- devel/qt5-qdoc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 32702cfd8806..eea703359093 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -BUILD_DEPENDS= llvm60>=0:devel/llvm60 -RUN_DEPENDS= llvm60>=0:devel/llvm60 +BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} +RUN_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core declarative buildtools_build qdoc-data_run @@ -20,6 +20,6 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm60 +CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT} .include -- cgit From b120d5d9f1e51f6cdb7ad8ab5080496d4e73bc00 Mon Sep 17 00:00:00 2001 From: pi Date: Sun, 11 Aug 2019 17:40:24 +0000 Subject: www/ljdump: force use of python 2.7 PR: 239643 Submitted by: Walter Schwarzenfeld Reported by: Victor Sudakov MFH: 2019Q3 --- www/ljdump/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/ljdump/Makefile b/www/ljdump/Makefile index e5f3fe5603b6..c2f23716b2cd 100644 --- a/www/ljdump/Makefile +++ b/www/ljdump/Makefile @@ -3,7 +3,7 @@ PORTNAME= ljdump PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= http://hewgill.com/ljdump/ @@ -14,7 +14,7 @@ LICENSE= ZLIB PORTSCOUT= skipv:1.5.1 # 1.5.1 is identical to 1.5 + our patches -USES= python:run shebangfix +USES= python:2.7,run shebangfix SHEBANG_FILES= ljdump.py NO_BUILD= yes NO_ARCH= yes -- cgit From ef9e3f573e3a4a8c2c6f67d8b7e5a36821086918 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 18:15:44 +0000 Subject: math/bitwise: Update 0.33 -> 0.40 Reported by: portscout --- math/bitwise/Makefile | 2 +- math/bitwise/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/math/bitwise/Makefile b/math/bitwise/Makefile index a4b8fb297643..5073e006b569 100644 --- a/math/bitwise/Makefile +++ b/math/bitwise/Makefile @@ -2,7 +2,7 @@ PORTNAME= bitwise DISTVERSIONPREFIX= v -DISTVERSION= 0.33 +DISTVERSION= 0.40 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/bitwise/distinfo b/math/bitwise/distinfo index ba34991d4041..97a63aa5d1be 100644 --- a/math/bitwise/distinfo +++ b/math/bitwise/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563855253 -SHA256 (mellowcandle-bitwise-v0.33_GH0.tar.gz) = 514a0db0d6372732eef96a2ebc040eb61eca43216339a5f6bacdcdd8dc8638e1 -SIZE (mellowcandle-bitwise-v0.33_GH0.tar.gz) = 264832 +TIMESTAMP = 1565547273 +SHA256 (mellowcandle-bitwise-v0.40_GH0.tar.gz) = 0160fb95d01063e3faddcf5ccbcc87e1b9634db245cc7089e0eb41de492ae598 +SIZE (mellowcandle-bitwise-v0.40_GH0.tar.gz) = 266056 -- cgit From 12d734c2e6e49ae7455762ddc1756d5bb5723dc3 Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 11 Aug 2019 18:34:15 +0000 Subject: Revert r508261, it's even more BROKEN Reported by: pkg-fallout --- math/superlu_mt/Makefile | 9 +++++---- math/superlu_mt/distinfo | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile index 8e554208bfbd..20a4e577f628 100644 --- a/math/superlu_mt/Makefile +++ b/math/superlu_mt/Makefile @@ -1,13 +1,14 @@ -# Created by: Pedro Giffuni +# Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= superlu_mt PORTVERSION= 3.1.20160319 PORTREVISION= 6 CATEGORIES= math -MASTER_SITES= https://portal.nersc.gov/project/sparse/superlu/ \ - https://portal.nersc.gov/project/sparse/xiaoye-web/:doc +MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ + http://crd.lbl.gov/~xiaoye/:doc DISTNAME= ${PORTNAME}_3.1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} simax97.ps.gz:doc DIST_SUBDIR= superlu2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -17,6 +18,7 @@ COMMENT= Routines for performing multithreaded sparse factorization LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/License.txt +BROKEN= unfetchable BROKEN_aarch64= fails to build: undefined reference to sbrk BROKEN_powerpc64= fails to build: pstest runs away and consumes all memory BROKEN_sparc64= fails to link @@ -24,7 +26,6 @@ BROKEN_sparc64= fails to link USES= fortran gmake OPTIONS_DEFINE= DOCS -DOCS_DISTFILES= simax97.ps.gz:doc .include diff --git a/math/superlu_mt/distinfo b/math/superlu_mt/distinfo index 83cc852397da..20e005bf9129 100644 --- a/math/superlu_mt/distinfo +++ b/math/superlu_mt/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1565022927 +TIMESTAMP = 1494706587 +SHA256 (superlu2/superlu_mt_3.1.tar.gz) = 407b544b9a92b2ed536b1e713e80f986824cf3016657a4bfc2f3e7d2a76ecab6 +SIZE (superlu2/superlu_mt_3.1.tar.gz) = 1824440 SHA256 (superlu2/simax97.ps.gz) = 8f8ae10e28dfdeda2fed58b0bcec1bf96f10fa7b1d055aff160d77d7aeb8a983 SIZE (superlu2/simax97.ps.gz) = 158724 -- cgit From 43e256516f824593615cec54563aa9ad884b1058 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 18:51:46 +0000 Subject: Remove expired port: 2019-05-08 textproc/sphinxsearch-devel: Broken for more than 6 months --- MOVED | 1 + textproc/Makefile | 1 - textproc/sphinxsearch-devel/Makefile | 175 --------------------- textproc/sphinxsearch-devel/distinfo | 4 - textproc/sphinxsearch-devel/files/pkg-deinstall.in | 32 ---- textproc/sphinxsearch-devel/files/sphinxsearch.in | 80 ---------- textproc/sphinxsearch-devel/pkg-descr | 27 ---- textproc/sphinxsearch-devel/pkg-plist | 15 -- 8 files changed, 1 insertion(+), 334 deletions(-) delete mode 100644 textproc/sphinxsearch-devel/Makefile delete mode 100644 textproc/sphinxsearch-devel/distinfo delete mode 100644 textproc/sphinxsearch-devel/files/pkg-deinstall.in delete mode 100644 textproc/sphinxsearch-devel/files/sphinxsearch.in delete mode 100644 textproc/sphinxsearch-devel/pkg-descr delete mode 100644 textproc/sphinxsearch-devel/pkg-plist diff --git a/MOVED b/MOVED index 3061f66ee4da..bf62530d1046 100644 --- a/MOVED +++ b/MOVED @@ -12864,3 +12864,4 @@ devel/rubygem-spring-rails5|devel/rubygem-spring|2019-08-11|Remove unnecessary p devel/rubygem-spring-rails50|devel/rubygem-spring|2019-08-11|Remove unnecessary port after devel/rubygem-spring update www/rubygem-turbolinks-rails5|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix +textproc/sphinxsearch-devel|textproc/sphinxsearch|2019-08-11|Has expired: Broken for more than 6 months diff --git a/textproc/Makefile b/textproc/Makefile index 260e865df6a9..af2547fa389b 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1708,7 +1708,6 @@ SUBDIR += sowing SUBDIR += spellutils SUBDIR += sphinxsearch - SUBDIR += sphinxsearch-devel SUBDIR += spiff SUBDIR += splitpatch SUBDIR += sq-hunspell diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile deleted file mode 100644 index 95f0d8108f7a..000000000000 --- a/textproc/sphinxsearch-devel/Makefile +++ /dev/null @@ -1,175 +0,0 @@ -# Created by: Daniel Gerzo -# $FreeBSD$ - -# Note: the Sphinx Storage Engine MySQL plugin is not supported by -# this port. You need a patched version of mysql server for that. -# See http://www.infracaninophile.co.uk/articles/sphinxse.html - -PORTNAME= sphinxsearch -PORTVERSION= 2.2.1 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES= textproc databases -MASTER_SITES= http://sphinxsearch.com/files/ \ - http://snowball.tartarus.org/dist/:libstemmer -PKGNAMESUFFIX?= -devel -DISTNAME= sphinx-${PORTVERSION}-beta -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= danger@FreeBSD.org -COMMENT= Sphinx Full-Text Search Engine - -LICENSE= GPLv2 - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 - -# If expat is present on the system and configure finds it, it will -# unconditionally link the output binary against it. There's no way -# of turning this off. So for consistency, make sure it's always on. -LIB_DEPENDS= libexpat.so:textproc/expat2 - -OPTIONS_DEFINE= ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \ - SYSLOG UNIXODBC DOCS EXAMPLES -OPTIONS_DEFAULT=ICONV MYSQL SYSLOG - -ICONV_CONFIGURE_WITH= iconv -ICONV_USES= iconv -ICONV_LDFLAGS= ${ICONV_LIB} - -# Changes document and word IDs to a 64bit type, useful if you have -# more than about 4.2E9 such items to deal with. Means corresponding -# changes in DB schema. Disabled by default. -ID64_DESC= Use 64-bit document and word IDs -ID64_CONFIGURE_ENABLE= id64 - -# Note: The snowball project doesn't release numbered versions of it's -# pre-processors. Instead, at arbitrary but fairly long intervals a -# snapshot of their source repository is turned into a tarball (always -# the same filename) and placed on their web site. It's like they -# want to make it as hard as possible for anyone to package and use -# their software. -# -# Adds support for two additional word stemmming pre-processors from -# the Snowball project (http://snowball.tartarus.org/) -- these -# essentially do exactly the same thing as the built in English, -# Russian and Czech stemmers but also support French, Spanish, -# Portuguese, Italian, Romanian, German, Dutch, Swedish, Norwegian, -# Danish, Finnish, Hungarian. Disabled by default. -LIBSTEMMER_DESC= Compile with libstemmer support -LIBSTEMMER_CONFIGURE_WITH=libstemmer -LIBSTEMMER_DISTNAME= libstemmer_c -LIBSTEMMER_DISTFILES= ${LIBSTEMMER_DISTNAME}.tgz:libstemmer - -.if make(makesum) || defined(FETCH_ALL) -OPTIONS_SET_FORCE= LIBSTEMMER -.endif - -# The port will successfully compile with both PGSQL and MYSQL support -# simultaneously. Not sure how useful that is in practice though. - -MYSQL_CONFIGURE_WITH= mysql -MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ - --with-mysql-libs=${LOCALBASE}/lib/mysql -MYSQL_USES= mysql - -OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer - -PGSQL_CONFIGURE_WITH= pgsql -PGSQL_CONFIGURE_ON= --with-pgsql-includes=${LOCALBASE}/include \ - --with-pgsql-libs=${LOCALBASE}/lib -PGSQL_USES= pgsql - -SYSLOG_DESC= Enable logging via syslog -SYSLOG_CONFIGURE_WITH= syslog - -UNIXODBC_CONFIGURE_WITH=unixodbc -UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC - -CONFLICTS= sphinxsearch-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \ - swish++-[0-9]* xaira-[0-9]* - -.include - -USERS?= _sphinx -GROUPS?= _sphinx - -SPHINX_DIR?= /var/db/${PORTNAME} -SPHINX_RUN?= /var/run/${PORTNAME} -SPHINX_LOG?= /var/log/${PORTNAME} - -# Yes, the conflation of CPPFLAGS and CXXFLAGS is deliberate. No, -# don't ask. - -GNU_CONFIGURE= yes -CPPFLAGS+= ${CXXFLAGS} -CFGFILE= ${PREFIX}/etc/sphinx.conf -USE_RC_SUBR= sphinxsearch -SUB_LIST+= PORTNAME=${PORTNAME} \ - CFGFILE=${CFGFILE} \ - SPHINX_USR=${USERS} \ - SPHINX_GRP=${GROUPS} \ - SPHINX_DIR=${SPHINX_DIR} \ - SPHINX_RUN=${SPHINX_RUN} \ - SPHINX_LOG=${SPHINX_LOG} -SUB_FILES+= pkg-deinstall - -.if ${PORT_OPTIONS:MEXAMPLES} -EXAMPLES= example.sql api -PORTEXAMPLES= * -.endif - -.if ${PORT_OPTIONS:MDOCS} -DOCS= doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml -DOCSRC= ${WRKSRC}/doc -MAN1SRC= indexer.1 indextool.1 search.1 spelldump.1 -MAN8SRC= searchd.8 -.endif - -post-extract: -.if ${PORT_OPTIONS:MLIBSTEMMER} - @( cd ${WRKDIR} && ${COPYTREE_SHARE} ${LIBSTEMMER_DISTNAME} ${WRKSRC} ) -.endif - -# Fix up the sample configuration file to correspond to FreeBSD norms -post-patch: - @${REINPLACE_CMD} \ - -e "s!@CONFDIR@/log/searchd.pid!${SPHINX_RUN}/searchd.pid!" \ - -e "s!@CONFDIR@/log/query.log!${SPHINX_LOG}/sphinx-query.log!" \ - -e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!" \ - -e "s!@CONFDIR@!${SPHINX_DIR}!" \ - ${WRKSRC}/sphinx.conf.in -.if ${PORT_OPTIONS:MDOCS} - ${SED} -e 's/"1"/"8"/' ${DOCSRC}/searchd.1 > ${DOCSRC}/searchd.8 -.for man in ${MAN1} - ${SED} -i~ -e 's/\\fBsearchd\\fR(1)/\\fBsearchd\\fR(8)/' \ - ${DOCSRC}/${man} -.endfor -.endif - -do-install: install-bin install-docs install-man install-examples - -install-bin: - ${INSTALL_PROGRAM} ${WRKSRC}/src/indexer ${STAGEDIR}${PREFIX}/bin/indexer - ${INSTALL_PROGRAM} ${WRKSRC}/src/indextool ${STAGEDIR}${PREFIX}/bin/indextool - ${INSTALL_PROGRAM} ${WRKSRC}/src/search ${STAGEDIR}${PREFIX}/bin/search - ${INSTALL_PROGRAM} ${WRKSRC}/src/spelldump ${STAGEDIR}${PREFIX}/bin/spelldump - ${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${STAGEDIR}${PREFIX}/sbin/searchd - ${INSTALL_DATA} ${WRKSRC}/sphinx.conf.dist ${STAGEDIR}${CFGFILE}.sample - -install-docs: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}/${DOCSDIR}) - -install-man: - (cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN1SRC} ${STAGEDIR}${MANPREFIX}/man/man1) - (cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN8SRC} ${STAGEDIR}${MANPREFIX}/man/man8) - -install-examples: -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} "${EXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}) -.endif - -.include diff --git a/textproc/sphinxsearch-devel/distinfo b/textproc/sphinxsearch-devel/distinfo deleted file mode 100644 index 15b91b1ba861..000000000000 --- a/textproc/sphinxsearch-devel/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (sphinx-2.2.1-beta.tar.gz) = 877b9e072b21c6d23f6808e004a7637cef7b186686a6cb0de97d99a9ed038898 -SIZE (sphinx-2.2.1-beta.tar.gz) = 2717191 -SHA256 (libstemmer_c.tgz) = 5adcf6432fd3d5ba51c8674d833d851b5aa6e532d52ff95e57102033edcd285f -SIZE (libstemmer_c.tgz) = 129496 diff --git a/textproc/sphinxsearch-devel/files/pkg-deinstall.in b/textproc/sphinxsearch-devel/files/pkg-deinstall.in deleted file mode 100644 index 6fe5ffd4cdb4..000000000000 --- a/textproc/sphinxsearch-devel/files/pkg-deinstall.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -sphinx_usr=%%SPHINX_USR%% -sphinx_grp=%%SPHINX_GRP%% -sphinx_dir=%%SPHINX_DIR%% -portname=%%PORTNAME%% - -case $2 in - POST-DEINSTALL) - - cat < Date: Sun, 11 Aug 2019 18:53:02 +0000 Subject: devel/gitblit: always depend on Tomcat 7, Tomcat 6 is EOL. Bump PORTREVISION --- devel/gitblit/Makefile | 9 +-------- devel/gitblit/pkg-descr | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile index bb79ff3afc36..b42405ed2f07 100644 --- a/devel/gitblit/Makefile +++ b/devel/gitblit/Makefile @@ -3,6 +3,7 @@ PORTNAME= gitblit PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://dl.bintray.com/${PORTNAME}/releases/ EXTRACT_SUFX= .war @@ -31,13 +32,10 @@ PLIST_SUB+= GB_DATAHOME=${PREFIX}/${PORTNAME} \ GB_USER=${USERS} OPTIONS_RADIO= SQL WEBSERVER -OPTIONS_SINGLE= TOMCAT OPTIONS_RADIO_SQL= REDIS OPTIONS_RADIO_WEBSERVER=APACHE HIAWATHA LIGHTTPD NGINX -OPTIONS_SINGLE_TOMCAT= TOMCAT6 TOMCAT7 HIAWATHA_DESC= Hiawatha server support NGINX_DESC= Nginx server support -OPTIONS_DEFAULT= TOMCAT7 REDIS_RUN_DEPENDS= redis-server:databases/redis .include @@ -52,13 +50,8 @@ RUN_DEPENDS+= hiawatha:www/hiawatha RUN_DEPENDS+= nginx:www/nginx .endif -.if ${PORT_OPTIONS:MTOMCAT6} -GB_HOME= ${PREFIX}/apache-tomcat-6.0/webapps/${PORTNAME} -RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6 -.elif ${PORT_OPTIONS:MTOMCAT7} GB_HOME= ${PREFIX}/apache-tomcat-7.0/webapps/${PORTNAME} RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat7:www/tomcat7 -.endif do-extract: ${MKDIR} ${WRKSRC} diff --git a/devel/gitblit/pkg-descr b/devel/gitblit/pkg-descr index e29e25af352d..616c92447e9f 100644 --- a/devel/gitblit/pkg-descr +++ b/devel/gitblit/pkg-descr @@ -3,8 +3,8 @@ and serving Git repositories. It's designed primarily as a tool for small workgroups who want to host centralized repositories. Gitblit WAR is what you should download if you already have a servlet -container available that you wish to use. Jetty 6/7/8 and Tomcat -6/7 are known to work. Generally, any Servlet 2.5 or Servlet 3.0 +container available that you wish to use. Jetty 6/7/8 and Tomcat 7 +are known to work. Generally, any Servlet 2.5 or Servlet 3.0 container should work. Gitblit can be used as a dumb repository viewer with no administrative -- cgit From 43436a7a2728fb48e2afddf85f3297a95bf27489 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 18:56:02 +0000 Subject: www/madsonic: remove optional dependency on expired www/tomcat6 --- www/madsonic/Makefile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile index 9466bca051e4..2da94de07517 100644 --- a/www/madsonic/Makefile +++ b/www/madsonic/Makefile @@ -16,9 +16,8 @@ LICENSE= GPLv3 OPTIONS_SINGLE= APPSERVER APPSERVER_DESC= Java Application Server -OPTIONS_SINGLE_APPSERVER= JETTY TOMCAT7 TOMCAT6 RESIN3 +OPTIONS_SINGLE_APPSERVER= JETTY TOMCAT7 RESIN3 TOMCAT7_DESC= Use Tomcat 7.x -TOMCAT6_DESC= Use Tomcat 6.x JETTY_DESC= Use Jetty RESIN3_DESC= Use Resin 3 @@ -42,8 +41,6 @@ RUN_DEPENDS+= ${JAVALIBDIR}/servlet-api.jar:www/servlet-api \ ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins TOMCAT7_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7 TOMCAT7_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7 -TOMCAT6_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6 -TOMCAT6_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6 JETTY_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8 JETTY_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8 RESIN3_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3 @@ -86,14 +83,6 @@ SERVERDIR= apache-tomcat-7.0 SUB_LIST+= CONTAINERFLAGS="tomcat7_java_opts" .endif -.if ${PORT_OPTIONS:MTOMCAT6} -APPPKGMESSAGE= pkg-message-tomcat -DISTVER= tomcat -PKGNAMESUFFIX= -tomcat6 -SERVERDIR= apache-tomcat-6.0 -SUB_LIST+= CONTAINERFLAGS="tomcat60_java_opts" -.endif - .if ${PORT_OPTIONS:MJETTY} APPPKGMESSAGE= pkg-message-jetty DISTVER= jspc -- cgit From 5a92ae038a834a2b76a6a7a27c8ebed479e86be3 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 18:58:31 +0000 Subject: deskutils/cfiles: Update 1.7.2 -> 1.8 Reported by: portscout --- deskutils/cfiles/Makefile | 3 +-- deskutils/cfiles/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/deskutils/cfiles/Makefile b/deskutils/cfiles/Makefile index 97ebbd2c9abe..48cc92497286 100644 --- a/deskutils/cfiles/Makefile +++ b/deskutils/cfiles/Makefile @@ -2,8 +2,7 @@ PORTNAME= cfiles DISTVERSIONPREFIX= v -DISTVERSION= 1.7.2 -PORTREVISION= 2 +DISTVERSION= 1.8 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org diff --git a/deskutils/cfiles/distinfo b/deskutils/cfiles/distinfo index d019440db719..7ad3e707d1de 100644 --- a/deskutils/cfiles/distinfo +++ b/deskutils/cfiles/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563338623 -SHA256 (mananapr-cfiles-v1.7.2_GH0.tar.gz) = 65f141e1deef8fec0bd35264a3837d98fd59fcb993d117deeb0a0a4b9543e383 -SIZE (mananapr-cfiles-v1.7.2_GH0.tar.gz) = 237829 +TIMESTAMP = 1565547363 +SHA256 (mananapr-cfiles-v1.8_GH0.tar.gz) = c5f8111df59496aafd817af0b7c7dcf7177bc4baa84b03ddf0912ef69f4be8f6 +SIZE (mananapr-cfiles-v1.8_GH0.tar.gz) = 237966 -- cgit From 277aa011973446bea1d92f27ce24cfb3a947a2ab Mon Sep 17 00:00:00 2001 From: leres Date: Sun, 11 Aug 2019 19:09:36 +0000 Subject: net/savvycan: This adds net/savvycan which is a CAN bus reverse engineering and capture tool. It supports EVTV hardware, socketCAN compatible devices, and other hardware. Reviewed by: ler (mentor) Approved by: ler (mentor) Differential Revision: https://reviews.freebsd.org/D21212 --- net/Makefile | 1 + net/savvycan/Makefile | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ net/savvycan/distinfo | 3 +++ net/savvycan/pkg-descr | 5 +++++ 4 files changed, 62 insertions(+) create mode 100644 net/savvycan/Makefile create mode 100644 net/savvycan/distinfo create mode 100644 net/savvycan/pkg-descr diff --git a/net/Makefile b/net/Makefile index 280792d699b6..5eaacbbc2699 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1341,6 +1341,7 @@ SUBDIR += samba48 SUBDIR += samba410 SUBDIR += samplicator + SUBDIR += savvycan SUBDIR += sbd SUBDIR += sbm SUBDIR += scamper diff --git a/net/savvycan/Makefile b/net/savvycan/Makefile new file mode 100644 index 000000000000..4a6011d13eca --- /dev/null +++ b/net/savvycan/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +PORTNAME= savvycan +PORTVERSION= 199.1 +DISTVERSIONPREFIX= V +CATEGORIES= net + +MAINTAINER= leres@FreeBSD.org +COMMENT= CAN bus reverse engineering and capture tool + +LICENSE= MIT + +BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} + +USES= gmake python:build qmake qt:5 +USE_QT= buildtools_build core gui help printsupport serialbus \ + serialport websockets-qml widgets + +USE_GITHUB= yes +GH_TUPLE= collin80:SavvyCAN:${DISTVERSIONPREFIX}${PORTVERSION} +NO_MTREE= yes +PLIST_FILES= bin/savvycan \ + man/man1/savvycan.1.gz + +OPTIONS_DEFINE+= DOCS EXAMPLES + +PORTDOCS= * +PORTEXAMPLES= * + +.include + +post-build: + cd ${WRKSRC}/docs && ${GMAKE} man +.if ${PORT_OPTIONS:MDOCS} + cd ${WRKSRC}/docs && ${GMAKE} html +.endif + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/SavvyCAN ${STAGEDIR}${PREFIX}/bin/savvycan + ${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/build/man/savvycan.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +.endif + +.include diff --git a/net/savvycan/distinfo b/net/savvycan/distinfo new file mode 100644 index 000000000000..7a1ffe01c978 --- /dev/null +++ b/net/savvycan/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565367333 +SHA256 (collin80-SavvyCAN-V199.1_GH0.tar.gz) = ed1a7131673f7363009ba067252d91053edce7491ff82a0b51d32fe5cee916b6 +SIZE (collin80-SavvyCAN-V199.1_GH0.tar.gz) = 4392251 diff --git a/net/savvycan/pkg-descr b/net/savvycan/pkg-descr new file mode 100644 index 000000000000..75b5284b06dd --- /dev/null +++ b/net/savvycan/pkg-descr @@ -0,0 +1,5 @@ +CSavvyCAN is a CAN bus reverse engineering and capture tool. It +supports EVTV hardware, socketCAN compatible devices, and other +hardware. + +WWW: https://www.savvycan.com/ -- cgit From 730b13ecf4c7ceade34ad3d7d21575c0d31873d3 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 19:16:49 +0000 Subject: biology/checkm: Update 1.0.16 -> 1.0.17 Reported by: portscout --- biology/checkm/Makefile | 2 +- biology/checkm/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/biology/checkm/Makefile b/biology/checkm/Makefile index 1823cddb1264..59baa4843e67 100644 --- a/biology/checkm/Makefile +++ b/biology/checkm/Makefile @@ -2,7 +2,7 @@ PORTNAME= CheckM DISTVERSIONPREFIX= v -DISTVERSION= 1.0.16 +DISTVERSION= 1.0.17 CATEGORIES= biology python MAINTAINER= yuri@FreeBSD.org diff --git a/biology/checkm/distinfo b/biology/checkm/distinfo index 275f6a83c0c8..cbdc5e54ce3f 100644 --- a/biology/checkm/distinfo +++ b/biology/checkm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565335007 -SHA256 (Ecogenomics-CheckM-v1.0.16_GH0.tar.gz) = f884e105b145030bbaf15406c528f1bd1464fb4c303a82e327c4b42b21790ce8 -SIZE (Ecogenomics-CheckM-v1.0.16_GH0.tar.gz) = 211994 +TIMESTAMP = 1565549932 +SHA256 (Ecogenomics-CheckM-v1.0.17_GH0.tar.gz) = 1d024a924f153a1209c2f219579ee8b402c3e5089b68f1b8217cf4aa5e1fdd9f +SIZE (Ecogenomics-CheckM-v1.0.17_GH0.tar.gz) = 212036 -- cgit From f42d84ed223c7bb2ef750a5c5f7ff04fa24d0ef3 Mon Sep 17 00:00:00 2001 From: dvl Date: Sun, 11 Aug 2019 19:23:09 +0000 Subject: Include the notify directory, for all those new features mentioned in the previous commit. Reported by: Ken --- security/acme.sh/Makefile | 3 +++ security/acme.sh/pkg-plist | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile index 312ea7e8f5bf..757f6a11ff69 100644 --- a/security/acme.sh/Makefile +++ b/security/acme.sh/Makefile @@ -2,6 +2,7 @@ PORTNAME= acme.sh PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org @@ -48,10 +49,12 @@ do-install: ${MKDIR} ${STAGEDIR}/var/db/acme/.acme.sh ${STAGEDIR}/var/db/acme/certs ( cd ${WRKSRC} && ${COPYTREE_BIN} deploy ${STAGEDIR}${EXAMPLESDIR} ) ( cd ${WRKSRC} && ${COPYTREE_BIN} dnsapi ${STAGEDIR}${EXAMPLESDIR} ) + ( cd ${WRKSRC} && ${COPYTREE_BIN} notify ${STAGEDIR}${EXAMPLESDIR} ) ${INSTALL_DATA} ${FILESDIR}/acme.sh.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/account.conf.sample ${STAGEDIR}/var/db/acme/.acme.sh ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/deploy ${STAGEDIR}/var/db/acme/.acme.sh ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/dnsapi ${STAGEDIR}/var/db/acme/.acme.sh + ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/notify ${STAGEDIR}/var/db/acme/.acme.sh do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/security/acme.sh/pkg-plist b/security/acme.sh/pkg-plist index 0ef4c8108b78..bafe9f069c4e 100644 --- a/security/acme.sh/pkg-plist +++ b/security/acme.sh/pkg-plist @@ -84,9 +84,19 @@ sbin/acme.sh %%EXAMPLESDIR%%/dnsapi/dns_yandex.sh %%EXAMPLESDIR%%/dnsapi/dns_zilore.sh %%EXAMPLESDIR%%/dnsapi/dns_zonomi.sh +%%EXAMPLESDIR%%/notify/smtp.sh +%%EXAMPLESDIR%%/notify/pop.sh +%%EXAMPLESDIR%%/notify/mail.sh +%%EXAMPLESDIR%%/notify/postmark.sh +%%EXAMPLESDIR%%/notify/slack.sh +%%EXAMPLESDIR%%/notify/pushover.sh +%%EXAMPLESDIR%%/notify/sendgrid.sh +%%EXAMPLESDIR%%/notify/ifttt.sh +%%EXAMPLESDIR%%/notify/mailgun.sh @sample(acme,acme,0640) /var/db/acme/.acme.sh/account.conf.sample /var/db/acme/.acme.sh/deploy /var/db/acme/.acme.sh/dnsapi +/var/db/acme/.acme.sh/notify @dir(acme,acme,0750) /var/db/acme/.acme.sh @dir(acme,acme,0750) /var/db/acme/certs @dir(acme,acme,0750) /var/db/acme -- cgit From 2e28977e22f94819639b8f3b6583975fcea00b74 Mon Sep 17 00:00:00 2001 From: martymac Date: Sun, 11 Aug 2019 19:50:13 +0000 Subject: Switch to base compiler on powerpc64 PR: 239762 Submitted by: pkubaj --- ftp/lftp/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index bb73662b7066..a5a66b2ae407 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -71,8 +71,4 @@ NEED_PTHREAD= # empty LDFLAGS+= -pthread .endif -.if ${ARCH} == powerpc64 -USE_GCC= yes -.endif - .include -- cgit From 994c184c639463c33385c9b3245660555aa63853 Mon Sep 17 00:00:00 2001 From: bofh Date: Sun, 11 Aug 2019 20:28:36 +0000 Subject: databases/freetds-devel: Update version 1.1.50=>1.1.51 - Add https MASTER_SITES [1] PR: 239445 [1] Submitted by: p5B2E9A8F@t-online.de [1] --- databases/freetds-devel/Makefile | 6 ++++-- databases/freetds-devel/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 79ec873976ef..280d7dbdb69d 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -2,10 +2,12 @@ # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 1.1.50 +PORTVERSION= 1.1.51 PORTEPOCH= 1 CATEGORIES= databases -MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/ +MASTER_SITES= https://www.freetds.org/files/current/ \ + ftp://ftp.freetds.org/pub/freetds/current/ + PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev.${PORTVERSION} diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo index 1fe1c8199a60..5239adda8388 100644 --- a/databases/freetds-devel/distinfo +++ b/databases/freetds-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563993385 -SHA256 (freetds-dev.1.1.50.tar.bz2) = 331026e0dd6b0616b62564c9df779835e2a088a1f135da22f04929b9b71d9547 -SIZE (freetds-dev.1.1.50.tar.bz2) = 2262421 +TIMESTAMP = 1565555125 +SHA256 (freetds-dev.1.1.51.tar.bz2) = 38501a906c8ab641a2e1c9acbe36892702b8d88669c5a39896f6894156a9574d +SIZE (freetds-dev.1.1.51.tar.bz2) = 2262275 -- cgit From 9a4d7d2335d0acc7e269eeb83e8ce063a783daee Mon Sep 17 00:00:00 2001 From: bofh Date: Sun, 11 Aug 2019 20:47:00 +0000 Subject: databases/freetds-devel: Fix typos --- databases/freetds-devel/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 280d7dbdb69d..531f355454dc 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -5,9 +5,8 @@ PORTNAME= freetds PORTVERSION= 1.1.51 PORTEPOCH= 1 CATEGORIES= databases -MASTER_SITES= https://www.freetds.org/files/current/ \ - ftp://ftp.freetds.org/pub/freetds/current/ - +MASTER_SITES= https://www.freetds.org/files/current/ \ + ftp://ftp.freetds.org/pub/freetds/current/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev.${PORTVERSION} -- cgit From 1fc21e42b8de39edbab2d576667a8eeacffa889b Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 21:00:41 +0000 Subject: graphics/bitmap: Backport the pull request adding more functionality, ex. C++-styled write image functions --- graphics/bitmap/Makefile | 4 ++++ graphics/bitmap/distinfo | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/graphics/bitmap/Makefile b/graphics/bitmap/Makefile index 4f57c232cfb8..815298af1300 100644 --- a/graphics/bitmap/Makefile +++ b/graphics/bitmap/Makefile @@ -2,9 +2,13 @@ PORTNAME= bitmap DISTVERSION= g20181222 +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -graphics-library +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= db80ca605a952e6a8ccd42eba3fcc5b40fba5640.patch:-p1 # https://github.com/ArashPartow/bitmap/pull/8: Implement write_image()/read_image() functions + MAINTAINER= yuri@FreeBSD.org COMMENT= Minimalistic library manipulating 24-bit per pixel bitmap images diff --git a/graphics/bitmap/distinfo b/graphics/bitmap/distinfo index 0eff37601b08..97a7805ba99f 100644 --- a/graphics/bitmap/distinfo +++ b/graphics/bitmap/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1558979256 +TIMESTAMP = 1565557083 SHA256 (ArashPartow-bitmap-g20181222-b02297f_GH0.tar.gz) = 9d6dd560d0bd01e78ebd08f7828249b96ad7b43e4a3589b54d62831d97c801f0 SIZE (ArashPartow-bitmap-g20181222-b02297f_GH0.tar.gz) = 52230 +SHA256 (db80ca605a952e6a8ccd42eba3fcc5b40fba5640.patch) = 09fb91e59b7c75d57e4f4473ed07dfa7bf9ba54cb65921ff47bf9dcc999a334f +SIZE (db80ca605a952e6a8ccd42eba3fcc5b40fba5640.patch) = 4745 -- cgit From 5ccfbee5f964907ed0feefba0ff24de72aa0b28b Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 11 Aug 2019 21:07:04 +0000 Subject: dmd1 is no longer supported upstream. --- lang/dmd1/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lang/dmd1/Makefile b/lang/dmd1/Makefile index 8045bbc625a1..6805843d369d 100644 --- a/lang/dmd1/Makefile +++ b/lang/dmd1/Makefile @@ -18,6 +18,10 @@ LICENSE_NAME_DMD= digital mars license LICENSE_FILE_DMD= ${WRKSRC}/../../license.txt LICENSE_PERMS_DMD= no-pkg-mirror auto-accept +DEPRECATED= No longer supported upstream +EXPIRATION_DATE= 2021-08-31 + + NO_PACKAGE= No redistribution of non validated binaries USES= gmake zip PORTDOCS= *.txt html/ phobos/ -- cgit From c631c79d9acdd70f2b497f218f4b8fd5c0bf62c6 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:17:37 +0000 Subject: graphics/deegree-wfs: drop support for EOL Tomcat6, bump PORTREVISION --- graphics/deegree-wfs/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-wfs/Makefile b/graphics/deegree-wfs/Makefile index c14046ba24cb..e89735e70926 100644 --- a/graphics/deegree-wfs/Makefile +++ b/graphics/deegree-wfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= wfs PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -27,26 +27,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From b63694dee28e950cff59a6a48a6b97571dbf3517 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:20:26 +0000 Subject: graphics/deegree-igeoportal: remove option for EOL tomcat6, bump PORTREVISION --- graphics/deegree-igeoportal/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-igeoportal/Makefile b/graphics/deegree-igeoportal/Makefile index b8c90c3fdede..08096b6a4bbf 100644 --- a/graphics/deegree-igeoportal/Makefile +++ b/graphics/deegree-igeoportal/Makefile @@ -3,7 +3,7 @@ PORTNAME= igeoportal PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -27,26 +27,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From 4e6c673f06aa3486b91df4c7762acc93b025ced7 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:21:52 +0000 Subject: graphics/deegree-wps: remove support for EOL tomcat6, bump PORTREVISION --- graphics/deegree-wps/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-wps/Makefile b/graphics/deegree-wps/Makefile index 7af41df8a7b0..2bc660ae939f 100644 --- a/graphics/deegree-wps/Makefile +++ b/graphics/deegree-wps/Makefile @@ -3,7 +3,7 @@ PORTNAME= wps PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -25,26 +25,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From b16d3e66c203905f84d21dace0f8955bf97cf125 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:23:59 +0000 Subject: graphics/barbecue: remove support for EOL tomcat6, bump PORTREVISION --- graphics/barbecue/Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile index 7c5d6b864378..173452bb5f40 100644 --- a/graphics/barbecue/Makefile +++ b/graphics/barbecue/Makefile @@ -3,6 +3,7 @@ PORTNAME= barbecue DISTVERSION= 1.5-beta1 +PORTREVISION= 1 CATEGORIES= graphics print java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/ DIST_SUBDIR= java @@ -29,25 +30,13 @@ PORTEXAMPLES= * PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 - OPTIONS_DEFINE= DOCS EXAMPLES .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: ${MV} ${WRKSRC}/${JARFILES} ${WRKSRC}/${JARFILES:S|-${DISTVERSION}||} @@ -58,7 +47,7 @@ do-install: ${INSTALL_DATA} ${JARFILES:S|-${DISTVERSION}||:S|^|${WRKSRC}/|} \ ${STAGEDIR}${JAVAJARDIR} -.if ${PORT_OPTIONS:MTOMCAT6} || ${PORT_OPTIONS:MTOMCAT7} +.if ${PORT_OPTIONS:MTOMCAT7} ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${WEBAPPDIR}/${PORTNAME} @(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . \ ${STAGEDIR}${WEBAPPDIR}/${PORTNAME}) -- cgit From 477625f28cc483b0753e5129bf0582621f45ee96 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:25:38 +0000 Subject: graphics/deegree-wpvs: drop support for EOL tomcat6, bump PORTREVISION --- graphics/deegree-wpvs/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-wpvs/Makefile b/graphics/deegree-wpvs/Makefile index d8ade080df0f..31ec97bf9043 100644 --- a/graphics/deegree-wpvs/Makefile +++ b/graphics/deegree-wpvs/Makefile @@ -3,7 +3,7 @@ PORTNAME= wpvs PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -28,26 +28,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From adbf12c7123509b2bd9c34981ac64df02a6581e9 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:28:00 +0000 Subject: graphics/deegree-wcs: remove support for EOL tomcat6, bump PORTREVISION --- graphics/deegree-wcs/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-wcs/Makefile b/graphics/deegree-wcs/Makefile index 1d35a1dc4773..80cfef9b0573 100644 --- a/graphics/deegree-wcs/Makefile +++ b/graphics/deegree-wcs/Makefile @@ -3,7 +3,7 @@ PORTNAME= wcs PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -28,26 +28,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From 37c3597b0de776c0615e395a89189779ceeadacd Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:29:28 +0000 Subject: graphics/deegree-wms: remove support for EOL tomcat6, bump PORTREVISION --- graphics/deegree-wms/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-wms/Makefile b/graphics/deegree-wms/Makefile index 0c36bbd81c07..5428612c73be 100644 --- a/graphics/deegree-wms/Makefile +++ b/graphics/deegree-wms/Makefile @@ -3,7 +3,7 @@ PORTNAME= wms PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -25,26 +25,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From 2484216ece739de193f25d93fd467c12723ac987 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:35:01 +0000 Subject: graphics/deegree-csw: remove support for EOL tomcat6, bump PORTREVISION --- graphics/deegree-csw/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/graphics/deegree-csw/Makefile b/graphics/deegree-csw/Makefile index 340f22adc5a1..96f148c83c8d 100644 --- a/graphics/deegree-csw/Makefile +++ b/graphics/deegree-csw/Makefile @@ -3,7 +3,7 @@ PORTNAME= csw PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -29,26 +29,14 @@ PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${W SUB_FILES= pkg-message SUB_LIST= TCPORT=${TCPORT} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 OPTIONS_DEFINE= DOCS .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MKDIR} ${WRKDIR}/${PKGBASE} -- cgit From 8d2383f14f3f8436efaffa05f35ce9346f1d10b1 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:40:39 +0000 Subject: www/axis2: drop tomcat6 as a suported option, bump PORTREVISION --- www/axis2/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/www/axis2/Makefile b/www/axis2/Makefile index 6822bb4ca68e..e64b7bd294d1 100644 --- a/www/axis2/Makefile +++ b/www/axis2/Makefile @@ -2,6 +2,7 @@ PORTNAME= axis2 PORTVERSION= 1.7.9 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin @@ -19,14 +20,11 @@ NO_BUILD= yes NO_ARCH= yes OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 TOMCAT85 -OPTIONS_DEFAULT= TOMCAT6 +OPTIONS_SINGLE_AS= TOMCAT7 TOMCAT85 +OPTIONS_DEFAULT= TOMCAT7 OPTIONS_DEFINE= EXAMPLES -TOMCAT6_VARS= APPHOME=${LOCALBASE}/apache-tomcat-6.0 -TOMCAT6_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 - TOMCAT7_VARS= APPHOME=${LOCALBASE}/apache-tomcat-7.0 TOMCAT7_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -- cgit From c6e43439db210d52da3eb1d6ffb8becbe6936ad9 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:44:02 +0000 Subject: www/pebble: mark for removal on 2019-11-01 due to tomcat6 --- www/pebble/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/pebble/Makefile b/www/pebble/Makefile index 11e6ecfb7558..3b1c9d0496d6 100644 --- a/www/pebble/Makefile +++ b/www/pebble/Makefile @@ -10,6 +10,9 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight, open source, Java EE blogging tool +DEPRECATED= depends on expired www/tomcat6 +EXPIRATION_DATE=2019-11-01 + PATCH_DEPENDS= zip:archivers/zip RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-6.0/bin/catalina.sh:www/tomcat6 -- cgit From 351f5e905030c83ba14140254977f3e1f9eb7db2 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:44:26 +0000 Subject: www/bigbluebutton: mark for removal on 2019-11-01 due to www/tomcat6 --- www/bigbluebutton/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile index a89dca9915bb..d865ff358bc8 100644 --- a/www/bigbluebutton/Makefile +++ b/www/bigbluebutton/Makefile @@ -17,6 +17,9 @@ EXTRACT_ONLY= bigbluebutton.tar.gz red5-0.9.1.tar.gz freeswitch-config.tar.gz MAINTAINER= alex.deiter@gmail.com COMMENT= Web conferencing system for distance education +DEPRECATED= Depends on expired www/tomcat6 +EXPIRATION_DATE=2019-11-01 + BUILD_DEPENDS= ${LOCALBASE}/bin/pdf2swf:graphics/swftools \ ${LOCALBASE}/bin/convert:graphics/ImageMagick6 \ ${LOCALBASE}/etc/rc.d/activemq:net/activemq \ -- cgit From 736601a1ce6e7740d3fdb85d204bf4f89b832dea Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:45:34 +0000 Subject: www/jspwiki: remove support for EOL tomcat6, bump PORTREVISION --- www/jspwiki/Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/www/jspwiki/Makefile b/www/jspwiki/Makefile index 44995814ea14..0ed314a4703c 100644 --- a/www/jspwiki/Makefile +++ b/www/jspwiki/Makefile @@ -3,7 +3,7 @@ PORTNAME= jspwiki PORTVERSION= 2.8.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www java MASTER_SITES= http://www.ecyrd.com/~jalkanen/JSPWiki/${PORTVERSION}/ DISTNAME= JSPWiki-${PORTVERSION}-bin @@ -29,21 +29,11 @@ PORTDOCS= ChangeLog README ReleaseNotes JSPWiki-*.zip PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 -.endif - -.if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: @${MV} ${WRKDIR}/${WEBAPP} ${WRKDIR}/${PORTNAME} -- cgit From f35ec444f6f302ac6006f296d851d3e3dcebb297 Mon Sep 17 00:00:00 2001 From: rene Date: Sun, 11 Aug 2019 21:46:24 +0000 Subject: devel/opengrok: remove support for EOL tomcat6 --- devel/opengrok/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile index 764d442c5cc1..b7940b3586a6 100644 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -32,16 +32,13 @@ PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT7 TOMCAT6 RESIN3 +OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT7 RESIN3 OPTIONS_DEFAULT= TOMCAT85 -TOMCAT6_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-6.0 TOMCAT7_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-7.0 TOMCAT85_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5 RESIN3_VARS= WEBAPP_HOME=${LOCALBASE}/resin3 -TOMCAT6_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 -TOMCAT6_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 TOMCAT7_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 TOMCAT7_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 TOMCAT85_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 -- cgit From 2a132710e076f73cc272748d9f92bd44a3597102 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 11 Aug 2019 22:12:41 +0000 Subject: Correct best before date. Reported by: rene@ --- lang/dmd1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/dmd1/Makefile b/lang/dmd1/Makefile index 6805843d369d..f7f03662c0a7 100644 --- a/lang/dmd1/Makefile +++ b/lang/dmd1/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE_DMD= ${WRKSRC}/../../license.txt LICENSE_PERMS_DMD= no-pkg-mirror auto-accept DEPRECATED= No longer supported upstream -EXPIRATION_DATE= 2021-08-31 +EXPIRATION_DATE= 2019-08-31 NO_PACKAGE= No redistribution of non validated binaries -- cgit From c158996e15325c20496da90eae2a6e9108ec866a Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 11 Aug 2019 22:15:14 +0000 Subject: dmd2 is past its best before date and has expired. Upstream is unable to address statfs64 issues as (self hosted) dmd does not support versioned symbols as llvm and gcc do. Upstream is unable to resolve. https://issues.dlang.org/show_bug.cgi?id=17596 https://issues.dlang.org/show_bug.cgi?id=18885 --- MOVED | 1 + lang/Makefile | 1 - lang/dmd2/Makefile | 123 --- lang/dmd2/Makefile.bootstrap | 84 -- lang/dmd2/distinfo | 9 - lang/dmd2/distinfo.bootstrap | 3 - .../files.bootstrap/patch-src__phobos__posix.mak | 11 - lang/dmd2/files/patch-freebsd__bin32__dmd.conf | 9 - lang/dmd2/files/patch-freebsd__bin64__dmd.conf | 8 - .../files/patch-src__res__default_ddoc_theme.ddoc | 116 --- lang/dmd2/pkg-descr | 22 - lang/dmd2/pkg-plist | 876 --------------------- 12 files changed, 1 insertion(+), 1262 deletions(-) delete mode 100644 lang/dmd2/Makefile delete mode 100644 lang/dmd2/Makefile.bootstrap delete mode 100644 lang/dmd2/distinfo delete mode 100644 lang/dmd2/distinfo.bootstrap delete mode 100644 lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak delete mode 100644 lang/dmd2/files/patch-freebsd__bin32__dmd.conf delete mode 100644 lang/dmd2/files/patch-freebsd__bin64__dmd.conf delete mode 100644 lang/dmd2/files/patch-src__res__default_ddoc_theme.ddoc delete mode 100644 lang/dmd2/pkg-descr delete mode 100644 lang/dmd2/pkg-plist diff --git a/MOVED b/MOVED index bf62530d1046..8b12a4ee6067 100644 --- a/MOVED +++ b/MOVED @@ -12865,3 +12865,4 @@ devel/rubygem-spring-rails50|devel/rubygem-spring|2019-08-11|Remove unnecessary www/rubygem-turbolinks-rails5|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix textproc/sphinxsearch-devel|textproc/sphinxsearch|2019-08-11|Has expired: Broken for more than 6 months +lang/dmd2||2019-08-11|Has expired: Broken for more than 6 months and upstream has no fix for statfs64 diff --git a/lang/Makefile b/lang/Makefile index 49a5cc3d783a..581e40fc7845 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -53,7 +53,6 @@ SUBDIR += dlang-tools SUBDIR += dlv SUBDIR += dmd1 - SUBDIR += dmd2 SUBDIR += duktape SUBDIR += duktape-lib SUBDIR += ecl diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile deleted file mode 100644 index a95677cd50ea..000000000000 --- a/lang/dmd2/Makefile +++ /dev/null @@ -1,123 +0,0 @@ -# Created by: Ruben -# $FreeBSD$ - -PORTNAME= dmd -PORTVERSION= 2.073.2 -DISTVERSIONPREFIX= v -CATEGORIES= lang -PKGNAMESUFFIX= 2 - -MAINTAINER= cy@FreeBSD.org -COMMENT= D 2.0 compiler, not officially validated for FreeBSD - -LICENSE= ART10 DMD BSL -LICENSE_COMB= multi -LICENSE_NAME_DMD= Digital Mars license -LICENSE_FILE_DMD= ${WRKSRC}/dmd/src/backendlicense.txt -LICENSE_PERMS_DMD= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept - -BROKEN= fails to build -BROKEN_armv6= dumps core: Assertion failed: (!signbit(Port::ldbl_nan)), function PortInitializer, file port.c -BROKEN_armv7= dumps core: Assertion failed: (!signbit(Port::ldbl_nan)), function PortInitializer, file port.c -BROKEN_mips64= fails to compile: cc1: unrecognized command line option -m32 -BROKEN_powerpc64= fails to build: can't mangle function with unknown linkage (void*()) -BROKEN_sparc64= fails to install: divide-by-zero error -BROKEN_FreeBSD_12= stack corruption in generated dmd tool caused by inode64 resulting in segfault -BROKEN_FreeBSD_13= stack corruption in generated dmd tool caused by inode64 resulting in segfault -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 -NOT_FOR_ARCHS= aarch64 -NOT_FOR_ARCHS_REASON= no cpu specified, assuming X86 - -USE_GITHUB= nodefault -GH_ACCOUNT= dlang -GH_PROJECT= dmd:dmd druntime:druntime phobos:phobos dlang.org:dlang_org -USES= gmake -MAKEFILE= posix.mak -MAKE_ARGS= HOST_DMD=${WRKDIR}/.host_dmd-2.067.1/stage/usr/local/bin/dmd -EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 -DOCSDIR= ${PREFIX}/share/doc/dmd2 -WRKSRC= ${WRKDIR} - -OPTIONS_DEFINE= DOCS EXAMPLES - -.include - -post-extract: - @${MV} ${WRKSRC_dmd} ${WRKSRC}/dmd - @${MV} ${WRKSRC_druntime} ${WRKSRC}/druntime - @${MV} ${WRKSRC_phobos} ${WRKSRC}/phobos - @${MV} ${WRKSRC_dlang_org} ${WRKSRC}/dlang.org - -.if ${ARCH} == "amd64" -MAKE_ARGS+= MODEL=64 -MODEL= 64 -.else -MAKE_ARGS+= MODEL=32 -MODEL= 32 -.endif - -.if defined(WITH_DEBUG) -MAKE_ARGS+= DEBUG_FLAGS=-g\ -DDEBUG=1\ -DUNITTEST BUILD=debug -.endif - -MODULEDIR= ${PREFIX}/include/d/phobos2 - -post-patch: - @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ - -e "s|/etc|${PREFIX}/etc|" \ - ${WRKSRC}/dmd/src/posix.mak - @${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/dmd/src/link.d - @${REINPLACE_CMD} -e "s|cc|${CC}|" ${WRKSRC}/phobos/posix.mak - @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|" \ - -e "s|\(dmd\)|\12|gI" \ - -e "s|\\\BR|.BR|" \ - ${WRKDIR}/dmd/docs/man/man1/dmd.1 \ - ${WRKDIR}/dmd/docs/man/man5/dmd.conf.5 - @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${MODULEDIR}|" \ - -e "s|%@P%/../lib|${PREFIX}/lib|" \ - -e "s|%@P%/../../src/druntime|${PREFIX}/include/d/druntime|" \ - ${WRKDIR}/dmd/ini/freebsd/bin${MODEL}/dmd.conf - @${ECHO_CMD} >> ${WRKDIR}/dmd/ini/freebsd/bin${MODEL}/dmd.conf - -make-phobos: - cd ${WRKSRC}/phobos && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -make-druntime: - cd ${WRKSRC}/druntime && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -make-dmd: - cd ${WRKSRC}/dmd && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -do-build: make-dmd make-phobos make-druntime - -do-install: - ${INSTALL_MAN} ${WRKDIR}/dmd/docs/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd.1 - ${INSTALL_MAN} ${WRKDIR}/dmd/docs/man/man5/dmd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/dmd.conf.5 - ${INSTALL_DATA} ${WRKDIR}/dmd/ini/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf - ${INSTALL_PROGRAM} ${WRKSRC}/dmd/src/dmd ${STAGEDIR}${PREFIX}/bin/dmd - ${INSTALL_DATA} ${WRKSRC}/phobos/generated/freebsd/release/${MODEL}/libphobos2.a ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/dmd/ini/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf.sample - cd ${WRKDIR}/druntime/import && ${COPYTREE_SHARE} . ${STAGEDIR}${MODULEDIR} - cd ${WRKSRC}/phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR} - cd ${WRKSRC}/phobos && ${COPYTREE_SHARE} etc ${STAGEDIR}${MODULEDIR} - -post-install-DOCS-on: - cd ${WRKSRC}/dlang.org && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} html ${BUILD} LATEST=${PORTVERSION} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/dmd/*.md ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/dlang.org/web && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - -post-install-EXAMPLES-on: - cd ${WRKDIR}/dmd && ${COPYTREE_SHARE} samples ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/dmd/ini/freebsd/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd32.conf - ${INSTALL_DATA} ${WRKDIR}/dmd/ini/freebsd/bin64/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd64.conf - -pre-fetch: - ${MAKE} -f Makefile.bootstrap BOOTDIR=${WRKDIR} checksum - -pre-configure: - ${MAKE} -f Makefile.bootstrap BOOTDIR=${WRKDIR} - -.include diff --git a/lang/dmd2/Makefile.bootstrap b/lang/dmd2/Makefile.bootstrap deleted file mode 100644 index a3ff36822383..000000000000 --- a/lang/dmd2/Makefile.bootstrap +++ /dev/null @@ -1,84 +0,0 @@ -# Created by: Ruben -# $FreeBSD$ - -PORTNAME= dmd -PORTVERSION= 2.067.1 -MASTER_SITES= http://ftp.digitalmars.com/ -CATEGORIES= lang -PKGNAMESUFFIX= 2 -DISTNAME= dmd.${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DISTINFO_FILE= ${MASTERDIR}/distinfo.bootstrap - -MAINTAINER= cy@FreeBSD.org -COMMENT= D 2.0 compiler bootstrap - -WRKDIR= ${BOOTDIR}/.host_dmd-2.067.1 -PATCHDIR= ${MASTERDIR}/files.bootstrap -USES= gmake zip -MAKEFILE= posix.mak -EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 -DOCSDIR= ${PREFIX}/share/doc/dmd2 -PORTDOCS= *.txt html/ -WRKSRC= ${WRKDIR}/dmd2/src/${PORTNAME} -.undef DEVELOPER - -OPTIONS_DEFINE= DOCS - -BROKEN_sparc64= Does not install: divide-by-zero error - -.include - -.if ${ARCH} == "amd64" -MAKE_ARGS+= MODEL=64 -MODEL= 64 -.else -MAKE_ARGS+= MODEL=32 -MODEL= 32 -.endif - -MODULEDIR= ${PREFIX}/include/d/phobos2 - -post-patch: - @${REINPLACE_CMD} -e "s|g++|${CXX}|" ${WRKSRC}/posix.mak - @${REINPLACE_CMD} -e "s|cc|${CC}|" ${WRKSRC}/../phobos/posix.mak - @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|" \ - -e "s|\(dmd\)|\12|gI" \ - -e "s|\\\BR|.BR|" \ - ${WRKDIR}/dmd2/man/man1/dmd.1 \ - ${WRKDIR}/dmd2/man/man5/dmd.conf.5 - @${REINPLACE_CMD} -e '/^SYSCONFDIR=/s|/etc/|${STAGEDIR}${PREFIX}/etc/|' ${WRKSRC}/posix.mak - @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${STAGEDIR}${MODULEDIR}|" \ - -e "s|%@P%/../lib32|${STAGEDIR}${PREFIX}/lib|" \ - -e "s|%@P%/../lib64|${STAGEDIR}${PREFIX}/lib|" \ - -e "s|%@P%/../../src/druntime|${STAGEDIR}${PREFIX}/include/d/druntime|" \ - ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf - @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf - -make-phobos: - cd ${WRKSRC}/../phobos && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -make-druntime: - cd ${WRKSRC}/../druntime && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -make-dmd: - cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} - -do-build: make-dmd make-phobos make-druntime - -do-install: - ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd - ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib${MODEL}/libphobos2.a ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${MODULEDIR}/etc/c - ${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${STAGEDIR}${MODULEDIR} - ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${STAGEDIR}${MODULEDIR}/etc/c - ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/curl.d ${STAGEDIR}${MODULEDIR}/etc/c - ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/sqlite3.d ${STAGEDIR}${MODULEDIR}/etc/c - cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR} - ${MKDIR} ${STAGEDIR}${MODULEDIR}/../druntime - cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} import ${STAGEDIR}${MODULEDIR}/../druntime - - ${LN} -sf ${STAGEDIR}/${PREFIX}/bin/dmd ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd - -.include diff --git a/lang/dmd2/distinfo b/lang/dmd2/distinfo deleted file mode 100644 index 9fb2c3bbf818..000000000000 --- a/lang/dmd2/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -TIMESTAMP = 1489142044 -SHA256 (dlang-dmd-v2.073.2_GH0.tar.gz) = 1cd983d73b0fa1a20232fb46dbc3a39434adfa00fc7668563983ec8ca210726a -SIZE (dlang-dmd-v2.073.2_GH0.tar.gz) = 2815046 -SHA256 (dlang-druntime-v2.073.2_GH0.tar.gz) = 9c0c1a818deb6a0d410f83f067450cc5b41287328c44c2d46c0d2e7de84aa68e -SIZE (dlang-druntime-v2.073.2_GH0.tar.gz) = 1496527 -SHA256 (dlang-phobos-v2.073.2_GH0.tar.gz) = 6a3b16649a33bcc3db522404a1fe98f046eedf082a96648f7972ab112c2cb289 -SIZE (dlang-phobos-v2.073.2_GH0.tar.gz) = 2168692 -SHA256 (dlang-dlang.org-v2.073.2_GH0.tar.gz) = 2417617ebca97594ad69a0602813f64d50590fc65b42a7099f44328d3d022bce -SIZE (dlang-dlang.org-v2.073.2_GH0.tar.gz) = 2321393 diff --git a/lang/dmd2/distinfo.bootstrap b/lang/dmd2/distinfo.bootstrap deleted file mode 100644 index cab39fc2fb25..000000000000 --- a/lang/dmd2/distinfo.bootstrap +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1487049092 -SHA256 (dmd.2.067.1.zip) = 24fd32d3b1401309187a3fcd235014e38c651beb3af29b0e656f6f4add4ec95b -SIZE (dmd.2.067.1.zip) = 56083735 diff --git a/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak b/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak deleted file mode 100644 index 51ff71f89d3a..000000000000 --- a/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../src/phobos/posix.mak.orig 2016-04-08 22:04:38.300872000 -0700 -+++ ../../src/phobos/posix.mak 2016-04-08 22:11:33.637271000 -0700 -@@ -121,7 +121,7 @@ - DMD = wine dmd.exe - RUN = wine - else -- DMD = ../dmd/src/dmd -+ DMD = ../dmd/dmd - ifeq ($(OS),win32) - CC = dmc - else diff --git a/lang/dmd2/files/patch-freebsd__bin32__dmd.conf b/lang/dmd2/files/patch-freebsd__bin32__dmd.conf deleted file mode 100644 index 80b54d3ef847..000000000000 --- a/lang/dmd2/files/patch-freebsd__bin32__dmd.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- dmd/ini/freebsd/bin32/dmd.conf.orig 2014-10-15 19:23:36.000000000 -0700 -+++ dmd/ini/freebsd/bin32/dmd.conf 2015-02-24 16:02:48.323239133 -0800 -@@ -1,5 +1,2 @@ - [Environment32] --DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic -- --[Environment64] --DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -+DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib -L--export-dynamic diff --git a/lang/dmd2/files/patch-freebsd__bin64__dmd.conf b/lang/dmd2/files/patch-freebsd__bin64__dmd.conf deleted file mode 100644 index 93467f0b3d17..000000000000 --- a/lang/dmd2/files/patch-freebsd__bin64__dmd.conf +++ /dev/null @@ -1,8 +0,0 @@ ---- dmd/ini/freebsd/bin64/dmd.conf.orig 2014-10-15 19:23:36.000000000 -0700 -+++ dmd/ini/freebsd/bin64/dmd.conf 2015-02-24 16:08:20.814712651 -0800 -@@ -2,4 +2,4 @@ - DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic - - [Environment64] --DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -+DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib -L--export-dynamic diff --git a/lang/dmd2/files/patch-src__res__default_ddoc_theme.ddoc b/lang/dmd2/files/patch-src__res__default_ddoc_theme.ddoc deleted file mode 100644 index e779c8d6ddd3..000000000000 --- a/lang/dmd2/files/patch-src__res__default_ddoc_theme.ddoc +++ /dev/null @@ -1,116 +0,0 @@ ---- ../../src/res/default_ddoc_theme.ddoc.orig 2017-02-13 14:01:32.569832000 -0800 -+++ ../../src/res/default_ddoc_theme.ddoc 2017-02-13 14:01:36.105742000 -0800 -@@ -0,0 +1,113 @@ -+DDOC = -+ $(DDOC_COMMENT Generated by Ddoc from $(SRCFILENAME)) -+ -+ $(TITLE) -+ -+

$(TITLE)

-+$(BODY) -+
$(SMALL Page generated by $(LINK2 http://dlang.org/ddoc.html, Ddoc). $(COPYRIGHT)) -+ -+ -+B = $0 -+I = $0 -+U = $0 -+P =

$0

-+DL =
$0
-+DT =
$0
-+DD =
$0
-+TABLE = $0
-+TR = $0 -+TH = $0 -+TD = $0 -+OL =
    $0
-+UL =
    $0
-+LI =
  • $0
  • -+BIG = $0 -+SMALL = $0 -+BR =
    -+LINK = $0 -+LINK2 = $+ -+LPAREN= ( -+RPAREN= ) -+BACKTICK= ` -+DOLLAR= $ -+DEPRECATED= $0 -+ -+RED = $0 -+BLUE = $0 -+GREEN = $0 -+YELLOW =$0 -+BLACK = $0 -+WHITE = $0 -+ -+D_CODE =
    $0
    -+DDOC_BACKQUOTED = $(D_INLINECODE $0) -+D_INLINECODE =
    $0
    -+D_COMMENT = $(GREEN $0) -+D_STRING = $(RED $0) -+D_KEYWORD = $(BLUE $0) -+D_PSYMBOL = $(U $0) -+D_PARAM = $(I $0) -+ -+DDOC_COMMENT = -+DDOC_DECL = $(DT $(BIG $0)) -+DDOC_DECL_DD = $(DD $0) -+DDOC_DITTO = $(BR)$0 -+DDOC_SECTIONS = $0 -+DDOC_SUMMARY = $0$(BR)$(BR) -+DDOC_DESCRIPTION = $0$(BR)$(BR) -+DDOC_AUTHORS = $(B Authors:)$(BR) -+$0$(BR)$(BR) -+DDOC_BUGS = $(RED BUGS:)$(BR) -+$0$(BR)$(BR) -+DDOC_COPYRIGHT = $(B Copyright:)$(BR) -+$0$(BR)$(BR) -+DDOC_DATE = $(B Date:)$(BR) -+$0$(BR)$(BR) -+DDOC_DEPRECATED = $(RED Deprecated:)$(BR) -+$0$(BR)$(BR) -+DDOC_EXAMPLES = $(B Examples:)$(BR) -+$0$(BR)$(BR) -+DDOC_HISTORY = $(B History:)$(BR) -+$0$(BR)$(BR) -+DDOC_LICENSE = $(B License:)$(BR) -+$0$(BR)$(BR) -+DDOC_RETURNS = $(B Returns:)$(BR) -+$0$(BR)$(BR) -+DDOC_SEE_ALSO = $(B See Also:)$(BR) -+$0$(BR)$(BR) -+DDOC_STANDARDS = $(B Standards:)$(BR) -+$0$(BR)$(BR) -+DDOC_THROWS = $(B Throws:)$(BR) -+$0$(BR)$(BR) -+DDOC_VERSION = $(B Version:)$(BR) -+$0$(BR)$(BR) -+DDOC_SECTION_H = $(B $0)$(BR) -+DDOC_SECTION = $0$(BR)$(BR) -+DDOC_MEMBERS = $(DL $0) -+DDOC_MODULE_MEMBERS = $(DDOC_MEMBERS $0) -+DDOC_CLASS_MEMBERS = $(DDOC_MEMBERS $0) -+DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0) -+DDOC_ENUM_MEMBERS = $(DDOC_MEMBERS $0) -+DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0) -+DDOC_ENUM_BASETYPE = $0 -+DDOC_PARAMS = $(B Params:)$(BR) -+$(TABLE $0)$(BR) -+DDOC_PARAM_ROW = $(TR $0) -+DDOC_PARAM_ID = $(TD $0) -+DDOC_PARAM_DESC = $(TD $0) -+DDOC_BLANKLINE = $(BR)$(BR) -+ -+DDOC_ANCHOR = -+DDOC_PSYMBOL = $(U $0) -+DDOC_PSUPER_SYMBOL = $(U $0) -+DDOC_KEYWORD = $(B $0) -+DDOC_PARAM = $(I $0) -+DDOC_CONSTRAINT = $(DDOC_CONSTRAINT) if ($0) -+DDOC_OVERLOAD_SEPARATOR = -+DDOC_TEMPLATE_PARAM_LIST = $0 -+DDOC_TEMPLATE_PARAM = $0 -+ -+ESCAPES = //>/ -+ /&/&/ diff --git a/lang/dmd2/pkg-descr b/lang/dmd2/pkg-descr deleted file mode 100644 index a1bfb8d16b90..000000000000 --- a/lang/dmd2/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -D is a systems programming language. Its focus is on combining the power and -high performance of C and C++ with the programmer productivity of modern -languages like Ruby and Python. Special attention is given to the needs of -quality assurance, documentation, management, portability and reliability. - -The D language is statically typed and compiles directly to machine code. It's -multiparadigm, supporting many programming styles: imperative, object oriented, -and metaprogramming. It's a member of the C syntax family, and its appearance -is very similar to that of C++. - -It is not governed by a corporate agenda or any overarching theory of -programming. The needs and contributions of the D programming community form -the direction it goes. - -This is an unofficial port that compiles directly from source, so it has not -been officially validated or tested on the FreeBSD platform by the developer. - -This Software is copyrighted and comes with a single user license, and may not -be redistributed. If you wish to obtain a redistribution license, please -contact Digital Mars. - -WWW: http://digitalmars.com/d/2.0/ diff --git a/lang/dmd2/pkg-plist b/lang/dmd2/pkg-plist deleted file mode 100644 index d5c3e09908af..000000000000 --- a/lang/dmd2/pkg-plist +++ /dev/null @@ -1,876 +0,0 @@ -bin/dmd -lib/libphobos2.a -@sample etc/dmd.conf.sample -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmd32.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmd64.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/all.sh -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/build.bat -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/chello.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/clean.bat -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/d2html.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/d2html.kwd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/dclient.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/dhry.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/dserver.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/dserver.def -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/hello.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/htmlget.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/listener.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/build.bat -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/dll.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/mydll.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/mydll.def -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/mydll.di -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/mydll/test.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/pi.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/posix.mak -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/sieve.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/wc.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/wc2.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/winsamp.d -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/winsamp.def -include/d/phobos2/core/atomic.d -include/d/phobos2/core/attribute.d -include/d/phobos2/core/bitop.d -include/d/phobos2/core/checkedint.d -include/d/phobos2/core/cpuid.d -include/d/phobos2/core/demangle.d -include/d/phobos2/core/exception.d -include/d/phobos2/core/internal/abort.d -include/d/phobos2/core/internal/convert.d -include/d/phobos2/core/internal/hash.d -include/d/phobos2/core/internal/spinlock.d -include/d/phobos2/core/internal/string.d -include/d/phobos2/core/internal/traits.d -include/d/phobos2/core/math.d -include/d/phobos2/core/memory.d -include/d/phobos2/core/runtime.d -include/d/phobos2/core/simd.d -include/d/phobos2/core/stdc/complex.d -include/d/phobos2/core/stdc/config.d -include/d/phobos2/core/stdc/ctype.d -include/d/phobos2/core/stdc/errno.d -include/d/phobos2/core/stdc/fenv.d -include/d/phobos2/core/stdc/float_.d -include/d/phobos2/core/stdc/inttypes.d -include/d/phobos2/core/stdc/limits.d -include/d/phobos2/core/stdc/locale.d -include/d/phobos2/core/stdc/math.d -include/d/phobos2/core/stdc/signal.d -include/d/phobos2/core/stdc/stdarg.d -include/d/phobos2/core/stdc/stddef.d -include/d/phobos2/core/stdc/stdint.d -include/d/phobos2/core/stdc/stdio.d -include/d/phobos2/core/stdc/stdlib.d -include/d/phobos2/core/stdc/string.d -include/d/phobos2/core/stdc/tgmath.d -include/d/phobos2/core/stdc/time.d -include/d/phobos2/core/stdc/wchar_.d -include/d/phobos2/core/stdc/wctype.d -include/d/phobos2/core/stdcpp/exception.d -include/d/phobos2/core/stdcpp/typeinfo.d -include/d/phobos2/core/sync/barrier.di -include/d/phobos2/core/sync/condition.di -include/d/phobos2/core/sync/config.di -include/d/phobos2/core/sync/exception.di -include/d/phobos2/core/sync/mutex.di -include/d/phobos2/core/sync/rwmutex.di -include/d/phobos2/core/sync/semaphore.di -include/d/phobos2/core/sys/darwin/execinfo.d -include/d/phobos2/core/sys/darwin/mach/dyld.d -include/d/phobos2/core/sys/darwin/mach/getsect.d -include/d/phobos2/core/sys/darwin/mach/kern_return.d -include/d/phobos2/core/sys/darwin/mach/loader.d -include/d/phobos2/core/sys/darwin/mach/port.d -include/d/phobos2/core/sys/darwin/mach/semaphore.d -include/d/phobos2/core/sys/darwin/mach/thread_act.d -include/d/phobos2/core/sys/darwin/pthread.d -include/d/phobos2/core/sys/darwin/sys/cdefs.d -include/d/phobos2/core/sys/darwin/sys/event.d -include/d/phobos2/core/sys/darwin/sys/mman.d -include/d/phobos2/core/sys/freebsd/dlfcn.d -include/d/phobos2/core/sys/freebsd/execinfo.d -include/d/phobos2/core/sys/freebsd/pthread_np.d -include/d/phobos2/core/sys/freebsd/sys/_bitset.d -include/d/phobos2/core/sys/freebsd/sys/_cpuset.d -include/d/phobos2/core/sys/freebsd/sys/cdefs.d -include/d/phobos2/core/sys/freebsd/sys/elf.d -include/d/phobos2/core/sys/freebsd/sys/elf32.d -include/d/phobos2/core/sys/freebsd/sys/elf64.d -include/d/phobos2/core/sys/freebsd/sys/elf_common.d -include/d/phobos2/core/sys/freebsd/sys/event.d -include/d/phobos2/core/sys/freebsd/sys/link_elf.d -include/d/phobos2/core/sys/freebsd/sys/mman.d -include/d/phobos2/core/sys/freebsd/time.d -include/d/phobos2/core/sys/linux/config.d -include/d/phobos2/core/sys/linux/dlfcn.d -include/d/phobos2/core/sys/linux/elf.d -include/d/phobos2/core/sys/linux/epoll.d -include/d/phobos2/core/sys/linux/errno.d -include/d/phobos2/core/sys/linux/execinfo.d -include/d/phobos2/core/sys/linux/fcntl.d -include/d/phobos2/core/sys/linux/ifaddrs.d -include/d/phobos2/core/sys/linux/link.d -include/d/phobos2/core/sys/linux/sched.d -include/d/phobos2/core/sys/linux/sys/auxv.d -include/d/phobos2/core/sys/linux/sys/inotify.d -include/d/phobos2/core/sys/linux/sys/mman.d -include/d/phobos2/core/sys/linux/sys/netinet/tcp.d -include/d/phobos2/core/sys/linux/sys/prctl.d -include/d/phobos2/core/sys/linux/sys/signalfd.d -include/d/phobos2/core/sys/linux/sys/socket.d -include/d/phobos2/core/sys/linux/sys/sysinfo.d -include/d/phobos2/core/sys/linux/sys/time.d -include/d/phobos2/core/sys/linux/sys/xattr.d -include/d/phobos2/core/sys/linux/termios.d -include/d/phobos2/core/sys/linux/time.d -include/d/phobos2/core/sys/linux/timerfd.d -include/d/phobos2/core/sys/linux/tipc.d -include/d/phobos2/core/sys/linux/unistd.d -include/d/phobos2/core/sys/openbsd/dlfcn.d -include/d/phobos2/core/sys/osx/execinfo.d -include/d/phobos2/core/sys/osx/mach/dyld.d -include/d/phobos2/core/sys/osx/mach/getsect.d -include/d/phobos2/core/sys/osx/mach/kern_return.d -include/d/phobos2/core/sys/osx/mach/loader.d -include/d/phobos2/core/sys/osx/mach/port.d -include/d/phobos2/core/sys/osx/mach/semaphore.d -include/d/phobos2/core/sys/osx/mach/thread_act.d -include/d/phobos2/core/sys/osx/pthread.d -include/d/phobos2/core/sys/osx/sys/cdefs.d -include/d/phobos2/core/sys/osx/sys/mman.d -include/d/phobos2/core/sys/posix/arpa/inet.d -include/d/phobos2/core/sys/posix/config.d -include/d/phobos2/core/sys/posix/dirent.d -include/d/phobos2/core/sys/posix/dlfcn.d -include/d/phobos2/core/sys/posix/fcntl.d -include/d/phobos2/core/sys/posix/grp.d -include/d/phobos2/core/sys/posix/iconv.d -include/d/phobos2/core/sys/posix/inttypes.d -include/d/phobos2/core/sys/posix/libgen.d -include/d/phobos2/core/sys/posix/net/if_.d -include/d/phobos2/core/sys/posix/netdb.d -include/d/phobos2/core/sys/posix/netinet/in_.d -include/d/phobos2/core/sys/posix/netinet/tcp.d -include/d/phobos2/core/sys/posix/poll.d -include/d/phobos2/core/sys/posix/pthread.d -include/d/phobos2/core/sys/posix/pwd.d -include/d/phobos2/core/sys/posix/sched.d -include/d/phobos2/core/sys/posix/semaphore.d -include/d/phobos2/core/sys/posix/setjmp.d -include/d/phobos2/core/sys/posix/signal.d -include/d/phobos2/core/sys/posix/stdio.d -include/d/phobos2/core/sys/posix/stdlib.d -include/d/phobos2/core/sys/posix/sys/filio.d -include/d/phobos2/core/sys/posix/sys/ioccom.d -include/d/phobos2/core/sys/posix/sys/ioctl.d -include/d/phobos2/core/sys/posix/sys/ipc.d -include/d/phobos2/core/sys/posix/sys/mman.d -include/d/phobos2/core/sys/posix/sys/resource.d -include/d/phobos2/core/sys/posix/sys/select.d -include/d/phobos2/core/sys/posix/sys/shm.d -include/d/phobos2/core/sys/posix/sys/socket.d -include/d/phobos2/core/sys/posix/sys/stat.d -include/d/phobos2/core/sys/posix/sys/statvfs.d -include/d/phobos2/core/sys/posix/sys/time.d -include/d/phobos2/core/sys/posix/sys/ttycom.d -include/d/phobos2/core/sys/posix/sys/types.d -include/d/phobos2/core/sys/posix/sys/uio.d -include/d/phobos2/core/sys/posix/sys/un.d -include/d/phobos2/core/sys/posix/sys/utsname.d -include/d/phobos2/core/sys/posix/sys/wait.d -include/d/phobos2/core/sys/posix/syslog.d -include/d/phobos2/core/sys/posix/termios.d -include/d/phobos2/core/sys/posix/time.d -include/d/phobos2/core/sys/posix/ucontext.d -include/d/phobos2/core/sys/posix/unistd.d -include/d/phobos2/core/sys/posix/utime.d -include/d/phobos2/core/sys/solaris/dlfcn.d -include/d/phobos2/core/sys/solaris/elf.d -include/d/phobos2/core/sys/solaris/execinfo.d -include/d/phobos2/core/sys/solaris/libelf.d -include/d/phobos2/core/sys/solaris/link.d -include/d/phobos2/core/sys/solaris/sys/elf.d -include/d/phobos2/core/sys/solaris/sys/elf_386.d -include/d/phobos2/core/sys/solaris/sys/elf_SPARC.d -include/d/phobos2/core/sys/solaris/sys/elf_amd64.d -include/d/phobos2/core/sys/solaris/sys/elf_notes.d -include/d/phobos2/core/sys/solaris/sys/elftypes.d -include/d/phobos2/core/sys/solaris/sys/link.d -include/d/phobos2/core/sys/solaris/sys/priocntl.d -include/d/phobos2/core/sys/solaris/sys/procset.d -include/d/phobos2/core/sys/solaris/sys/types.d -include/d/phobos2/core/sys/solaris/time.d -include/d/phobos2/core/sys/windows/accctrl.d -include/d/phobos2/core/sys/windows/aclapi.d -include/d/phobos2/core/sys/windows/aclui.d -include/d/phobos2/core/sys/windows/basetsd.d -include/d/phobos2/core/sys/windows/basetyps.d -include/d/phobos2/core/sys/windows/cderr.d -include/d/phobos2/core/sys/windows/cguid.d -include/d/phobos2/core/sys/windows/com.d -include/d/phobos2/core/sys/windows/comcat.d -include/d/phobos2/core/sys/windows/commctrl.d -include/d/phobos2/core/sys/windows/commdlg.d -include/d/phobos2/core/sys/windows/core.d -include/d/phobos2/core/sys/windows/cpl.d -include/d/phobos2/core/sys/windows/cplext.d -include/d/phobos2/core/sys/windows/custcntl.d -include/d/phobos2/core/sys/windows/dbghelp.d -include/d/phobos2/core/sys/windows/dbghelp_types.d -include/d/phobos2/core/sys/windows/dbt.d -include/d/phobos2/core/sys/windows/dde.d -include/d/phobos2/core/sys/windows/ddeml.d -include/d/phobos2/core/sys/windows/dhcpcsdk.d -include/d/phobos2/core/sys/windows/dlgs.d -include/d/phobos2/core/sys/windows/dll.d -include/d/phobos2/core/sys/windows/docobj.d -include/d/phobos2/core/sys/windows/errorrep.d -include/d/phobos2/core/sys/windows/exdisp.d -include/d/phobos2/core/sys/windows/exdispid.d -include/d/phobos2/core/sys/windows/httpext.d -include/d/phobos2/core/sys/windows/idispids.d -include/d/phobos2/core/sys/windows/imagehlp.d -include/d/phobos2/core/sys/windows/imm.d -include/d/phobos2/core/sys/windows/intshcut.d -include/d/phobos2/core/sys/windows/ipexport.d -include/d/phobos2/core/sys/windows/iphlpapi.d -include/d/phobos2/core/sys/windows/ipifcons.d -include/d/phobos2/core/sys/windows/iprtrmib.d -include/d/phobos2/core/sys/windows/iptypes.d -include/d/phobos2/core/sys/windows/isguids.d -include/d/phobos2/core/sys/windows/lm.d -include/d/phobos2/core/sys/windows/lmaccess.d -include/d/phobos2/core/sys/windows/lmalert.d -include/d/phobos2/core/sys/windows/lmapibuf.d -include/d/phobos2/core/sys/windows/lmat.d -include/d/phobos2/core/sys/windows/lmaudit.d -include/d/phobos2/core/sys/windows/lmbrowsr.d -include/d/phobos2/core/sys/windows/lmchdev.d -include/d/phobos2/core/sys/windows/lmconfig.d -include/d/phobos2/core/sys/windows/lmcons.d -include/d/phobos2/core/sys/windows/lmerr.d -include/d/phobos2/core/sys/windows/lmerrlog.d -include/d/phobos2/core/sys/windows/lmmsg.d -include/d/phobos2/core/sys/windows/lmremutl.d -include/d/phobos2/core/sys/windows/lmrepl.d -include/d/phobos2/core/sys/windows/lmserver.d -include/d/phobos2/core/sys/windows/lmshare.d -include/d/phobos2/core/sys/windows/lmsname.d -include/d/phobos2/core/sys/windows/lmstats.d -include/d/phobos2/core/sys/windows/lmsvc.d -include/d/phobos2/core/sys/windows/lmuse.d -include/d/phobos2/core/sys/windows/lmuseflg.d -include/d/phobos2/core/sys/windows/lmwksta.d -include/d/phobos2/core/sys/windows/lzexpand.d -include/d/phobos2/core/sys/windows/mapi.d -include/d/phobos2/core/sys/windows/mciavi.d -include/d/phobos2/core/sys/windows/mcx.d -include/d/phobos2/core/sys/windows/mgmtapi.d -include/d/phobos2/core/sys/windows/mmsystem.d -include/d/phobos2/core/sys/windows/msacm.d -include/d/phobos2/core/sys/windows/mshtml.d -include/d/phobos2/core/sys/windows/mswsock.d -include/d/phobos2/core/sys/windows/nb30.d -include/d/phobos2/core/sys/windows/nddeapi.d -include/d/phobos2/core/sys/windows/nspapi.d -include/d/phobos2/core/sys/windows/ntdef.d -include/d/phobos2/core/sys/windows/ntdll.d -include/d/phobos2/core/sys/windows/ntldap.d -include/d/phobos2/core/sys/windows/ntsecapi.d -include/d/phobos2/core/sys/windows/ntsecpkg.d -include/d/phobos2/core/sys/windows/oaidl.d -include/d/phobos2/core/sys/windows/objbase.d -include/d/phobos2/core/sys/windows/objfwd.d -include/d/phobos2/core/sys/windows/objidl.d -include/d/phobos2/core/sys/windows/objsafe.d -include/d/phobos2/core/sys/windows/ocidl.d -include/d/phobos2/core/sys/windows/odbcinst.d -include/d/phobos2/core/sys/windows/ole.d -include/d/phobos2/core/sys/windows/ole2.d -include/d/phobos2/core/sys/windows/ole2ver.d -include/d/phobos2/core/sys/windows/oleacc.d -include/d/phobos2/core/sys/windows/oleauto.d -include/d/phobos2/core/sys/windows/olectl.d -include/d/phobos2/core/sys/windows/olectlid.d -include/d/phobos2/core/sys/windows/oledlg.d -include/d/phobos2/core/sys/windows/oleidl.d -include/d/phobos2/core/sys/windows/pbt.d -include/d/phobos2/core/sys/windows/powrprof.d -include/d/phobos2/core/sys/windows/prsht.d -include/d/phobos2/core/sys/windows/psapi.d -include/d/phobos2/core/sys/windows/rapi.d -include/d/phobos2/core/sys/windows/ras.d -include/d/phobos2/core/sys/windows/rasdlg.d -include/d/phobos2/core/sys/windows/raserror.d -include/d/phobos2/core/sys/windows/rassapi.d -include/d/phobos2/core/sys/windows/reason.d -include/d/phobos2/core/sys/windows/regstr.d -include/d/phobos2/core/sys/windows/richedit.d -include/d/phobos2/core/sys/windows/richole.d -include/d/phobos2/core/sys/windows/rpc.d -include/d/phobos2/core/sys/windows/rpcdce.d -include/d/phobos2/core/sys/windows/rpcdce2.d -include/d/phobos2/core/sys/windows/rpcdcep.d -include/d/phobos2/core/sys/windows/rpcndr.d -include/d/phobos2/core/sys/windows/rpcnsi.d -include/d/phobos2/core/sys/windows/rpcnsip.d -include/d/phobos2/core/sys/windows/rpcnterr.d -include/d/phobos2/core/sys/windows/schannel.d -include/d/phobos2/core/sys/windows/secext.d -include/d/phobos2/core/sys/windows/security.d -include/d/phobos2/core/sys/windows/servprov.d -include/d/phobos2/core/sys/windows/setupapi.d -include/d/phobos2/core/sys/windows/shellapi.d -include/d/phobos2/core/sys/windows/shldisp.d -include/d/phobos2/core/sys/windows/shlguid.d -include/d/phobos2/core/sys/windows/shlobj.d -include/d/phobos2/core/sys/windows/shlwapi.d -include/d/phobos2/core/sys/windows/snmp.d -include/d/phobos2/core/sys/windows/sql.d -include/d/phobos2/core/sys/windows/sqlext.d -include/d/phobos2/core/sys/windows/sqltypes.d -include/d/phobos2/core/sys/windows/sqlucode.d -include/d/phobos2/core/sys/windows/sspi.d -include/d/phobos2/core/sys/windows/stacktrace.d -include/d/phobos2/core/sys/windows/stat.d -include/d/phobos2/core/sys/windows/subauth.d -include/d/phobos2/core/sys/windows/threadaux.d -include/d/phobos2/core/sys/windows/tlhelp32.d -include/d/phobos2/core/sys/windows/tmschema.d -include/d/phobos2/core/sys/windows/unknwn.d -include/d/phobos2/core/sys/windows/uuid.d -include/d/phobos2/core/sys/windows/vfw.d -include/d/phobos2/core/sys/windows/w32api.d -include/d/phobos2/core/sys/windows/winbase.d -include/d/phobos2/core/sys/windows/winber.d -include/d/phobos2/core/sys/windows/wincon.d -include/d/phobos2/core/sys/windows/wincrypt.d -include/d/phobos2/core/sys/windows/windef.d -include/d/phobos2/core/sys/windows/windows.d -include/d/phobos2/core/sys/windows/winerror.d -include/d/phobos2/core/sys/windows/wingdi.d -include/d/phobos2/core/sys/windows/winhttp.d -include/d/phobos2/core/sys/windows/wininet.d -include/d/phobos2/core/sys/windows/winioctl.d -include/d/phobos2/core/sys/windows/winldap.d -include/d/phobos2/core/sys/windows/winnetwk.d -include/d/phobos2/core/sys/windows/winnls.d -include/d/phobos2/core/sys/windows/winnt.d -include/d/phobos2/core/sys/windows/winperf.d -include/d/phobos2/core/sys/windows/winreg.d -include/d/phobos2/core/sys/windows/winsock2.d -include/d/phobos2/core/sys/windows/winspool.d -include/d/phobos2/core/sys/windows/winsvc.d -include/d/phobos2/core/sys/windows/winuser.d -include/d/phobos2/core/sys/windows/winver.d -include/d/phobos2/core/sys/windows/wtsapi32.d -include/d/phobos2/core/sys/windows/wtypes.d -include/d/phobos2/core/thread.d -include/d/phobos2/core/time.d -include/d/phobos2/core/vararg.d -include/d/phobos2/etc/c/curl.d -include/d/phobos2/etc/c/odbc/sql.d -include/d/phobos2/etc/c/odbc/sqlext.d -include/d/phobos2/etc/c/odbc/sqltypes.d -include/d/phobos2/etc/c/odbc/sqlucode.d -include/d/phobos2/etc/c/sqlite3.d -include/d/phobos2/etc/c/zlib.d -include/d/phobos2/etc/c/zlib/ChangeLog -include/d/phobos2/etc/c/zlib/README -include/d/phobos2/etc/c/zlib/adler32.c -include/d/phobos2/etc/c/zlib/algorithm.txt -include/d/phobos2/etc/c/zlib/compress.c -include/d/phobos2/etc/c/zlib/crc32.c -include/d/phobos2/etc/c/zlib/crc32.h -include/d/phobos2/etc/c/zlib/deflate.c -include/d/phobos2/etc/c/zlib/deflate.h -include/d/phobos2/etc/c/zlib/example.c -include/d/phobos2/etc/c/zlib/gzclose.c -include/d/phobos2/etc/c/zlib/gzguts.h -include/d/phobos2/etc/c/zlib/gzlib.c -include/d/phobos2/etc/c/zlib/gzread.c -include/d/phobos2/etc/c/zlib/gzwrite.c -include/d/phobos2/etc/c/zlib/infback.c -include/d/phobos2/etc/c/zlib/inffast.c -include/d/phobos2/etc/c/zlib/inffast.h -include/d/phobos2/etc/c/zlib/inffixed.h -include/d/phobos2/etc/c/zlib/inflate.c -include/d/phobos2/etc/c/zlib/inflate.h -include/d/phobos2/etc/c/zlib/inftrees.c -include/d/phobos2/etc/c/zlib/inftrees.h -include/d/phobos2/etc/c/zlib/linux.mak -include/d/phobos2/etc/c/zlib/minigzip.c -include/d/phobos2/etc/c/zlib/osx.mak -include/d/phobos2/etc/c/zlib/trees.c -include/d/phobos2/etc/c/zlib/trees.h -include/d/phobos2/etc/c/zlib/uncompr.c -include/d/phobos2/etc/c/zlib/win32.mak -include/d/phobos2/etc/c/zlib/win64.mak -include/d/phobos2/etc/c/zlib/zconf.h -include/d/phobos2/etc/c/zlib/zlib.3 -include/d/phobos2/etc/c/zlib/zlib.h -include/d/phobos2/etc/c/zlib/zutil.c -include/d/phobos2/etc/c/zlib/zutil.h -include/d/phobos2/etc/linux/memoryerror.d -include/d/phobos2/object.d -include/d/phobos2/std/algorithm/comparison.d -include/d/phobos2/std/algorithm/internal.d -include/d/phobos2/std/algorithm/iteration.d -include/d/phobos2/std/algorithm/mutation.d -include/d/phobos2/std/algorithm/package.d -include/d/phobos2/std/algorithm/searching.d -include/d/phobos2/std/algorithm/setops.d -include/d/phobos2/std/algorithm/sorting.d -include/d/phobos2/std/array.d -include/d/phobos2/std/ascii.d -include/d/phobos2/std/base64.d -include/d/phobos2/std/bigint.d -include/d/phobos2/std/bitmanip.d -include/d/phobos2/std/c/fenv.d -include/d/phobos2/std/c/freebsd/socket.d -include/d/phobos2/std/c/linux/linux.d -include/d/phobos2/std/c/linux/linuxextern.d -include/d/phobos2/std/c/linux/pthread.d -include/d/phobos2/std/c/linux/socket.d -include/d/phobos2/std/c/linux/termios.d -include/d/phobos2/std/c/linux/tipc.d -include/d/phobos2/std/c/locale.d -include/d/phobos2/std/c/math.d -include/d/phobos2/std/c/osx/socket.d -include/d/phobos2/std/c/process.d -include/d/phobos2/std/c/stdarg.d -include/d/phobos2/std/c/stddef.d -include/d/phobos2/std/c/stdio.d -include/d/phobos2/std/c/stdlib.d -include/d/phobos2/std/c/string.d -include/d/phobos2/std/c/time.d -include/d/phobos2/std/c/wcharh.d -include/d/phobos2/std/c/windows/com.d -include/d/phobos2/std/c/windows/stat.d -include/d/phobos2/std/c/windows/windows.d -include/d/phobos2/std/c/windows/winsock.d -include/d/phobos2/std/compiler.d -include/d/phobos2/std/complex.d -include/d/phobos2/std/concurrency.d -include/d/phobos2/std/concurrencybase.d -include/d/phobos2/std/container/array.d -include/d/phobos2/std/container/binaryheap.d -include/d/phobos2/std/container/dlist.d -include/d/phobos2/std/container/package.d -include/d/phobos2/std/container/rbtree.d -include/d/phobos2/std/container/slist.d -include/d/phobos2/std/container/util.d -include/d/phobos2/std/conv.d -include/d/phobos2/std/csv.d -include/d/phobos2/std/datetime.d -include/d/phobos2/std/demangle.d -include/d/phobos2/std/digest/crc.d -include/d/phobos2/std/digest/digest.d -include/d/phobos2/std/digest/hmac.d -include/d/phobos2/std/digest/md.d -include/d/phobos2/std/digest/murmurhash.d -include/d/phobos2/std/digest/ripemd.d -include/d/phobos2/std/digest/sha.d -include/d/phobos2/std/encoding.d -include/d/phobos2/std/exception.d -include/d/phobos2/std/experimental/allocator/building_blocks/affix_allocator.d -include/d/phobos2/std/experimental/allocator/building_blocks/allocator_list.d -include/d/phobos2/std/experimental/allocator/building_blocks/bitmapped_block.d -include/d/phobos2/std/experimental/allocator/building_blocks/bucketizer.d -include/d/phobos2/std/experimental/allocator/building_blocks/fallback_allocator.d -include/d/phobos2/std/experimental/allocator/building_blocks/free_list.d -include/d/phobos2/std/experimental/allocator/building_blocks/free_tree.d -include/d/phobos2/std/experimental/allocator/building_blocks/kernighan_ritchie.d -include/d/phobos2/std/experimental/allocator/building_blocks/null_allocator.d -include/d/phobos2/std/experimental/allocator/building_blocks/package.d -include/d/phobos2/std/experimental/allocator/building_blocks/quantizer.d -include/d/phobos2/std/experimental/allocator/building_blocks/region.d -include/d/phobos2/std/experimental/allocator/building_blocks/scoped_allocator.d -include/d/phobos2/std/experimental/allocator/building_blocks/segregator.d -include/d/phobos2/std/experimental/allocator/building_blocks/stats_collector.d -include/d/phobos2/std/experimental/allocator/common.d -include/d/phobos2/std/experimental/allocator/gc_allocator.d -include/d/phobos2/std/experimental/allocator/mallocator.d -include/d/phobos2/std/experimental/allocator/mmap_allocator.d -include/d/phobos2/std/experimental/allocator/package.d -include/d/phobos2/std/experimental/allocator/showcase.d -include/d/phobos2/std/experimental/allocator/typed.d -include/d/phobos2/std/experimental/logger/core.d -include/d/phobos2/std/experimental/logger/filelogger.d -include/d/phobos2/std/experimental/logger/multilogger.d -include/d/phobos2/std/experimental/logger/nulllogger.d -include/d/phobos2/std/experimental/logger/package.d -include/d/phobos2/std/experimental/ndslice/internal.d -include/d/phobos2/std/experimental/ndslice/iteration.d -include/d/phobos2/std/experimental/ndslice/package.d -include/d/phobos2/std/experimental/ndslice/selection.d -include/d/phobos2/std/experimental/ndslice/slice.d -include/d/phobos2/std/experimental/note.md -include/d/phobos2/std/experimental/typecons.d -include/d/phobos2/std/file.d -include/d/phobos2/std/format.d -include/d/phobos2/std/functional.d -include/d/phobos2/std/getopt.d -include/d/phobos2/std/internal/cstring.d -include/d/phobos2/std/internal/digest/sha_SSSE3.d -include/d/phobos2/std/internal/encodinginit.d -include/d/phobos2/std/internal/math/biguintcore.d -include/d/phobos2/std/internal/math/biguintnoasm.d -include/d/phobos2/std/internal/math/biguintx86.d -include/d/phobos2/std/internal/math/errorfunction.d -include/d/phobos2/std/internal/math/gammafunction.d -include/d/phobos2/std/internal/processinit.d -include/d/phobos2/std/internal/scopebuffer.d -include/d/phobos2/std/internal/test/dummyrange.d -include/d/phobos2/std/internal/test/uda.d -include/d/phobos2/std/internal/unicode_comp.d -include/d/phobos2/std/internal/unicode_decomp.d -include/d/phobos2/std/internal/unicode_grapheme.d -include/d/phobos2/std/internal/unicode_norm.d -include/d/phobos2/std/internal/unicode_tables.d -include/d/phobos2/std/internal/windows/advapi32.d -include/d/phobos2/std/json.d -include/d/phobos2/std/math.d -include/d/phobos2/std/mathspecial.d -include/d/phobos2/std/meta.d -include/d/phobos2/std/mmfile.d -include/d/phobos2/std/net/curl.d -include/d/phobos2/std/net/isemail.d -include/d/phobos2/std/numeric.d -include/d/phobos2/std/outbuffer.d -include/d/phobos2/std/parallelism.d -include/d/phobos2/std/path.d -include/d/phobos2/std/process.d -include/d/phobos2/std/random.d -include/d/phobos2/std/range/interfaces.d -include/d/phobos2/std/range/package.d -include/d/phobos2/std/range/primitives.d -include/d/phobos2/std/regex/internal/backtracking.d -include/d/phobos2/std/regex/internal/generator.d -include/d/phobos2/std/regex/internal/ir.d -include/d/phobos2/std/regex/internal/kickstart.d -include/d/phobos2/std/regex/internal/parser.d -include/d/phobos2/std/regex/internal/shiftor.d -include/d/phobos2/std/regex/internal/tests.d -include/d/phobos2/std/regex/internal/thompson.d -include/d/phobos2/std/regex/package.d -include/d/phobos2/std/signals.d -include/d/phobos2/std/socket.d -include/d/phobos2/std/stdint.d -include/d/phobos2/std/stdio.d -include/d/phobos2/std/stdiobase.d -include/d/phobos2/std/string.d -include/d/phobos2/std/system.d -include/d/phobos2/std/traits.d -include/d/phobos2/std/typecons.d -include/d/phobos2/std/typetuple.d -include/d/phobos2/std/uni.d -include/d/phobos2/std/uri.d -include/d/phobos2/std/utf.d -include/d/phobos2/std/uuid.d -include/d/phobos2/std/variant.d -include/d/phobos2/std/windows/charset.d -include/d/phobos2/std/windows/iunknown.d -include/d/phobos2/std/windows/registry.d -include/d/phobos2/std/windows/syserror.d -include/d/phobos2/std/xml.d -include/d/phobos2/std/zip.d -include/d/phobos2/std/zlib.d -%%PORTDOCS%%%%DOCSDIR%%/.dpl_rewrite_map.txt -%%PORTDOCS%%%%DOCSDIR%%/.htaccess -%%PORTDOCS%%%%DOCSDIR%%/404.html -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md -%%PORTDOCS%%%%DOCSDIR%%/D1toD2.html -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/acknowledgements.html -%%PORTDOCS%%%%DOCSDIR%%/appendices.html -%%PORTDOCS%%%%DOCSDIR%%/areas-of-d-usage.html -%%PORTDOCS%%%%DOCSDIR%%/articles.html -%%PORTDOCS%%%%DOCSDIR%%/ascii-table.html -%%PORTDOCS%%%%DOCSDIR%%/bugstats.php.html -%%PORTDOCS%%%%DOCSDIR%%/builtin.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.000.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.001.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.002.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.003.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.004.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.005.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.006.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.007.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.008.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.009.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.010.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.011.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.012.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.013.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.014.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.015.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.016.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.017.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.018.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.019.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.020.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.021.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.022.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.023.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.025.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.026.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.027.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.028.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.029.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.030.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.031.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.032.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.033.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.034.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.035.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.036.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.037.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.038.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.039.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.040.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.041.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.042.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.043.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.044.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.045.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.046.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.047.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.048.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.049.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.050.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.051.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.052.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.053.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.054.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.055.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.056.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.057.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.058.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.059.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.060.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.061.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.062.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.063.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.064.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.065.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.066.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.066.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.067.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.067.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.068.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.068.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.068.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.069.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.069.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.069.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.070.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.070.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.070.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.071.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.071.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.071.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.072.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.072.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.072.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.073.0.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.073.1.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/2.073.2.html -%%PORTDOCS%%%%DOCSDIR%%/changelog/index.html -%%PORTDOCS%%%%DOCSDIR%%/code_coverage.html -%%PORTDOCS%%%%DOCSDIR%%/community.html -%%PORTDOCS%%%%DOCSDIR%%/comparison.html -%%PORTDOCS%%%%DOCSDIR%%/concepts.html -%%PORTDOCS%%%%DOCSDIR%%/const-faq.html -%%PORTDOCS%%%%DOCSDIR%%/cpptod.html -%%PORTDOCS%%%%DOCSDIR%%/css/codemirror.css -%%PORTDOCS%%%%DOCSDIR%%/css/ddox.css -%%PORTDOCS%%%%DOCSDIR%%/css/print.css -%%PORTDOCS%%%%DOCSDIR%%/css/style.css -%%PORTDOCS%%%%DOCSDIR%%/ctarguments.html -%%PORTDOCS%%%%DOCSDIR%%/ctod.html -%%PORTDOCS%%%%DOCSDIR%%/d-array-article.html -%%PORTDOCS%%%%DOCSDIR%%/d-floating-point.html -%%PORTDOCS%%%%DOCSDIR%%/d-keyring.gpg -%%PORTDOCS%%%%DOCSDIR%%/deprecate.html -%%PORTDOCS%%%%DOCSDIR%%/dlangupb-scholarship.html -%%PORTDOCS%%%%DOCSDIR%%/dll-linux.html -%%PORTDOCS%%%%DOCSDIR%%/dmd-freebsd.html -%%PORTDOCS%%%%DOCSDIR%%/dmd-linux.html -%%PORTDOCS%%%%DOCSDIR%%/dmd-osx.html -%%PORTDOCS%%%%DOCSDIR%%/dmd-windows.html -%%PORTDOCS%%%%DOCSDIR%%/dmd.html -%%PORTDOCS%%%%DOCSDIR%%/documentation.html -%%PORTDOCS%%%%DOCSDIR%%/donate.html -%%PORTDOCS%%%%DOCSDIR%%/download.html -%%PORTDOCS%%%%DOCSDIR%%/dstyle.html -%%PORTDOCS%%%%DOCSDIR%%/exception-safe.html -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/favicon.ico -%%PORTDOCS%%%%DOCSDIR%%/fetch-issue-cnt.php -%%PORTDOCS%%%%DOCSDIR%%/forum-template.html -%%PORTDOCS%%%%DOCSDIR%%/foundation.html -%%PORTDOCS%%%%DOCSDIR%%/glossary.html -%%PORTDOCS%%%%DOCSDIR%%/gpg_keys.html -%%PORTDOCS%%%%DOCSDIR%%/gsoc2011.html -%%PORTDOCS%%%%DOCSDIR%%/gsoc2012-template.html -%%PORTDOCS%%%%DOCSDIR%%/gsoc2012.html -%%PORTDOCS%%%%DOCSDIR%%/hijack.html -%%PORTDOCS%%%%DOCSDIR%%/howto-promote.html -%%PORTDOCS%%%%DOCSDIR%%/howtos.html -%%PORTDOCS%%%%DOCSDIR%%/htod.html -%%PORTDOCS%%%%DOCSDIR%%/images/apple_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/archlinux_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/c1.gif -%%PORTDOCS%%%%DOCSDIR%%/images/centos_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/chocolatey_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/compiler-dmd.png -%%PORTDOCS%%%%DOCSDIR%%/images/compiler-gdc.svg -%%PORTDOCS%%%%DOCSDIR%%/images/compiler-ldc.png -%%PORTDOCS%%%%DOCSDIR%%/images/cpp1.gif -%%PORTDOCS%%%%DOCSDIR%%/images/d002.ico -%%PORTDOCS%%%%DOCSDIR%%/images/d3.png -%%PORTDOCS%%%%DOCSDIR%%/images/d4.gif -%%PORTDOCS%%%%DOCSDIR%%/images/d5.gif -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/alias.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/class.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/enum.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/enummember.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/function.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/inherited.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/interface.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/module.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/package.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/private.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/property.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/protected.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/struct.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/template.png -%%PORTDOCS%%%%DOCSDIR%%/images/ddox/variable.png -%%PORTDOCS%%%%DOCSDIR%%/images/debian_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/dlogo.png -%%PORTDOCS%%%%DOCSDIR%%/images/dlogo.svg -%%PORTDOCS%%%%DOCSDIR%%/images/dman-error.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/dman-rain.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/dman-time.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/dmlogo-smaller.gif -%%PORTDOCS%%%%DOCSDIR%%/images/dmlogo.gif -%%PORTDOCS%%%%DOCSDIR%%/images/faster-aa-1.svg -%%PORTDOCS%%%%DOCSDIR%%/images/faster-gc-1.svg -%%PORTDOCS%%%%DOCSDIR%%/images/fedora_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/freebsd_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/github-ribbon.png -%%PORTDOCS%%%%DOCSDIR%%/images/globe.gif -%%PORTDOCS%%%%DOCSDIR%%/images/hamburger.svg -%%PORTDOCS%%%%DOCSDIR%%/images/homebrew_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/icon_minus.svg -%%PORTDOCS%%%%DOCSDIR%%/images/icon_plus.svg -%%PORTDOCS%%%%DOCSDIR%%/images/opensuse_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/arex.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/auburn.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/auburn_hq.svg -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/cereris.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/cereris_hq.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/da_roll.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/ebay.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/ecratum.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/ecratum_hq.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/emsi.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/facebook.svg -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/funatics.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/funatics_hq.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/funkwerk.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/infognition.svg -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/putao.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/putao_hq.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/remedy.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/remedy_hq.svg -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/sociomantic.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/tamedia_digital.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/tripaneer.png -%%PORTDOCS%%%%DOCSDIR%%/images/orgs-using-d/weka.png -%%PORTDOCS%%%%DOCSDIR%%/images/pattern.png -%%PORTDOCS%%%%DOCSDIR%%/images/pen.gif -%%PORTDOCS%%%%DOCSDIR%%/images/style3.gif -%%PORTDOCS%%%%DOCSDIR%%/images/tdpl.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/ubuntu_logo.png -%%PORTDOCS%%%%DOCSDIR%%/images/windows_logo.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/intro-to-datetime.html -%%PORTDOCS%%%%DOCSDIR%%/js/codemirror-compressed.js -%%PORTDOCS%%%%DOCSDIR%%/js/ddox.js -%%PORTDOCS%%%%DOCSDIR%%/js/dlang.js -%%PORTDOCS%%%%DOCSDIR%%/js/jquery-1.7.2.min.js -%%PORTDOCS%%%%DOCSDIR%%/js/listanchors.js -%%PORTDOCS%%%%DOCSDIR%%/js/platform-downloads.js -%%PORTDOCS%%%%DOCSDIR%%/js/run-main-website.js -%%PORTDOCS%%%%DOCSDIR%%/js/run.js -%%PORTDOCS%%%%DOCSDIR%%/js/run_examples.js -%%PORTDOCS%%%%DOCSDIR%%/js/show_contributors.js -%%PORTDOCS%%%%DOCSDIR%%/language-reference.html -%%PORTDOCS%%%%DOCSDIR%%/lazy-evaluation.html -%%PORTDOCS%%%%DOCSDIR%%/menu.html -%%PORTDOCS%%%%DOCSDIR%%/migrate-to-shared.html -%%PORTDOCS%%%%DOCSDIR%%/mixin.html -%%PORTDOCS%%%%DOCSDIR%%/orgs-using-d.html -%%PORTDOCS%%%%DOCSDIR%%/overview.html -%%PORTDOCS%%%%DOCSDIR%%/pretod.html -%%PORTDOCS%%%%DOCSDIR%%/rationale.html -%%PORTDOCS%%%%DOCSDIR%%/rdmd.html -%%PORTDOCS%%%%DOCSDIR%%/regular-expression.html -%%PORTDOCS%%%%DOCSDIR%%/resources.html -%%PORTDOCS%%%%DOCSDIR%%/robots.txt -%%PORTDOCS%%%%DOCSDIR%%/safed.html -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/sitemap.html -%%PORTDOCS%%%%DOCSDIR%%/spec/abi.html -%%PORTDOCS%%%%DOCSDIR%%/spec/arrays.html -%%PORTDOCS%%%%DOCSDIR%%/spec/attribute.html -%%PORTDOCS%%%%DOCSDIR%%/spec/class.html -%%PORTDOCS%%%%DOCSDIR%%/spec/const3.html -%%PORTDOCS%%%%DOCSDIR%%/spec/contracts.html -%%PORTDOCS%%%%DOCSDIR%%/spec/cpp_interface.html -%%PORTDOCS%%%%DOCSDIR%%/spec/ddoc.html -%%PORTDOCS%%%%DOCSDIR%%/spec/declaration.html -%%PORTDOCS%%%%DOCSDIR%%/spec/entity.html -%%PORTDOCS%%%%DOCSDIR%%/spec/enum.html -%%PORTDOCS%%%%DOCSDIR%%/spec/errors.html -%%PORTDOCS%%%%DOCSDIR%%/spec/expression.html -%%PORTDOCS%%%%DOCSDIR%%/spec/float.html -%%PORTDOCS%%%%DOCSDIR%%/spec/function.html -%%PORTDOCS%%%%DOCSDIR%%/spec/garbage.html -%%PORTDOCS%%%%DOCSDIR%%/spec/grammar.html -%%PORTDOCS%%%%DOCSDIR%%/spec/hash-map.html -%%PORTDOCS%%%%DOCSDIR%%/spec/iasm.html -%%PORTDOCS%%%%DOCSDIR%%/spec/interface.html -%%PORTDOCS%%%%DOCSDIR%%/spec/interfaceToC.html -%%PORTDOCS%%%%DOCSDIR%%/spec/intro.html -%%PORTDOCS%%%%DOCSDIR%%/spec/lex.html -%%PORTDOCS%%%%DOCSDIR%%/spec/memory-safe-d.html -%%PORTDOCS%%%%DOCSDIR%%/spec/module.html -%%PORTDOCS%%%%DOCSDIR%%/spec/objc_interface.html -%%PORTDOCS%%%%DOCSDIR%%/spec/operatoroverloading.html -%%PORTDOCS%%%%DOCSDIR%%/spec/portability.html -%%PORTDOCS%%%%DOCSDIR%%/spec/pragma.html -%%PORTDOCS%%%%DOCSDIR%%/spec/property.html -%%PORTDOCS%%%%DOCSDIR%%/spec/simd.html -%%PORTDOCS%%%%DOCSDIR%%/spec/spec.html -%%PORTDOCS%%%%DOCSDIR%%/spec/statement.html -%%PORTDOCS%%%%DOCSDIR%%/spec/struct.html -%%PORTDOCS%%%%DOCSDIR%%/spec/template-mixin.html -%%PORTDOCS%%%%DOCSDIR%%/spec/template.html -%%PORTDOCS%%%%DOCSDIR%%/spec/traits.html -%%PORTDOCS%%%%DOCSDIR%%/spec/type.html -%%PORTDOCS%%%%DOCSDIR%%/spec/unittest.html -%%PORTDOCS%%%%DOCSDIR%%/spec/version.html -%%PORTDOCS%%%%DOCSDIR%%/template-comparison.html -%%PORTDOCS%%%%DOCSDIR%%/templates-revisited.html -%%PORTDOCS%%%%DOCSDIR%%/tuple.html -%%PORTDOCS%%%%DOCSDIR%%/variadic-function-templates.html -%%PORTDOCS%%%%DOCSDIR%%/warnings.html -%%PORTDOCS%%%%DOCSDIR%%/wc.html -%%PORTDOCS%%%%DOCSDIR%%/windbg.html -man/man1/dmd.1.gz -man/man5/dmd.conf.5.gz -- cgit From fba3d048beac74af8259626bb6b772ff895c61f0 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 22:24:49 +0000 Subject: games/openbor: fix free memory stats source/ramlib/ram.c:137:18: runtime error: unsigned integer overflow: 9420649 * 4096 cannot be represented in type 'unsigned int' Reported by: -fsanitize=integer --- games/openbor/Makefile | 2 +- games/openbor/files/patch-source_ramlib_ram.c | 12 ++++++------ games/openbor3482/Makefile | 2 +- games/openbor3482/files/patch-source_ramlib_ram.c | 12 ++++++------ games/openbor3711/Makefile | 2 +- games/openbor3979/Makefile | 2 +- games/openbor3979/files/patch-source_ramlib_ram.c | 12 ++++++------ games/openbor4432/Makefile | 2 +- games/openbor4432/files/patch-source_ramlib_ram.c | 12 ++++++------ 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 7c0f30d30857..a90c977de205 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -4,7 +4,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} PORTVERSION?= 7068 .ifndef PKGNAMESUFFIX -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= games diff --git a/games/openbor/files/patch-source_ramlib_ram.c b/games/openbor/files/patch-source_ramlib_ram.c index adcdf0d70f6f..9b5896dc1539 100644 --- a/games/openbor/files/patch-source_ramlib_ram.c +++ b/games/openbor/files/patch-source_ramlib_ram.c @@ -59,8 +59,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize()) / byte_size; ++ return (u64)(vms.v_free_count + vms.v_inactive_count ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -70,8 +70,8 @@ Implement Linux-like memory stats for BSDs + &v_inactive_count, &sz, NULL, 0); + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); -+ return (u64)((v_free_count + v_inactive_count + v_cache_count) -+ * getpagesize()) / byte_size; ++ return (u64)(v_free_count + v_inactive_count ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -92,8 +92,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize) / byte_size; ++ return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); diff --git a/games/openbor3482/Makefile b/games/openbor3482/Makefile index 92a8ef30b4cb..553d748cf3de 100644 --- a/games/openbor3482/Makefile +++ b/games/openbor3482/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 3482 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= ${PORTVERSION} MASTERDIR= ${.CURDIR}/../openbor diff --git a/games/openbor3482/files/patch-source_ramlib_ram.c b/games/openbor3482/files/patch-source_ramlib_ram.c index c1609f723ea0..4a5a760fc13a 100644 --- a/games/openbor3482/files/patch-source_ramlib_ram.c +++ b/games/openbor3482/files/patch-source_ramlib_ram.c @@ -82,8 +82,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize()) / byte_size; ++ return (u64)(vms.v_free_count + vms.v_inactive_count ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -93,8 +93,8 @@ Implement Linux-like memory stats for BSDs + &v_inactive_count, &sz, NULL, 0); + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); -+ return (u64)((v_free_count + v_inactive_count + v_cache_count) -+ * getpagesize()) / byte_size; ++ return (u64)(v_free_count + v_inactive_count ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -115,8 +115,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize) / byte_size; ++ return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); diff --git a/games/openbor3711/Makefile b/games/openbor3711/Makefile index af248917d873..32de774c0237 100644 --- a/games/openbor3711/Makefile +++ b/games/openbor3711/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 3711 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= ${PORTVERSION} MASTERDIR= ${.CURDIR}/../openbor diff --git a/games/openbor3979/Makefile b/games/openbor3979/Makefile index 058e6d7c0024..a5237b6f81b4 100644 --- a/games/openbor3979/Makefile +++ b/games/openbor3979/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 3979 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= ${PORTVERSION} MASTERDIR= ${.CURDIR}/../openbor diff --git a/games/openbor3979/files/patch-source_ramlib_ram.c b/games/openbor3979/files/patch-source_ramlib_ram.c index 9485b7bd1906..eb06b6b133b7 100644 --- a/games/openbor3979/files/patch-source_ramlib_ram.c +++ b/games/openbor3979/files/patch-source_ramlib_ram.c @@ -82,8 +82,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize()) / byte_size; ++ return (u64)(vms.v_free_count + vms.v_inactive_count ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -93,8 +93,8 @@ Implement Linux-like memory stats for BSDs + &v_inactive_count, &sz, NULL, 0); + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); -+ return (u64)((v_free_count + v_inactive_count + v_cache_count) -+ * getpagesize()) / byte_size; ++ return (u64)(v_free_count + v_inactive_count ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -115,8 +115,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize) / byte_size; ++ return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); diff --git a/games/openbor4432/Makefile b/games/openbor4432/Makefile index 213faa22da20..21f0cb9ecc37 100644 --- a/games/openbor4432/Makefile +++ b/games/openbor4432/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 4432 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= ${PORTVERSION} MASTERDIR= ${.CURDIR}/../openbor diff --git a/games/openbor4432/files/patch-source_ramlib_ram.c b/games/openbor4432/files/patch-source_ramlib_ram.c index c88e7fda3724..430384591fde 100644 --- a/games/openbor4432/files/patch-source_ramlib_ram.c +++ b/games/openbor4432/files/patch-source_ramlib_ram.c @@ -59,8 +59,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize()) / byte_size; ++ return (u64)(vms.v_free_count + vms.v_inactive_count ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -70,8 +70,8 @@ Implement Linux-like memory stats for BSDs + &v_inactive_count, &sz, NULL, 0); + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); -+ return (u64)((v_free_count + v_inactive_count + v_cache_count) -+ * getpagesize()) / byte_size; ++ return (u64)(v_free_count + v_inactive_count ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -92,8 +92,8 @@ Implement Linux-like memory stats for BSDs + { + return 0; + } -+ return (u64)((uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize) / byte_size; ++ return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); -- cgit From 3430046ca1fe9e0c294bf29ea1b21230b7dde09d Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 22:25:00 +0000 Subject: x11/waybar: fix memory stats src/modules/memory.cpp:72:5: runtime error: unsigned integer overflow: 4982552 * 4096 cannot be represented in type 'unsigned int' Reported by: -fsanitize=integer --- x11/waybar/Makefile | 13 +++++++------ x11/waybar/distinfo | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index dbc21152f03f..26ca479fe750 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -2,6 +2,7 @@ PORTNAME= waybar DISTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= x11 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -12,11 +13,11 @@ PATCHFILES+= f0dfa34e651c.patch:-p1 PATCHFILES+= 25d4420904bd.patch:-p1 PATCHFILES+= bf0d2621504e.patch:-p1 PATCHFILES+= 82844ce8a6f3.patch:-p1 -PATCHFILES+= f3ed50fa3364.patch:-p1 -PATCHFILES+= 964d7030f7af.patch:-p1 -PATCHFILES+= c73a8162a265.patch:-p1 -PATCHFILES+= 997f7787fdbe.patch:-p1 -PATCHFILES+= 726ba2cf79f1.patch:-p1 +PATCHFILES+= 7bc3577137af.patch:-p1 +PATCHFILES+= 96ef80d06c00.patch:-p1 +PATCHFILES+= cf114a111fe0.patch:-p1 +PATCHFILES+= 684d9121a721.patch:-p1 +PATCHFILES+= f1b288adf8b5.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors @@ -56,6 +57,6 @@ PULSEAUDIO_MESON_ENABLED= pulseaudio UDEV_DESC= Monitor backlight level via libudev UDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd -UDEV_MESON_ENABLED= libepoll libudev +UDEV_MESON_ENABLED= libudev .include diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index aab34f8d7825..fed1f04d9703 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -13,13 +13,13 @@ SHA256 (bf0d2621504e.patch) = acb25d11fbd6ec03f3ca7845ff368cc9370ba2297298c522b8 SIZE (bf0d2621504e.patch) = 4167 SHA256 (82844ce8a6f3.patch) = 1c8ecbe8341e03f2ce0d27c68954b46bab890229f6d14e99f0c859422eb2c551 SIZE (82844ce8a6f3.patch) = 1382 -SHA256 (f3ed50fa3364.patch) = 0a0d3cffc7820e61aec12b454e3560c0b4014bf98128be5333fe0713fd7961c6 -SIZE (f3ed50fa3364.patch) = 2813 -SHA256 (964d7030f7af.patch) = a01a384d998e6ff1e5a0002332b6aac1859d97577a61626579db8d379fa5e473 -SIZE (964d7030f7af.patch) = 2059 -SHA256 (c73a8162a265.patch) = 9857db78c8309f72f2f2a4a35a10843ee8e04e984ccbbf788043a19ef5303e40 -SIZE (c73a8162a265.patch) = 4012 -SHA256 (997f7787fdbe.patch) = 8a132e51767459e3d5eccba12ddafdfd2039b37033966afc52eb809c71964b50 -SIZE (997f7787fdbe.patch) = 2957 -SHA256 (726ba2cf79f1.patch) = db1698155b9052b9f00935625da9ec9a5d1117ae6f560cf7405b76b40c9392b2 -SIZE (726ba2cf79f1.patch) = 2150 +SHA256 (7bc3577137af.patch) = 1cb5e6301146cc901fd59033f45702d5b64250e72abfea83a2f6e682c061e0b5 +SIZE (7bc3577137af.patch) = 1854 +SHA256 (96ef80d06c00.patch) = 6094a3ba22b4dec7ad4e1e3ff662308445c61f04580e6045aaa4492ab49aa60a +SIZE (96ef80d06c00.patch) = 2059 +SHA256 (cf114a111fe0.patch) = 9d7acaf149a2446f9c0cd80c689f2910394ace84b8a9838ea943f0275c341f3e +SIZE (cf114a111fe0.patch) = 3959 +SHA256 (684d9121a721.patch) = f0e6f54ef8be9b982eb4bf54e811e5c77bf4cbb54b82d99104ff3c98b9942f43 +SIZE (684d9121a721.patch) = 2957 +SHA256 (f1b288adf8b5.patch) = ba051ded886def63352eedaf68137d7042c1437ddfa614828ad8a70987b404e4 +SIZE (f1b288adf8b5.patch) = 2150 -- cgit From 96b0078dc88e7964d8ceec98568d57666878c94f Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 11 Aug 2019 22:36:31 +0000 Subject: games/openbor: untabify after r508689 --- games/openbor/files/patch-source_ramlib_ram.c | 6 +++--- games/openbor3979/files/patch-source_ramlib_ram.c | 6 +++--- games/openbor4432/files/patch-source_ramlib_ram.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/games/openbor/files/patch-source_ramlib_ram.c b/games/openbor/files/patch-source_ramlib_ram.c index 9b5896dc1539..f37ceae0bb48 100644 --- a/games/openbor/files/patch-source_ramlib_ram.c +++ b/games/openbor/files/patch-source_ramlib_ram.c @@ -60,7 +60,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize() / byte_size; ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -71,7 +71,7 @@ Implement Linux-like memory stats for BSDs + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); + return (u64)(v_free_count + v_inactive_count -+ + v_cache_count) * getpagesize() / byte_size; ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -93,7 +93,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize / byte_size; ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); diff --git a/games/openbor3979/files/patch-source_ramlib_ram.c b/games/openbor3979/files/patch-source_ramlib_ram.c index eb06b6b133b7..8d31053517f0 100644 --- a/games/openbor3979/files/patch-source_ramlib_ram.c +++ b/games/openbor3979/files/patch-source_ramlib_ram.c @@ -83,7 +83,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize() / byte_size; ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -94,7 +94,7 @@ Implement Linux-like memory stats for BSDs + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); + return (u64)(v_free_count + v_inactive_count -+ + v_cache_count) * getpagesize() / byte_size; ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -116,7 +116,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize / byte_size; ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); diff --git a/games/openbor4432/files/patch-source_ramlib_ram.c b/games/openbor4432/files/patch-source_ramlib_ram.c index 430384591fde..4aa2874abc81 100644 --- a/games/openbor4432/files/patch-source_ramlib_ram.c +++ b/games/openbor4432/files/patch-source_ramlib_ram.c @@ -60,7 +60,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(vms.v_free_count + vms.v_inactive_count -+ + vms.v_cache_count) * getpagesize() / byte_size; ++ + vms.v_cache_count) * getpagesize() / byte_size; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0; + size_t sz = sizeof(u_int); @@ -71,7 +71,7 @@ Implement Linux-like memory stats for BSDs + sysctlbyname("vm.stats.vm.v_cache_count", + &v_cache_count, &sz, NULL, 0); + return (u64)(v_free_count + v_inactive_count -+ + v_cache_count) * getpagesize() / byte_size; ++ + v_cache_count) * getpagesize() / byte_size; +#elif defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__NetBSD__) +#undef VM_UVMEXP @@ -93,7 +93,7 @@ Implement Linux-like memory stats for BSDs + return 0; + } + return (u64)(uvmexp.free + uvmexp.inactive + uvmexp.filepages -+ + uvmexp.execpages) * uvmexp.pagesize / byte_size; ++ + uvmexp.execpages) * uvmexp.pagesize / byte_size; #elif LINUX struct sysinfo info; sysinfo(&info); -- cgit From 4ed4dc738c8a51583a28ceb599e18e516ae8e56e Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 11 Aug 2019 23:15:44 +0000 Subject: science/nwchem: Update 6.8.1.20190606 -> 6.8.1.20190809 --- science/nwchem/Makefile | 5 ++--- science/nwchem/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/science/nwchem/Makefile b/science/nwchem/Makefile index b75c1578ab5d..112ae8109dce 100644 --- a/science/nwchem/Makefile +++ b/science/nwchem/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= nwchem -PORTVERSION= 6.8.1.20190606 -PORTREVISION= 1 +PORTVERSION= 6.8.1.20190809 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -24,7 +23,7 @@ SHEBANG_FILES= ../contrib/distro-tools/build_* ../contrib/add_* config/64_to_32 SHEBANG_GLOB= *.sh USE_GITHUB= yes GH_ACCOUNT= nwchemgit -GH_TAGNAME= master-oct22_2018-262-gbe00273ff +GH_TAGNAME= master-oct22_2018-327-g81507e607 USE_PERL5= build MAKEFILE= GNUmakefile diff --git a/science/nwchem/distinfo b/science/nwchem/distinfo index 6ff1721ff20c..08ec6450b399 100644 --- a/science/nwchem/distinfo +++ b/science/nwchem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559976667 -SHA256 (nwchemgit-nwchem-6.8.1.20190606-master-oct22_2018-262-gbe00273ff_GH0.tar.gz) = 10fbfd540407cb2b14f044450da5cb2e393de221a73f2ec60d3d5962b5412fd7 -SIZE (nwchemgit-nwchem-6.8.1.20190606-master-oct22_2018-262-gbe00273ff_GH0.tar.gz) = 180652723 +TIMESTAMP = 1565557687 +SHA256 (nwchemgit-nwchem-6.8.1.20190809-master-oct22_2018-327-g81507e607_GH0.tar.gz) = 548bbaf8a01a04be8a21b46cf8376e226e723c91b4c5955390ad725dfb4fcf20 +SIZE (nwchemgit-nwchem-6.8.1.20190809-master-oct22_2018-327-g81507e607_GH0.tar.gz) = 187971972 -- cgit From 9ff5028c0091e051df9b9d478a36ca9e4886fdd6 Mon Sep 17 00:00:00 2001 From: lifanov Date: Sun, 11 Aug 2019 23:27:13 +0000 Subject: update sysutils/ansible to 2.8.3 https://github.com/ansible/ansible/blob/v2.8.3/changelogs/CHANGELOG-v2.8.rst --- sysutils/ansible/Makefile | 2 +- sysutils/ansible/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 3111733b896d..22895860c716 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ansible -PORTVERSION?= 2.8.2 +PORTVERSION?= 2.8.3 PORTREVISION?= 0 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo index cdacd18696ee..f811ec9ca93c 100644 --- a/sysutils/ansible/distinfo +++ b/sysutils/ansible/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562452893 -SHA256 (ansible-2.8.2.tar.gz) = 1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730 -SIZE (ansible-2.8.2.tar.gz) = 14328267 +TIMESTAMP = 1565565728 +SHA256 (ansible-2.8.3.tar.gz) = 05f9ed3ca3e06dffaa87a73a8e6f7f322825bc3f609f8b71c4fe22dbbdf72abc +SIZE (ansible-2.8.3.tar.gz) = 14343746 -- cgit From 945fa7a9229ce00c86ac119b14b7c12ebd8f3f3a Mon Sep 17 00:00:00 2001 From: lifanov Date: Sun, 11 Aug 2019 23:29:35 +0000 Subject: update sysutils/terraform to 0.12.6 --- sysutils/terraform/Makefile | 2 +- sysutils/terraform/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile index 7bfbd4df53a5..c9e899ffbd7e 100644 --- a/sysutils/terraform/Makefile +++ b/sysutils/terraform/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= terraform -PORTVERSION= 0.12.3 +PORTVERSION= 0.12.6 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo index 8ffb60f1e541..d0d0d0910c62 100644 --- a/sysutils/terraform/distinfo +++ b/sysutils/terraform/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562454535 -SHA256 (hashicorp-terraform-v0.12.3_GH0.tar.gz) = 7114326641fd5b1ab52d0d3e55a876fdc2bbc5e6869b25b291503faa68c875be -SIZE (hashicorp-terraform-v0.12.3_GH0.tar.gz) = 9702723 +TIMESTAMP = 1565566051 +SHA256 (hashicorp-terraform-v0.12.6_GH0.tar.gz) = df108a45f5ba2658eed844c3a6647117324c99770e06cbd549b26dd7c20ee623 +SIZE (hashicorp-terraform-v0.12.6_GH0.tar.gz) = 9728742 -- cgit From 3f6ead54db30bbbd38854e43ed09691fdb6b5e93 Mon Sep 17 00:00:00 2001 From: lifanov Date: Sun, 11 Aug 2019 23:32:46 +0000 Subject: update sysutils/debootstrap to 1.0.115 --- sysutils/debootstrap/Makefile | 4 ++-- sysutils/debootstrap/distinfo | 6 +++--- sysutils/debootstrap/pkg-plist | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index 30c11e95ea7f..ba8d840c9d53 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.114 +PORTVERSION= 1.0.115 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/debian/copyright RUN_DEPENDS= wget:ftp/wget -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes NO_ARCH= yes USES= gmake perl5 diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index 606067c1f641..a2b77321d24a 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551669104 -SHA256 (debootstrap_1.0.114.tar.gz) = a8e1456816a9ed55bf329de1cc93a199ad2099a21a66804b78e1aa0e170a9c92 -SIZE (debootstrap_1.0.114.tar.gz) = 75613 +TIMESTAMP = 1565566198 +SHA256 (debootstrap_1.0.115.tar.gz) = e4811165e02b027feb6a299aa354bcecc351ba273db9f56b072e246ff2b1d4e8 +SIZE (debootstrap_1.0.115.tar.gz) = 75691 diff --git a/sysutils/debootstrap/pkg-plist b/sysutils/debootstrap/pkg-plist index 157ec1398a6c..6dcbbec1037f 100644 --- a/sysutils/debootstrap/pkg-plist +++ b/sysutils/debootstrap/pkg-plist @@ -16,6 +16,7 @@ man/man8/debootstrap.8.gz %%DATADIR%%/scripts/debian-common %%DATADIR%%/scripts/disco %%DATADIR%%/scripts/edgy +%%DATADIR%%/scripts/eoan %%DATADIR%%/scripts/etch %%DATADIR%%/scripts/etch-m68k %%DATADIR%%/scripts/feisty -- cgit From 109b9ca20c4c6bef2c2d899e5fcdef582611a0e5 Mon Sep 17 00:00:00 2001 From: lifanov Date: Sun, 11 Aug 2019 23:34:16 +0000 Subject: update games/wtf to 20190728 snapshot from NetBSD --- games/wtf/Makefile | 2 +- games/wtf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games/wtf/Makefile b/games/wtf/Makefile index f91fa380278b..125f88beed0e 100644 --- a/games/wtf/Makefile +++ b/games/wtf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wtf -PORTVERSION= 20190705 +PORTVERSION= 20190728 CATEGORIES= games MASTER_SITES= SF/bsdwtf diff --git a/games/wtf/distinfo b/games/wtf/distinfo index 1f7f2d1ef1af..3d9bbdefce84 100644 --- a/games/wtf/distinfo +++ b/games/wtf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562454435 -SHA256 (wtf-20190705.tar.gz) = 6db1be765ed96f9ebfea66cae6e4558fcaddd6ff29328a7e44a26db4fe9ffcbc -SIZE (wtf-20190705.tar.gz) = 29515 +TIMESTAMP = 1565566396 +SHA256 (wtf-20190728.tar.gz) = 2122466d52a7b879598ae154bef5e2cccb161cd3e19e69be96a6ea9678e86f34 +SIZE (wtf-20190728.tar.gz) = 29623 -- cgit From 2c5a0b9d39f8a6b59bb4d24e0f674feb7ce9ce5e Mon Sep 17 00:00:00 2001 From: koobs Date: Mon, 12 Aug 2019 01:11:25 +0000 Subject: textproc/py-sphinxcontrib-bitbucket: Fix Python 3 build/run Fix Python 3 build, identified while testing devel/py-virtualenvwrapper: Exception occurred: File "/usr/local/lib/python3.7/site-packages/sphinx/registry.py", line 196, in load_extension mod = __import__(extname, None, None, ['setup']) File "/usr/local/lib/python3.7/site-packages/sphinxcontrib/bitbucket.py", line 26 except AttributeError, err: ^ SyntaxError: invalid syntax While I'm here, level up ports/python compliance: - Add python to CATEGORIES - Add LICENSE/LICENSE_FILE - Add NO_ARCH - Add missing RUN_DEPENDS - Correct RUN_DEPENDS version-specs Approved by: portmgr (blanket(s): build fix, ports compliance, dependencies) MFH: 2019Q3 --- textproc/py-sphinxcontrib-bitbucket/Makefile | 12 +++++++++--- textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py | 6 +++--- .../files/patch-sphinxcontrib_bitbucket.py | 13 +++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile index 0773c7387441..bee7529967d4 100644 --- a/textproc/py-sphinxcontrib-bitbucket/Makefile +++ b/textproc/py-sphinxcontrib-bitbucket/Makefile @@ -3,17 +3,23 @@ PORTNAME= sphinxcontrib-bitbucket PORTVERSION= 1.0 -PORTREVISION= 1 -CATEGORIES= textproc +PORTREVISION= 2 +CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= Sphinx/BitBucket integration -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.6:textproc/py-docutils@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes + .include diff --git a/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py b/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py index 88df160f2416..a224b3f67c2a 100644 --- a/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py +++ b/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py @@ -1,5 +1,5 @@ ---- ./setup.py.orig 2012-08-20 21:53:58.000000000 +0200 -+++ ./setup.py 2012-08-20 21:54:10.000000000 +0200 +--- setup.py.orig 2011-04-24 16:19:59 UTC ++++ setup.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- @@ -10,7 +10,7 @@ from setuptools import setup, find_packages try: -@@ -43,5 +39,4 @@ +@@ -43,5 +39,4 @@ setup( include_package_data=True, install_requires=requires, namespace_packages=['sphinxcontrib'], diff --git a/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py b/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py new file mode 100644 index 000000000000..23f8b9253af6 --- /dev/null +++ b/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py @@ -0,0 +1,13 @@ +# Fix Python 3 build + +--- sphinxcontrib/bitbucket.py.orig 2019-08-11 09:19:09 UTC ++++ sphinxcontrib/bitbucket.py +@@ -23,7 +23,7 @@ def make_link_node(rawtext, app, type, slug, options): + base = app.config.bitbucket_project_url + if not base: + raise AttributeError +- except AttributeError, err: ++ except AttributeError as err: + raise ValueError('bitbucket_project_url configuration value is not set (%s)' % str(err)) + # + slash = '/' if base[-1] != '/' else '' -- cgit From e99d97f74e166fad6ef8c7a953896da68194fac4 Mon Sep 17 00:00:00 2001 From: koobs Date: Mon, 12 Aug 2019 01:33:35 +0000 Subject: devel/py-virtualenvwrapper: Allow Python 3 builds virtualenvwrapper supports Python 3, remove unnecessary limitation on 2.7 accordingly. A dependency (sphinxcontrib-bitbucket) Python 3 build/run error was fixed in ports r508699, which is required by virtualenvwrapper for its DOCS option/build. While I'm here: - Level up ports compliance (NO_ARCH, USES/USE order) - Remove unecessary DOCS_VARS DOCSDIR override (concurrent does this) - Patch virtualenvwrapper command invocations (virtualenv, virtualenv-clone) to use Python version-specific filenames Approved by: portmgr (blanket(s): ports compliance, python compliance) MFH: 2019Q3 --- devel/py-virtualenvwrapper/Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile index c4b8cc30a9c4..6a403bdaf8d5 100644 --- a/devel/py-virtualenvwrapper/Makefile +++ b/devel/py-virtualenvwrapper/Makefile @@ -3,7 +3,7 @@ PORTNAME= virtualenvwrapper PORTVERSION= 4.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,20 +19,24 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone@${PY_FLAVOR} +# Actually 2.6-2.7,3.3-3.6 +USES= python +USE_PYTHON= autoplist concurrent distutils + OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${PY_FLAVOR} +DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx \ + PYDISTUTILS_BUILDARGS="-a -E" -USES= python:2.7 -USE_PYTHON= autoplist concurrent distutils - -DOCS_VARS= DOCSDIR=${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} \ - PYDISTUTILS_BUILD_TARGET+=build_sphinx \ - PYDISTUTILS_BUILDARGS="-a -E" +NO_ARCH= yes post-patch: - @${REINPLACE_CMD} -e 's|$$(command \\which python)|${PYTHON_CMD}|1' \ + @${REINPLACE_CMD} \ + -e 's|$$(command \\which python)|${PYTHON_CMD}|1' \ + -e 's|="virtualenv"|="virtualenv${UNIQUE_SUFFIX}"|1' \ + -e 's|="virtualenv-clone"|="virtualenv-clone${UNIQUE_SUFFIX}"|1' \ ${WRKSRC}/${PORTNAME}.sh post-patch-DOCS-on: -- cgit From bf4c61cab826477255c2c6105c8ec52e50fcec04 Mon Sep 17 00:00:00 2001 From: glewis Date: Mon, 12 Aug 2019 04:05:58 +0000 Subject: Workaround for infinite recursion crash * FreeBSD crashes on infinite recursion rather than throwing a stack overflow because the stack address of the fault is in the page below the guard area. Workaround this by rounding down the fault address to the nearest page boundary. Investigation is still under way into what may be causing this but this appears to prevent it in simple test cases. PR: 222146 --- java/openjdk8/Makefile | 1 + .../patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 6421cbffb776..1c1e27d8bf56 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,6 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}.${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp new file mode 100644 index 000000000000..f90ed6a5ba19 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp @@ -0,0 +1,12 @@ +--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2019-08-11 09:24:22.211149000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2019-08-11 09:25:08.826582000 -0700 +@@ -470,6 +470,9 @@ + // Handle ALL stack overflow variations here + if (sig == SIGSEGV || sig == SIGBUS) { + address addr = (address) info->si_addr; ++#ifdef __FreeBSD__ ++ addr = (unsigned char*) align_ptr_down(addr, os::vm_page_size()); ++#endif + + // check if fault address is within thread stack + if (addr < thread->stack_base() && -- cgit From cf8dc0eefedbd254bb6d03cd2ee1176921c4cb3a Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 12 Aug 2019 04:44:24 +0000 Subject: Whitespace adjustment. --- shells/ksh93/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 69034ecc9b39..0735302b3cde 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ksh93 -DISTVERSION=2020.0.0-alpha1 +DISTVERSION= 2020.0.0-alpha1 PORTEPOCH= 1 PORTREVISION= 3 CATEGORIES= shells -- cgit From 29b17769665fe091b4ab4dbcd49e1fdd740490d5 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 12 Aug 2019 04:44:37 +0000 Subject: Mark broken when USE_GCC=9. Upstream git commit 63e9edcb6084d4b164439065e2d71f3e900ec3c7 resolves this issue. Unfortunately it does not apply, requiring this port to be upated to ksh93 well into ksh93-devel. Bringing ksh93 up to the ksh93-devel or shy of it would negate the justification for ksh93's existence. It is therefore recommended that people use ksh93-devel on architectures that use GCC 9 or use GCC 8. PR: 239644 Reported by: pkubaj@ --- shells/ksh93/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 0735302b3cde..c522487e449b 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -13,6 +13,10 @@ LICENSE= EPL USES= compiler:c11 meson ninja python:build +.if ${USE_GCC} == "9" +BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel +.endif + USE_GITHUB= yes GH_ACCOUNT= att GH_PROJECT= ast -- cgit From 7629d0448a9cae00ecf76981ecc2903a0a0622b7 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 12 Aug 2019 05:15:20 +0000 Subject: Update to the latest att/ast github commit. --- shells/ksh93-devel/Makefile | 4 ++-- shells/ksh93-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shells/ksh93-devel/Makefile b/shells/ksh93-devel/Makefile index 302a3fbb4f5d..505de38b7ec1 100644 --- a/shells/ksh93-devel/Makefile +++ b/shells/ksh93-devel/Makefile @@ -12,8 +12,8 @@ LICENSE= EPL USES= compiler:c11 meson ninja python:build -HASH= 8d91e8a -AST_COMMIT_DATE= 2019.08.04 +HASH= 5981a47 +AST_COMMIT_DATE= 2019.08.11 USE_GITHUB= yes GH_ACCOUNT= att diff --git a/shells/ksh93-devel/distinfo b/shells/ksh93-devel/distinfo index 2b666d2e7d27..dce1a5edf573 100644 --- a/shells/ksh93-devel/distinfo +++ b/shells/ksh93-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564938790 -SHA256 (att-ast-2019.08.04-8d91e8a_GH0.tar.gz) = 481fcbe7716ea00d0c1c3ab7e5533d73406bd169ada8555b5c2ca1c37d8cd82b -SIZE (att-ast-2019.08.04-8d91e8a_GH0.tar.gz) = 2030322 +TIMESTAMP = 1565586115 +SHA256 (att-ast-2019.08.11-5981a47_GH0.tar.gz) = 06dee9b25b8b332431abf32b5a5306d9308aea91deeb40edae9e08e86dbd8dbd +SIZE (att-ast-2019.08.11-5981a47_GH0.tar.gz) = 2027446 -- cgit From e395930d80340fc3e74121ba475091037d9dc4a5 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 12 Aug 2019 05:15:24 +0000 Subject: Update to the latest MIT KRB5 github commit. --- security/krb5-devel/Makefile | 4 ++-- security/krb5-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 489277ffee6c..4f6779925906 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -7,8 +7,8 @@ CATEGORIES= security .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel .endif -HASH= dd402f9 -MIT_COMMIT_DATE= 2019.08.04 +HASH= d81c587 +MIT_COMMIT_DATE= 2019.08.11 PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 diff --git a/security/krb5-devel/distinfo b/security/krb5-devel/distinfo index caceb3cace4c..823135df0b41 100644 --- a/security/krb5-devel/distinfo +++ b/security/krb5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564938864 -SHA256 (krb5-krb5-1.18.2019.08.04-dd402f9_GH0.tar.gz) = e1db23f11130b4eb293fe7318b33891cadd0fd81fee5bcb65b14c90810bddbfc -SIZE (krb5-krb5-1.18.2019.08.04-dd402f9_GH0.tar.gz) = 5141959 +TIMESTAMP = 1565586493 +SHA256 (krb5-krb5-1.18.2019.08.11-d81c587_GH0.tar.gz) = a2bef8562e473e200a9f994b14b481e70a42b52f539e549c85098e05d270bebc +SIZE (krb5-krb5-1.18.2019.08.11-d81c587_GH0.tar.gz) = 5142348 -- cgit From a23f3c266f10b5d44695e4dc4b713113c2f9839d Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 12 Aug 2019 05:15:28 +0000 Subject: Update to the latest cfengine gitub commit. --- sysutils/cfengine-devel/Makefile | 4 ++-- sysutils/cfengine-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile index 95386301b218..30971ab1ecad 100644 --- a/sysutils/cfengine-devel/Makefile +++ b/sysutils/cfengine-devel/Makefile @@ -6,8 +6,8 @@ PORTVERSION= 3.${CFENGINE_COMMIT_DATE} CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/ PKGNAMESUFFIX= -devel -HASH= 27fe45e -CFENGINE_COMMIT_DATE= 2019.08.04 +HASH= b417fb6 +CFENGINE_COMMIT_DATE= 2019.08.11 MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo index 74f3528072e7..7887c2894af0 100644 --- a/sysutils/cfengine-devel/distinfo +++ b/sysutils/cfengine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564940284 -SHA256 (cfengine-core-3.2019.08.04-27fe45e_GH0.tar.gz) = dc9643d3f28e417ff398a9cd33eb76566f04c1cd7363f1a7b4ddf360364805b2 -SIZE (cfengine-core-3.2019.08.04-27fe45e_GH0.tar.gz) = 2241040 +TIMESTAMP = 1565586651 +SHA256 (cfengine-core-3.2019.08.11-b417fb6_GH0.tar.gz) = 5b2404411b0f3dabd5e3005e5e0ba812921055ad1b572da10781b8aa072717bd +SIZE (cfengine-core-3.2019.08.11-b417fb6_GH0.tar.gz) = 2384367 -- cgit From 2877816ba78abeeb84ae6efdea2e2dc5ddf8e452 Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 07:17:09 +0000 Subject: shells/ksh93: Attempt to fix r508705 and unbreak index It fails basic sanity checks: make: "/usr/ports/shells/ksh93/Makefile" line 16: Malformed conditional (${USE_GCC} == "9") make: Fatal errors encountered -- cannot continue make: stopped in /usr/ports/shells/ksh93 PR: 239644 Pointy hat: cy --- shells/ksh93/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index c522487e449b..f33d860f18b3 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -13,10 +13,6 @@ LICENSE= EPL USES= compiler:c11 meson ninja python:build -.if ${USE_GCC} == "9" -BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel -.endif - USE_GITHUB= yes GH_ACCOUNT= att GH_PROJECT= ast @@ -38,7 +34,11 @@ KSH93_EXTRA_PATCHES= ${FILESDIR}/extra-patch-install-as-ksh93 KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} >= 90 +BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel +.endif post-patch: @${REINPLACE_CMD} -e '/for name in/ s|python.*|${PYTHON_CMD}|g' ${WRKSRC}/scripts/python.sh @@ -50,4 +50,4 @@ post-patch: @# Keep portlint happy .endif -.include +.include -- cgit From 7e9b7daed469027bd39aa237a32c2e1072aab919 Mon Sep 17 00:00:00 2001 From: gerald Date: Mon, 12 Aug 2019 07:30:34 +0000 Subject: Ensure _GNU_SOURCE is now longer defined on powerpc64 (which was a regression from the GCC 8 series). The technical background is that a consolidation in upstream GCC made non-GNU platforms include gnu-user.h and then undefined some macros in rs6000/freebsd.h, but missed doing the same in rs6000/freebsd64.h. The has now been included upstream and the current snapshot that the lang/gcc9-devel port tracks; carrying files/patch-powerpc64-no-_GNU_SOURCE in this port should become obsolete with the GCC 9.2 release. (As this should be a very short-lived measure, bump PORTREVISION only for powerpc64 to avoid all other users having to rebuild, too.) PR: 239648 --- lang/gcc9/Makefile | 1 + lang/gcc9/files/patch-powerpc64-no-_GNU_SOURCE | 27 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lang/gcc9/files/patch-powerpc64-no-_GNU_SOURCE diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile index 8b938485bfc0..5391c548f67a 100644 --- a/lang/gcc9/Makefile +++ b/lang/gcc9/Makefile @@ -61,6 +61,7 @@ CONFIGURE_ARGS+= --disable-multilib CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .elif ${ARCH} == powerpc64 +PORTREVISION= 2 CONFIGURE_ENV+= UNAME_m="powerpc64" USE_GCC= 8 .endif diff --git a/lang/gcc9/files/patch-powerpc64-no-_GNU_SOURCE b/lang/gcc9/files/patch-powerpc64-no-_GNU_SOURCE new file mode 100644 index 000000000000..4303b436fb9d --- /dev/null +++ b/lang/gcc9/files/patch-powerpc64-no-_GNU_SOURCE @@ -0,0 +1,27 @@ +r274105 | amodra | 2019-08-05 01:52:33 +0000 + +PR91349, powerpc64*-*-freebsd* defines _GNU_SOURCE + +rev 266496 (git ab6b1bb456) undefined some macros in rs6000/freebsd.h +but missed doing the same in rs6000/freebsd64.h. + + PR target/91349 + * config/rs6000/freebsd64.h (CPLUSPLUS_CPP_SPEC), + (LINK_GCC_C_SEQUENCE_SPEC): Undef. + +--- UTC +Index: gcc/config/rs6000/freebsd64.h +=================================================================== +--- gcc/config/rs6000/freebsd64.h (revision 274104) ++++ gcc/config/rs6000/freebsd64.h (revision 274105) +@@ -17,6 +17,10 @@ + along with GCC; see the file COPYING3. If not see + . */ + ++/* Undef gnu-user.h macros we don't want. */ ++#undef CPLUSPLUS_CPP_SPEC ++#undef LINK_GCC_C_SEQUENCE_SPEC ++ + /* Override the defaults, which exist to force the proper definition. */ + + #ifdef IN_LIBGCC2 -- cgit From 42d73528ad9da15f2110bc3b16ae373addc8bf36 Mon Sep 17 00:00:00 2001 From: egypcio Date: Mon, 12 Aug 2019 08:15:05 +0000 Subject: [NEW] devel/go-bindata-assetfs: serves embedded files with net/http support go-bindata-assetfs serves embedded files from go-bindata with Go's net/http support, allowing packages to serve http static content. WWW: https://github.com/elazarl/go-bindata-assetfs --- devel/Makefile | 1 + devel/go-bindata-assetfs/Makefile | 33 +++++++++++++++++++++++++++++++++ devel/go-bindata-assetfs/distinfo | 7 +++++++ devel/go-bindata-assetfs/pkg-descr | 4 ++++ 4 files changed, 45 insertions(+) create mode 100644 devel/go-bindata-assetfs/Makefile create mode 100644 devel/go-bindata-assetfs/distinfo create mode 100644 devel/go-bindata-assetfs/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index bad99cb21ff2..de276250109b 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -851,6 +851,7 @@ SUBDIR += gnustep SUBDIR += gnustep-make SUBDIR += go-bindata + SUBDIR += go-bindata-assetfs SUBDIR += go-git SUBDIR += go-glide SUBDIR += go-godef diff --git a/devel/go-bindata-assetfs/Makefile b/devel/go-bindata-assetfs/Makefile new file mode 100644 index 000000000000..766c3fc6c2e8 --- /dev/null +++ b/devel/go-bindata-assetfs/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= go-bindata-assetfs +PORTVERSION= g20180223 +CATEGORIES= devel www + +MAINTAINER= egypcio@FreeBSD.org +COMMENT= Serves embedded files from go-bindata with Go's net/http support + +LICENSE= BSD2CLAUSE + +RUN_DEPENDS= go-bindata>=0:devel/go-bindata + +USES= go +USE_GITHUB= nodefault + +GO_PKGNAME= github.com/elazarl/${PORTNAME}/${PORTNAME} +GH_TUPLE= elazarl:${PORTNAME}:38087fe:elazarl_gbd/github.com/elazarl/${PORTNAME} \ + golang:net:ca1201d:golang_net/golang.org/x/net \ + golang:sys:51ab0e2:golang_sys/golang.org/x/sys \ + +PLIST_FILES= bin/${PORTNAME} + +do-build: + @cd ${WRKSRC} && \ + ${RLN} ${WRKSRC} src && \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} \ + build ${GO_BUILDFLAGS} -o bin/${PORTNAME} ${GO_PKGNAME} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + +.include diff --git a/devel/go-bindata-assetfs/distinfo b/devel/go-bindata-assetfs/distinfo new file mode 100644 index 000000000000..dcf7c7b71c4c --- /dev/null +++ b/devel/go-bindata-assetfs/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1565348812 +SHA256 (elazarl-go-bindata-assetfs-38087fe_GH0.tar.gz) = b08df214d8cc9e4004fc399414cbe18de80f666a38ad49d79c34f7378e2f13c8 +SIZE (elazarl-go-bindata-assetfs-38087fe_GH0.tar.gz) = 3988 +SHA256 (golang-net-ca1201d_GH0.tar.gz) = d70d188cea7e5c254eac97d3a63e6b959b18c159cb0393cd38e01277fe377eff +SIZE (golang-net-ca1201d_GH0.tar.gz) = 1099085 +SHA256 (golang-sys-51ab0e2_GH0.tar.gz) = dc0fffb69ff5a4e83b3bf3d4817b8cacfa85f36ab93855030e3ce8937cc89b88 +SIZE (golang-sys-51ab0e2_GH0.tar.gz) = 1454786 diff --git a/devel/go-bindata-assetfs/pkg-descr b/devel/go-bindata-assetfs/pkg-descr new file mode 100644 index 000000000000..64e7238a2ebb --- /dev/null +++ b/devel/go-bindata-assetfs/pkg-descr @@ -0,0 +1,4 @@ +go-bindata-assetfs serves embedded files from go-bindata with Go's net/http +support, allowing packages to serve static content. + +WWW: https://github.com/elazarl/go-bindata-assetfs -- cgit From cfdb820bac632039bfc810b1997c2b6138a5257a Mon Sep 17 00:00:00 2001 From: danfe Date: Mon, 12 Aug 2019 08:30:42 +0000 Subject: Update `archivers/libdeflate' to version 1.3. Reported by: portscout --- archivers/libdeflate/Makefile | 2 +- archivers/libdeflate/distinfo | 6 +++--- archivers/libdeflate/files/patch-Makefile | 29 +++++++++++++---------------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/archivers/libdeflate/Makefile b/archivers/libdeflate/Makefile index 333e4244dc13..7d93d0898b60 100644 --- a/archivers/libdeflate/Makefile +++ b/archivers/libdeflate/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdeflate -PORTVERSION= 1.2 +PORTVERSION= 1.3 DISTVERSIONPREFIX= v CATEGORIES= archivers diff --git a/archivers/libdeflate/distinfo b/archivers/libdeflate/distinfo index 19075c16bdbd..9f7c2b4426cc 100644 --- a/archivers/libdeflate/distinfo +++ b/archivers/libdeflate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547530668 -SHA256 (ebiggers-libdeflate-v1.2_GH0.tar.gz) = d30203c3a2fae6cee70d52a59cc668740f806a4bb9eb6668930fb7de99464d90 -SIZE (ebiggers-libdeflate-v1.2_GH0.tar.gz) = 133494 +TIMESTAMP = 1565570198 +SHA256 (ebiggers-libdeflate-v1.3_GH0.tar.gz) = 09a23f5a6bf74789605a452364fae2156627a0a62a3de2a82ceb362982a87f0b +SIZE (ebiggers-libdeflate-v1.3_GH0.tar.gz) = 134207 diff --git a/archivers/libdeflate/files/patch-Makefile b/archivers/libdeflate/files/patch-Makefile index 782d449bfe53..ec9073c9e42e 100644 --- a/archivers/libdeflate/files/patch-Makefile +++ b/archivers/libdeflate/files/patch-Makefile @@ -1,27 +1,24 @@ ---- Makefile.orig 2019-01-15 05:37:48 UTC +--- Makefile.orig 2019-08-12 00:36:38 UTC +++ Makefile -@@ -21,7 +21,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o +@@ -41,7 +41,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o 1>&2 2>/dev/null; then echo $(1); fi) override CFLAGS := \ -- $(CFLAGS) -O2 -fomit-frame-pointer -std=c99 -I. -Icommon \ +- -O2 -fomit-frame-pointer $(CFLAGS) -std=c99 -I. -Icommon \ + $(CFLAGS) -std=c99 -I. -Icommon \ -Wall -Wundef \ $(call cc-option,-Wpedantic) \ $(call cc-option,-Wdeclaration-after-statement) \ -@@ -240,11 +240,11 @@ DEFAULT_TARGETS += gunzip$(PROG_SUFFIX) - all:$(DEFAULT_TARGETS) - +@@ -267,10 +267,10 @@ all:$(DEFAULT_TARGETS) install:all -- install -Dm644 -t $(DESTDIR)$(PREFIX)/lib $(STATIC_LIB) -- install -Dm755 -t $(DESTDIR)$(PREFIX)/lib $(SHARED_LIB) -+ install -m644 $(STATIC_LIB) $(DESTDIR)$(PREFIX)/lib -+ install -s -m755 $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib - ln -sf $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib/libdeflate.so -- install -Dm644 -t $(DESTDIR)$(PREFIX)/include libdeflate.h -- install -Dm755 gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip -+ install -m644 libdeflate.h $(DESTDIR)$(PREFIX)/include -+ install -s -m755 gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip - ln -f $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip + install -d $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR) + install -m644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR) +- install -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR) ++ install -s -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR) + ln -sf $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/libdeflate.so + install -m644 libdeflate.h $(DESTDIR)$(INCDIR) +- install -m755 gzip $(DESTDIR)$(BINDIR)/libdeflate-gzip ++ install -s -m755 gzip $(DESTDIR)$(BINDIR)/libdeflate-gzip + ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip $(DESTDIR)$(BINDIR)/libdeflate-gunzip uninstall: -- cgit From 75901826dc0052904b1c9730d44a5e29ab4d71db Mon Sep 17 00:00:00 2001 From: tijl Date: Mon, 12 Aug 2019 08:51:54 +0000 Subject: Update to 2.0.10. MFH: 2019Q3 (2.0.9 is now unfetchable) --- devel/linux-c7-sdl20/Makefile | 2 +- devel/linux-c7-sdl20/distinfo | 10 +++++----- devel/linux-c7-sdl20/pkg-plist.amd64 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devel/linux-c7-sdl20/Makefile b/devel/linux-c7-sdl20/Makefile index 98d736cbd3bd..eb8cf50d4e6f 100644 --- a/devel/linux-c7-sdl20/Makefile +++ b/devel/linux-c7-sdl20/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sdl20 -PORTVERSION= 2.0.9 +PORTVERSION= 2.0.10 DISTVERSIONSUFFIX= -1.el7 CATEGORIES= devel linux MASTER_SITES= EPEL7/s diff --git a/devel/linux-c7-sdl20/distinfo b/devel/linux-c7-sdl20/distinfo index 2825086c351c..c93ed754cee7 100644 --- a/devel/linux-c7-sdl20/distinfo +++ b/devel/linux-c7-sdl20/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1544528706 -SHA256 (centos/SDL2-2.0.9-1.el7.x86_64.rpm) = fdd8b5aa46b13fc1f6dd5f19979e6aca6005426d7c33ce1841f5d27b95a4ea1c -SIZE (centos/SDL2-2.0.9-1.el7.x86_64.rpm) = 440564 -SHA256 (centos/SDL2-2.0.9-1.el7.src.rpm) = 1216b997989f9d6e401e46a3ab0febf7dc64de56184f6553961bb01d7f81dae8 -SIZE (centos/SDL2-2.0.9-1.el7.src.rpm) = 5182836 +TIMESTAMP = 1565599308 +SHA256 (centos/SDL2-2.0.10-1.el7.x86_64.rpm) = 8b046118e735af049157b5110398f495e5a19e76f9b7eb909e56ad5d5affbd69 +SIZE (centos/SDL2-2.0.10-1.el7.x86_64.rpm) = 458772 +SHA256 (centos/SDL2-2.0.10-1.el7.src.rpm) = 72db9f364453cadb8acf74f97766210505d68e803b2e5dd72ac9817b820551cb +SIZE (centos/SDL2-2.0.10-1.el7.src.rpm) = 5483963 diff --git a/devel/linux-c7-sdl20/pkg-plist.amd64 b/devel/linux-c7-sdl20/pkg-plist.amd64 index a07dd3f80f80..7b6fd1631b8c 100644 --- a/devel/linux-c7-sdl20/pkg-plist.amd64 +++ b/devel/linux-c7-sdl20/pkg-plist.amd64 @@ -1,6 +1,6 @@ usr/lib64/libSDL2-2.0.so.0 -usr/lib64/libSDL2-2.0.so.0.9.0 +usr/lib64/libSDL2-2.0.so.0.10.0 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt %%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt -usr/share/licenses/SDL2-2.0.9/COPYING.txt +usr/share/licenses/SDL2-2.0.10/COPYING.txt -- cgit From d90b70c7f17219876ceb4de1771834de2ce16ec6 Mon Sep 17 00:00:00 2001 From: arrowd Date: Mon, 12 Aug 2019 08:59:46 +0000 Subject: devel/elfio: Update to 3.4. Submitted by: james.wright@digital-chaos.com (maintainer) Differential Revision: https://reviews.freebsd.org/D21185 --- devel/elfio/Makefile | 4 ++-- devel/elfio/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile index 2626e2c3599f..9cc1dd37645d 100644 --- a/devel/elfio/Makefile +++ b/devel/elfio/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= elfio -PORTVERSION= 3.3 -PORTREVISION= 1 +PORTVERSION= 3.4 +PORTREVISION= CATEGORIES= devel MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION} diff --git a/devel/elfio/distinfo b/devel/elfio/distinfo index 1ec15916ec02..386f17b27c1e 100644 --- a/devel/elfio/distinfo +++ b/devel/elfio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554830757 -SHA256 (elfio-3.3.tar.gz) = d931d72c9c8bda130b3716fcf6671aded2127d8f3903cf34669311296c89b5c2 -SIZE (elfio-3.3.tar.gz) = 881052 +TIMESTAMP = 1565225926 +SHA256 (elfio-3.4.tar.gz) = 2613b19546092e7644f55c0fd1da09358b77a654a52f04bf9b88b91dc5fe87e9 +SIZE (elfio-3.4.tar.gz) = 880981 -- cgit From 081a23591999dfe1322fc8644680880b10a4a268 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 12 Aug 2019 09:02:31 +0000 Subject: - Update WWW Approved by: portmgr blanket --- security/cryptopp/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/cryptopp/pkg-descr b/security/cryptopp/pkg-descr index d21d6769558a..3481776dd7f1 100644 --- a/security/cryptopp/pkg-descr +++ b/security/cryptopp/pkg-descr @@ -4,4 +4,4 @@ copyrighted) source code. Although the library is copyrighted as a compilation, the individual files in it (except for a few exceptions listed in the license) are in the public domain. -WWW: http://www.cryptopp.com/ +WWW: https://www.cryptopp.com/ -- cgit From 639a87c172f5ed0022811273dad3a4439411d155 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 12 Aug 2019 09:32:58 +0000 Subject: science/erkale: Update g20190412 -> g20190812 --- science/erkale/Makefile | 7 ++++--- science/erkale/distinfo | 6 +++--- science/erkale/pkg-message | 7 ------- science/erkale/pkg-plist | 1 + 4 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 science/erkale/pkg-message diff --git a/science/erkale/Makefile b/science/erkale/Makefile index f6474271497a..ff2c8414d322 100644 --- a/science/erkale/Makefile +++ b/science/erkale/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= erkale -DISTVERSION= g20190412 -PORTREVISION= 3 +DISTVERSION= g20190812 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -22,6 +21,7 @@ LIB_DEPENDS= libderiv.so:science/libint \ libopenblas.so:math/openblas \ libsz.so:science/szip \ libxc.so:science/libxc +xRUN_DEPENDS= erkale-pseudopotentials>=0:science/erkale-pseudopotentials FLAVORS= serial parallel FLAVOR?= ${FLAVORS:[1]} @@ -30,7 +30,7 @@ serial_PKGNAMESUFFIX= -serial USES= cmake:noninja fortran pkgconfig USE_GITHUB= yes GH_ACCOUNT= susilehtola -GH_TAGNAME= 695bd16 +GH_TAGNAME= b9279190bbd82fef33968e88bad706c8e213b6e4 USE_LDCONFIG= yes TEST_TARGET= test @@ -45,6 +45,7 @@ CMAKE_OFF= USE_OPENMP .else # parallel CMAKE_ON+= USE_OPENMP SUFFIX= _omp +LIB_DEPENDS+= libomp.so:devel/openmp .endif OPTIONS_SINGLE= LINALG diff --git a/science/erkale/distinfo b/science/erkale/distinfo index fee777ddbdc7..6e195c778844 100644 --- a/science/erkale/distinfo +++ b/science/erkale/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555189363 -SHA256 (susilehtola-erkale-g20190412-695bd16_GH0.tar.gz) = 7661d9d6a233ab37850e8d8f3047ae7fc778f1633c27859a2c7b10e3219302aa -SIZE (susilehtola-erkale-g20190412-695bd16_GH0.tar.gz) = 72662800 +TIMESTAMP = 1565601219 +SHA256 (susilehtola-erkale-g20190812-b9279190bbd82fef33968e88bad706c8e213b6e4_GH0.tar.gz) = fe518080a1cc3bf273bd74e2b47f63dd341bfc3c68841d73786adf90e1758882 +SIZE (susilehtola-erkale-g20190812-b9279190bbd82fef33968e88bad706c8e213b6e4_GH0.tar.gz) = 72700305 diff --git a/science/erkale/pkg-message b/science/erkale/pkg-message deleted file mode 100644 index 7a493549e4c4..000000000000 --- a/science/erkale/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -====================================================================== -You installed Erkale: a quantum chemistry program used to solve the -electronic structure of atoms. - -Most likely you also need to install erkale-pseudopotentials, a set of -pseudopotential files needed for almost every Erkale operation. -====================================================================== diff --git a/science/erkale/pkg-plist b/science/erkale/pkg-plist index 6e51a0713f4f..8f90c422211c 100644 --- a/science/erkale/pkg-plist +++ b/science/erkale/pkg-plist @@ -7,6 +7,7 @@ bin/erkale_copt_plateau%%SUFFIX%% bin/erkale_cube%%SUFFIX%% bin/erkale_emd%%SUFFIX%% bin/erkale_fchkpt%%SUFFIX%% +bin/erkale_genlinconf%%SUFFIX%% bin/erkale_geom%%SUFFIX%% bin/erkale_loc%%SUFFIX%% bin/erkale_pop%%SUFFIX%% -- cgit From 772f34e982f08d500a629ceb4b07f0ec75592cd4 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 12 Aug 2019 09:33:39 +0000 Subject: science/erkale: correction --- science/erkale/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/erkale/Makefile b/science/erkale/Makefile index ff2c8414d322..895d1d377371 100644 --- a/science/erkale/Makefile +++ b/science/erkale/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libderiv.so:science/libint \ libopenblas.so:math/openblas \ libsz.so:science/szip \ libxc.so:science/libxc -xRUN_DEPENDS= erkale-pseudopotentials>=0:science/erkale-pseudopotentials +RUN_DEPENDS= erkale-pseudopotentials>=0:science/erkale-pseudopotentials FLAVORS= serial parallel FLAVOR?= ${FLAVORS:[1]} -- cgit From be6b64bc0ca8e158c26dec9e2b98bc727a1e28f0 Mon Sep 17 00:00:00 2001 From: riggs Date: Mon, 12 Aug 2019 10:28:44 +0000 Subject: Update to upstream version 36.0.0 Details: - Bug fixes and enhancements, see https://mkvtoolnix.download/doc/NEWS.md MFH: 2019Q3 (hat: ports-secteam) --- multimedia/mkvtoolnix/Makefile | 3 +-- multimedia/mkvtoolnix/distinfo | 6 +++--- .../mkvtoolnix/files/patch-src_common_strings_editing.h | 11 ----------- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index c6d9fd53572c..46e530ac2dc1 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 35.0.0 -PORTREVISION= 1 +PORTVERSION= 36.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo index 628c5a404d51..9bd14f1cc64f 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563449672 -SHA256 (mkvtoolnix-35.0.0.tar.xz) = 5144e77ce0bd4653733bd07eed143870fb5cdcda31c5e943a3f22a069da4e6fd -SIZE (mkvtoolnix-35.0.0.tar.xz) = 7297244 +TIMESTAMP = 1565527855 +SHA256 (mkvtoolnix-36.0.0.tar.xz) = 2697321755a277fd499000b7888e6beced1a1d67230110f1d631b4b83922a704 +SIZE (mkvtoolnix-36.0.0.tar.xz) = 7304756 diff --git a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h deleted file mode 100644 index 46f2d2be90ff..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/strings/editing.h.orig 2019-06-22 10:06:04 UTC -+++ src/common/strings/editing.h -@@ -29,7 +29,7 @@ inline std::vector - split(std::string const &text, - std::string const &pattern = ",", - size_t max = 0) { -- return split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max); -+ return ::split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max); - } - - void strip(std::string &s, bool newlines = false); -- cgit From 6713ccc7be83295b46586dc1ae161def973b646d Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 10:34:22 +0000 Subject: Fix install for Perl > 5.10. (Yes, really.) PR: 239742 --- devel/cvslines/files/patch-INSTALL | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/devel/cvslines/files/patch-INSTALL b/devel/cvslines/files/patch-INSTALL index df0e8010cc13..6abc11a35d86 100644 --- a/devel/cvslines/files/patch-INSTALL +++ b/devel/cvslines/files/patch-INSTALL @@ -1,6 +1,6 @@ ---- INSTALL.orig Fri Apr 19 21:26:39 2002 -+++ INSTALL Wed Oct 8 09:22:22 2003 -@@ -73,7 +73,7 @@ +--- INSTALL.orig 2003-07-28 12:34:07 UTC ++++ INSTALL +@@ -73,7 +73,7 @@ sub x } @@ -9,7 +9,7 @@ ($u_os, $u_host, $u_osrel) = split(/\s+/, $uname); # Try to find things in the usual places, but failing those, -@@ -122,6 +122,7 @@ +@@ -122,6 +122,7 @@ if ($op eq "install") if ( ! ( ($u_os eq "SunOS" && $u_osrel =~ /^5\./) || ($u_os eq "SunOS" && $u_osrel =~ /^4\./) || ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./) @@ -17,7 +17,7 @@ || ($u_os eq "Linux"))) { print STDERR < Date: Mon, 12 Aug 2019 10:35:01 +0000 Subject: Fix install with Perl 5.30 and all future possible versions. PR: 239742. --- .../files/patch-pandora__agent__installer | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer diff --git a/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer b/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer new file mode 100644 index 000000000000..61a71caf4bb7 --- /dev/null +++ b/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer @@ -0,0 +1,17 @@ +--- pandora_agent_installer.orig 2019-08-12 10:17:59 UTC ++++ pandora_agent_installer +@@ -88,13 +88,9 @@ fi + + [ "$4" ] && PANDORA_PERL_PATH=$4 + +-# Check for Perl 5.6.x or higher available +-PERL_VERSION=`$PANDORA_PERL_PATH -v | egrep 'v5.[6-9]|v5.[12][0-9]' | grep perl` +- +-if [ -z "$PERL_VERSION" ] ++if ! perl -M5.006 -e 1 + then + echo "Perl 5.6.x or higher is not detected. This is required for Pandora FMS" +- echo "Detected: $PERL_VERSION " + echo "Aborting install..." + exit 2 + fi -- cgit From f2561e92d24fad5659bd62f193cb4d069caac911 Mon Sep 17 00:00:00 2001 From: cpm Date: Mon, 12 Aug 2019 10:39:48 +0000 Subject: www/chromium: Update to 76.0.3809.100 Changelog: https://chromium.googlesource.com/chromium/src/+log/75.0.3770.142..76.0.3809.100?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q3 --- www/chromium/Makefile | 8 +- www/chromium/distinfo | 10 +- www/chromium/files/patch-BUILD.gn | 22 +-- www/chromium/files/patch-base_BUILD.gn | 10 +- .../files/patch-base_allocator_allocator__shim.cc | 4 +- ...llocator__shim__default__dispatch__to__glibc.cc | 19 ++- ...__allocator_page__allocator__internals__posix.h | 6 +- www/chromium/files/patch-base_base__switches.cc | 20 +++ www/chromium/files/patch-base_base__switches.h | 20 +++ www/chromium/files/patch-base_cpu.cc | 38 ++++++ .../files/patch-base_files_file__path__watcher.cc | 11 ++ www/chromium/files/patch-base_files_file__util.h | 4 +- .../files/patch-base_files_scoped__file.cc | 11 ++ www/chromium/files/patch-base_i18n_icu__util.cc | 4 +- www/chromium/files/patch-base_logging__unittest.cc | 4 +- .../files/patch-base_process_process__metrics.cc | 20 ++- .../files/patch-base_process_process__metrics.h | 50 ++++--- ...patch-base_process_process__metrics__freebsd.cc | 147 ++++++++++++++++++++- ...profiler_stack__sampling__profiler__unittest.cc | 4 +- ...ing__heap__profiler_sampling__heap__profiler.cc | 8 +- .../files/patch-base_system_sys__info__posix.cc | 8 +- ...k_thread__pool_environment__config__unittest.cc | 11 ++ www/chromium/files/patch-build_config_BUILD.gn | 8 +- .../files/patch-build_config_compiler_BUILD.gn | 20 +-- .../files/patch-build_config_compiler_compiler.gni | 4 +- .../files/patch-build_config_linux_pkg-config.py | 10 +- .../files/patch-build_detect__host__arch.py | 4 +- www/chromium/files/patch-build_gn__run__binary.py | 4 +- www/chromium/files/patch-cc_BUILD.gn | 6 +- ...ler_compositor__frame__reporting__controller.cc | 11 -- .../files/patch-cc_trees_property__tree.cc | 4 +- ..._chrome__content__browser__overlay__manifest.cc | 20 +++ .../patch-chrome_app_chrome__main__delegate.cc | 35 +++-- .../files/patch-chrome_app_chromium__strings.grd | 8 +- .../patch-chrome_app_generated__resources.grd | 8 +- .../patch-chrome_app_google__chrome__strings.grd | 8 +- .../files/patch-chrome_app_settings__strings.grdp | 6 +- ...hrome_app_theme_chrome__unscaled__resources.grd | 11 +- .../files/patch-chrome_browser_about__flags.cc | 116 +++++++++++----- ...h-chrome_browser_after__startup__task__utils.cc | 14 +- .../patch-chrome_browser_browser__resources.grd | 12 +- .../patch-chrome_browser_chrome__browser__main.cc | 20 +-- ...ome_browser_chrome__content__browser__client.cc | 59 +++++---- ...rome_browser_chrome__content__browser__client.h | 4 +- ...download_chrome__download__manager__delegate.cc | 6 +- ...h-chrome_browser_download_download__commands.cc | 29 +++- ...ch-chrome_browser_download_download__commands.h | 6 +- ...hrome_browser_download_download__item__model.cc | 6 +- .../files/patch-chrome_browser_extensions_BUILD.gn | 4 +- ..._browser__context__keyed__service__factories.cc | 4 +- ..._browser_extensions_external__provider__impl.cc | 6 +- ...-chrome_browser_first__run_first__run__dialog.h | 11 ++ ...hrome_browser_first__run_first__run__internal.h | 18 +++ .../patch-chrome_browser_flag__descriptions.cc | 14 +- .../patch-chrome_browser_flag__descriptions.h | 13 +- ..._media_webrtc_webrtc__logging__handler__host.cc | 6 +- ...ser_metrics_chrome__metrics__service__client.cc | 4 +- ...er_metrics_process__memory__metrics__emitter.cc | 6 +- ...rowser_net_system__network__context__manager.cc | 10 +- ...d__manager_chrome__password__manager__client.cc | 4 +- ...onfiguration__policy__handler__list__factory.cc | 34 +++-- .../patch-chrome_browser_prefs_browser__prefs.cc | 22 +-- ...hrome__browser__main__extra__parts__profiles.cc | 12 +- ..._browser_profiles_profile__attributes__entry.cc | 4 +- ...r__context__menu_render__view__context__menu.cc | 8 +- ...h-chrome_browser_renderer__preferences__util.cc | 8 +- ...s_settings_appearance__page_appearance__page.js | 8 +- ...o__self_send__tab__to__self__client__service.cc | 11 ++ .../patch-chrome_browser_signin_signin__util.cc | 13 +- ...e_browser_ssl_ssl__error__controller__client.cc | 4 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 14 +- ...ome_browser_tracing_crash__service__uploader.cc | 4 +- ...rome_browser_ui_browser__command__controller.cc | 10 +- .../patch-chrome_browser_ui_browser__window.h | 4 +- ...browser_ui_startup_startup__browser__creator.cc | 4 +- .../files/patch-chrome_browser_ui_tab__helpers.cc | 4 +- ...h-chrome_browser_ui_toolbar_app__menu__model.cc | 4 +- ...s_chrome__browser__main__extra__parts__views.cc | 10 +- ...h-chrome_browser_ui_views_first__run__dialog.cc | 6 +- ...-chrome_browser_ui_views_frame_browser__view.cc | 6 +- ..._ui_views_frame_opaque__browser__frame__view.cc | 4 +- ..._ui_views_frame_system__menu__model__builder.cc | 8 +- ...hrome_browser_ui_views_tabs_new__tab__button.cc | 4 +- .../patch-chrome_browser_ui_views_tabs_tab.cc | 20 +++ ..._browser_ui_views_tabs_tab__drag__controller.cc | 10 +- ...i_webui_chrome__web__ui__controller__factory.cc | 10 +- ...tings_settings__localized__strings__provider.cc | 10 +- www/chromium/files/patch-chrome_common_BUILD.gn | 4 +- .../files/patch-chrome_common_chrome__features.cc | 15 +-- .../files/patch-chrome_common_chrome__features.h | 6 +- .../patch-chrome_common_chrome__paths__internal.h | 4 +- .../files/patch-chrome_common_chrome__switches.cc | 10 +- .../files/patch-chrome_common_chrome__switches.h | 10 +- ...h-chrome_common_extensions_api_api__sources.gni | 4 +- .../files/patch-chrome_common_features.gni | 6 +- .../files/patch-chrome_common_pref__names.cc | 10 +- .../files/patch-chrome_common_pref__names.h | 10 +- .../patch-chrome_common_webui__url__constants.cc | 8 +- .../patch-chrome_common_webui__url__constants.h | 6 +- ...e_renderer_chrome__content__renderer__client.cc | 4 +- www/chromium/files/patch-chrome_test_BUILD.gn | 4 +- ...-chrome_test_base_in__process__browser__test.cc | 6 +- ...ch-chrome_test_base_testing__browser__process.h | 6 +- ...hromecast_browser_cast__browser__main__parts.cc | 14 +- ...ecast_browser_cast__content__browser__client.cc | 4 +- .../patch-chromecast_browser_metrics_BUILD.gn | 4 +- ...owser_metrics_cast__metrics__service__client.cc | 102 -------------- ...rowser_metrics_cast__metrics__service__client.h | 15 --- ..._autofill_core_browser_autofill__experiments.cc | 4 +- ...utofill_core_browser_personal__data__manager.cc | 4 +- ...mponents_autofill_core_common_autofill__util.cc | 4 +- .../patch-components_crash_content_app_BUILD.gn | 17 +-- .../patch-components_crash_core_common_BUILD.gn | 8 +- ...mponents_download_internal_common_base__file.cc | 6 +- ..._feature__engagement_public_event__constants.cc | 6 +- ...s_feature__engagement_public_event__constants.h | 8 +- ...tch-components_gcm__driver_gcm__client__impl.cc | 4 +- .../files/patch-components_metrics_BUILD.gn | 4 +- .../files/patch-components_metrics_metrics__log.cc | 4 +- ...rator_browser_network__session__configurator.cc | 4 +- ...ponents_policy_resources_policy__templates.json | 20 +-- ...onents_services_filesystem_file__system__app.cc | 6 +- ...evice__info_local__device__info__util__linux.cc | 26 ++++ ...atch-components_sync_base_get__session__name.cc | 20 --- ...mponents_sync_base_get__session__name__linux.cc | 14 -- ...atch-content_app_content__main__runner__impl.cc | 14 +- www/chromium/files/patch-content_browser_BUILD.gn | 19 ++- .../patch-content_browser_browser__main__loop.cc | 8 +- ...-content_browser_builtin__service__manifests.cc | 20 +++ ...patch-content_browser_gpu_gpu__process__host.cc | 6 +- ...content_browser_ppapi__plugin__process__host.cc | 6 +- ...r_renderer__host_render__process__host__impl.cc | 12 +- ...er_renderer__host_render__process__host__impl.h | 4 +- ...derer__host_render__widget__host__view__aura.cc | 8 +- ...r_service__manager_service__manager__context.cc | 12 +- ...rowser_webui_shared__resources__data__source.cc | 15 ++- www/chromium/files/patch-content_common_BUILD.gn | 4 +- www/chromium/files/patch-content_gpu_gpu__main.cc | 6 +- .../patch-content_gpu_gpu__sandbox__hook__linux.cc | 10 +- ...ic_app_content__packaged__services__manifest.cc | 20 --- ...ch-content_public_common_child__process__host.h | 11 +- ...t_public_common_common__param__traits__macros.h | 4 +- ...atch-content_public_common_content__features.cc | 6 +- ...atch-content_public_common_content__switches.cc | 4 +- ...atch-content_public_test_browser__test__base.cc | 4 +- ...patch-content_renderer_render__process__impl.cc | 6 +- .../patch-content_renderer_render__thread__impl.cc | 10 +- ...ent_renderer_renderer__blink__platform__impl.cc | 14 +- ...tent_renderer_renderer__blink__platform__impl.h | 6 +- www/chromium/files/patch-content_shell_BUILD.gn | 12 +- ...atch-content_shell_app_shell__main__delegate.cc | 20 +++ ...ontent_shell_browser_shell__browser__context.cc | 6 +- ...er_web__test_web__test__browser__main__parts.cc | 4 +- ...atch-content_shell_test__runner_test__runner.cc | 18 +-- www/chromium/files/patch-device_usb_BUILD.gn | 21 --- .../files/patch-device_usb_usb__context.cc | 12 -- www/chromium/files/patch-device_usb_usb__error.cc | 11 -- .../files/patch-device_usb_usb__service__impl.cc | 45 ------- .../files/patch-device_usb_usb__service__impl.h | 26 ---- ...i_declarative__webrequest_webrequest__action.cc | 4 +- ...tensions_common_api___permission__features.json | 6 +- .../patch-extensions_common_features_feature.cc | 18 +-- ..._buffer_service_external__vk__image__backing.cc | 8 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 30 ++--- ...gpu_ipc_service_gpu__memory__buffer__factory.cc | 12 +- .../patch-gpu_ipc_service_gpu__watchdog__thread.cc | 16 +-- .../patch-gpu_ipc_service_gpu__watchdog__thread.h | 4 +- .../patch-gpu_vulkan_vulkan__function__pointers.cc | 6 +- .../patch-gpu_vulkan_vulkan__function__pointers.h | 6 +- ...b_browser_headless__content__browser__client.cc | 6 +- ...ib_browser_headless__content__browser__client.h | 4 +- .../files/patch-ipc_ipc__message__utils.cc | 4 +- www/chromium/files/patch-ipc_ipc__message__utils.h | 4 +- .../files/patch-media_base_video__frame.cc | 6 +- www/chromium/files/patch-media_base_video__frame.h | 10 +- ...capture_video_video__capture__device__client.cc | 4 +- .../patch-media_gpu_libyuv__image__processor.cc | 38 ++++++ ...edia_gpu_linux_platform__video__frame__utils.cc | 6 +- ...pu_vaapi_vaapi__dmabuf__video__frame__mapper.cc | 4 +- ..._gpu_vaapi_vaapi__video__encode__accelerator.cc | 4 +- ...atch-media_gpu_video__frame__mapper__factory.cc | 16 ++- www/chromium/files/patch-media_media__options.gni | 4 +- ...media_mojo_services_gpu__mojo__media__client.cc | 6 +- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 4 +- ...ch-mojo_public_js_mojo__bindings__resources.grd | 8 +- www/chromium/files/patch-net_BUILD.gn | 6 +- .../patch-net_base_network__change__notifier.cc | 4 +- www/chromium/files/patch-net_features.gni | 4 +- .../patch-net_http_http__auth__gssapi__posix.cc | 4 +- ...proxy__resolution_proxy__resolution__service.cc | 4 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 6 +- ...ch-net_tools_quic_quic__http__proxy__backend.cc | 4 +- ..._url__request_url__request__context__builder.cc | 6 +- .../patch-remoting_host_remoting__me2me__host.cc | 22 +-- ...ent_simple__browser_simple__browser__service.cc | 4 +- ...tent_simple__browser_simple__browser__service.h | 6 +- .../files/patch-services_device_usb_BUILD.gn | 11 ++ www/chromium/files/patch-services_network_BUILD.gn | 4 +- .../patch-services_network_network__context.cc | 31 +---- .../patch-services_network_network__service.cc | 6 +- .../patch-services_network_network__service.h | 6 +- .../patch-services_network_public_cpp_features.cc | 11 -- ..._instrumentation_queued__request__dispatcher.cc | 20 +++ ...ublic_cpp_memory__instrumentation_os__metrics.h | 10 +- ...p_memory__instrumentation_os__metrics__linux.cc | 47 ++++--- ...atch-services_service__manager_embedder_main.cc | 4 +- .../files/patch-third__party_angle_BUILD.gn | 6 +- ...party_angle_src_common_system__utils__posix.cpp | 11 -- .../patch-third__party_blink_renderer_BUILD.gn | 13 ++ ...ore_html_canvas_canvas__async__blob__creator.cc | 4 +- ...arty_blink_renderer_core_layout_layout__view.cc | 4 +- ...h-third__party_blink_renderer_platform_BUILD.gn | 4 +- ...ty_blink_renderer_platform_fonts_font__cache.cc | 6 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 18 +-- ..._blink_renderer_platform_fonts_font__metrics.cc | 8 +- ..._fonts_shaping_shape__result__inline__headers.h | 78 +++++++++++ ...nderer_platform_fonts_skia_font__cache__skia.cc | 22 +-- ...hird__party_pdfium_core_fxcrt_cfx__datetime.cpp | 11 ++ ...tch-third__party_pdfium_core_fxcrt_fx__system.h | 8 +- ...third__party_pdfium_core_fxge_fx__ge__linux.cpp | 4 +- ...-third__party_pdfium_fxjs_fx__date__helpers.cpp | 10 +- ...ium_xfa_fgas_font_cfx__fontsourceenum__file.cpp | 18 +-- ...hird__party_pdfium_xfa_fwl_cfwl__notedriver.cpp | 19 +++ ...-third__party_perfetto_src_base_unix__socket.cc | 4 +- ...etto_src_tracing_core_tracing__service__impl.cc | 6 +- .../patch-third__party_skia_src_core_SkCpu.cpp | 10 +- ...__party_skia_src_ports_SkFontHost__FreeType.cpp | 77 ----------- .../patch-third__party_skia_src_sksl_SkSLString.h | 4 +- .../files/patch-third__party_sqlite_BUILD.gn | 4 +- .../patch-third__party_webrtc_rtc__base_BUILD.gn | 6 +- ...ty_webrtc_rtc__base_physical__socket__server.cc | 23 +++- ...h-third__party_webrtc_rtc__base_string__utils.h | 17 --- www/chromium/files/patch-tools_gn_build_gen.py | 14 +- ...ols_json__schema__compiler_feature__compiler.py | 4 +- ...atch-tools_variations_fieldtrial__to__struct.py | 4 +- ...agdrop_os__exchange__data__provider__factory.cc | 6 +- .../patch-ui_base_resource_resource__bundle.cc | 6 +- .../files/patch-ui_base_webui_web__ui__util.cc | 4 +- www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +- .../files/patch-ui_gfx_font__render__params.h | 8 +- .../patch-ui_gfx_ipc_gfx__param__traits__macros.h | 5 +- ...-ui_gfx_linux_client__native__pixmap__dmabuf.cc | 6 +- ...ch-ui_gfx_mojo_buffer__types__struct__traits.cc | 16 +-- ...tch-ui_gfx_mojo_buffer__types__struct__traits.h | 6 +- .../files/patch-ui_gfx_native__pixmap__handle.cc | 18 +-- .../files/patch-ui_gfx_native__pixmap__handle.h | 18 +-- www/chromium/files/patch-ui_gfx_render__text.cc | 4 +- www/chromium/files/patch-ui_gl_BUILD.gn | 14 +- .../files/patch-ui_gl_generate__bindings.py | 4 +- www/chromium/files/patch-ui_gl_gl__surface__glx.cc | 66 ++------- ...i_message__center_views_message__popup__view.cc | 4 +- .../files/patch-ui_views_controls_label.cc | 6 +- .../patch-ui_views_controls_textfield_textfield.cc | 16 +-- .../patch-ui_views_examples_widget__example.cc | 4 +- .../files/patch-ui_views_style_platform__style.cc | 4 +- .../files/patch-ui_views_views__delegate.h | 4 +- ...sktop__aura_desktop__window__tree__host__x11.cc | 4 +- .../patch-ui_views_window_custom__frame__view.cc | 4 +- .../files/patch-ui_webui_resources_js_cr.js | 4 +- www/chromium/files/patch-v8_BUILD.gn | 10 +- www/chromium/files/patch-v8_src_api.cc | 20 --- www/chromium/files/patch-v8_src_api_api.cc | 20 +++ .../files/patch-v8_src_external-reference-table.cc | 11 -- www/chromium/files/patch-v8_src_log-utils.h | 11 -- www/chromium/pkg-plist | 15 ++- 265 files changed, 1705 insertions(+), 1541 deletions(-) create mode 100644 www/chromium/files/patch-base_base__switches.cc create mode 100644 www/chromium/files/patch-base_base__switches.h create mode 100644 www/chromium/files/patch-base_cpu.cc create mode 100644 www/chromium/files/patch-base_files_file__path__watcher.cc create mode 100644 www/chromium/files/patch-base_files_scoped__file.cc create mode 100644 www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc delete mode 100644 www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc create mode 100644 www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc create mode 100644 www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h create mode 100644 www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h create mode 100644 www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc delete mode 100644 www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc delete mode 100644 www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h create mode 100644 www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc delete mode 100644 www/chromium/files/patch-components_sync_base_get__session__name.cc delete mode 100644 www/chromium/files/patch-components_sync_base_get__session__name__linux.cc create mode 100644 www/chromium/files/patch-content_browser_builtin__service__manifests.cc delete mode 100644 www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc create mode 100644 www/chromium/files/patch-content_shell_app_shell__main__delegate.cc delete mode 100644 www/chromium/files/patch-device_usb_BUILD.gn delete mode 100644 www/chromium/files/patch-device_usb_usb__context.cc delete mode 100644 www/chromium/files/patch-device_usb_usb__error.cc delete mode 100644 www/chromium/files/patch-device_usb_usb__service__impl.cc delete mode 100644 www/chromium/files/patch-device_usb_usb__service__impl.h create mode 100644 www/chromium/files/patch-media_gpu_libyuv__image__processor.cc create mode 100644 www/chromium/files/patch-services_device_usb_BUILD.gn delete mode 100644 www/chromium/files/patch-services_network_public_cpp_features.cc create mode 100644 www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc delete mode 100644 www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp create mode 100644 www/chromium/files/patch-third__party_blink_renderer_BUILD.gn create mode 100644 www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h create mode 100644 www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp create mode 100644 www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp delete mode 100644 www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp delete mode 100644 www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h delete mode 100644 www/chromium/files/patch-v8_src_api.cc create mode 100644 www/chromium/files/patch-v8_src_api_api.cc delete mode 100644 www/chromium/files/patch-v8_src_external-reference-table.cc delete mode 100644 www/chromium/files/patch-v8_src_log-utils.h diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 59ab3b15a925..c0d5b3878650 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 75.0.3770.142 -PORTREVISION= 3 +PORTVERSION= 76.0.3809.100 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -315,8 +314,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} - # ANGLE -.for f in libEGL.so libGLESv2.so + # ANGLE, EGL, Vk +.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so libVkLayer_core_validation.so libVkLayer_object_lifetimes.so \ + libVkLayer_stateless_validation.so libVkLayer_thread_safety.so libVkLayer_unique_objects.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 7135b0291ccc..7e4f361934c3 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1563322422 -SHA256 (chromium-75.0.3770.142.tar.xz) = 510e6ca7ccc218b401b375c13656f6aecab196b03142026dc3602b9d1804a5ac -SIZE (chromium-75.0.3770.142.tar.xz) = 709968204 -SHA256 (chromium-75.0.3770.142-testdata.tar.xz) = 4a5736d686d4081c2e550089691670d81959a5e7d8f9c02ad973e797390da476 -SIZE (chromium-75.0.3770.142-testdata.tar.xz) = 352138048 +TIMESTAMP = 1565536681 +SHA256 (chromium-76.0.3809.100.tar.xz) = 8cd93ada3e0837ced512f69783400991d3b82e0d9622e04fab5922877577d26d +SIZE (chromium-76.0.3809.100.tar.xz) = 728852892 +SHA256 (chromium-76.0.3809.100-testdata.tar.xz) = 95eed86c25e75b9b8cb611a3a63debb0d9243e2e314ffe121890a80c5446954f +SIZE (chromium-76.0.3809.100-testdata.tar.xz) = 262859232 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index cd9926e30c92..fd5cd8f923c5 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-06-04 18:55:14 UTC +--- BUILD.gn.orig 2019-07-24 18:58:00 UTC +++ BUILD.gn -@@ -385,7 +385,7 @@ group("gn_all") { +@@ -386,7 +386,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -426,8 +426,6 @@ group("gn_all") { +@@ -427,8 +427,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -482,10 +480,6 @@ group("gn_all") { +@@ -483,10 +481,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -540,10 +534,6 @@ group("gn_all") { +@@ -541,10 +535,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -618,7 +608,7 @@ group("gn_all") { +@@ -619,7 +609,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -757,7 +747,6 @@ group("gn_all") { +@@ -758,7 +748,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,7 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -876,7 +865,6 @@ if (is_chromeos) { +@@ -877,7 +866,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -65,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1029,7 +1017,7 @@ if (!is_ios) { +@@ -1033,7 +1021,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1038,7 +1026,7 @@ if (!is_ios) { +@@ -1042,7 +1030,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1181,9 +1169,6 @@ group("chromium_builder_perf") { +@@ -1185,9 +1173,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 30a152076cec..8975b8222992 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- base/BUILD.gn.orig 2019-07-24 18:58:01 UTC +++ base/BUILD.gn -@@ -1234,7 +1234,7 @@ jumbo_component("base") { +@@ -1258,7 +1258,7 @@ jumbo_component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -9,7 +9,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1260,7 +1260,7 @@ jumbo_component("base") { +@@ -1284,7 +1284,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1813,6 +1813,33 @@ jumbo_component("base") { +@@ -1862,6 +1862,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2910,6 +2937,12 @@ test("base_unittests") { +@@ -2999,6 +3026,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc index 24588a8948d6..1b79f69c285b 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim.cc.orig 2019-04-30 22:22:27 UTC +--- base/allocator/allocator_shim.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim.cc -@@ -69,7 +69,7 @@ inline const base::allocator::AllocatorDispatch* GetCh +@@ -70,7 +70,7 @@ inline const base::allocator::AllocatorDispatch* GetCh // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast( diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index af63d279da53..947e49a1167c 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,15 +1,14 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -3,19 +3,28 @@ - // found in the LICENSE file. - +@@ -5,18 +5,28 @@ #include "base/allocator/allocator_shim.h" + + #include +-#include +#include +#include +#include --#include -- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. @@ -23,13 +22,13 @@ -void __libc_free(void* ptr); +void* __malloc(size_t size); +void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t size); ++void* __realloc(void* address, size_t len); +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} +int __posix_memalign(void **ptr, size_t alignment, size_t size); @@ -37,7 +36,7 @@ } // extern "C" namespace { -@@ -23,32 +32,32 @@ namespace { +@@ -24,32 +34,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index ec542f9bb84e..fab5ea393ea6 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:55:15 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-07-24 18:58:01 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -14,7 +14,7 @@ - #if defined(OS_MACOSX) +@@ -16,7 +16,7 @@ + #include #endif -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc new file mode 100644 index 000000000000..27fbdf9baac7 --- /dev/null +++ b/www/chromium/files/patch-base_base__switches.cc @@ -0,0 +1,20 @@ +--- base/base_switches.cc.orig 2019-07-29 16:52:17 UTC ++++ base/base_switches.cc +@@ -107,7 +107,7 @@ const char kProfilingFlush[] = "profiling-flush"; + const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The /dev/shm partition is too small in certain VM environments, causing + // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to + // work-around this issue (a temporary directory will always be used to create +@@ -128,7 +128,7 @@ const char kEnableCrashReporterForTesting[] = + const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Controls whether or not retired instruction counts are surfaced for threads + // in trace events on Linux. + // diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h new file mode 100644 index 000000000000..395a39f3ec35 --- /dev/null +++ b/www/chromium/files/patch-base_base__switches.h @@ -0,0 +1,20 @@ +--- base/base_switches.h.orig 2019-07-29 18:05:10 UTC ++++ base/base_switches.h +@@ -36,7 +36,7 @@ extern const char kWaitForDebugger[]; + extern const char kDisableUsbKeyboardDetect[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kDisableDevShmUsage[]; + #endif + +@@ -49,7 +49,7 @@ extern const char kEnableReachedCodeProfiler[]; + extern const char kOrderfileMemoryOptimization[]; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kEnableThreadInstructionCount[]; + #endif + diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc new file mode 100644 index 000000000000..b56fe344b0ce --- /dev/null +++ b/www/chromium/files/patch-base_cpu.cc @@ -0,0 +1,38 @@ +--- base/cpu.cc.orig 2019-07-29 18:05:46 UTC ++++ base/cpu.cc +@@ -15,7 +15,7 @@ + #include "base/stl_util.h" + #include "build/build_config.h" + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #include "base/files/file_util.h" + #endif + +@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) { + + #endif // ARCH_CPU_X86_FAMILY + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + std::string* CpuInfoBrand() { + static std::string* brand = []() { + // This function finds the value from /proc/cpuinfo under the key "model +@@ -127,7 +127,7 @@ std::string* CpuInfoBrand() { + return brand; + } + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || +- // defined(OS_LINUX)) ++ // defined(OS_LINUX) || defined(OS_BSD)) + + } // namespace + +@@ -252,7 +252,7 @@ void CPU::Initialize() { + } + } + #elif defined(ARCH_CPU_ARM_FAMILY) +-#if (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in diff --git a/www/chromium/files/patch-base_files_file__path__watcher.cc b/www/chromium/files/patch-base_files_file__path__watcher.cc new file mode 100644 index 000000000000..8617c587be43 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher.cc @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.cc.orig 2019-07-29 18:12:09 UTC ++++ base/files/file_path_watcher.cc +@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() { + // static + bool FilePathWatcher::RecursiveWatchAvailable() { + #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + return true; + #else + // FSEvents isn't available on iOS. diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 36ade4d74565..1b4fa7fe3db9 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2019-06-04 18:55:15 UTC +--- base/files/file_util.h.orig 2019-07-24 18:58:02 UTC +++ base/files/file_util.h -@@ -467,7 +467,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -476,7 +476,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc new file mode 100644 index 000000000000..84ba47ff6aeb --- /dev/null +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -0,0 +1,11 @@ +--- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC ++++ base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 80e0544ed35b..ba2c42de3a2d 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/i18n/icu_util.cc.orig 2019-07-24 18:58:02 UTC +++ base/i18n/icu_util.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -315,7 +315,7 @@ bool InitializeICU() { +@@ -285,7 +285,7 @@ bool InitializeICU() { // TODO(jungshik): Some callers do not care about tz at all. If necessary, // add a boolean argument to this function to init'd the default tz only // when requested. diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 7f2f83724dfe..38cca84921cc 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2019-04-30 22:22:28 UTC +--- base/logging_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/logging_unittest.cc -@@ -421,7 +421,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -444,7 +444,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 9f7731d5b8ec..8e47c5106248 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,5 +1,23 @@ ---- base/process/process_metrics.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr SystemMetrics::ToValue() const + std::unique_ptr res(new DictionaryValue()); + + res->SetIntKey("committed_memory", static_cast(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr meminfo = memory_info_.ToValue(); + std::unique_ptr vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 1b3e36d74918..c27ece03d2f6 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics.h.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -62,15 +62,15 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -292,7 +292,7 @@ BASE_EXPORT size_t GetMaxFds(); + BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. - // @@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,30 +80,31 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -340,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int swap_free = 0; #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) int buffers = 0; int cached = 0; - int active_anon = 0; -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int inactive_file = 0; int dirty = 0; int reclaimable = 0; - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -- // defined(OS_FUCHSIA) -+ // defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || + // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) - int shmem = 0; -@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -376,10 +376,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) @@ -119,3 +120,12 @@ #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. +@@ -547,7 +547,7 @@ class BASE_EXPORT SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index c75d66fbff8a..1dc5323f3252 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics_freebsd.cc @@ -5,6 +5,7 @@ #include "base/process/process_metrics.h" @@ -8,7 +8,7 @@ #include #include #include -@@ -14,11 +15,15 @@ +@@ -14,11 +15,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -18,7 +18,21 @@ +#include + namespace base { ++namespace { ++int GetPageShift() { ++ int pagesize = getpagesize(); ++ int pageshift = 0; ++ ++ while (pagesize > 1) { ++ pageshift++; ++ pagesize >>= 1; ++ } ++ ++ return pageshift; ++} ++} ++ ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -26,7 +40,7 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -110,13 +124,136 @@ + return total_count; +} + ++size_t ProcessMetrics::GetResidentSetSize() const { ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t rss; ++ ++ if (nproc > 0) { ++ rss = pp->ki_rssize << GetPageShift(); ++ } else { ++ rss = 0; ++ } ++ ++ kvm_close(kd); ++ return rss; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ NOTIMPLEMENTED(); -+ return 0; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t swrss; ++ ++ if (nproc > 0) { ++ swrss = pp->ki_swrss > pp->ki_rssize ++ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() ++ : 0; ++ } else { ++ swrss = 0; ++ } ++ ++ kvm_close(kd); ++ return swrss; +} + +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; ++} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast(reads)); ++ res->SetDouble("reads_merged", static_cast(reads_merged)); ++ res->SetDouble("sectors_read", static_cast(sectors_read)); ++ res->SetDouble("read_time", static_cast(read_time)); ++ res->SetDouble("writes", static_cast(writes)); ++ res->SetDouble("writes_merged", static_cast(writes_merged)); ++ res->SetDouble("sectors_written", static_cast(sectors_written)); ++ res->SetDouble("write_time", static_cast(write_time)); ++ res->SetDouble("io", static_cast(io)); ++ res->SetDouble("io_time", static_cast(io_time)); ++ res->SetDouble("weighted_io_time", static_cast(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++std::unique_ptr SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("total", total); ++ res->SetIntKey("free", free); ++ res->SetIntKey("available", available); ++ res->SetIntKey("buffers", buffers); ++ res->SetIntKey("cached", cached); ++ res->SetIntKey("active_anon", active_anon); ++ res->SetIntKey("inactive_anon", inactive_anon); ++ res->SetIntKey("active_file", active_file); ++ res->SetIntKey("inactive_file", inactive_file); ++ res->SetIntKey("swap_total", swap_total); ++ res->SetIntKey("swap_free", swap_free); ++ res->SetIntKey("swap_used", swap_total - swap_free); ++ res->SetIntKey("dirty", dirty); ++ res->SetIntKey("reclaimable", reclaimable); ++ ++ return res; ++} ++ ++std::unique_ptr VmStatInfo::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("pswpin", pswpin); ++ res->SetIntKey("pswpout", pswpout); ++ res->SetIntKey("pgmajfault", pgmajfault); ++ return res; +} } // namespace base diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 3c21942cb31d..686f7e90afb3 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include #include #include diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index d7f1525e19ab..d383e54560b5 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,5 +1,5 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-06-13 09:11:51.000000000 +0200 -+++ base/sampling_heap_profiler/sampling_heap_profiler.cc 2019-06-14 21:28:04.089347000 +0200 +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-07-24 18:58:02 UTC ++++ base/sampling_heap_profiler/sampling_heap_profiler.cc @@ -30,6 +30,10 @@ #include #endif @@ -11,12 +11,12 @@ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ defined(OFFICIAL_BUILD) #include "base/trace_event/cfi_backtrace_android.h" -@@ -65,6 +69,10 @@ +@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { #elif defined(OS_MACOSX) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') + return strdup(name); -+#elif defined(OS_BSD) && defined(HAVE_PTHREAD_GET_NAME_NP) ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') return strdup(name); diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 84ab212f4877..80aa7d04fcf7 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info_posix.cc.orig 2019-04-30 22:22:28 UTC +--- base/system/sys_info_posix.cc.orig 2019-07-24 18:58:02 UTC +++ base/system/sys_info_posix.cc @@ -38,7 +38,7 @@ namespace { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. @@ -14,7 +14,7 @@ base::LazyInstance>:: Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; -#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) #if !defined(OS_FUCHSIA) int64_t AmountOfVirtualMemory() { @@ -23,7 +23,7 @@ namespace base { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc new file mode 100644 index 000000000000..92b120193ada --- /dev/null +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -14,7 +14,7 @@ namespace internal { + TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_NACL) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index f8a797d22050..ed3ac8500b58 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ build/config/BUILD.gn -@@ -163,7 +163,7 @@ config("debug") { +@@ -161,7 +161,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -264,9 +264,7 @@ config("default_libs") { +@@ -259,9 +259,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -354,7 +352,7 @@ config("executable_config") { +@@ -349,7 +347,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index d6840799fa79..a2f56038a0c5 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/compiler/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ build/config/compiler/BUILD.gn @@ -54,7 +54,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -740,7 +740,7 @@ config("compiler_cpu_abi") { +@@ -741,7 +741,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,16 +45,16 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1174,7 +1174,7 @@ config("assembler_debug_dir") { - # TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move - # this behind the -fdebug-compilation-dir cflags in the "compiler" config. - if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) { +@@ -1102,7 +1102,7 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1490,7 +1490,7 @@ config("default_warnings") { +@@ -1492,7 +1492,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1699,7 +1699,7 @@ config("thin_archive") { +@@ -1701,7 +1701,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2286,7 +2286,7 @@ config("symbols") { +@@ -2288,7 +2288,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -81,7 +81,7 @@ } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2307,7 +2307,7 @@ config("symbols") { +@@ -2309,7 +2309,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index c6cc835cc9b1..e2e1b41576e9 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2019-04-30 22:22:28 UTC +--- build/config/compiler/compiler.gni.orig 2019-07-24 18:58:02 UTC +++ build/config/compiler/compiler.gni -@@ -181,7 +181,7 @@ declare_args() { +@@ -179,7 +179,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index bac7de0165ef..8a2865a024c0 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,7 +1,7 @@ ---- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +++ build/config/linux/pkg-config.py -@@ -57,8 +57,12 @@ def SetConfigPath(options): - print "You must specify an architecture via -a if using a sysroot." +@@ -59,8 +59,12 @@ def SetConfigPath(options): + print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) - libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' @@ -15,12 +15,12 @@ os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ def main(): +@@ -109,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if "linux" not in sys.platform: + if "bsd" not in sys.platform: - print "[[],[],[],[],[]]" + print("[[],[],[],[],[]]") return 0 diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py index 92310f8e043a..588896662607 100644 --- a/www/chromium/files/patch-build_detect__host__arch.py +++ b/www/chromium/files/patch-build_detect__host__arch.py @@ -1,6 +1,6 @@ ---- build/detect_host_arch.py.orig 2019-04-30 22:22:28 UTC +--- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC +++ build/detect_host_arch.py -@@ -19,6 +19,8 @@ def HostArch(): +@@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: host_arch = 'x64' diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py index 2b7f4a526104..d9e733834b4a 100644 --- a/www/chromium/files/patch-build_gn__run__binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC +--- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +++ build/gn_run_binary.py -@@ -22,7 +22,7 @@ if not os.path.isabs(path): +@@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 757c9fc0091c..1997ef8dff45 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- cc/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ cc/BUILD.gn -@@ -562,7 +562,7 @@ cc_test_static_library("test_support") { +@@ -566,7 +566,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers", ] -@@ -762,9 +762,6 @@ cc_test("cc_unittests") { +@@ -767,9 +767,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", diff --git a/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc b/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc deleted file mode 100644 index 83074373b430..000000000000 --- a/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/scheduler/compositor_frame_reporting_controller.cc.orig 2019-06-04 18:55:15 UTC -+++ cc/scheduler/compositor_frame_reporting_controller.cc -@@ -31,8 +31,6 @@ void CompositorFrameReportingController::WillBeginImpl - - void CompositorFrameReportingController::WillBeginMainFrame() { - DCHECK(reporters_[PipelineStage::kBeginImplFrame]); -- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame], -- reporters_[PipelineStage::kBeginImplFrame]); - reporters_[PipelineStage::kBeginImplFrame]->StartStage( - "SendBeginMainFrameToCommit"); - AdvanceReporterStage(PipelineStage::kBeginImplFrame, diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 4d7ff2e198ea..9d83c161e7f2 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2019-06-04 18:55:15 UTC +--- cc/trees/property_tree.cc.orig 2019-07-24 18:58:03 UTC +++ cc/trees/property_tree.cc -@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1348,13 +1348,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc new file mode 100644 index 000000000000..66e8f3488ba2 --- /dev/null +++ b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc @@ -0,0 +1,20 @@ +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-07-29 18:39:15 UTC ++++ chrome/app/chrome_content_browser_overlay_manifest.cc +@@ -79,7 +79,7 @@ + #include "chrome/services/app_service/public/cpp/manifest.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck + #include "chrome/browser/ui/webui/discards/discards.mojom.h" +@@ -240,7 +240,7 @@ const service_manager::Manifest& GetChromeContentBrows + #else + app_management::mojom::PageHandlerFactory, + #endif +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + mojom::DiscardsDetailsProvider, + performance_manager::mojom::WebUIGraphDump, diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index c9dd9ec6af2c..09e9d2b6256a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chrome_main_delegate.cc @@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -240,7 +240,7 @@ bool UseHooks() { +@@ -241,7 +241,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -300,7 +300,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +36,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -345,7 +345,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -45,7 +45,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -355,7 +355,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +54,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -409,7 +409,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,7 +63,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -421,7 +421,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +72,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { +@@ -478,7 +478,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); @@ -81,7 +81,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -650,7 +650,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +90,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -674,7 +674,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +99,16 @@ nacl::RegisterPathProvider(); #endif -@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -868,7 +868,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_WIN) + child_process_logging::Init(); + #endif +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -108,7 +117,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -117,7 +126,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -990,7 +990,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1021,7 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index cd8c13d14780..4ddacbbdf526 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/chromium_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chromium_strings.grd -@@ -710,7 +710,7 @@ Signing in anyway will merge Chromium information like +@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like @@ -9,7 +9,7 @@ Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like +@@ -815,7 +815,7 @@ Signing in anyway will merge Chromium information like @@ -18,7 +18,7 @@ The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. -@@ -1098,7 +1098,7 @@ Please check your email at $2 +@@ -1074,7 +1074,7 @@ Please check your email at $2 diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 93359b5b8b36..5932184926e2 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/generated_resources.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/generated_resources.grd -@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t +@@ -4805,7 +4805,7 @@ Keep your key file in a safe place. You will need it t @@ -9,7 +9,7 @@ Legacy Browser Support -@@ -6304,7 +6304,7 @@ the Bookmarks menu."> +@@ -6370,7 +6370,7 @@ the Bookmarks menu."> Google Pay @@ -18,7 +18,7 @@ Use system title bar and borders -@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7223,7 +7223,7 @@ Please help our engineers fix this problem. Tell us wh Set as default diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index fc279b57b18c..401aa915e93b 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/google_chrome_strings.grd -@@ -722,7 +722,7 @@ Signing in anyway will merge Chrome information like b +@@ -702,7 +702,7 @@ Signing in anyway will merge Chrome information like b @@ -9,7 +9,7 @@ Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. -@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b +@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b @@ -18,7 +18,7 @@ The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. -@@ -1117,7 +1117,7 @@ Please check your email at $2 +@@ -1093,7 +1093,7 @@ Please check your email at $2 diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 6187a7c8ff9a..4d47e4f9413f 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2019-06-04 18:55:16 UTC +--- chrome/app/settings_strings.grdp.orig 2019-07-24 18:58:07 UTC +++ chrome/app/settings_strings.grdp -@@ -634,7 +634,7 @@ +@@ -653,7 +653,7 @@ Themes @@ -9,7 +9,7 @@ GTK+ -@@ -648,7 +648,7 @@ +@@ -667,7 +667,7 @@ Use Classic diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index d8702ebfc748..b13926ff0562 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,5 +1,14 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-07-24 18:58:07 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd +@@ -18,7 +18,7 @@ + + + +- ++ + + + @@ -100,7 +100,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index ad12e08163e9..bde5ef133453 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,42 @@ ---- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/about_flags.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/about_flags.cc -@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -621,7 +621,7 @@ const FeatureEntry::FeatureVariation + nullptr}}; + #endif // OS_ANDROID + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const FeatureEntry::FeatureParam + kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { + {autofill::features:: +@@ -668,7 +668,7 @@ const FeatureEntry::FeatureVariation + kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), + nullptr}, + }; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const FeatureEntry::Choice kMemlogModeChoices[] = { + {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, +@@ -776,7 +776,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), + nullptr}}; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { + {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; +@@ -792,7 +792,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU + {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}, + {"Button_GM2", kTranslateBubbleUIButtonGM2, + base::size(kTranslateBubbleUIButton), nullptr}}; +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin0px[] = { + {OmniboxFieldTrial::kUIVerticalMarginParam, "0"}}; +@@ -1567,13 +1567,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -16,31 +52,33 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableDataSaverLiteModeRebrandName, - flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll, - FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)}, +@@ -1614,14 +1614,14 @@ const FeatureEntry kFeatureEntries[] = { + "OverrideTranslateTriggerInIndia")}, + #endif // OS_ANDROID + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, + flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUI, + kTranslateBubbleUIVariations, + "UseButtonTranslateBubbleUI")}, +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) + {"enable-native-notifications", +@@ -1762,7 +1762,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + previews::features::kHTTPSServerPreviewsUsingURLLoader)}, + #endif // OS_ANDROID -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = { - {"force-text-direction", flag_descriptions::kForceTextDirectionName, - flag_descriptions::kForceTextDirectionDescription, kOsAll, - MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, - flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-brotli", flag_descriptions::kEnableBrotliName, - flag_descriptions::kEnableBrotliDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, -@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2091,12 +2091,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID @@ -55,7 +93,7 @@ {"enable-experimental-accessibility-features", flag_descriptions::kExperimentalAccessibilityFeaturesName, flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2423,7 +2423,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, @@ -64,7 +102,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2470,7 +2470,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxDeduplicateDriveUrlsName, flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)}, @@ -73,7 +111,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2696,7 +2696,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -82,7 +120,7 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2707,7 +2707,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kShowManagedUiDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(features::kShowManagedUi)}, @@ -90,8 +128,8 @@ +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) - {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName, -@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = { + {"chrome-colors", flag_descriptions::kChromeColorsName, +@@ -3514,7 +3514,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) @@ -100,7 +138,7 @@ {"autofill-always-show-server-cards-in-sync-transport", flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, flag_descriptions:: -@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3522,7 +3522,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsLinux, FEATURE_VALUE_TYPE( autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, @@ -109,7 +147,7 @@ #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) {"enable-custom-mac-paper-sizes", -@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3562,13 +3562,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, #endif // OS_CHROMEOS @@ -125,3 +163,21 @@ #if !defined(OS_ANDROID) {"hardware-media-key-handling", +@@ -3895,7 +3895,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"enable-autofill-save-credit-card-uses-improved-messaging", + flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, + flag_descriptions:: +@@ -3905,7 +3905,7 @@ const FeatureEntry kFeatureEntries[] = { + autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, + kAutofillSaveCreditCardUsesImprovedMessagingVariations, + "AutofillSaveCreditCardUsesImprovedMessaging")}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + {"smart-dim-model-v3", flag_descriptions::kSmartDimModelV3Name, diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index c59df4a0b8de..20f0448c3605 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -29,7 +29,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_contents_observer.h" +@@ -32,7 +32,7 @@ + #include "chrome/browser/ui/tabs/tab_strip_model.h" + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr queue +@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -126,7 +126,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { +@@ -135,7 +135,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index f2961c2c6c96..099e3d8e0ffe 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,15 +1,15 @@ ---- chrome/browser/browser_resources.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/browser_resources.grd.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/browser_resources.grd @@ -77,7 +77,7 @@ - + - + - - - -@@ -690,7 +690,7 @@ + + + +@@ -666,7 +666,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 0e1d75e4a9f5..b7710c4836b2 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -218,9 +218,9 @@ +@@ -220,9 +220,9 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -12,16 +12,16 @@ #if defined(OS_LINUX) #include "components/crash/content/app/breakpad_linux.h" -@@ -258,7 +258,7 @@ +@@ -260,7 +260,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif - -@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1079,7 +1079,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,7 +30,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1088,14 +1088,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -48,16 +48,16 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); + ProfileActivityMetricsRecorder::Initialize(); #endif - metrics::RendererUptimeTracker::Initialize(); -@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1291,6 +1291,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -65,7 +65,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); BrowserThread::PostAfterStartupTask( -@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1299,6 +1300,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 499684621100..7cf047cf157e 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -418,7 +418,7 @@ +@@ -429,7 +429,7 @@ + #include "chromeos/services/secure_channel/secure_channel_service.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" - #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -467,7 +467,7 @@ +@@ -484,7 +484,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,34 +18,34 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -493,7 +493,7 @@ +@@ -510,7 +510,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" - #endif - -@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" + #else +@@ -1250,7 +1250,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) - main_parts = - new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_); + main_parts = std::make_unique( + parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_); + main_parts = + std::make_unique(parameters, startup_data_); #elif defined(OS_ANDROID) - main_parts = new ChromeBrowserMainPartsAndroid(parameters, startup_data_); -@@ -1213,7 +1213,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1276,7 +1276,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -2034,7 +2034,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2093,7 +2093,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2318,7 +2318,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + process_type, + command_line); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && + command_line->HasSwitch(service_manager::switches::kNoSandbox)) { +@@ -3660,7 +3660,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -63,7 +72,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4362,7 +4362,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -72,7 +81,7 @@ std::unique_ptr browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: MaybeCreateThrottleFor(handle); -@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco +@@ -5205,7 +5205,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco std::unique_ptr ChromeContentBrowserClient::CreateWindowForPictureInPicture( content::PictureInPictureWindowController* controller) { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index e7c2a696aeb7..d5c03fb8c2ca 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -380,12 +380,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 40a80672911b..638aab69b6b6 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1228,7 +1228,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1237,7 +1237,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1267,7 +1267,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 4f4c08e05c87..1eaffe80ffc5 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,15 +1,24 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.cc -@@ -159,7 +159,7 @@ Browser* DownloadCommands::GetBrowser() const { - return browser_displayer.browser(); +@@ -30,7 +30,7 @@ + #include "net/base/url_util.h" + #include "ui/base/clipboard/scoped_clipboard_writer.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" +@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command) + model_->ExecuteCommand(this, command); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = model_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -176,7 +176,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons + + Browser* DownloadCommands::GetBrowser() const { + chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); +@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); @@ -18,3 +27,9 @@ return IsDownloadPdf(); #endif } + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + void DownloadCommands::CopyFileAsImageToClipboard() { + if (model_->GetState() != download::DownloadItem::COMPLETE || diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index ad92f02380b9..e0c3482b0ebc 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,7 @@ class DownloadCommands { +@@ -45,7 +45,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); @@ -8,4 +8,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - #endif + Browser* GetBrowser() const; diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 48d6fd2a1ade..b4cd9485a2c8 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_item_model.cc -@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -560,7 +560,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -597,7 +597,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 0ae2b1b84f85..42d115e10c9c 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") { +@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 64894bbb4afd..bb8e332d5c7b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -54,7 +54,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index b5596df7d97d..0f8d49f35598 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -753,7 +753,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -755,7 +755,7 @@ void ExternalProviderImpl::CreateExternalProviders( chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique( service, new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -780,7 +780,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -782,7 +782,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h new file mode 100644 index 000000000000..c079a7eac3e3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -0,0 +1,11 @@ +--- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC ++++ chrome/browser/first_run/first_run_dialog.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + // Hide this function on platforms where the dialog does not exist. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + class Profile; + diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h new file mode 100644 index 000000000000..5b60fc717be9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -0,0 +1,18 @@ +--- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC ++++ chrome/browser/first_run/first_run_internal.h +@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); + +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For testing, forces the first run dialog to either be shown or not. If not + // called, the decision to show the dialog or not will be made by Chrome based + // on a number of factors (such as install type, whether it's a Chrome-branded + // build, etc). + void ForceFirstRunDialogShownForTesting(bool shown); +-#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace internal + } // namespace first_run diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index ded61fdbd3ca..46fcefffd808 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,19 +1,9 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] = +@@ -3256,21 +3256,21 @@ const char kInstallableInkDropDescription[] = // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - const char kEnableInputImeApiName[] = "Enable Input IME API"; - const char kEnableInputImeApiDescription[] = - "Enable the use of chrome.input.ime API."; - --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 9089bc1a0c0b..6a9b4fcdd4c6 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,18 +1,9 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.h -@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[]; +@@ -1963,19 +1963,19 @@ extern const char kInstallableInkDropDescription[]; // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - extern const char kEnableInputImeApiName[]; - extern const char kEnableInputImeApiDescription[]; - --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc index d9c27f8b834b..4bef24642cc2 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc @@ -26,10 +26,10 @@ #include "content/public/browser/content_browser_client.h" @@ -22,9 +22,9 @@ void WebRtcLoggingHandlerHost::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces +@@ -328,7 +328,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, filesystem_id, registered_name)); + base::BindOnce(callback, file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index d8e26a9e4bc6..691445b63a1e 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -902,7 +902,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc index 42006a6f5f96..00bcd9672288 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -360,7 +360,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -382,7 +382,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -383,7 +383,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB( std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / 1024); diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 0a796e195432..80a31ea106e6 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -72,12 +72,12 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -15,7 +15,7 @@ namespace { -@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -191,10 +191,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -28,7 +28,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -433,10 +433,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -434,10 +434,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -41,7 +41,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -481,10 +481,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -486,10 +486,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -54,7 +54,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -532,7 +532,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -586,7 +586,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea content::GetNetworkService()->ConfigureStubHostResolver( stub_resolver_enabled, std::move(dns_over_https_servers)); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index f2c97de5a93c..45506f2dcd70 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -81,7 +81,11 @@ +@@ -82,7 +82,11 @@ #include "net/cert/cert_status_flags.h" #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 5d17a1dd0f59..70c7fdb4a42c 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,20 +1,34 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -109,7 +109,7 @@ - #include "chrome/browser/policy/browser_signin_policy_handler.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kAllowPopupsDuringPageUnload, + +@@ -321,11 +321,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kSafeSitesFilterBehavior, + policy_prefs::kSafeSitesFilterBehavior, + base::Value::Type::INTEGER}, +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + { key::kAuthNegotiateDelegateByKdcPolicy, + prefs::kAuthNegotiateDelegateByKdcPolicy, + base::Value::Type::BOOLEAN }, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_POSIX) + { key::kNtlmV2Enabled, + prefs::kNtlmV2Enabled, +@@ -1021,7 +1021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index f21a30fc7cbc..3c36b6b42e3a 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -332,7 +332,7 @@ - #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" +@@ -338,7 +338,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); + +@@ -872,7 +872,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif + diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index a8549e03e6b0..175c7a801253 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !defined(OS_ANDROID) +@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsProfiles:: MediaGalleriesPreferencesFactory::GetInstance(); #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif + ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index b41d40af3973..d90c3b69e971 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -83,7 +83,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index a9c1d5294f6d..35ec1b1dad33 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1531,7 +1531,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1672,7 +1672,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1573,7 +1573,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1714,7 +1714,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -1994,7 +1994,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 45105fa21cce..b797d07880be 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -129,7 +129,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -130,7 +130,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -148,7 +148,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 9a48cb455280..ad20f24a351f 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -120,7 +120,7 @@ Polymer({ +@@ -125,7 +125,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', @@ -9,7 +9,7 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // -@@ -223,7 +223,7 @@ Polymer({ +@@ -228,7 +228,7 @@ Polymer({ this.browserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -292,10 +292,10 @@ Polymer({ +@@ -304,10 +304,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc new file mode 100644 index 000000000000..d20b30112256 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC ++++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc +@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa + void SendTabToSelfClientService::EntriesAddedRemotely( + const std::vector& new_entries) { + for (const std::unique_ptr& handler : GetHandlers()) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Only respond to notifications corresponding to this service's profile + // for these OSes; mobile does not have a Profile. + // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 1bd2e0affda7..fdf032282034 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,15 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/signin/signin_util.cc -@@ -42,7 +42,7 @@ namespace { +@@ -33,7 +33,7 @@ + #include "services/identity/public/cpp/primary_account_mutator.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_list_observer.h" +@@ -45,7 +45,7 @@ namespace { constexpr char kSignoutSettingKey[] = "signout_setting"; diff --git a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc index 6c2f97d66cc7..6171474e7606 100644 --- a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc +++ b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc @@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) @@ -9,7 +9,7 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -218,7 +218,7 @@ void SSLErrorControllerClient::Proceed() { } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 79a597d1c3cf..ca8d85c2b52b 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,17 +1,17 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - } +@@ -372,7 +372,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + dump_stack)); #endif // BUILDFLAG(ENABLE_APP_LIST) -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { - if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) { -@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI}))); - } + controllers.push_back( +@@ -382,7 +382,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + base::Unretained(this), syncer::DICTIONARY), + dump_stack)); } -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index 965ad2bc13ea..a692188d2a5f 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -163,6 +163,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index b583e1f17ba3..727ed8d20eaa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -251,7 +251,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -461,7 +461,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -863,7 +863,7 @@ void BrowserCommandController::InitCommandState() { +@@ -911,7 +911,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__window.h b/www/chromium/files/patch-chrome_browser_ui_browser__window.h index 92fc3893e97a..5bff1e115a48 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__window.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_window.h.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_window.h -@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow { +@@ -448,7 +448,7 @@ class BrowserWindow : public ui::BaseWindow { bool is_source_keyboard) = 0; #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index dfd2913831b6..ca3d2dea58e3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -82,7 +82,7 @@ #include "chrome/browser/ui/user_manager.h" @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -663,8 +663,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index d6566aa6c949..67f7eab232ce 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index de23a230f774..79d1f1fb8d50 100644 --- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index a7bcfe28ecfd..4b980d95c7a5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include #include #include -@@ -43,7 +43,7 @@ +@@ -42,7 +42,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -18,7 +18,7 @@ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} -@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -87,7 +87,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( g_browser_process->system_network_context_manager()->GetContext()); } @@ -27,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -118,7 +118,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 9e9039a5fdbd..81ebcce24d95 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -37,8 +37,10 @@ namespace { @@ -16,9 +16,9 @@ GetWidget()->Hide(); +#if !defined(OS_BSD) - ChangeMetricsReportingStateWithReply(report_crashes_->checked(), + ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(), base::Bind(&InitCrashReporterIfEnabled)); +#endif - if (make_default_->checked()) + if (make_default_->GetChecked()) shell_integration::SetAsDefaultBrowser(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index c286e0eac942..159ec7f62f8e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT - // light to dark mode. +@@ -1557,7 +1557,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); + bool must_regenerate_frame; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 432407bf13cc..61d4bb6d6cfe 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -47,7 +47,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -17,7 +17,7 @@ +#if defined(OS_LINUX) || defined(OS_BSD) views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); - menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_, + menu_runner.RunMenuAt( @@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index f9af94718fda..90627603db72 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -79,7 +79,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -127,7 +127,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 1ab795897fe8..b21dd7a39c6c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -65,7 +65,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -69,7 +69,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) : views::ImageButton(listener), tab_strip_(tab_strip) { set_animate_on_state_change(true); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc new file mode 100644 index 000000000000..c806dd473555 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-07-29 18:58:58 UTC ++++ chrome/browser/ui/views/tabs/tab.cc +@@ -525,7 +525,7 @@ void Tab::OnMouseCaptureLost() { + void Tab::OnMouseMoved(const ui::MouseEvent& event) { + tab_style_->SetHoverLocation(event.location()); + controller_->OnMouseEventInTab(this, event); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + MaybeUpdateHoverStatus(event); + #endif + } +@@ -535,7 +535,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) + } + + void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& event) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Move the hit test area for hovering up so that it is not overlapped by tab + // hover cards when they are shown. + // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 1a9200d9205b..c9ae2025df96 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -436,7 +436,7 @@ void TabDragController::Init(TabStrip* source_tabstrip +@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,16 +9,16 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* +@@ -872,7 +872,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else - target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); + SetCapture(target_context); -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2023,7 +2023,7 @@ TabDragController::Liveness TabDragController::GetLoca exclude.insert(dragged_window); } } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 2aea9636e194..e2c08a27ae5c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -202,11 +202,11 @@ +@@ -205,11 +205,11 @@ #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox_internals_ui.h" #endif -@@ -322,7 +322,7 @@ bool IsAboutUI(const GURL& url) { +@@ -325,7 +325,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -23,7 +23,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -619,7 +619,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -627,7 +627,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -32,7 +32,7 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI; #endif -@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -672,17 +672,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 1aad9db11c3b..194ed11744de 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,9 +9,9 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, - {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, +@@ -605,7 +605,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP}, + {"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER}, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index a13cf3b20a80..601d96b5fc62 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2019-06-04 18:55:18 UTC +--- chrome/common/BUILD.gn.orig 2019-07-24 18:58:13 UTC +++ chrome/common/BUILD.gn -@@ -306,6 +306,10 @@ static_library("common") { +@@ -298,6 +298,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 55ea8b7fe5b2..129c37bd3e94 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_features.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.cc -@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc +@@ -98,13 +98,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) @@ -16,7 +16,7 @@ // Enables or disables whether permission prompts are automatically blocked // after the user has explicitly dismissed them too many times. -@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{ +@@ -150,7 +150,7 @@ const base::Feature kThirdPartyModulesBlocking{ "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -25,12 +25,3 @@ // Enables the dual certificate verification trial feature. // https://crbug.com/649026 const base::Feature kCertDualVerificationTrialFeature{ -@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi - // Enables or disables windowing related features for desktop PWAs. - const base::Feature kDesktopPWAWindowing { - "DesktopPWAWindowing", --#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_MACOSX) - base::FEATURE_ENABLED_BY_DEFAULT - #else diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index cb0d9a68581c..c6957e6df02e 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_features.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.h -@@ -60,10 +60,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -65,10 +65,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutoFetchOnNetErrorPage; #endif @@ -13,7 +13,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -79,7 +79,7 @@ extern const base::Feature kBrowserHangFixesExperiment +@@ -84,7 +84,7 @@ extern const base::Feature kBrowserHangFixesExperiment COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBundledConnectionHelpFeature; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index 3283c4a35e38..9bf429302cd3 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_paths_internal.h -@@ -47,7 +47,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 8b28f290fb44..a29c37867348 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,15 +1,9 @@ ---- chrome/common/chrome_switches.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.cc -@@ -878,12 +878,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -853,7 +853,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - const char kDisableInputImeAPI[] = "disable-input-ime-api"; - const char kEnableInputImeAPI[] = "enable-input-ime-api"; - #endif - -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 854ec871e183..9a7d74efaef0 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,15 +1,9 @@ ---- chrome/common/chrome_switches.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -265,7 +265,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kDisableInputImeAPI[]; - extern const char kEnableInputImeAPI[]; - #endif - -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) extern const char kEnableNewAppMenuIcon[]; diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni index f04b49402457..cc8ae9e5c9f3 100644 --- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni +++ b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni @@ -1,6 +1,6 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-06-04 18:55:18 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-07-24 18:58:13 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -108,7 +108,7 @@ if (is_chromeos) { +@@ -106,7 +106,7 @@ if (is_chromeos) { "wallpaper.json", "wallpaper_private.json", ] diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index d6696dfe5af4..277fce476cef 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,4 +1,4 @@ ---- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/features.gni.orig 2019-07-24 18:58:14 UTC +++ chrome/common/features.gni @@ -41,9 +41,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos @@ -7,8 +7,8 @@ - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) -- enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac -+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac || is_bsd +- enable_service_discovery = (enable_mdns && !is_android) || is_mac ++ enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd # Enables use of the session service, which is enabled by default. # Android stores them separately on the Java side. diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index bbcd4ed5bd9a..eecf4c8204ce 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/common/pref_names.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.cc -@@ -953,7 +953,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -982,7 +982,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1047,7 +1047,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1076,7 +1076,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1434,7 +1434,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1468,7 +1468,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -1716,12 +1716,12 @@ const char kAuthAndroidNegotiateAccountType[] = +@@ -1730,12 +1730,12 @@ const char kAuthAndroidNegotiateAccountType[] = // domain sub-content requests. const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 5be274fc6212..67623a3c23fe 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2019-06-04 18:55:19 UTC +--- chrome/common/pref_names.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.h -@@ -302,7 +302,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -309,7 +309,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -332,7 +332,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -339,7 +339,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -488,7 +488,7 @@ extern const char kAppWindowPlacement[]; +@@ -496,7 +496,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) -@@ -692,9 +692,9 @@ extern const char kGSSAPILibraryName[]; +@@ -696,9 +696,9 @@ extern const char kGSSAPILibraryName[]; extern const char kAuthAndroidNegotiateAccountType[]; extern const char kAllowCrossOriginAuthPrompt[]; diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index a349d6d2512c..33b27e9f08b9 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.cc -@@ -251,7 +251,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -299,7 +299,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me const char kChromeUICastHost[] = "cast"; #endif @@ -9,7 +9,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -262,17 +262,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -310,17 +310,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -30,7 +30,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -463,13 +463,13 @@ const char* const kChromeHostURLs[] = { +@@ -525,13 +525,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 009fc83dd3df..2355e0a4e503 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2019-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.h -@@ -246,7 +246,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -262,7 +262,7 @@ extern const char kChromeUIMetroFlowURL[]; extern const char kChromeUICastHost[]; #endif @@ -9,7 +9,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -258,17 +258,17 @@ extern const char kChromeUIHatsURL[]; +@@ -274,17 +274,17 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index 9e5a27985621..58a2217abe7e 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -986,7 +986,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1011,7 +1011,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 1b6bc6ce6e8a..8b33510aee79 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2019-06-04 18:55:19 UTC +--- chrome/test/BUILD.gn.orig 2019-07-24 18:58:15 UTC +++ chrome/test/BUILD.gn -@@ -5399,7 +5399,7 @@ test("chrome_app_unittests") { +@@ -5475,7 +5475,7 @@ test("chrome_app_unittests") { "//components/crash/core/common", "//components/flags_ui:switches", ] diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 90b47cba6dc7..0f98cebed8e2 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -74,6 +74,10 @@ +@@ -75,6 +75,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -106,7 +110,7 @@ +@@ -101,7 +105,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index c60b12af1029..f88d7c1bd355 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,8 +1,8 @@ ---- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/testing_browser_process.h -@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { - DownloadStatusUpdater* download_status_updater() override; +@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; + StartupData* startup_data() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - void StartAutoupdateTimer() override {} diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index b6da2ed23b8a..c54ba38f7eba 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include #include #include -@@ -263,7 +263,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -280,7 +280,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -18,7 +18,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -273,7 +273,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -290,7 +290,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -27,10 +27,10 @@ // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -412,7 +412,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() - } +@@ -435,7 +435,7 @@ void CastBrowserMainParts::ToolkitInitialized() { + views_delegate_ = std::make_unique(); + #endif // defined(USE_AURA) - void CastBrowserMainParts::ToolkitInitialized() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Without this call, the FontConfig library gets implicitly initialized diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index de12823db6fa..1f934b98cfb3 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -575,7 +575,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -576,7 +576,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn index e90005f6196c..e3c84406e9bf 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/metrics/BUILD.gn -@@ -31,7 +31,7 @@ cast_source_set("metrics") { +@@ -32,7 +32,7 @@ cast_source_set("metrics") { "//third_party/metrics_proto", ] diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc deleted file mode 100644 index 9b6852216fb1..000000000000 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc +++ /dev/null @@ -1,102 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.cc -@@ -38,9 +38,9 @@ - #include "content/public/common/content_switches.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chromecast/browser/metrics/external_metrics.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_ANDROID) - #include "chromecast/base/android/dumpstate_writer.h" -@@ -60,10 +60,10 @@ const char kMetricsOldClientID[] = "user_experience_me - const char kClientIdName[] = "Client ID"; - #else - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char kExternalUmaEventsRelativePath[] = "metrics/uma-events"; - const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events"; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - const struct ChannelMap { - const char* chromecast_channel; -@@ -280,19 +280,19 @@ CastMetricsServiceClient::CastMetricsServiceClient( - : delegate_(delegate), - pref_service_(pref_service), - client_info_loaded_(false), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - external_metrics_(nullptr), - platform_metrics_(nullptr), --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - task_runner_(base::ThreadTaskRunnerHandle::Get()), - url_loader_factory_(url_loader_factory) { - } - - CastMetricsServiceClient::~CastMetricsServiceClient() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK(!external_metrics_); - DCHECK(!platform_metrics_); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::OnApplicationNotIdle() { -@@ -300,13 +300,13 @@ void CastMetricsServiceClient::OnApplicationNotIdle() - } - - void CastMetricsServiceClient::ProcessExternalEvents(const base::Closure& cb) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - external_metrics_->ProcessExternalEvents( - base::Bind(&ExternalMetrics::ProcessExternalEvents, - base::Unretained(platform_metrics_), cb)); - #else - cb.Run(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::SetForceClientId( -@@ -371,7 +371,7 @@ void CastMetricsServiceClient::Initialize() { - if (IsReportingEnabled()) - metrics_service_->Start(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Start external metrics collection, which feeds data from external - // processes into the main external metrics. - external_metrics_ = new ExternalMetrics( -@@ -381,7 +381,7 @@ void CastMetricsServiceClient::Initialize() { - platform_metrics_ = - new ExternalMetrics(stability_provider, kPlatformUmaEventsPath); - platform_metrics_->Start(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::Finalize() { -@@ -390,14 +390,14 @@ void CastMetricsServiceClient::Finalize() { - metrics_service_->RecordCompletedSessionEnd(); - #endif // !defined(OS_ANDROID) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Stop metrics service cleanly before destructing CastMetricsServiceClient. - // The pointer will be deleted in StopAndDestroy(). - external_metrics_->StopAndDestroy(); - external_metrics_ = nullptr; - platform_metrics_->StopAndDestroy(); - platform_metrics_ = nullptr; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - metrics_service_->Stop(); - } - diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h deleted file mode 100644 index 8f4202cc7940..000000000000 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h +++ /dev/null @@ -1,15 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.h -@@ -111,10 +111,10 @@ class CastMetricsServiceClient : public ::metrics::Met - std::string force_client_id_; - bool client_info_loaded_; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - ExternalMetrics* external_metrics_; - ExternalMetrics* platform_metrics_; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - const scoped_refptr task_runner_; - std::unique_ptr<::metrics::MetricsStateManager> metrics_state_manager_; - std::unique_ptr<::metrics::MetricsService> metrics_service_; diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc index c35f7619cbf4..325527a66d53 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-06-04 18:55:21 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -227,7 +227,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -215,7 +215,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna } bool OfferStoreUnmaskedCards(bool is_off_the_record) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 1beaa01507fc..600810092a1d 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2019-06-04 18:55:21 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1949,10 +1949,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1940,10 +1940,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index 147fe2467b6f..4bb0156fb1e1 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-04-30 22:22:41 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -202,7 +202,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn index 3cc3df11aab5..53de5d05b67e 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,28 +1,19 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/content/app/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/content/app/BUILD.gn -@@ -36,12 +36,12 @@ static_library("app") { +@@ -37,7 +37,7 @@ static_library("app") { sources += [ "crashpad.cc" ] } -- if (is_android || (is_linux && !is_chromeos)) { -+ if (is_android || (is_linux && !is_chromeos && !is_bsd)) { - set_sources_assignment_filter([]) - sources += [ "crashpad_linux.cc" ] - } - - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -82,7 +82,10 @@ static_library("app") { - "//third_party/crashpad/crashpad/snapshot", +@@ -78,7 +78,7 @@ static_library("app") { + "//sandbox", ] - if (is_linux) { -+ if (is_bsd) { -+ deps -= [ "//third_party/crashpad/crashpad/snapshot" ] -+ } + if (is_linux && !is_bsd) { deps += [ "//third_party/breakpad:client" ] } diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn index b042dcf472a0..0ffc64ea8f92 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/core/common/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/core/common/BUILD.gn -@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") +@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn declare_args() { # If set to true, this will stub out and disable the entire crash key system. @@ -9,7 +9,7 @@ } group("common") { -@@ -92,7 +92,6 @@ target(crash_key_target_type, "crash_key") { +@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") { ] } @@ -17,7 +17,7 @@ } } -@@ -147,7 +146,7 @@ source_set("unit_tests") { +@@ -153,7 +152,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc index 080a98e51b65..a4a10cdb5790 100644 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc @@ -1,6 +1,6 @@ ---- components/download/internal/common/base_file.cc.orig 2019-04-30 22:22:41 UTC +--- components/download/internal/common/base_file.cc.orig 2019-07-24 18:58:19 UTC +++ components/download/internal/common/base_file.cc -@@ -494,7 +494,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { +@@ -516,7 +516,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { } #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ namespace { -@@ -578,7 +578,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn +@@ -600,7 +600,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index e8252eefd572..1b6be4c76a46 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con - const char kTabReopened[] = "tab_reopened"; +@@ -29,9 +29,9 @@ const char kFocusModeOpened[] = "focus_mode_opened"; + const char kFocusModeConditionsMet[] = "focus_mode_conditions_met"; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 6fea1eadd62f..fca3b9dd3629 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.h.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.h -@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[]; - extern const char kTabReopened[]; +@@ -57,7 +57,7 @@ extern const char kFocusModeOpened[]; + extern const char kFocusModeConditionsMet[]; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) @@ -9,7 +9,7 @@ // This event is included in the deferred onboarding events for the New Tab // described above, but it is also used on iOS, so it must be compiled // separately. -@@ -57,7 +57,7 @@ extern const char kTabReopened[]; +@@ -65,7 +65,7 @@ extern const char kFocusModeConditionsMet[]; // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index b74cc52fc72f..21f35446e18e 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2019-07-24 18:58:19 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -150,6 +150,9 @@ void ToCheckinProtoVersion( +@@ -149,6 +149,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index e50efbe67667..05a61bd2fa4b 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2019-04-30 22:22:42 UTC +--- components/metrics/BUILD.gn.orig 2019-07-24 18:58:19 UTC +++ components/metrics/BUILD.gn -@@ -144,6 +144,11 @@ jumbo_static_library("metrics") { +@@ -146,6 +146,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 4c3918ed3c93..4e1e83b76db8 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2019-06-04 18:55:21 UTC +--- components/metrics/metrics_log.cc.orig 2019-07-24 18:58:19 UTC +++ components/metrics/metrics_log.cc -@@ -197,7 +197,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic +@@ -210,7 +210,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index b932f6d6a265..f75e956cab6e 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-04-30 22:22:42 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-07-24 18:58:19 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -697,7 +697,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -716,7 +716,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index e45e15c95769..dcdc4f09f362 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2019-06-04 18:55:21 UTC +--- components/policy/resources/policy_templates.json.orig 2019-07-24 18:58:20 UTC +++ components/policy/resources/policy_templates.json -@@ -984,7 +984,7 @@ +@@ -1019,7 +1019,7 @@ 'name': 'HomepageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1013,7 +1013,7 @@ +@@ -1048,7 +1048,7 @@ 'name': 'HomepageIsNewTabPage', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1039,7 +1039,7 @@ +@@ -1074,7 +1074,7 @@ 'name': 'NewTabPageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1732,7 +1732,7 @@ +@@ -1767,7 +1767,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3369,7 +3369,7 @@ +@@ -3399,7 +3399,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3421,7 +3421,7 @@ +@@ -3450,7 +3450,7 @@ 'name': 'NtlmV2Enabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -6537,7 +6537,7 @@ +@@ -6637,7 +6637,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7667,7 +7667,7 @@ +@@ -7761,7 +7761,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -8183,7 +8183,7 @@ +@@ -8277,7 +8277,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc index c9bf5bdb81f6..15ae4e284e0b 100644 --- a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc +++ b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc @@ -1,6 +1,6 @@ ---- components/services/filesystem/file_system_app.cc.orig 2019-04-30 22:22:43 UTC +--- components/services/filesystem/file_system_app.cc.orig 2019-07-24 18:58:21 UTC +++ components/services/filesystem/file_system_app.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #elif defined(OS_ANDROID) #include "base/base_paths_android.h" #include "base/path_service.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) -@@ -74,7 +74,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { +@@ -68,7 +68,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { CHECK(base::PathService::Get(base::DIR_APP_DATA, &path)); #elif defined(OS_ANDROID) CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc new file mode 100644 index 000000000000..52dda1501cee --- /dev/null +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -0,0 +1,26 @@ +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-07-29 16:01:57 UTC ++++ components/sync_device_info/local_device_info_util_linux.cc +@@ -30,6 +30,23 @@ std::string GetSessionNameInternal() { + break; + } + return "Chromebook"; ++#elif defined(OS_BSD) ++ long len = sysconf(_SC_HOST_NAME_MAX); ++ ++ if (len == -1) ++ return "FreeBSD"; ++ ++ char *hostname = new (std::nothrow) char[len](); ++ ++ if ((hostname == nullptr) || (gethostname(hostname, len) == -1)) { ++ delete[](hostname); ++ return "FreeBSD"; ++ } ++ ++ std::string res{hostname}; ++ ++ delete[](hostname); ++ return res; + #else + char hostname[HOST_NAME_MAX]; + if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc deleted file mode 100644 index 6afc6529bc28..000000000000 --- a/www/chromium/files/patch-components_sync_base_get__session__name.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/sync/base/get_session_name.cc.orig 2019-04-30 22:22:44 UTC -+++ components/sync/base/get_session_name.cc -@@ -17,7 +17,7 @@ - - #if defined(OS_CHROMEOS) - #include "chromeos/constants/devicetype.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "components/sync/base/get_session_name_linux.h" - #elif defined(OS_IOS) - #include "components/sync/base/get_session_name_ios.h" -@@ -53,7 +53,7 @@ std::string GetSessionNameBlocking() { - session_name = "Chromebook"; - break; - } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - session_name = internal::GetHostname(); - #elif defined(OS_IOS) - session_name = internal::GetComputerName(); diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc deleted file mode 100644 index f82fe5e19719..000000000000 --- a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC -+++ components/sync/base/get_session_name_linux.cc -@@ -13,8 +13,9 @@ namespace syncer { - namespace internal { - - std::string GetHostname() { -- char hostname[HOST_NAME_MAX]; -- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, len) == 0) // Success. - return hostname; - return base::GetLinuxDistro(); - } diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index fc52368a6836..57cb14d98fb1 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2019-04-30 22:22:45 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-07-24 18:58:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -96,17 +96,17 @@ +@@ -99,17 +99,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,7 +21,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -127,7 +127,7 @@ +@@ -130,7 +130,7 @@ #include "content/public/common/content_client.h" #endif @@ -30,7 +30,7 @@ #if !defined(CHROME_MULTIPLE_DLL_BROWSER) #include "content/child/field_trial.h" -@@ -319,7 +319,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -322,7 +322,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,7 +39,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -416,7 +416,7 @@ void PreSandboxInit() { +@@ -419,7 +419,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -48,7 +48,7 @@ } // namespace -@@ -474,7 +474,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -477,7 +477,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -642,11 +642,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 8dcb31f8c439..d4c4492aef33 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,14 +1,11 @@ ---- content/browser/BUILD.gn.orig 2019-06-04 18:55:22 UTC +--- content/browser/BUILD.gn.orig 2019-07-24 18:58:23 UTC +++ content/browser/BUILD.gn -@@ -1982,11 +1982,6 @@ jumbo_source_set("browser") { - "tracing/cros_tracing_agent.h", +@@ -2058,7 +2058,7 @@ jumbo_source_set("browser") { + "//chromeos/resources", + "//components/chromeos_camera:mojo_mjpeg_decode_accelerator", ] - deps += [ "//chromeos/resources" ] - } else { -- sources += [ -- "memory/memory_monitor_linux.cc", -- "memory/memory_monitor_linux.h", -- ] - } - - if (is_chromeos || is_android || is_chromecast) { ++ } else if (!is_bsd) { + sources += [ + "memory/memory_monitor_linux.cc", + "memory/memory_monitor_linux.h", diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 0e034f5a2b61..b47373ffcc85 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC +--- content/browser/browser_main_loop.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/browser_main_loop.cc @@ -251,6 +251,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -593,6 +600,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -576,6 +583,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif #if defined(USE_X11) -@@ -636,7 +648,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -619,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) @@ -35,7 +35,7 @@ defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. -@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); diff --git a/www/chromium/files/patch-content_browser_builtin__service__manifests.cc b/www/chromium/files/patch-content_browser_builtin__service__manifests.cc new file mode 100644 index 000000000000..aa515107168a --- /dev/null +++ b/www/chromium/files/patch-content_browser_builtin__service__manifests.cc @@ -0,0 +1,20 @@ +--- content/browser/builtin_service_manifests.cc.orig 2019-07-29 19:11:14 UTC ++++ content/browser/builtin_service_manifests.cc +@@ -33,7 +33,7 @@ + #include "services/video_capture/public/cpp/manifest.h" + #include "services/viz/public/cpp/manifest.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/cpp/manifest.h" // nogncheck + #endif + +@@ -99,7 +99,7 @@ const std::vector& GetBuilt + : service_manager::Manifest::ExecutionMode:: + kInProcessBuiltin), + viz::GetManifest(), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + font_service::GetManifest(), + #endif + #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 8bbab3b5f149..7bcb296f41b8 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1082,7 +1082,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1062,7 +1062,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr cmd_line = std::make_unique(base::CommandLine::NO_PROGRAM); #else @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 4c2671b2267c..c66eeab22457 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2019-05-04 09:03:05 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -343,7 +343,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index c8ba9a364c0c..437db86a57d7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -231,7 +231,7 @@ +@@ -229,7 +229,7 @@ #include "content/browser/compositor/image_transport_factory.h" #endif @@ -9,7 +9,7 @@ #include #include #endif -@@ -1211,7 +1211,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1231,7 +1231,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1222,7 +1222,7 @@ size_t GetPlatformProcessLimit() { +@@ -1242,7 +1242,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1636,7 +1636,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1654,7 +1654,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -35,4 +35,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 57078cc52adc..691d494cdd28 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-06-04 18:55:23 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -401,10 +401,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -400,10 +400,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 5405f6235346..2502fa83ea02 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -124,7 +124,7 @@ +@@ -117,7 +117,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2287,7 +2287,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2200,7 +2200,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2485,7 +2485,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2397,7 +2397,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc index f59102abdd13..0d0ec1908d24 100644 --- a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc +++ b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc @@ -1,15 +1,15 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/service_manager/service_manager_context.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/service_manager/service_manager_context.cc -@@ -99,7 +99,7 @@ +@@ -98,7 +98,7 @@ #include "jni/ContentNfcDelegate_jni.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/font_service_app.h" - #include "components/services/font/public/interfaces/constants.mojom.h" + #include "components/services/font/public/interfaces/constants.mojom.h" // nogncheck #endif -@@ -378,12 +378,12 @@ void CreateInProcessAudioService( +@@ -342,12 +342,12 @@ void CreateInProcessAudioService( BrowserMainLoop::GetAudioManager(), std::move(request))); } @@ -24,12 +24,12 @@ std::unique_ptr CreateResourceCoordinatorService( service_manager::mojom::ServiceRequest request) { -@@ -605,7 +605,7 @@ ServiceManagerContext::ServiceManagerContext( +@@ -665,7 +665,7 @@ ServiceManagerContext::ServiceManagerContext( base::BindRepeating(&CreateVideoCaptureService)); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) RegisterInProcessService( - packaged_services_connection_.get(), font_service::mojom::kServiceName, + font_service::mojom::kServiceName, base::CreateSequencedTaskRunnerWithTraits( diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index d5e03434e915..767ca6f739f5 100644 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,12 +1,15 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -101,9 +101,9 @@ const std::map CreateMojoResourceIdT - {IDR_MOJO_BIG_BUFFER_MOJOM_LITE_JS, "js/big_buffer.mojom-lite.js"}, - {IDR_MOJO_FILE_MOJOM_LITE_JS, "js/file.mojom-lite.js"}, - {IDR_MOJO_STRING16_MOJOM_LITE_JS, "js/string16.mojom-lite.js"}, +@@ -119,12 +119,12 @@ const std::map CreateMojoResourceIdT + "mojo/mojo/public/mojom/base/string16.mojom.html"}, + {IDR_MOJO_STRING16_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/string16.mojom-lite.js"}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {IDR_MOJO_TIME_MOJOM_LITE_JS, "js/time.mojom-lite.js"}, + {IDR_MOJO_TIME_MOJOM_HTML, + "mojo/mojo/public/mojom/base/time.mojom.html"}, + {IDR_MOJO_TIME_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) }; diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 18c6260202f9..e149fe9db7b5 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- content/common/BUILD.gn.orig 2019-07-24 18:58:24 UTC +++ content/common/BUILD.gn -@@ -375,6 +375,12 @@ source_set("common") { +@@ -381,6 +381,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 2a3b751ec206..ee699a82ce2e 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2019-04-30 22:22:47 UTC +--- content/gpu/gpu_main.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_main.cc @@ -79,7 +79,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -363,7 +363,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -369,7 +369,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +36,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -398,7 +398,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -404,7 +404,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 108731c88ab0..b9266e56d4aa 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -277,8 +278,10 @@ std::vector FilePermissionsForGp +@@ -287,8 +288,10 @@ std::vector FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() { +@@ -303,6 +306,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu( +@@ -358,6 +362,7 @@ bool LoadLibrariesForGpu( return true; } @@ -38,7 +38,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook( +@@ -378,13 +383,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc deleted file mode 100644 index de0f19f529d7..000000000000 --- a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/public/app/content_packaged_services_manifest.cc.orig 2019-06-04 18:55:23 UTC -+++ content/public/app/content_packaged_services_manifest.cc -@@ -23,7 +23,7 @@ - #include "services/video_capture/public/cpp/manifest.h" - #include "services/viz/public/cpp/manifest.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/manifest.h" // nogncheck - #endif - -@@ -63,7 +63,7 @@ const service_manager::Manifest& GetContentPackagedSer - .PackageService(tracing::GetManifest()) - .PackageService(video_capture::GetManifest()) - .PackageService(viz::GetManifest()) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - .PackageService(font_service::GetManifest()) - #endif - #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index bd32ffbf6314..d7f2fe5c2985 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,4 +1,4 @@ ---- content/public/common/child_process_host.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/child_process_host.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/child_process_host.h @@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. @@ -9,12 +9,3 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -60,7 +60,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se - // gdb). In this case, you'd use GetChildPath to get the real executable - // file name, and then prepend the GDB command to the command line. - CHILD_ALLOW_SELF = 1 << 0, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - }; - - // Returns the pathname to be used for a child process. If a subprocess diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 97050b5cf57f..94548e336aa5 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/common_param_traits_macros.h -@@ -331,7 +331,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -329,7 +329,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 571c55458c84..0bf68d97af34 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_features.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_features.cc -@@ -559,7 +559,7 @@ const base::Feature kWebAssemblyThreads { +@@ -577,7 +577,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -9,7 +9,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -594,7 +594,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -612,7 +612,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 551441cfb891..08f41bb44f03 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_switches.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_switches.cc -@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -949,7 +949,7 @@ const char kEnableAutomation[] = "enable-automation"; const char kDisablePanelFitting[] = "disable-panel-fitting"; #endif diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 178d3bdc4cda..54b76f65a09e 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,6 +1,6 @@ ---- content/public/test/browser_test_base.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/test/browser_test_base.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/test/browser_test_base.cc -@@ -63,6 +63,10 @@ +@@ -75,6 +75,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index 3eb2dcd8f640..36742f1dfeda 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,11 +1,11 @@ ---- content/renderer/render_process_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/render_process_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_process_impl.cc -@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl( +@@ -157,7 +157,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); -#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - bool use_v8_signal_handler = false; base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch( diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 03a7cdfad5c5..85394137eeab 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_thread_impl.cc -@@ -191,12 +191,21 @@ +@@ -187,12 +187,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -917,7 +926,7 @@ void RenderThreadImpl::Init() { +@@ -907,7 +916,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,7 +31,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -958,7 +967,7 @@ void RenderThreadImpl::Init() { +@@ -939,7 +948,7 @@ void RenderThreadImpl::Init() { GetConnector()->BindInterface(mojom::kBrowserServiceName, mojo::MakeRequest(&storage_partition_service_)); @@ -40,7 +40,7 @@ render_message_filter()->SetThreadPriority( ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); #endif -@@ -1332,7 +1341,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1321,7 +1330,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 6d7ab6884b04..fe449c23578a 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -113,7 +113,7 @@ +@@ -108,7 +108,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -206,7 +206,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( ->Clone(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); @@ -18,7 +18,7 @@ font_loader_ = sk_make_sp(connector_.get()); SkFontConfigInterface::SetGlobal(font_loader_); #endif -@@ -215,7 +215,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -208,7 +208,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( connector_ = service_manager::Connector::Create(&request); } @@ -27,7 +27,7 @@ if (g_sandbox_enabled && sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -243,7 +243,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( +@@ -236,7 +236,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( } void RendererBlinkPlatformImpl::Shutdown() { @@ -36,7 +36,7 @@ // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -324,7 +324,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -311,7 +311,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -45,7 +45,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -337,7 +337,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -324,7 +324,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 1a432146787a..57e23d4585ea 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-07-24 18:58:25 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr connector_; scoped_refptr io_runner_; @@ -18,7 +18,7 @@ std::unique_ptr sandbox_support_; #endif -@@ -311,7 +311,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -296,7 +296,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr web_transmission_encoding_info_handler_; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 4454beb5747c..833001dcb9b0 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- content/shell/BUILD.gn.orig 2019-07-24 18:58:25 UTC +++ content/shell/BUILD.gn -@@ -947,7 +947,7 @@ group("content_shell_crash_test") { +@@ -961,7 +961,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } -- if (is_posix && !is_android) { -+ if (is_posix && !is_android && !is_bsd) { +- if (is_posix) { ++ if (is_posix && !is_bsd) { data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + "//third_party/breakpad:dump_syms", + "//third_party/breakpad:minidump_stackwalk", diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc new file mode 100644 index 000000000000..a40dcd5bd1f2 --- /dev/null +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -0,0 +1,20 @@ +--- content/shell/app/shell_main_delegate.cc.orig 2019-07-29 19:14:59 UTC ++++ content/shell/app/shell_main_delegate.cc +@@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + + v8_crashpad_support::SetUp(); + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); + #endif + #if defined(OS_MACOSX) +@@ -314,7 +314,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + } + + void ShellMainDelegate::PreSandboxStartup() { +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index 1cb41f0e4fbc..f8fb589f6246 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -108,7 +108,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -115,7 +115,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc index ad856fcc3d60..fce9b779f199 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/browser/web_test/web_test_browser_main_parts.cc -@@ -42,7 +42,7 @@ +@@ -37,7 +37,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc index 2441104b8d0d..808ff4655bd7 100644 --- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc @@ -1,29 +1,29 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/test_runner/test_runner.cc @@ -66,7 +66,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1546,7 +1546,7 @@ void TestRunner::Reset() { +@@ -1538,7 +1538,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2075,7 +2075,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2065,7 +2065,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Since FontConfig doesn't provide a variable to control subpixel // positioning, we'll fall back to setting it globally for all fonts. blink::WebFontRenderStyle::SetSubpixelPositioning(value); diff --git a/www/chromium/files/patch-device_usb_BUILD.gn b/www/chromium/files/patch-device_usb_BUILD.gn deleted file mode 100644 index 2d5a3b0a8dcc..000000000000 --- a/www/chromium/files/patch-device_usb_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC -+++ device/usb/BUILD.gn -@@ -112,10 +112,17 @@ static_library("usb") { - ] - } - -- if (is_android || is_chromeos || is_linux) { -+ if (is_android || is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "usb_device_handle_usbfs.cc", - "usb_device_handle_usbfs.h", -+ ] -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "usb_device_linux.cc", -+ "usb_device_linux.h", - ] - } - diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc deleted file mode 100644 index dd97946fb79e..000000000000 --- a/www/chromium/files/patch-device_usb_usb__context.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_context.cc -@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() { - - void UsbContext::UsbEventHandler::Stop() { - base::subtle::Release_Store(&running_, 0); -+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version - libusb_interrupt_handle_event(context_); -+#endif - } - - UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc deleted file mode 100644 index a23797cfef2c..000000000000 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_error.cc -@@ -9,7 +9,7 @@ - namespace device { - - std::string ConvertPlatformUsbErrorToString(int errcode) { -- return libusb_strerror(static_cast(errcode)); -+ return ""; - } - - } // namespace device diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc deleted file mode 100644 index 4f222e5fe7e0..000000000000 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- device/usb/usb_service_impl.cc.orig 2019-06-04 18:55:24 UTC -+++ device/usb/usb_service_impl.cc -@@ -234,8 +234,10 @@ UsbServiceImpl::UsbServiceImpl() - - UsbServiceImpl::~UsbServiceImpl() { - NotifyWillDestroyUsbService(); -+#if !defined(OS_FREEBSD) - if (hotplug_enabled_) - libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -+#endif // !defined(OS_FREEBSD) - } - - void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -290,6 +292,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrcontext(), - static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -302,6 +305,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrOnDisconnect(); - } - -+#if !defined(OS_FREEBSD) - // static - int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, - libusb_device* device_raw, -@@ -531,6 +536,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb - - return 0; - } -+#endif // !defined(OS_FREEBSD) - - void UsbServiceImpl::OnPlatformDeviceAdded( - ScopedLibusbDeviceRef platform_device) { diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h deleted file mode 100644 index b9bdde03159d..000000000000 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ /dev/null @@ -1,26 +0,0 @@ ---- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_service_impl.h -@@ -73,11 +73,13 @@ class UsbServiceImpl : - scoped_refptr device); - void RemoveDevice(scoped_refptr device); - -+#if !defined(OS_FREEBSD) - // Handle hotplug events from libusb. - static int LIBUSB_CALL HotplugCallback(libusb_context* context, - libusb_device* device, - libusb_hotplug_event event, - void* user_data); -+#endif - // These functions release a reference to the provided platform device. - void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); - void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); -@@ -97,7 +99,9 @@ class UsbServiceImpl : - // connected instead of only when a full enumeration is requested. - // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_ = false; -+#if !defined(OS_FREEBSD) - libusb_hotplug_callback_handle hotplug_handle_; -+#endif - - // Enumeration callbacks are queued until an enumeration completes. - bool enumeration_ready_ = false; diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 3f13f43d7e15..732fe5e884f2 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -29,7 +29,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index f626f1c08048..0ce7f4e6ffa8 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2019-04-30 22:22:49 UTC +--- extensions/common/api/_permission_features.json.orig 2019-07-24 18:58:27 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -473,7 +473,7 @@ +@@ -469,7 +469,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -504,7 +504,7 @@ +@@ -500,7 +500,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index a2cd4e35c041..e97794f406b1 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,11 +1,11 @@ ---- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/common/features/feature.cc -@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -20,7 +20,7 @@ namespace extensions { + Feature::Platform Feature::GetCurrentPlatform() { + #if defined(OS_CHROMEOS) + return CHROMEOS_PLATFORM; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return LINUX_PLATFORM; + #elif defined(OS_MACOSX) return MACOSX_PLATFORM; - #elif defined(OS_WIN) - return WIN_PLATFORM; -+#elif defined(OS_BSD) -+ return LINUX_PLATFORM; - #else - return UNSPECIFIED_PLATFORM; - #endif diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index 5b78e4c1edba..d8cf13ba65e5 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -18,7 +18,7 @@ +@@ -26,7 +26,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -9,7 +9,7 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -140,7 +140,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -439,7 +439,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa #if defined(OS_FUCHSIA) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; @@ -18,7 +18,7 @@ if (!texture_) { VkMemoryGetFdInfoKHR get_fd_info; get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; -@@ -202,7 +202,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -502,7 +502,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa } return std::make_unique( manager, this, tracker, texture_, texture_->service_id()); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 579cba128615..5aab116e20b1 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,15 +1,15 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo +@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in + #endif } - #endif // defined(OS_WIN) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ } // namespace -@@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -150,7 +150,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -201,7 +201,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -220,7 +220,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; @@ -36,7 +36,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -229,7 +229,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -45,16 +45,16 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - InitializeDirectCompositionOverlaySupport(&gpu_info_); - #endif +@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + + InitializePlatformOverlaySettings(&gpu_info_); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -63,16 +63,16 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c - InitializeDirectCompositionOverlaySupport(&gpu_info_); - #endif +@@ -516,7 +516,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + + InitializePlatformOverlaySettings(&gpu_info_); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -536,7 +536,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index fc8d721f4aca..af39329a6e9d 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" @@ -9,12 +9,12 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { - return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); +@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( + return std::make_unique(); #elif defined(OS_ANDROID) - return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); + return std::make_unique(); -#elif defined(OS_LINUX) || defined(OS_FUCHSIA) +#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap); + return std::make_unique( + vulkan_context_provider); #elif defined(OS_WIN) - return base::WrapUnique(new GpuMemoryBufferFactoryDXGI); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index 900372366661..8021272770eb 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -54,8 +54,10 @@ const int kGpuTimeout = 10000; +@@ -55,8 +55,10 @@ const int kGpuTimeout = 10000; #endif #if defined(USE_X11) @@ -11,7 +11,7 @@ const unsigned char text[20] = "check"; #endif -@@ -78,8 +80,10 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -79,8 +81,10 @@ GpuWatchdogThread::GpuWatchdogThread() display_(nullptr), window_(0), atom_(x11::None), @@ -22,7 +22,7 @@ weak_factory_(this) { base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); -@@ -94,7 +98,9 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -95,7 +99,9 @@ GpuWatchdogThread::GpuWatchdogThread() #endif #if defined(USE_X11) @@ -32,7 +32,7 @@ SetupXServer(); #endif base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -242,8 +248,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -231,8 +237,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { power_monitor->RemoveObserver(this); #if defined(USE_X11) @@ -43,7 +43,7 @@ if (display_) { DCHECK(window_); XDestroyWindow(display_, window_); -@@ -467,7 +475,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover +@@ -436,7 +444,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover return; #endif @@ -52,7 +52,7 @@ // Don't crash if we're not on the TTY of our host X11 server. int active_tty = GetActiveTTY(); if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) { -@@ -554,7 +562,9 @@ void GpuWatchdogThread::SetupXServer() { +@@ -510,7 +518,9 @@ void GpuWatchdogThread::SetupXServer() { CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); atom_ = XInternAtom(display_, "CHECK", x11::False); } @@ -62,7 +62,7 @@ } void GpuWatchdogThread::SetupXChangeProp() { -@@ -657,7 +667,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT +@@ -611,7 +621,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index 782be406427b..1f736ba2f75f 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -195,8 +195,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi XDisplay* display_; gfx::AcceleratedWidget window_; XAtom atom_; diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index c10bfa481ca5..3093f01c5b61 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -305,7 +305,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -352,7 +352,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif @@ -9,7 +9,7 @@ vkGetSemaphoreFdKHRFn = reinterpret_cast( vkGetDeviceProcAddrFn(vk_device, "vkGetSemaphoreFdKHR")); -@@ -319,7 +319,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -366,7 +366,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index bcf27d2ad1a8..70fcc795f218 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -131,13 +131,13 @@ struct VulkanFunctionPointers { +@@ -145,13 +145,13 @@ struct VulkanFunctionPointers { #endif // Device functions shared between Linux and Android. @@ -16,7 +16,7 @@ PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; #endif -@@ -286,14 +286,14 @@ struct VulkanFunctionPointers { +@@ -313,14 +313,14 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 9c424a4c41d9..c35942a703cc 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2019-04-30 22:22:49 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -189,7 +189,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -178,7 +178,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } @@ -9,7 +9,7 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -200,7 +200,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -189,7 +189,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index 36ed1838d3ff..b71066ee7708 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-06-04 18:55:24 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -35,7 +35,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -36,7 +36,7 @@ class HeadlessContentBrowserClient : public content::C ::storage::OptionalQuotaSettingsCallback callback) override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 6b3f197c066a..00d57043fb58 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.cc -@@ -356,7 +356,7 @@ void ParamTraits::Log(const param_type& +@@ -355,7 +355,7 @@ void ParamTraits::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index b3744d4c0d96..b5d5bf84b128 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.h.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.h -@@ -204,7 +204,7 @@ struct ParamTraits { +@@ -205,7 +205,7 @@ struct ParamTraits { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 0ceb731b9952..a40d2bc207fb 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.cc.orig 2019-07-24 18:58:30 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; @@ -34,8 +34,8 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If there are any |dmabuf_fds_| plugged in, we should duplicate them. - if (frame->storage_type() == STORAGE_DMABUFS) { - wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_); + if (frame.storage_type() == STORAGE_DMABUFS) { + wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame.dmabuf_fds_); @@ -950,7 +950,7 @@ size_t VideoFrame::shared_memory_offset() const { return shared_memory_offset_; } diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 02dbb8ddb239..1abbeab3f146 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.h.orig 2019-07-24 18:58:30 UTC +++ media/base/video_frame.h -@@ -72,7 +72,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -74,7 +74,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. @@ -9,7 +9,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -266,7 +266,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -268,7 +268,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,7 +18,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -458,7 +458,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -464,7 +464,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; @@ -27,7 +27,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -652,7 +652,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // memory. size_t shared_memory_offset_; diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index bd9dfa2a89f3..40b161c1bf98 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2019-06-04 18:55:25 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-07-24 18:58:30 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -298,7 +298,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc new file mode 100644 index 000000000000..083e80e8e001 --- /dev/null +++ b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc @@ -0,0 +1,38 @@ +--- media/gpu/libyuv_image_processor.cc.orig 2019-07-29 19:24:17 UTC ++++ media/gpu/libyuv_image_processor.cc +@@ -91,7 +91,7 @@ std::unique_ptr LibYUVImageProce + // LibYUVImageProcessor supports only memory-based video frame for input. + VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; + for (auto input_type : input_config.preferred_storage_types) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_type == VideoFrame::STORAGE_DMABUFS) { + video_frame_mapper = VideoFrameMapperFactory::CreateMapper( + input_config.layout.format(), true); +@@ -100,7 +100,7 @@ std::unique_ptr LibYUVImageProce + break; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (VideoFrame::IsStorageTypeMappable(input_type)) { + input_storage_type = input_type; +@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptrBelongsToCurrentThread()); + DVLOGF(4); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { + DCHECK_NE(video_frame_mapper_.get(), nullptr); + input_frame = video_frame_mapper_->Map(std::move(input_frame)); +@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr duped_fds = -@@ -124,7 +124,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -126,7 +126,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle } #else NOTREACHED(); diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc index b695531c0bf2..2109b75820e0 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc @@ -1,4 +1,4 @@ ---- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-06-04 18:55:25 UTC +--- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc @@ -15,7 +15,7 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -9,7 +9,7 @@ #include "media/gpu/linux/platform_video_frame_utils.h" #endif -@@ -124,7 +124,7 @@ scoped_refptr VaapiDmaBufVideoFrameMapper: +@@ -137,7 +137,7 @@ scoped_refptr VaapiDmaBufVideoFrameMapper: } gfx::GpuMemoryBufferHandle gmb_handle; diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc index 1b1de4489d36..8d5714c32cb2 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc @@ -1,4 +1,4 @@ ---- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-06-04 18:55:25 UTC +--- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/vaapi/vaapi_video_encode_accelerator.cc @@ -41,7 +41,7 @@ #include "media/gpu/vp8_reference_frame_vector.h" @@ -9,7 +9,7 @@ #include "media/gpu/linux/platform_video_frame_utils.h" #endif -@@ -555,7 +555,7 @@ scoped_refptr VaapiVideoEncodeAccelera +@@ -558,7 +558,7 @@ scoped_refptr VaapiVideoEncodeAccelera vaapi_wrapper_, MakeGLContextCurrentCallback(), BindGLImageCallback(), PictureBuffer(kDummyPictureBufferId, frame->coded_size())); gfx::GpuMemoryBufferHandle gmb_handle; diff --git a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc index dee939e97028..f1dbba5e8200 100644 --- a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc +++ b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/video_frame_mapper_factory.cc.orig 2019-06-04 18:55:25 UTC +--- media/gpu/video_frame_mapper_factory.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/video_frame_mapper_factory.cc -@@ -7,36 +7,36 @@ +@@ -7,38 +7,38 @@ #include "build/build_config.h" #include "media/gpu/buildflags.h" @@ -19,29 +19,31 @@ namespace media { // static - std::unique_ptr VideoFrameMapperFactory::CreateMapper() { + std::unique_ptr VideoFrameMapperFactory::CreateMapper( + VideoPixelFormat format) { -#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - return CreateMapper(false); + return CreateMapper(format, false); #else - return CreateMapper(true); + return CreateMapper(format, true); -#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) } // static std::unique_ptr VideoFrameMapperFactory::CreateMapper( + VideoPixelFormat format, bool linear_buffer_mapper) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (linear_buffer_mapper) - return std::make_unique(); + return GenericDmaBufVideoFrameMapper::Create(format); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) -#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - return VaapiDmaBufVideoFrameMapper::Create(); + return VaapiDmaBufVideoFrameMapper::Create(format); -#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index dd172ea7c2b0..3b1ec33b29a8 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2019-06-04 18:55:25 UTC +--- media/media_options.gni.orig 2019-07-24 18:58:30 UTC +++ media/media_options.gni -@@ -111,6 +111,9 @@ declare_args() { +@@ -110,6 +110,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc index 5f2c85e18843..a121fdc8958b 100644 --- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -1,4 +1,4 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-06-04 18:55:25 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-07-24 18:58:30 UTC +++ media/mojo/services/gpu_mojo_media_client.cc @@ -55,7 +55,7 @@ namespace media { namespace { @@ -10,8 +10,8 @@ base::WeakPtr media_gpu_channel_manager, base::UnguessableToken channel_token, @@ -199,7 +199,7 @@ std::unique_ptr GpuMojoMediaClient::Crea - std::make_unique(gpu_task_runner_, - std::move(get_stub_cb))); + std::make_unique( + gpu_task_runner_, std::move(get_stub_cb), gpu_preferences_)); #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 64330bb9d846..36519644232a 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-04-30 22:22:53 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-07-24 18:58:31 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -598,7 +598,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -597,7 +597,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 98490d51a42c..0d14b7fefa78 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-06-04 18:55:26 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-07-24 18:58:31 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -41,7 +41,7 @@ +@@ -60,7 +60,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> - + - (); diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 152648e41c6b..34788bd112d1 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-04-30 22:22:55 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-07-24 18:58:33 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -28,7 +28,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,8 +9,8 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -47,7 +47,7 @@ void SetUpOnNetworkThread(std::unique_ptr URLRequestContextBu +@@ -534,7 +534,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ProxyResolutionService::CreateSystemProxyConfigService()'s signature // doesn't suck. -@@ -542,7 +542,7 @@ std::unique_ptr URLRequestContextBu +@@ -543,7 +543,7 @@ std::unique_ptr URLRequestContextBu ProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index a32ad8c4f6e6..d60b26126c50 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2019-04-30 22:22:56 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2019-07-24 18:58:34 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -117,13 +117,13 @@ +@@ -126,13 +126,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include -@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting"; +@@ -167,11 +167,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -30,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -354,7 +354,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -369,7 +369,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr context_; @@ -39,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr cert_watcher_; #endif -@@ -563,10 +563,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -589,10 +589,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -52,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -760,7 +760,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -788,7 +788,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -61,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -846,7 +846,7 @@ void HostProcess::StartOnUiThread() { +@@ -874,7 +874,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +70,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -855,7 +855,7 @@ void HostProcess::StartOnUiThread() { +@@ -883,7 +883,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -912,7 +912,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -940,7 +940,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1564,7 +1564,7 @@ void HostProcess::StartHost() { +@@ -1634,7 +1634,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1736,7 +1736,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1819,7 +1819,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); diff --git a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc index 3b0676568632..5fbe86cba0ff 100644 --- a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc +++ b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc @@ -1,4 +1,4 @@ ---- services/content/simple_browser/simple_browser_service.cc.orig 2019-04-30 22:22:56 UTC +--- services/content/simple_browser/simple_browser_service.cc.orig 2019-07-24 18:58:34 UTC +++ services/content/simple_browser/simple_browser_service.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" // nogncheck #endif -@@ -27,7 +27,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul +@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul void SimpleBrowserService::OnStart() { if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) { diff --git a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h index 899614558c19..e117349b35f1 100644 --- a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h +++ b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h @@ -1,6 +1,6 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC +--- services/content/simple_browser/simple_browser_service.h.orig 2019-07-24 18:58:34 UTC +++ services/content/simple_browser/simple_browser_service.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "services/service_manager/public/cpp/service_binding.h" #include "services/service_manager/public/mojom/service.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #endif -@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe +@@ -45,7 +45,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe // service_manager::Service: void OnStart() override; diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn new file mode 100644 index 000000000000..fa698bc64997 --- /dev/null +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/usb/BUILD.gn.orig 2019-07-29 14:20:42 UTC ++++ services/device/usb/BUILD.gn +@@ -111,7 +111,7 @@ static_library("usb") { + ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if ((is_android || is_chromeos || is_linux) && !is_bsd) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 518017fc4d67..8c70cc7e0a3b 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2019-06-04 18:55:28 UTC +--- services/network/BUILD.gn.orig 2019-07-24 18:58:34 UTC +++ services/network/BUILD.gn -@@ -247,7 +247,6 @@ jumbo_component("network_service") { +@@ -253,7 +253,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index 435d35e5dabf..fe056ef0561f 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,24 +1,6 @@ ---- services/network/network_context.cc.orig 2019-06-04 18:55:28 UTC +--- services/network/network_context.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_context.cc -@@ -132,7 +132,7 @@ - #endif // defined(USE_NSS_CERTS) - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - #include "net/cert/cert_net_fetcher.h" - #include "net/cert_net/cert_net_fetcher_impl.h" - #endif -@@ -618,7 +618,7 @@ NetworkContext::~NetworkContext() { - #endif - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::ShutdownGlobalCertNetFetcher(); - #endif - } -@@ -1764,7 +1764,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -1711,7 +1711,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { @@ -27,12 +9,3 @@ DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -@@ -2090,7 +2090,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar - net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get()); - #endif - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::SetGlobalCertNetFetcher( - net::CreateCertNetFetcher(result.url_request_context.get())); - #endif diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 5363ecc28428..a864991884c2 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2019-06-04 18:55:28 UTC +--- services/network/network_service.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.cc -@@ -62,7 +62,7 @@ +@@ -60,7 +60,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() { +@@ -625,7 +625,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 452d04bb3c6c..d4dd082d0540 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,7 +1,7 @@ ---- services/network/network_service.h.orig 2019-06-04 18:55:28 UTC +--- services/network/network_service.h.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.h -@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - #endif // !BUILDFLAG(IS_CT_SUPPORTED) +@@ -176,7 +176,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + mojom::NetworkService::GetNetworkListCallback callback) override; void UpdateCRLSet(base::span crl_set) override; void OnCertDBChanged() override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-services_network_public_cpp_features.cc b/www/chromium/files/patch-services_network_public_cpp_features.cc deleted file mode 100644 index eed488de5453..000000000000 --- a/www/chromium/files/patch-services_network_public_cpp_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/network/public/cpp/features.cc.orig 2019-04-30 22:22:56 UTC -+++ services/network/public/cpp/features.cc -@@ -20,7 +20,7 @@ const base::Feature kNetworkErrorLogging{"NetworkError - const base::Feature kNetworkService { - "NetworkService", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - }; - #else diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc new file mode 100644 index 000000000000..f7f75e7ebc91 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -0,0 +1,20 @@ +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-07-29 19:31:28 UTC ++++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc +@@ -42,7 +42,7 @@ namespace { + uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, + uint32_t shared_resident_kb) { + DCHECK(os_dump.platform_private_footprint); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; + uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; + return (rss_anon_bytes + vm_swap_bytes) / 1024; +@@ -151,7 +151,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl + os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; + os_dump->private_footprint_kb = + CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + os_dump->private_footprint_swap_kb = + internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; + #endif diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index df4eb423e0ea..f8b2542dae6e 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -28,9 +28,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); @@ -21,10 +21,10 @@ // Provides information on the dump state of resident pages. enum class MappedAndResidentPagesDumpState { // Access to /proc//pagemap can be denied for android devices running -@@ -65,7 +65,7 @@ class COMPONENT_EXPORT( - const size_t end_address, - std::vector* accessed_pages_bitmap); - +@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( + // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after + // making sure that peak RSS is useful. + static size_t GetPeakResidentSetSize(base::ProcessId pid); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) }; diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index c3400cbc3097..b38e937afd6f 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -19,8 +19,10 @@ +@@ -22,8 +22,10 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" @@ -11,7 +11,7 @@ namespace memory_instrumentation { -@@ -69,6 +71,7 @@ struct ModuleData { +@@ -86,6 +88,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; @@ -19,7 +19,7 @@ Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { base::debug::ElfBuildIdBuffer build_id; -@@ -79,6 +82,7 @@ ModuleData GetMainModuleData() { +@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { module_data.build_id = std::string(build_id, build_id_length); } } @@ -27,7 +27,7 @@ return module_data; } -@@ -126,14 +130,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. @@ -44,23 +44,26 @@ return res; } -@@ -220,6 +224,10 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) { - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ NOTIMPLEMENTED(); -+ return false; -+#else - base::ScopedFD autoclose = OpenStatm(pid); + // TODO(chiniforooshan): There is no need to read both /statm and /status + // files. Refactor to get everything from /status using ProcessMetric. ++#if !defined(OS_BSD) + auto statm_file = GetProcPidDir(pid).Append("statm"); + auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); +@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, -@@ -267,10 +275,15 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - #endif // defined(OS_ANDROID) - - return true; + if (!success) + return false; ++#else ++ uint64_t resident_pages = 0; ++ uint64_t shared_pages = 0; +#endif - } + + auto process_metrics = CreateProcessMetrics(pid); + +@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { @@ -71,7 +74,7 @@ std::vector maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -288,6 +301,7 @@ std::vector OSMetrics::GetProcessMemoryMa +@@ -310,6 +323,7 @@ std::vector OSMetrics::GetProcessMemoryMa return std::vector(); return maps; @@ -79,7 +82,7 @@ } // static -@@ -295,6 +309,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector* accessed_pages_bitmap) { @@ -90,11 +93,11 @@ const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -336,6 +354,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; +#endif } - } // namespace memory_instrumentation + // static diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-services_service__manager_embedder_main.cc index a234385b060d..3b5397b33b37 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_main.cc +++ b/www/chromium/files/patch-services_service__manager_embedder_main.cc @@ -1,6 +1,6 @@ ---- services/service_manager/embedder/main.cc.orig 2019-06-04 18:55:28 UTC +--- services/service_manager/embedder/main.cc.orig 2019-07-24 18:58:35 UTC +++ services/service_manager/embedder/main.cc -@@ -264,7 +264,7 @@ int Main(const MainParams& params) { +@@ -271,7 +271,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 5d77ccaf4b44..b3e7a475e7f0 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2019-06-04 18:57:56 UTC +--- third_party/angle/BUILD.gn.orig 2019-07-24 19:03:24 UTC +++ third_party/angle/BUILD.gn -@@ -319,6 +319,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -322,6 +322,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,7 +8,7 @@ ] } } -@@ -916,10 +917,6 @@ foreach(is_shared_library, +@@ -929,10 +930,6 @@ foreach(is_shared_library, libs = [] if (is_linux) { sources += util_linux_sources diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp deleted file mode 100644 index 84c27f2ec781..000000000000 --- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2019-04-30 22:25:51 UTC -+++ third_party/angle/src/common/system_utils_posix.cpp -@@ -17,7 +17,7 @@ - - // On mac, environ is not declared anywhere: - // https://stackoverflow.com/a/31347357/912144 --#if defined(ANGLE_PLATFORM_APPLE) -+#if defined(ANGLE_PLATFORM_APPLE) || defined(__FreeBSD__) - extern char **environ; - #endif - diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn new file mode 100644 index 000000000000..aa5fb90a1b0d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/blink/renderer/BUILD.gn.orig 2019-07-29 20:47:32 UTC ++++ third_party/blink/renderer/BUILD.gn +@@ -45,8 +45,8 @@ config("inside_blink") { + "-Wconversion", + "-Wno-float-conversion", + "-Wno-sign-conversion", +- "-Wno-implicit-float-conversion", +- "-Wno-implicit-int-conversion", ++# "-Wno-implicit-float-conversion", ++# "-Wno-implicit-int-conversion", + ] + } + } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 52d3aa574519..d722560d65a6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-07-24 18:58:40 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = +@@ -40,7 +40,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index c960ddc9f0d3..3afbacd652da 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,8 +1,8 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-07-24 18:58:40 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -58,7 +58,7 @@ + #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" - #include "third_party/blink/renderer/platform/transforms/transform_state.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index c90a2e990cf4..1418dc2178fa 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -137,6 +137,7 @@ executable("character_data_generator") { +@@ -111,6 +111,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 898a95ad5227..1be1325ae7dc 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-04-30 22:23:02 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -67,7 +67,7 @@ namespace blink { +@@ -72,7 +72,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -90,7 +90,7 @@ FontCache::FontCache() +@@ -95,7 +95,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index f3e41fe258ce..aa278a6fdc03 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-04-30 22:23:02 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -155,7 +155,7 @@ class PLATFORM_EXPORT FontCache { sk_sp FontManager() { return font_manager_; } @@ -27,22 +27,22 @@ scoped_refptr FontDataFromFontPlatformData( const FontPlatformData*, -@@ -292,12 +292,12 @@ class PLATFORM_EXPORT FontCache { +@@ -301,12 +301,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority); --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - scoped_refptr FallbackOnStandardFontStyle(const FontDescription&, - UChar32); -@@ -328,7 +328,7 @@ class PLATFORM_EXPORT FontCache { + scoped_refptr FallbackOnStandardFontStyle( + const FontDescription&, +@@ -338,7 +338,7 @@ class PLATFORM_EXPORT FontCache { bool is_test_font_mgr_ = false; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index f2ef075940b9..4445ec96128b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; @@ -18,7 +18,7 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h new file mode 100644 index 000000000000..abf58788f9d5 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h @@ -0,0 +1,78 @@ +--- third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h.orig 2019-07-29 20:52:32 UTC ++++ third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h +@@ -251,37 +251,6 @@ struct ShapeResult::RunInfo : public RefCounted + struct iterator final {}; + +- // For non-zero glyph offset array +- template <> +- struct iterator final { +- // The constructor for ShapeResult +- explicit iterator(const GlyphOffsetArray& array) +- : pointer(array.storage_.get()) { +- DCHECK(pointer); +- } +- +- // The constructor for ShapeResultView +- explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { +- DCHECK(pointer); +- } +- +- GlyphOffset operator*() const { return *pointer; } +- void operator++() { ++pointer; } +- +- const GlyphOffset* pointer; +- }; +- +- // For zero glyph offset array +- template <> +- struct iterator final { +- explicit iterator(const GlyphOffsetArray& array) { +- DCHECK(!array.HasStorage()); +- } +- explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } +- GlyphOffset operator*() const { return GlyphOffset(); } +- void operator++() {} +- }; +- + template + iterator GetIterator() const { + return iterator(*this); +@@ -493,6 +462,37 @@ struct ShapeResult::RunInfo : public RefCounted ++struct ShapeResult::RunInfo::GlyphOffsetArray::iterator final { ++ // The constructor for ShapeResult ++ explicit iterator(const GlyphOffsetArray& array) ++ : pointer(array.storage_.get()) { ++ DCHECK(pointer); ++ } ++ ++ // The constructor for ShapeResultView ++ explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { ++ DCHECK(pointer); ++ } ++ ++ GlyphOffset operator*() const { return *pointer; } ++ void operator++() { ++pointer; } ++ ++ const GlyphOffset* pointer; ++}; ++ ++// For zero glyph offset array ++template <> ++struct ShapeResult::RunInfo::GlyphOffsetArray::iterator final { ++ explicit iterator(const GlyphOffsetArray& array) { ++ DCHECK(!array.HasStorage()); ++ } ++ explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } ++ GlyphOffset operator*() const { return GlyphOffset(); } ++ void operator++() {} + }; + + // Find the range of HarfBuzzRunGlyphData for the specified character index diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 60496185f038..e42775c2ec2a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,24 +1,24 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Android special locale for retrieving the color emoji font - // based on the proposed changes in UTR #51 for introducing - // an Emoji script code: -@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // This function is called on android or when we are emulating android fonts on + // linux and the embedder has overriden the default fontManager with + // WebFontRendering::setSkiaFontMgr. +@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) void FontCache::PlatformInit() {} -@@ -249,7 +249,7 @@ sk_sp FontCache::CreateTypeface( +@@ -228,7 +228,7 @@ sk_sp FontCache::CreateTypeface( } #endif @@ -27,7 +27,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -276,7 +276,7 @@ std::unique_ptr FontCache::CreateFon +@@ -255,7 +255,7 @@ std::unique_ptr FontCache::CreateFon CString name; sk_sp typeface; diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp new file mode 100644 index 000000000000..0e9aa30717ed --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp @@ -0,0 +1,11 @@ +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC ++++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "core/fxcrt/fx_system.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_ASMJS) || defined(__wasm__) + #include + #include diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 29e2991ce2c1..05d6c3e28de0 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h -@@ -36,7 +36,7 @@ +@@ -26,7 +26,7 @@ + #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ #elif defined(_WIN64) - #define _FX_OS_ _FX_OS_WIN64_ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - #define _FX_OS_ _FX_OS_LINUX_ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ #elif defined(__APPLE__) + #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp index 5092acc1342f..e0a802df2fbb 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-04-30 22:25:55 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -147,9 +147,8 @@ std::unique_ptr SystemFontInfoIfa +@@ -151,9 +151,8 @@ std::unique_ptr SystemFontInfoIfa const char** pUserPaths) { auto pInfo = pdfium::MakeUnique(); if (!pInfo->ParseFontCfg(pUserPaths)) { diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index ba05a132a557..425ec0a4bc9a 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -34,6 +34,11 @@ double GetLocalTZA() { +@@ -35,6 +35,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -10,11 +10,11 @@ + return (double)(-(lt.tm_gmtoff * 1000)); +#else FXSYS_localtime(&t); - #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -42,6 +47,7 @@ double GetLocalTZA() { +@@ -43,6 +48,7 @@ double GetLocalTZA() { _get_timezone(&timezone); - #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #endif return (double)(-(timezone * 1000)); +#endif // __FreeBSD__ } diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp index 89745ae6447c..af4bafcfee40 100644 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp @@ -1,14 +1,14 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC +++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp -@@ -16,8 +16,9 @@ constexpr char kFolderSeparator = '/'; +@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/'; - constexpr const char* g_FontFolders[] = { + constexpr const char* kFontFolders[] = { #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ -- "/usr/share/fonts", "/usr/share/X11/fonts/Type1", -- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts", +- "/usr/share/fonts", +- "/usr/share/X11/fonts/Type1", +- "/usr/share/X11/fonts/TTF", + "/usr/local/share/fonts/Type1", + "/usr/local/share/fonts/TTF", -+ "/usr/local/share/fonts", - #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", - #elif defined(OS_ANDROID) + "/usr/local/share/fonts", + #elif defined(OS_MACOSX) + "~/Library/Fonts", diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp new file mode 100644 index 000000000000..0fad19aace3f --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp @@ -0,0 +1,19 @@ +--- third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp.orig 2019-07-29 19:41:09 UTC ++++ third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp +@@ -83,14 +83,14 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) { + } + + void CFWL_NoteDriver::Run() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + for (;;) { + CFWL_NoteLoop* pTopLoop = GetTopLoop(); + if (!pTopLoop || !pTopLoop->ContinueModal()) + break; + UnqueueMessageAndProcess(pTopLoop); + } +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + } + + void CFWL_NoteDriver::NotifyTargetHide(CFWL_Widget* pNoteTarget) { diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index a24c5dbfbc22..2c44e0006792 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-04-30 22:25:55 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -524,7 +524,8 @@ void UnixSocket::DoConnect(const std::string& socket_n +@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n void UnixSocket::ReadPeerCredentials() { #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index ddb94e384164..81284573e619 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-06-04 18:58:01 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-07-24 19:03:29 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -1953,7 +1953,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin +@@ -2053,7 +2053,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin void TracingServiceImpl::UpdateMemoryGuardrail() { #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ @@ -10,7 +10,7 @@ uint64_t total_buffer_bytes = 0; // Sum up all the shared memory buffers. -@@ -2005,7 +2006,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector static uint32_t read_cpu_features() { @@ -9,9 +9,9 @@ const uint32_t kHWCAP_CRC32 = (1<< 7), kHWCAP_ASIMDHP = (1<<10); -@@ -82,6 +84,7 @@ - if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; } - if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; } +@@ -112,6 +114,7 @@ + } + } return features; +#endif } diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp deleted file mode 100644 index fbc2c2455aca..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp +++ /dev/null @@ -1,77 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-06-04 18:58:12 UTC -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp -@@ -128,8 +128,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -- , fLCDExtra(0) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; -@@ -189,12 +187,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - #endif - -- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. -- // The default has changed over time, so this doesn't mean the same thing to all users. -- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { -- fIsLCDSupported = true; -- fLCDExtra = 2; //Using a filter adds one full pixel to each side. -- } -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); - } - ~FreeTypeLibrary() { - if (fLibrary) { -@@ -203,8 +196,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - - FT_Library library() { return fLibrary; } -- bool isLCDSupported() { return fIsLCDSupported; } -- int lcdExtra() { return fLCDExtra; } - - // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. - // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -221,8 +212,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - - private: - FT_Library fLibrary; -- bool fIsLCDSupported; -- int fLCDExtra; - - // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. - // The following platforms provide FreeType of at least 2.4.0. -@@ -718,17 +707,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR - rec->fTextSize = SkIntToScalar(1 << 14); - } - -- if (isLCD(*rec)) { -- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. -- SkAutoMutexAcquire ama(gFTMutex); -- ref_ft_library(); -- if (!gFTLibrary->isLCDSupported()) { -- // If the runtime Freetype library doesn't support LCD, disable it here. -- rec->fMaskFormat = SkMask::kA8_Format; -- } -- unref_ft_library(); -- } -- - SkFontHinting h = rec->getHinting(); - if (kFull_SkFontHinting == h && !isLCD(*rec)) { - // collapse full->normal hinting if we're not doing LCD -@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l - void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { - if (glyph->fMaskFormat == SkMask::kLCD16_Format) { - if (fLCDIsVert) { -- glyph->fHeight += gFTLibrary->lcdExtra(); -- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fHeight += 2; -+ glyph->fTop -= 1; - } else { -- glyph->fWidth += gFTLibrary->lcdExtra(); -- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fWidth += 2; -+ glyph->fLeft -= 1; - } - } - } diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h index 5cf7d9de5ca3..7bb8d3f1aeb9 100644 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,7 +1,7 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-07-24 19:03:37 UTC +++ third_party/skia/src/sksl/SkSLString.h @@ -22,6 +22,8 @@ - #include "SkString.h" + #include "include/core/SkString.h" #endif +#include diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index 747f4d473bb6..0a780974a862 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC +--- third_party/sqlite/BUILD.gn.orig 2019-07-24 18:59:14 UTC +++ third_party/sqlite/BUILD.gn -@@ -251,7 +251,7 @@ config("sqlite_warnings") { +@@ -258,7 +258,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index 3fbc434f09db..ddafc6ba9fdd 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-06-04 18:58:09 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -947,8 +947,6 @@ rtc_static_library("rtc_base") { +@@ -952,8 +952,6 @@ rtc_static_library("rtc_base") { if (rtc_use_x11) { libs += [ @@ -9,7 +9,7 @@ "Xext", "X11", "Xcomposite", -@@ -956,7 +954,7 @@ rtc_static_library("rtc_base") { +@@ -961,7 +959,7 @@ rtc_static_library("rtc_base") { ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index d72e2a3f05fc..126a1b8f615e 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,15 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -66,7 +66,7 @@ typedef void* SockOptArg; +@@ -51,7 +51,7 @@ + #include "rtc_base/null_socket_server.h" + #include "rtc_base/time_utils.h" + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include + #endif + +@@ -70,7 +70,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -9,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -18,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -313,7 +313,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast(pv), static_cast(cb), @@ -36,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -342,7 +342,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast(buffer), static_cast(length), @@ -45,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h deleted file mode 100644 index b01596a3dfe6..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC -+++ third_party/webrtc/rtc_base/string_utils.h -@@ -25,11 +25,11 @@ - #endif // WEBRTC_WIN - - #if defined(WEBRTC_POSIX) --#ifdef BSD -+#if defined(WEBRTC_BSD) || defined(BSD) - #include --#else // BSD -+#else // WEBRTC_BSD - #include --#endif // !BSD -+#endif // !WEBRTC_BSD - #include - #endif // WEBRTC_POSIX - diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index d052840249e9..34b612046ca9 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,15 +1,15 @@ ---- tools/gn/build/gen.py.orig 2019-06-04 19:02:25 UTC +--- tools/gn/build/gen.py.orig 2019-07-24 19:05:33 UTC +++ tools/gn/build/gen.py -@@ -44,7 +44,7 @@ class Platform(object): +@@ -46,7 +46,7 @@ class Platform(object): @staticmethod def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd'] +- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd'] ++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd'] def platform(self): return self._platform -@@ -67,6 +67,9 @@ class Platform(object): +@@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): return self._platform == 'aix' @@ -17,9 +17,9 @@ + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -335,6 +338,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_aix(): cflags_cc.append('-maix64') ldflags.append('-maix64') diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index a2799a571432..9096172bd0e5 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2019-06-04 18:55:48 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-07-24 18:59:16 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -212,6 +212,7 @@ FEATURE_GRAMMAR = ( +@@ -213,6 +213,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index d9ad340d66d8..feeb6cb934a0 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,6 +1,6 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2019-07-24 18:59:17 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -24,6 +24,7 @@ finally: +@@ -33,6 +33,7 @@ finally: _platforms = [ 'android', 'android_webview', diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index a40bc4c2c4bd..40534eb32dbb 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ @@ -9,8 +9,8 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { - +@@ -23,7 +23,7 @@ std::unique_ptr + OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) return std::make_unique(); -#elif defined(OS_LINUX) diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index c7c978f465e1..d9f731193455 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/resource/resource_bundle.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/resource/resource_bundle.cc -@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() { +@@ -701,7 +701,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -754,7 +754,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index d60216d5b592..45f0ca83a151 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/webui/web_ui_util.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/webui/web_ui_util.cc -@@ -217,7 +217,7 @@ std::string GetFontFamily() { +@@ -215,7 +215,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 72991ef3942e..b583fe1ae17a 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/BUILD.gn.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/BUILD.gn -@@ -546,7 +546,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -550,7 +550,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index de06f9dd7cc9..5f0bb35c60b5 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/font_render_params.h @@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, @@ -11,8 +11,8 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); - diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index df5d51999fc1..4fdc86dbf2c2 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,4 +1,4 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -18,7 +18,7 @@ IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_MACOSX) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -66,13 +66,13 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) +@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() @@ -28,7 +28,6 @@ IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(size) - IPC_STRUCT_TRAITS_MEMBER(modifier) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(fd) diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index cec7290a738d..049249cc0c7b 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-04-30 22:23:42 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,9 +10,9 @@ #include #include #include -@@ -22,11 +24,7 @@ - #include "base/trace_event/trace_event.h" +@@ -24,11 +26,7 @@ #include "build/build_config.h" + #include "ui/gfx/switches.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -#include diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc index a93da4df5688..a4d70a061747 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.cc @@ -24,15 +24,15 @@ bool StructTraitsusage) && data.ReadFormat(&out->format); @@ -19,7 +19,7 @@ } bool StructTraits< -@@ -46,7 +46,7 @@ bool StructTraits< +@@ -45,7 +45,7 @@ bool StructTraits< mojo::PlatformHandle handle = mojo::UnwrapPlatformHandle(data.TakeBufferHandle()); @@ -28,8 +28,8 @@ if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -54,7 +54,7 @@ bool StructTraits< - if (!handle.is_valid_handle()) +@@ -53,7 +53,7 @@ bool StructTraits< + if (!handle.is_handle()) return false; out->vmo = zx::vmo(handle.TakeHandle()); -#endif // defined(OS_LINUX) @@ -37,8 +37,8 @@ return true; } -@@ -65,7 +65,7 @@ bool StructTraits< - gfx::NativePixmapHandle* out) { +@@ -71,7 +71,7 @@ bool StructTraits< + out->modifier = data.modifier(); return data.ReadPlanes(&out->planes); } -#endif // defined(OS_LINUX) || defined(USE_OZONE) @@ -46,7 +46,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -78,7 +78,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra +@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: @@ -55,7 +55,7 @@ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -154,7 +154,7 @@ bool StructTraitstype = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h index bccdb4cfab6b..3ab3814e827a 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h @@ -1,6 +1,6 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.h -@@ -186,7 +186,7 @@ struct StructTraits struct StructTraits { -@@ -218,7 +218,7 @@ struct StructTraitsrgba_visual(); -+ ui::IsCompositingManagerPresent() -+ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() -+ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); +- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); ++ const auto& visual_info = ++ ui::IsCompositingManagerPresent() ++ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() ++ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); g_visual = visual_info.visual; g_depth = visual_info.depth; g_colormap = -@@ -581,18 +584,30 @@ bool NativeViewGLSurfaceGLX::Initialize(GLSurfaceForma - } - size_ = gfx::Size(attributes.width, attributes.height); - -- XSetWindowAttributes swa; -- memset(&swa, 0, sizeof(swa)); -- swa.background_pixmap = 0; -- swa.bit_gravity = NorthWestGravity; -- swa.colormap = g_colormap; -- swa.background_pixel = 0; -- swa.border_pixel = 0; -- window_ = XCreateWindow( -- gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, size_.width(), -- size_.height(), 0 /* border_width */, g_depth, InputOutput, g_visual, -- CWBackPixmap | CWBitGravity | CWColormap | CWBackPixel | CWBorderPixel, -- &swa); -+ XSetWindowAttributes swa = { -+ .background_pixmap = 0, -+ .bit_gravity = NorthWestGravity, -+ .colormap = g_colormap, -+ .background_pixel = 0, // ARGB(0,0,0,0) for compositing WM -+ .border_pixel = 0, -+ }; -+ auto value_mask = CWBackPixmap | CWBitGravity | CWColormap | CWBorderPixel; -+ if (ui::IsCompositingManagerPresent() && -+ XVisualIDFromVisual(attributes.visual) == XVisualIDFromVisual(g_visual)) { -+ // When parent and child are using the same visual, the back buffer will be -+ // shared between parent and child. If WM compositing is enabled, we set -+ // child's background pixel to ARGB(0,0,0,0), so ARGB(0,0,0,0) will be -+ // filled to the shared buffer, when the child window is mapped. It can -+ // avoid an annoying flash when the child window is mapped below. -+ // If WM compositing is disabled, we don't set the background pixel, so -+ // nothing will be draw when the child window is mapped. -+ value_mask |= CWBackPixel; -+ } -+ -+ window_ = -+ XCreateWindow(gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, -+ size_.width(), size_.height(), 0 /* border_width */, -+ g_depth, InputOutput, g_visual, value_mask, &swa); - if (!window_) { - LOG(ERROR) << "XCreateWindow failed"; - return false; diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc index e850dc111d74..976ae17d1ef9 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-07-24 18:59:22 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() { +@@ -103,7 +103,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.keep_on_top = true; diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index eb6ecd0609e7..ca844a3bcdb8 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/controls/label.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/label.cc -@@ -544,7 +544,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -548,7 +548,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() { +@@ -733,7 +733,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 26815cc6ed89..bc17a9e94d20 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -63,7 +63,7 @@ +@@ -62,7 +62,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -166,14 +166,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -165,14 +165,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -232,7 +232,7 @@ bool IsControlKeyModifier(int flags) { +@@ -240,7 +240,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -667,7 +667,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -713,7 +713,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -721,7 +721,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; -@@ -882,7 +882,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -890,7 +890,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2081,7 +2081,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2109,7 +2109,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index b17fad9ff775..bb142c235433 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/examples/widget_example.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/examples/widget_example.cc -@@ -78,7 +78,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -80,7 +80,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 2c76de33fe03..20e3d072eec2 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/style/platform_style.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/style/platform_style.cc -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_CHROMEOS) #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 673dc5f85167..96b31d1cba7f 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2019-06-04 18:55:50 UTC +--- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC +++ ui/views/views_delegate.h -@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc index f12471a6e4a1..689d8e6d8f89 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -1423,24 +1423,15 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1463,24 +1463,15 @@ void DesktopWindowTreeHostX11::InitX11Window( if (override_redirect_) attribute_mask |= CWOverrideRedirect; diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 6ff1ea0d53d0..0cd3458e5585 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/window/custom_frame_view.cc -@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -291,7 +291,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index 9f4e8730e896..c9f8d9db27d3 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC +--- ui/webui/resources/js/cr.js.orig 2019-07-24 18:59:23 UTC +++ ui/webui/resources/js/cr.js -@@ -463,6 +463,11 @@ var cr = cr || function(global) { +@@ -425,6 +425,11 @@ var cr = cr || function(global) { get doc() { return document; }, diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 4aeb39971d63..64c843a118be 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2019-06-04 18:58:07 UTC +--- v8/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ v8/BUILD.gn -@@ -3474,7 +3474,7 @@ v8_component("v8_libbase") { +@@ -3541,7 +3541,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3494,6 +3494,12 @@ v8_component("v8_libbase") { +@@ -3561,6 +3561,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,8 +22,8 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3721,6 +3727,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho - "src/snapshot/embedded-file-writer.h", +@@ -3818,6 +3824,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho + "src/snapshot/embedded/platform-embedded-file-writer-win.h", "src/snapshot/mksnapshot.cc", ] + libs = ["execinfo"] diff --git a/www/chromium/files/patch-v8_src_api.cc b/www/chromium/files/patch-v8_src_api.cc deleted file mode 100644 index 742d62ae9cb0..000000000000 --- a/www/chromium/files/patch-v8_src_api.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- v8/src/api.cc.orig 2019-06-04 18:58:07 UTC -+++ v8/src/api.cc -@@ -109,7 +109,7 @@ - #include "src/wasm/wasm-result.h" - #include "src/wasm/wasm-serialization.h" - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - #include - #include "include/v8-wasm-trap-handler-posix.h" - #include "src/trap-handler/handler-inside-posix.h" -@@ -5762,7 +5762,7 @@ bool v8::V8::Initialize() { - return true; - } - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, - void* context) { - #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc new file mode 100644 index 000000000000..cb9ebbb0233d --- /dev/null +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -0,0 +1,20 @@ +--- v8/src/api/api.cc.orig 2019-07-24 19:03:36 UTC ++++ v8/src/api/api.cc +@@ -110,7 +110,7 @@ + #include "src/wasm/wasm-result.h" + #include "src/wasm/wasm-serialization.h" + +-#if V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD + #include + #include "include/v8-wasm-trap-handler-posix.h" + #include "src/trap-handler/handler-inside-posix.h" +@@ -5505,7 +5505,7 @@ bool v8::V8::Initialize() { + return true; + } + +-#if V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD + bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, + void* context) { + #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID diff --git a/www/chromium/files/patch-v8_src_external-reference-table.cc b/www/chromium/files/patch-v8_src_external-reference-table.cc deleted file mode 100644 index 9ca737217419..000000000000 --- a/www/chromium/files/patch-v8_src_external-reference-table.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC -+++ v8/src/external-reference-table.cc -@@ -9,7 +9,7 @@ - #include "src/external-reference.h" - #include "src/ic/stub-cache.h" - --#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) -+#if defined(DEBUG) && (defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID) - #define SYMBOLIZE_FUNCTION - #include - #include diff --git a/www/chromium/files/patch-v8_src_log-utils.h b/www/chromium/files/patch-v8_src_log-utils.h deleted file mode 100644 index 67b92cd174d1..000000000000 --- a/www/chromium/files/patch-v8_src_log-utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC -+++ v8/src/log-utils.h -@@ -16,6 +16,8 @@ - #include "src/flags.h" - #include "src/ostreams.h" - -+#include -+ - namespace v8 { - namespace internal { - diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 3fcaebb1a169..686431396b49 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -7,6 +7,12 @@ bin/chrome %%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so +%%DATADIR%%/libVkICD_mock_icd.so +%%DATADIR%%/libVkLayer_core_validation.so +%%DATADIR%%/libVkLayer_object_lifetimes.so +%%DATADIR%%/libVkLayer_stateless_validation.so +%%DATADIR%%/libVkLayer_thread_safety.so +%%DATADIR%%/libVkLayer_unique_objects.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak @@ -307,6 +313,7 @@ bin/chrome %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js +%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js @@ -314,14 +321,8 @@ bin/chrome %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin -%%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator -%%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so -%%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_object_lifetimes.so -%%DEBUG%%%%DATADIR%%/libVkLayer_stateless_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_thread_safety.so -%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so +%%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so %%DRIVER%%bin/chromedriver -- cgit From 4d2d17b7452bab6b1be6c4a1d28533ff4018666d Mon Sep 17 00:00:00 2001 From: cpm Date: Mon, 12 Aug 2019 10:52:00 +0000 Subject: net/ocserv: Fix typos in pkg-descr PR: 239577 Submitted by: Mikael Urankar --- net/ocserv/pkg-descr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ocserv/pkg-descr b/net/ocserv/pkg-descr index 466d02e0903e..1ea470b7f93b 100644 --- a/net/ocserv/pkg-descr +++ b/net/ocserv/pkg-descr @@ -6,9 +6,9 @@ The OpenConnect protocol provides a dual TCP/UDP VPN channel, and uses the standard IETF security protocols to secure it. Both IPv4 and IPv6 are supported. -Ocserv's main features are security through provilege separation +Ocserv's main features are security through privilege separation and sandboxing, accounting, and resilience due to a combined use -of TCP and UDP. Authentication occurs in an isolated security +of TCP and UDP. Authentication occurs in an isolated security module process, and each user is assigned an unprivileged worker process, and a networking (tun) device. That not only eases the control of the resources of each user or group of users, but also -- cgit From ec16515ee94e8bf57caab7cebbb0716c0ac95299 Mon Sep 17 00:00:00 2001 From: antoine Date: Mon, 12 Aug 2019 11:17:25 +0000 Subject: Fix typo --- www/grafana3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/grafana3/Makefile b/www/grafana3/Makefile index 60721d8751de..3270de6235af 100644 --- a/www/grafana3/Makefile +++ b/www/grafana3/Makefile @@ -26,7 +26,7 @@ USES= compiler go USE_GITHUB= yes -GH_TUPLE \ +GH_TUPLE= \ BurntSushi:toml:v0.2.0:toml/src/github.com/BurntSushi/toml \ Unknwon:com:v1:com/src/github.com/Unknwon/com \ aws:aws-sdk-go:v1.1.36:aws_sdk_go/src/github.com/aws/aws-sdk-go \ -- cgit From 0c675c8dde705b56c6292381e3c78256888ab643 Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 11:21:30 +0000 Subject: sysutils/yank: Update to 1.2.0 Changes: https://github.com/mptre/yank/releases/tag/v1.2.0 --- sysutils/yank/Makefile | 2 +- sysutils/yank/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/yank/Makefile b/sysutils/yank/Makefile index 83a45a8f59b8..e8365ff7ebdb 100644 --- a/sysutils/yank/Makefile +++ b/sysutils/yank/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= yank -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.0 CATEGORIES= sysutils MASTER_SITES= https://github.com/mptre/yank/releases/download/v${DISTVERSION}/ diff --git a/sysutils/yank/distinfo b/sysutils/yank/distinfo index 016946a2be22..c054ed0c3f47 100644 --- a/sysutils/yank/distinfo +++ b/sysutils/yank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541092705 -SHA256 (yank-1.1.0.tar.gz) = f197107cd604c41ef3c2390175bd34e5ad3c7cf1feafedefe357ba75149f1c59 -SIZE (yank-1.1.0.tar.gz) = 8516 +TIMESTAMP = 1565608529 +SHA256 (yank-1.2.0.tar.gz) = b500d1a71378e69a2a348032107e6d8db728b8f6af280a9bb4cb446c1d26e43a +SIZE (yank-1.2.0.tar.gz) = 8682 -- cgit From b9ab88c152174e4a26696134e542902fe5ea6d6c Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 11:40:46 +0000 Subject: devel/raylib: Update to 2.5.0 PR: 239270 Submitted by: Martin Filla (maintainer) --- devel/raylib/Makefile | 10 ++++++---- devel/raylib/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/devel/raylib/Makefile b/devel/raylib/Makefile index 67a6f42096a4..001b90b39e25 100644 --- a/devel/raylib/Makefile +++ b/devel/raylib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= raylib -DISTVERSION= 2.0.0 -DISTVERSIONSUFFIX= -dev +DISTVERSION= 2.5.0 CATEGORIES= devel MAINTAINER= freebsd@sysctl.cz @@ -11,9 +10,10 @@ COMMENT= Library to learn videogames programming LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.md +BUILD_DEPENDS= glfw>=3.3:graphics/glfw LIB_DEPENDS= libglfw.so:graphics/glfw -USES= cmake localbase:ldflags +USES= cmake gl localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= raysan5 USE_LDCONFIG= yes @@ -24,9 +24,11 @@ CMAKE_ON= SHARED USE_EXTERNAL_GLFW CMAKE_OFF= STATIC BUILD_EXAMPLES BUILD_GAMES PLIST_FILES= include/raylib.h \ + lib/cmake/raylib/raylib-config-version.cmake \ + lib/cmake/raylib/raylib-config.cmake \ lib/libraylib.so \ - lib/libraylib.so.1 \ lib/libraylib.so.${DISTVERSION} \ + lib/libraylib.so.2 \ libdata/pkgconfig/raylib.pc post-patch: # the equivalent of https://github.com/raysan5/raylib/pull/558 for the -dev branch diff --git a/devel/raylib/distinfo b/devel/raylib/distinfo index 224686b913f0..71b459b06d94 100644 --- a/devel/raylib/distinfo +++ b/devel/raylib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529673142 -SHA256 (raysan5-raylib-2.0.0-dev_GH0.tar.gz) = e0aec21da642b4f373e9a6b628877dcc02a22a1267a7d6eace3ad5eb1ab33b5d -SIZE (raysan5-raylib-2.0.0-dev_GH0.tar.gz) = 95683544 +TIMESTAMP = 1559394835 +SHA256 (raysan5-raylib-2.5.0_GH0.tar.gz) = fa947329975bdc9ea284019f0edc30ca929535dc78dcf8c19676900d67a845ac +SIZE (raysan5-raylib-2.5.0_GH0.tar.gz) = 73808565 -- cgit From a1b87248f8535f3a0361c2d72393531e2a878a8f Mon Sep 17 00:00:00 2001 From: rodrigo Date: Mon, 12 Aug 2019 11:54:15 +0000 Subject: Upgrade textproc/smu to v1.5 few bugfixes: - remove useless .hgtags - fix shortlinks when -n is not given - Make documentation slightly more English The WWW link now points to the github page since the legacy webserver is unavailable --- textproc/smu/Makefile | 3 +-- textproc/smu/distinfo | 5 +++-- textproc/smu/pkg-descr | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/textproc/smu/Makefile b/textproc/smu/Makefile index 9315becc8b8d..353303b06043 100644 --- a/textproc/smu/Makefile +++ b/textproc/smu/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= smu -PORTVERSION= 1.4 +PORTVERSION= 1.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= rodrigo@FreeBSD.org diff --git a/textproc/smu/distinfo b/textproc/smu/distinfo index 0865988694e3..6153e084ffdb 100644 --- a/textproc/smu/distinfo +++ b/textproc/smu/distinfo @@ -1,2 +1,3 @@ -SHA256 (Gottox-smu-v1.4_GH0.tar.gz) = 378f24e6cff54dcfcbc7a17a88f16efb59c0cda1d35f58967e16fd990ba15f45 -SIZE (Gottox-smu-v1.4_GH0.tar.gz) = 9617 +TIMESTAMP = 1565610330 +SHA256 (Gottox-smu-v1.5_GH0.tar.gz) = f3bb18f958962679a7fb48d7f8dcab8b59154d66f23c9aba02e78103106093a4 +SIZE (Gottox-smu-v1.5_GH0.tar.gz) = 8552 diff --git a/textproc/smu/pkg-descr b/textproc/smu/pkg-descr index 6fc666b36432..d340a86eabde 100644 --- a/textproc/smu/pkg-descr +++ b/textproc/smu/pkg-descr @@ -1,4 +1,4 @@ smu - simple markup Smu is a simple interpreter for a simplified markdown dialect. -WWW: http://s01.de/~tox/index.cgi/proj_smu +WWW: https://github.com/Gottox/smu -- cgit From 638d2c9317cd2d9a1caafd468b12aec2a13c48d1 Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 12:17:48 +0000 Subject: lang/ponyc: Update to 0.30.0 Changes: https://github.com/ponylang/ponyc/issues/3221 PR: 239581 Submitted by: Greg V (maintainer) --- lang/ponyc/Makefile | 9 ++------- lang/ponyc/distinfo | 6 +++--- lang/ponyc/pkg-message | 1 - lang/ponyc/pkg-plist | 22 ---------------------- 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 lang/ponyc/pkg-message diff --git a/lang/ponyc/Makefile b/lang/ponyc/Makefile index af378a96352a..6725658eec64 100644 --- a/lang/ponyc/Makefile +++ b/lang/ponyc/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ponyc -DISTVERSION= 0.29.0 -PORTREVISION= 1 +DISTVERSION= 0.30.0 CATEGORIES= lang MAINTAINER= greg@unrelenting.technology @@ -57,12 +56,8 @@ PONYARCH?= core2 LIB_DEPENDS+= libunwind.so:devel/libunwind .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 -MAKE_ENV+= default_ssl=openssl_1.1.0 -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang -# Building the bitcode with clang70 and linking with llvm50 fails, +# Building the bitcode with clangX and linking with llvmY often fails, # so let's use the clang from the LLVM version that will be used by ponyc CC= ${LOCALBASE}/bin/clang${LLVM_VERSION} CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION} diff --git a/lang/ponyc/distinfo b/lang/ponyc/distinfo index 3d2e8bccfe1f..3b32ee98db54 100644 --- a/lang/ponyc/distinfo +++ b/lang/ponyc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562545676 -SHA256 (ponylang-ponyc-0.29.0_GH0.tar.gz) = 9e20afeaf46343633fc93f995a15a62acd01b42943050c7c282381e4a0144241 -SIZE (ponylang-ponyc-0.29.0_GH0.tar.gz) = 1420203 +TIMESTAMP = 1564680808 +SHA256 (ponylang-ponyc-0.30.0_GH0.tar.gz) = 9f78f4e7cd7965d46818db84a2ab4d3f5891ba10f16bcb189496238f503e6009 +SIZE (ponylang-ponyc-0.30.0_GH0.tar.gz) = 1398063 diff --git a/lang/ponyc/pkg-message b/lang/ponyc/pkg-message deleted file mode 100644 index 3a2225993764..000000000000 --- a/lang/ponyc/pkg-message +++ /dev/null @@ -1 +0,0 @@ -Install devel/pcre2 for regex/glob support in Pony programs. diff --git a/lang/ponyc/pkg-plist b/lang/ponyc/pkg-plist index f9e80f46d228..16e09ede203b 100644 --- a/lang/ponyc/pkg-plist +++ b/lang/ponyc/pkg-plist @@ -82,11 +82,6 @@ lib/pony/%%VERSION%%/packages/collections/reverse.pony lib/pony/%%VERSION%%/packages/collections/ring_buffer.pony lib/pony/%%VERSION%%/packages/collections/set.pony lib/pony/%%VERSION%%/packages/collections/sort.pony -lib/pony/%%VERSION%%/packages/crypto/_test.pony -lib/pony/%%VERSION%%/packages/crypto/constant_time_compare.pony -lib/pony/%%VERSION%%/packages/crypto/crypto.pony -lib/pony/%%VERSION%%/packages/crypto/digest.pony -lib/pony/%%VERSION%%/packages/crypto/hash_fn.pony lib/pony/%%VERSION%%/packages/debug/debug.pony lib/pony/%%VERSION%%/packages/encode/base64/_test.pony lib/pony/%%VERSION%%/packages/encode/base64/base64.pony @@ -109,8 +104,6 @@ lib/pony/%%VERSION%%/packages/format/align.pony lib/pony/%%VERSION%%/packages/format/format.pony lib/pony/%%VERSION%%/packages/format/format_spec.pony lib/pony/%%VERSION%%/packages/format/prefix_spec.pony -lib/pony/%%VERSION%%/packages/glob/_test.pony -lib/pony/%%VERSION%%/packages/glob/glob.pony lib/pony/%%VERSION%%/packages/ini/_test.pony lib/pony/%%VERSION%%/packages/ini/ini.pony lib/pony/%%VERSION%%/packages/ini/ini_map.pony @@ -132,15 +125,6 @@ lib/pony/%%VERSION%%/packages/net/net.pony lib/pony/%%VERSION%%/packages/net/net_address.pony lib/pony/%%VERSION%%/packages/net/ossocket.pony lib/pony/%%VERSION%%/packages/net/ossockopt.pony -lib/pony/%%VERSION%%/packages/net/ssl/_ssl_init.pony -lib/pony/%%VERSION%%/packages/net/ssl/_ssl_versions.pony -lib/pony/%%VERSION%%/packages/net/ssl/_test.pony -lib/pony/%%VERSION%%/packages/net/ssl/alpn.pony -lib/pony/%%VERSION%%/packages/net/ssl/ssl.pony -lib/pony/%%VERSION%%/packages/net/ssl/ssl_connection.pony -lib/pony/%%VERSION%%/packages/net/ssl/ssl_context.pony -lib/pony/%%VERSION%%/packages/net/ssl/ssl_versions.pony -lib/pony/%%VERSION%%/packages/net/ssl/x509.pony lib/pony/%%VERSION%%/packages/net/tcp_connection.pony lib/pony/%%VERSION%%/packages/net/tcp_connection_notify.pony lib/pony/%%VERSION%%/packages/net/tcp_listen_notify.pony @@ -182,10 +166,6 @@ lib/pony/%%VERSION%%/packages/random/random.pony lib/pony/%%VERSION%%/packages/random/splitmix64.pony lib/pony/%%VERSION%%/packages/random/xoroshiro.pony lib/pony/%%VERSION%%/packages/random/xorshift.pony -lib/pony/%%VERSION%%/packages/regex/_test.pony -lib/pony/%%VERSION%%/packages/regex/match.pony -lib/pony/%%VERSION%%/packages/regex/match_iterator.pony -lib/pony/%%VERSION%%/packages/regex/regex.pony lib/pony/%%VERSION%%/packages/serialise/_test.pony lib/pony/%%VERSION%%/packages/serialise/serialise.pony lib/pony/%%VERSION%%/packages/signals/_test.pony @@ -236,9 +216,7 @@ lib/pony/%%VERSION%%/packages/time/timers.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/message-ubench/main.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed/main.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-body/n-body.pony -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/cert.pem %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/client.pony -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/key.pem %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/listener.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/net.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/ping.pony -- cgit From c43599c3f50d682673e55fe07e46e0c47798068e Mon Sep 17 00:00:00 2001 From: db Date: Mon, 12 Aug 2019 12:38:41 +0000 Subject: Changelog: ## [3.8.0.0] - 2019-08-09 Witness me! Tonight, we release GNU Radio 3.8.0.0. It's the first minor release version since more than six years, not without pride this community stands to face the brightest future SDR on general purpose hardware ever had. Since we've not been documenting changes in the shape of a Changelog for the whole of the development that happened since GNU Radio 3.7.0, I'm afraid that these release notes will be more of a GLTL;DR (git log too long; didn't read) than a detailed account of what has changed. What has _not** changed is the fact that GNU Radio is centered around a very simple truth: > Let the developers hack on DSP. Software interfaces are for humans, not the > other way around. And so, compared to the later 3.7 releases, nothing has fundamentally modified the way one develops signal processing systems with GNU Radio: You write blocks, and you combine blocks to be part of a larger signal processing flow graph. With that as a success story, we of course have faced quite a bit of change in the systems we use to develop and in the people that develop GNU Radio. This has lead to several changes that weren't compatible with 3.7. **This is an excerpt only:** ### Fixed #### Project Scope - Roughly 36 dBBug, (ETOOMANYBUGS) - Fixed .so versioning ### Changed #### Project Scope - C++11 - merged the wholeness of the `next` branch - Dependency version bumps: CMake, GCC, MSVC, Swig, Boost - New dependencies: MPIR/GMP, Qt5, gsm, codec2 - Removed dependencies: libusb, Qt4, CppUnit - Python: Python 2 & Python 3 compatible. 3.8 will be the last Py2k-compatible release series - gengen was replaced by templates (if you don't know gengen, don't do any research; save yourself that sorrow) - Modern CMake (as far as feasible at this point) - VOLK version updated to v2.0.0 - .clang-format file now dictates coding style - clang-format'ed the whole tree. - installed CMake files now tell about configuration #### gnuradio-runtime - reworked fractional tag time handling, especially in the context of resamplers #### GRC - C++ generation as option - YAML instead of XML - removed `blks2` - much better canvas tooling - consistent gobject usage - ROUNDED ARROWS #### gr-qtgui - moving from Qt4 to Qt5 #### gr-utils - `gr_modtool` now vastly improved #### gr-vocoder - improved versatility - removed in-tree libgsm, libcodec2, use system-wide libs ### Removed #### Project Scope - Modules `gr-comedi`, `gr-fcd` and `gr-wxgui` are gone #### gr-comedi - nobody could remember who used this, or for what. It has seen 0 active code contributions in the 3.7 lifecycle #### gr-digital - python-based `packet_encoder` and related tools: Bugs that were sporadic and never fixed, so after long deprecation, we're removing it #### gr-fcd - since it's currently untestable by the CI, it's being removed, as there was no code contributions. Generally, we strive to include all batteries with GNU Radio. Re-integration within a more general SDR interface would be desirable. #### gr-utils - removed PyQwt (dead) based tools #### gr-wxgui - Unmaintained, breaks on increasingly many systems, always was slower than Qtgui. We've been starting to tell people to migrate to Qt since at least 2015. Now, we're finally removing it. ==== Mike English notes: Note that the 3.8.0.0 tarball is again available from https://www.gnuradio.org/releases/gnuradio/ and the volk dependency (a submodule in the git repo) is included so we can do away with USES_GITHUB and go back to building from the official release tarball. I've run this through portlint and poudriere already, so it should apply cleanly. ==== PR: ports/239793 Submitted by: mike.english@gmail.com --- comms/gnuradio/Makefile | 8 ++--- comms/gnuradio/distinfo | 8 ++--- .../files/patch-cmake_Modules_GrPython.cmake | 4 +-- .../gnuradio/files/patch-docs_doxygen_Doxyfile.in | 4 +-- ...atch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h | 4 +-- ...atch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h | 4 +-- comms/gnuradio/pkg-plist | 39 +++++++++++----------- 7 files changed, 33 insertions(+), 38 deletions(-) diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index c3ea46032c40..e7db8a94d62d 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= gnuradio -#MASTER_SITES= http://gnuradio.org/releases/gnuradio/ -PORTVERSION= 3.8.0.0.r2 +PORTVERSION= 3.8.0.0 CATEGORIES= comms astro hamradio -DISTNAME= v3.8.0.0-rc2 +MASTER_SITES= http://gnuradio.org/releases/gnuradio/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio Software defined radio @@ -56,9 +55,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints USES= cmake compiler:c11 desktop-file-utils fortran gnome iconv \ perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix -USE_GITHUB= yes -GH_TUPLE= gnuradio:gnuradio:${DISTNAME} \ - gnuradio:volk:d250816:volk/volk SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \ gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \ diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo index def6c489a0ff..35beaf2af245 100644 --- a/comms/gnuradio/distinfo +++ b/comms/gnuradio/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1565477657 -SHA256 (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 0dc466017101f39aa903780fa510c3cdf3a29ce75d12148fc449b12fe6324304 -SIZE (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 3400475 -SHA256 (gnuradio-volk-d250816_GH0.tar.gz) = 334da8910cfadc2e1487ef2a651f8eaa472262a4bfd3fa7c38d913c8fc32cbd8 -SIZE (gnuradio-volk-d250816_GH0.tar.gz) = 252477 +TIMESTAMP = 1565539118 +SHA256 (gnuradio-3.8.0.0.tar.gz) = 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092 +SIZE (gnuradio-3.8.0.0.tar.gz) = 3557884 diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake index 8ad804608fcf..7e7554ea678b 100644 --- a/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake +++ b/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake @@ -1,6 +1,6 @@ ---- cmake/Modules/GrPython.cmake.orig 2019-03-09 13:28:14 UTC +--- cmake/Modules/GrPython.cmake.orig 2019-08-09 21:40:34 UTC +++ cmake/Modules/GrPython.cmake -@@ -101,11 +101,15 @@ if(NOT DEFINED GR_PYTHON_DIR) +@@ -111,11 +111,15 @@ if(NOT DEFINED GR_PYTHON_DIR) execute_process(COMMAND ${PYTHON_EXECUTABLE} -c " import os import sys diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in index 8cc97c16529b..b8e9761d703e 100644 --- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in +++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in @@ -1,6 +1,6 @@ ---- docs/doxygen/Doxyfile.in.orig 2019-03-09 13:28:14 UTC +--- docs/doxygen/Doxyfile.in.orig 2019-08-09 21:40:34 UTC +++ docs/doxygen/Doxyfile.in -@@ -1852,7 +1852,7 @@ DOT_FONTSIZE = 10 +@@ -1848,7 +1848,7 @@ DOT_FONTSIZE = 10 # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to # set the path where dot can find it. diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h index 526dd4a51cd7..ed0dc385e100 100644 --- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h +++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h @@ -1,9 +1,9 @@ ---- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig 2019-05-29 03:34:08 UTC +--- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig 2019-08-09 21:40:34 UTC +++ gr-vocoder/lib/gsm_fr_decode_ps_impl.h @@ -26,7 +26,11 @@ #include - extern "C"{ + extern "C" { +#ifdef __FreeBSD__ +#include +#else diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h index 2d1096501144..8b32b26bc512 100644 --- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h +++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h @@ -1,9 +1,9 @@ ---- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig 2019-05-29 03:34:08 UTC +--- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig 2019-08-11 18:52:58 UTC +++ gr-vocoder/lib/gsm_fr_encode_sp_impl.h @@ -26,7 +26,11 @@ #include - extern "C"{ + extern "C" { +#ifdef __FreeBSD__ +#include +#else diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index ed4ccd532478..3a497edce6bf 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -757,6 +757,7 @@ include/pmt/pmt.h include/pmt/pmt_pool.h include/pmt/pmt_serial_tags.h include/pmt/pmt_sugar.h +include/volk/constants.h include/volk/saturation_arithmetic.h include/volk/volk.h include/volk/volk_16i_32fc_dot_prod_32fc.h @@ -998,60 +999,60 @@ lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/volk/VolkTargets.cmake lib/libgnuradio-analog.so lib/libgnuradio-analog.so.3.8.0 -lib/libgnuradio-analog.so.3.8.0.0-rc2 +lib/libgnuradio-analog.so.3.8.0.0 lib/libgnuradio-audio.so lib/libgnuradio-audio.so.3.8.0 -lib/libgnuradio-audio.so.3.8.0.0-rc2 +lib/libgnuradio-audio.so.3.8.0.0 lib/libgnuradio-blocks.so lib/libgnuradio-blocks.so.3.8.0 -lib/libgnuradio-blocks.so.3.8.0.0-rc2 +lib/libgnuradio-blocks.so.3.8.0.0 lib/libgnuradio-channels.so lib/libgnuradio-channels.so.3.8.0 -lib/libgnuradio-channels.so.3.8.0.0-rc2 +lib/libgnuradio-channels.so.3.8.0.0 lib/libgnuradio-digital.so lib/libgnuradio-digital.so.3.8.0 -lib/libgnuradio-digital.so.3.8.0.0-rc2 +lib/libgnuradio-digital.so.3.8.0.0 lib/libgnuradio-dtv.so lib/libgnuradio-dtv.so.3.8.0 -lib/libgnuradio-dtv.so.3.8.0.0-rc2 +lib/libgnuradio-dtv.so.3.8.0.0 lib/libgnuradio-fec.so lib/libgnuradio-fec.so.3.8.0 -lib/libgnuradio-fec.so.3.8.0.0-rc2 +lib/libgnuradio-fec.so.3.8.0.0 lib/libgnuradio-fft.so lib/libgnuradio-fft.so.3.8.0 -lib/libgnuradio-fft.so.3.8.0.0-rc2 +lib/libgnuradio-fft.so.3.8.0.0 lib/libgnuradio-filter.so lib/libgnuradio-filter.so.3.8.0 -lib/libgnuradio-filter.so.3.8.0.0-rc2 +lib/libgnuradio-filter.so.3.8.0.0 lib/libgnuradio-pmt.so lib/libgnuradio-pmt.so.3.8.0 -lib/libgnuradio-pmt.so.3.8.0.0-rc2 +lib/libgnuradio-pmt.so.3.8.0.0 lib/libgnuradio-qtgui.so lib/libgnuradio-qtgui.so.3.8.0 -lib/libgnuradio-qtgui.so.3.8.0.0-rc2 +lib/libgnuradio-qtgui.so.3.8.0.0 lib/libgnuradio-runtime.so lib/libgnuradio-runtime.so.3.8.0 -lib/libgnuradio-runtime.so.3.8.0.0-rc2 +lib/libgnuradio-runtime.so.3.8.0.0 lib/libgnuradio-trellis.so lib/libgnuradio-trellis.so.3.8.0 -lib/libgnuradio-trellis.so.3.8.0.0-rc2 +lib/libgnuradio-trellis.so.3.8.0.0 %%UHD%%lib/libgnuradio-uhd.so %%UHD%%lib/libgnuradio-uhd.so.3.8.0 -%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0-rc2 +%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0 lib/libgnuradio-video-sdl.so lib/libgnuradio-video-sdl.so.3.8.0 -lib/libgnuradio-video-sdl.so.3.8.0.0-rc2 +lib/libgnuradio-video-sdl.so.3.8.0.0 lib/libgnuradio-vocoder.so lib/libgnuradio-vocoder.so.3.8.0 -lib/libgnuradio-vocoder.so.3.8.0.0-rc2 +lib/libgnuradio-vocoder.so.3.8.0.0 lib/libgnuradio-wavelet.so lib/libgnuradio-wavelet.so.3.8.0 -lib/libgnuradio-wavelet.so.3.8.0.0-rc2 +lib/libgnuradio-wavelet.so.3.8.0.0 lib/libgnuradio-zeromq.so lib/libgnuradio-zeromq.so.3.8.0 -lib/libgnuradio-zeromq.so.3.8.0.0-rc2 +lib/libgnuradio-zeromq.so.3.8.0.0 lib/libvolk.so -lib/libvolk.so.1.4.1git +lib/libvolk.so.2.0 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo -- cgit From 67136765580382f581be70531dc118360427fc86 Mon Sep 17 00:00:00 2001 From: rodrigo Date: Mon, 12 Aug 2019 13:14:47 +0000 Subject: Add new port devel/robin-map, a hash map and hash set library C++ implementation of a fast hash map and hash set using open-addressing and linear robin hood hashing with backward shift deletion to resolve collisions. https://github.com/Tessil/robin-map Required to update graphics/openimageio (PR 239587) PR: 239587 Submitted by: Shane --- devel/Makefile | 1 + devel/robin-map/Makefile | 27 +++++++++++++++++++++++++++ devel/robin-map/distinfo | 3 +++ devel/robin-map/pkg-descr | 5 +++++ 4 files changed, 36 insertions(+) create mode 100644 devel/robin-map/Makefile create mode 100644 devel/robin-map/distinfo create mode 100644 devel/robin-map/pkg-descr diff --git a/devel/Makefile b/devel/Makefile index de276250109b..3055bae1a321 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5340,6 +5340,7 @@ SUBDIR += riscv64-xtoolchain-gcc SUBDIR += rlog SUBDIR += rlwrap + SUBDIR += robin-map SUBDIR += roboctl SUBDIR += robodoc SUBDIR += root-doc diff --git a/devel/robin-map/Makefile b/devel/robin-map/Makefile new file mode 100644 index 000000000000..50bf3231488c --- /dev/null +++ b/devel/robin-map/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= robin-map +DISTVERSIONPREFIX= v +DISTVERSION= 0.6.1 +CATEGORIES= devel + +MAINTAINER= FreeBSD@Shaneware.biz +COMMENT= Fast hash map and hash set + +LICENSE= MIT + +USE_GITHUB= yes +GH_ACCOUNT= Tessil + +NO_BUILD= yes + +PLIST_FILES= include/tsl/robin_growth_policy.h \ + include/tsl/robin_hash.h \ + include/tsl/robin_map.h \ + include/tsl/robin_set.h + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/include/tsl + ${INSTALL_DATA} ${WRKSRC}/include/tsl/* ${STAGEDIR}${PREFIX}/include/tsl/ + +.include diff --git a/devel/robin-map/distinfo b/devel/robin-map/distinfo new file mode 100644 index 000000000000..bb8b1ee3f491 --- /dev/null +++ b/devel/robin-map/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1557648905 +SHA256 (Tessil-robin-map-v0.6.1_GH0.tar.gz) = c196a7d6a4e4ef9672ec280bbd9404003c360ac74a480a629b75cbbc84870304 +SIZE (Tessil-robin-map-v0.6.1_GH0.tar.gz) = 61705 diff --git a/devel/robin-map/pkg-descr b/devel/robin-map/pkg-descr new file mode 100644 index 000000000000..6e97e57303aa --- /dev/null +++ b/devel/robin-map/pkg-descr @@ -0,0 +1,5 @@ +A C++ implementation of a fast hash map and hash set using +open-addressing and linear robin hood hashing with backward +shift deletion to resolve collisions. + +WWW: https://github.com/Tessil/robin-map -- cgit From 95c01b77f2f1bb811faeaad70cb09e0b7cade760 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 13:57:44 +0000 Subject: Update the default Perl version to 5.30. PR: 239742 Submitted by: mat Exp-run by: antoine --- Mk/bsd.default-versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 7546d624548f..aa648e46a7cf 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -68,7 +68,7 @@ MYSQL_DEFAULT?= 5.7 # Possible values: 5.26, 5.28, 5.30, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) -PERL5_DEFAULT?= 5.28 +PERL5_DEFAULT?= 5.30 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must -- cgit From 7e9c4bc12135a58996aa51491fc16852b6777e80 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 13:57:48 +0000 Subject: Update to 0.5.0. PR: 239778 Submitted by: mat Reviewed by: maintainer --- devel/git-absorb/Makefile | 97 +++++++++++------------ devel/git-absorb/distinfo | 194 +++++++++++++++++++++++----------------------- 2 files changed, 142 insertions(+), 149 deletions(-) diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile index 421665378225..c8d90cc0f10a 100644 --- a/devel/git-absorb/Makefile +++ b/devel/git-absorb/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= git-absorb -DISTVERSION= 0.3.0 -PORTREVISION= 7 +DISTVERSION= 0.5.0 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology @@ -18,66 +17,64 @@ USE_GITHUB= yes GH_ACCOUNT= tummychow CARGO_CRATES= ansi_term-0.10.2 \ - atty-0.2.6 \ - backtrace-0.3.5 \ - backtrace-sys-0.1.16 \ - bitflags-1.0.1 \ - cc-1.0.25 \ - cfg-if-0.1.2 \ - chrono-0.4.0 \ + atty-0.2.12 \ + autocfg-0.1.4 \ + backtrace-0.3.32 \ + backtrace-sys-0.1.30 \ + bitflags-1.1.0 \ + cc-1.0.37 \ + cfg-if-0.1.9 \ + chrono-0.4.7 \ clap-2.30.0 \ - failure-0.1.1 \ - failure_derive-0.1.1 \ - fuchsia-zircon-0.3.3 \ - fuchsia-zircon-sys-0.3.3 \ - git2-0.7.5 \ - idna-0.1.4 \ - isatty-0.1.6 \ + failure-0.1.5 \ + failure_derive-0.1.5 \ + fuchsia-cprng-0.1.1 \ + git2-0.9.1 \ + idna-0.1.5 \ + isatty-0.1.9 \ kernel32-sys-0.2.2 \ - lazy_static-1.0.0 \ - libc-0.2.49 \ - libgit2-sys-0.7.10 \ + lazy_static-1.3.0 \ + libc-0.2.59 \ + libgit2-sys-0.8.1 \ libz-sys-1.0.25 \ - log-0.4.6 \ - matches-0.1.6 \ - memchr-2.0.1 \ - num-0.1.42 \ - num-integer-0.1.36 \ - num-iter-0.1.35 \ - num-traits-0.2.0 \ + log-0.4.7 \ + matches-0.1.8 \ + memchr-2.0.2 \ + num-integer-0.1.41 \ + num-traits-0.2.8 \ percent-encoding-1.0.1 \ - pkg-config-0.3.9 \ - quote-0.3.15 \ - rand-0.4.2 \ - redox_syscall-0.1.37 \ - redox_termios-0.1.1 \ - remove_dir_all-0.3.0 \ - rustc-demangle-0.1.5 \ + pkg-config-0.3.14 \ + proc-macro2-0.4.30 \ + quote-0.6.13 \ + rand-0.4.6 \ + rand_core-0.3.1 \ + rand_core-0.4.0 \ + rdrand-0.4.0 \ + redox_syscall-0.1.56 \ + remove_dir_all-0.5.2 \ + rustc-demangle-0.1.15 \ slog-2.1.1 \ slog-async-2.2.0 \ slog-term-2.3.0 \ + smallvec-0.6.10 \ strsim-0.7.0 \ - syn-0.11.11 \ - synom-0.11.3 \ - synstructure-0.6.1 \ - take_mut-0.2.0 \ - tempdir-0.3.6 \ + syn-0.15.39 \ + synstructure-0.10.2 \ + take_mut-0.2.2 \ + tempdir-0.3.7 \ term-0.4.6 \ - termion-1.5.1 \ textwrap-0.9.0 \ - thread_local-0.3.5 \ - time-0.1.39 \ + thread_local-0.3.6 \ + time-0.1.42 \ unicode-bidi-0.3.4 \ - unicode-normalization-0.1.5 \ - unicode-width-0.1.4 \ - unicode-xid-0.0.4 \ - unreachable-1.0.0 \ - url-1.6.0 \ - vcpkg-0.2.2 \ - vec_map-0.8.0 \ - void-1.0.2 \ + unicode-normalization-0.1.8 \ + unicode-width-0.1.5 \ + unicode-xid-0.1.0 \ + url-1.7.2 \ + vcpkg-0.2.7 \ + vec_map-0.8.1 \ winapi-0.2.8 \ - winapi-0.3.4 \ + winapi-0.3.7 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 diff --git a/devel/git-absorb/distinfo b/devel/git-absorb/distinfo index ed0f06bcc0d7..fec6755e7a9d 100644 --- a/devel/git-absorb/distinfo +++ b/devel/git-absorb/distinfo @@ -1,131 +1,127 @@ -TIMESTAMP = 1548801687 +TIMESTAMP = 1565540852 SHA256 (rust/crates/ansi_term-0.10.2.tar.gz) = 6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455 SIZE (rust/crates/ansi_term-0.10.2.tar.gz) = 16642 -SHA256 (rust/crates/atty-0.2.6.tar.gz) = 8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859 -SIZE (rust/crates/atty-0.2.6.tar.gz) = 5617 -SHA256 (rust/crates/backtrace-0.3.5.tar.gz) = ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2 -SIZE (rust/crates/backtrace-0.3.5.tar.gz) = 27636 -SHA256 (rust/crates/backtrace-sys-0.1.16.tar.gz) = 44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661 -SIZE (rust/crates/backtrace-sys-0.1.16.tar.gz) = 283418 -SHA256 (rust/crates/bitflags-1.0.1.tar.gz) = b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf -SIZE (rust/crates/bitflags-1.0.1.tar.gz) = 13451 -SHA256 (rust/crates/cc-1.0.25.tar.gz) = f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16 -SIZE (rust/crates/cc-1.0.25.tar.gz) = 43191 -SHA256 (rust/crates/cfg-if-0.1.2.tar.gz) = d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de -SIZE (rust/crates/cfg-if-0.1.2.tar.gz) = 6668 -SHA256 (rust/crates/chrono-0.4.0.tar.gz) = 7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9 -SIZE (rust/crates/chrono-0.4.0.tar.gz) = 118850 +SHA256 (rust/crates/atty-0.2.12.tar.gz) = ecaaea69f52b3b18633611ec0007d188517d0366f47ff703d400fa6879d6f8d5 +SIZE (rust/crates/atty-0.2.12.tar.gz) = 4739 +SHA256 (rust/crates/autocfg-0.1.4.tar.gz) = 0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf +SIZE (rust/crates/autocfg-0.1.4.tar.gz) = 10937 +SHA256 (rust/crates/backtrace-0.3.32.tar.gz) = 18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5 +SIZE (rust/crates/backtrace-0.3.32.tar.gz) = 50979 +SHA256 (rust/crates/backtrace-sys-0.1.30.tar.gz) = 5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61 +SIZE (rust/crates/backtrace-sys-0.1.30.tar.gz) = 518350 +SHA256 (rust/crates/bitflags-1.1.0.tar.gz) = 3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd +SIZE (rust/crates/bitflags-1.1.0.tar.gz) = 16322 +SHA256 (rust/crates/cc-1.0.37.tar.gz) = 39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d +SIZE (rust/crates/cc-1.0.37.tar.gz) = 44499 +SHA256 (rust/crates/cfg-if-0.1.9.tar.gz) = b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33 +SIZE (rust/crates/cfg-if-0.1.9.tar.gz) = 7353 +SHA256 (rust/crates/chrono-0.4.7.tar.gz) = 77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe +SIZE (rust/crates/chrono-0.4.7.tar.gz) = 131963 SHA256 (rust/crates/clap-2.30.0.tar.gz) = 1c07b9257a00f3fc93b7f3c417fc15607ec7a56823bc2c37ec744e266387de5b SIZE (rust/crates/clap-2.30.0.tar.gz) = 190562 -SHA256 (rust/crates/failure-0.1.1.tar.gz) = 934799b6c1de475a012a02dab0ace1ace43789ee4b99bcfbf1a2e3e8ced5de82 -SIZE (rust/crates/failure-0.1.1.tar.gz) = 26782 -SHA256 (rust/crates/failure_derive-0.1.1.tar.gz) = c7cdda555bb90c9bb67a3b670a0f42de8e73f5981524123ad8578aafec8ddb8b -SIZE (rust/crates/failure_derive-0.1.1.tar.gz) = 9312 -SHA256 (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82 -SIZE (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 22565 -SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7 -SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 -SHA256 (rust/crates/git2-0.7.5.tar.gz) = 591f8be1674b421644b6c030969520bc3fa12114d2eb467471982ed3e9584e71 -SIZE (rust/crates/git2-0.7.5.tar.gz) = 145895 -SHA256 (rust/crates/idna-0.1.4.tar.gz) = 014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d -SIZE (rust/crates/idna-0.1.4.tar.gz) = 289112 -SHA256 (rust/crates/isatty-0.1.6.tar.gz) = 8f2a233726c7bb76995cec749d59582e5664823b7245d4970354408f1d79a7a2 -SIZE (rust/crates/isatty-0.1.6.tar.gz) = 7752 +SHA256 (rust/crates/failure-0.1.5.tar.gz) = 795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2 +SIZE (rust/crates/failure-0.1.5.tar.gz) = 36749 +SHA256 (rust/crates/failure_derive-0.1.5.tar.gz) = ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1 +SIZE (rust/crates/failure_derive-0.1.5.tar.gz) = 4884 +SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba +SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950 +SHA256 (rust/crates/git2-0.9.1.tar.gz) = 924b2e7d2986e625dcad89e8a429a7b3adee3c3d71e585f4a66c4f7e78715e31 +SIZE (rust/crates/git2-0.9.1.tar.gz) = 151280 +SHA256 (rust/crates/idna-0.1.5.tar.gz) = 38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e +SIZE (rust/crates/idna-0.1.5.tar.gz) = 258735 +SHA256 (rust/crates/isatty-0.1.9.tar.gz) = e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc +SIZE (rust/crates/isatty-0.1.9.tar.gz) = 8009 SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537 -SHA256 (rust/crates/lazy_static-1.0.0.tar.gz) = c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d -SIZE (rust/crates/lazy_static-1.0.0.tar.gz) = 12611 -SHA256 (rust/crates/libc-0.2.49.tar.gz) = 413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e -SIZE (rust/crates/libc-0.2.49.tar.gz) = 375486 -SHA256 (rust/crates/libgit2-sys-0.7.10.tar.gz) = 4916b5addc78ec36cc309acfcdf0b9f9d97ab7b84083118b248709c5b7029356 -SIZE (rust/crates/libgit2-sys-0.7.10.tar.gz) = 1176435 +SHA256 (rust/crates/lazy_static-1.3.0.tar.gz) = bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14 +SIZE (rust/crates/lazy_static-1.3.0.tar.gz) = 10616 +SHA256 (rust/crates/libc-0.2.59.tar.gz) = 3262021842bf00fe07dbd6cf34ff25c99d7a7ebef8deea84db72be3ea3bb0aff +SIZE (rust/crates/libc-0.2.59.tar.gz) = 408668 +SHA256 (rust/crates/libgit2-sys-0.8.1.tar.gz) = 941a41e23f77323b8c9d2ee118aec9ee39dfc176078c18b4757d3bad049d9ff7 +SIZE (rust/crates/libgit2-sys-0.8.1.tar.gz) = 1264574 SHA256 (rust/crates/libz-sys-1.0.25.tar.gz) = 2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe SIZE (rust/crates/libz-sys-1.0.25.tar.gz) = 650151 -SHA256 (rust/crates/log-0.4.6.tar.gz) = c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6 -SIZE (rust/crates/log-0.4.6.tar.gz) = 22303 -SHA256 (rust/crates/matches-0.1.6.tar.gz) = 100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376 -SIZE (rust/crates/matches-0.1.6.tar.gz) = 1916 -SHA256 (rust/crates/memchr-2.0.1.tar.gz) = 796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d -SIZE (rust/crates/memchr-2.0.1.tar.gz) = 9858 -SHA256 (rust/crates/num-0.1.42.tar.gz) = 4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e -SIZE (rust/crates/num-0.1.42.tar.gz) = 8323 -SHA256 (rust/crates/num-integer-0.1.36.tar.gz) = f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe -SIZE (rust/crates/num-integer-0.1.36.tar.gz) = 12168 -SHA256 (rust/crates/num-iter-0.1.35.tar.gz) = 4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593 -SIZE (rust/crates/num-iter-0.1.35.tar.gz) = 9013 -SHA256 (rust/crates/num-traits-0.2.0.tar.gz) = e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10 -SIZE (rust/crates/num-traits-0.2.0.tar.gz) = 29853 +SHA256 (rust/crates/log-0.4.7.tar.gz) = c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3 +SIZE (rust/crates/log-0.4.7.tar.gz) = 30733 +SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08 +SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216 +SHA256 (rust/crates/memchr-2.0.2.tar.gz) = a3b4142ab8738a78c51896f704f83c11df047ff1bda9a92a661aa6361552d93d +SIZE (rust/crates/memchr-2.0.2.tar.gz) = 10092 +SHA256 (rust/crates/num-integer-0.1.41.tar.gz) = b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09 +SIZE (rust/crates/num-integer-0.1.41.tar.gz) = 19399 +SHA256 (rust/crates/num-traits-0.2.8.tar.gz) = 6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32 +SIZE (rust/crates/num-traits-0.2.8.tar.gz) = 39965 SHA256 (rust/crates/percent-encoding-1.0.1.tar.gz) = 31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831 SIZE (rust/crates/percent-encoding-1.0.1.tar.gz) = 10057 -SHA256 (rust/crates/pkg-config-0.3.9.tar.gz) = 3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903 -SIZE (rust/crates/pkg-config-0.3.9.tar.gz) = 11055 -SHA256 (rust/crates/quote-0.3.15.tar.gz) = 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a -SIZE (rust/crates/quote-0.3.15.tar.gz) = 12041 -SHA256 (rust/crates/rand-0.4.2.tar.gz) = eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5 -SIZE (rust/crates/rand-0.4.2.tar.gz) = 76170 -SHA256 (rust/crates/redox_syscall-0.1.37.tar.gz) = 0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd -SIZE (rust/crates/redox_syscall-0.1.37.tar.gz) = 13980 -SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 -SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227 -SHA256 (rust/crates/remove_dir_all-0.3.0.tar.gz) = b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5 -SIZE (rust/crates/remove_dir_all-0.3.0.tar.gz) = 8579 -SHA256 (rust/crates/rustc-demangle-0.1.5.tar.gz) = aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e -SIZE (rust/crates/rustc-demangle-0.1.5.tar.gz) = 10099 +SHA256 (rust/crates/pkg-config-0.3.14.tar.gz) = 676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c +SIZE (rust/crates/pkg-config-0.3.14.tar.gz) = 13565 +SHA256 (rust/crates/proc-macro2-0.4.30.tar.gz) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759 +SIZE (rust/crates/proc-macro2-0.4.30.tar.gz) = 34731 +SHA256 (rust/crates/quote-0.6.13.tar.gz) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1 +SIZE (rust/crates/quote-0.6.13.tar.gz) = 17475 +SHA256 (rust/crates/rand-0.4.6.tar.gz) = 552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293 +SIZE (rust/crates/rand-0.4.6.tar.gz) = 76401 +SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b +SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483 +SHA256 (rust/crates/rand_core-0.4.0.tar.gz) = d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0 +SIZE (rust/crates/rand_core-0.4.0.tar.gz) = 20326 +SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 +SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 +SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84 +SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117 +SHA256 (rust/crates/remove_dir_all-0.5.2.tar.gz) = 4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e +SIZE (rust/crates/remove_dir_all-0.5.2.tar.gz) = 8907 +SHA256 (rust/crates/rustc-demangle-0.1.15.tar.gz) = a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af +SIZE (rust/crates/rustc-demangle-0.1.15.tar.gz) = 18640 SHA256 (rust/crates/slog-2.1.1.tar.gz) = 0a6b13b17f4225771f7f15cece704a4e68d3a5f31278ed26367f497133398a18 SIZE (rust/crates/slog-2.1.1.tar.gz) = 38752 SHA256 (rust/crates/slog-async-2.2.0.tar.gz) = 5e319a30c08b004618d5f7ca2f2b1dad7b4623ba7fcb1a12846fc3b01e9eaa10 SIZE (rust/crates/slog-async-2.2.0.tar.gz) = 12956 SHA256 (rust/crates/slog-term-2.3.0.tar.gz) = 5bb5d9360b2b279b326824b3b4ca2402ead8a8138f0e5ec1900605c861bb6671 SIZE (rust/crates/slog-term-2.3.0.tar.gz) = 17179 +SHA256 (rust/crates/smallvec-0.6.10.tar.gz) = ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7 +SIZE (rust/crates/smallvec-0.6.10.tar.gz) = 22064 SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550 SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435 -SHA256 (rust/crates/syn-0.11.11.tar.gz) = d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad -SIZE (rust/crates/syn-0.11.11.tar.gz) = 63309 -SHA256 (rust/crates/synom-0.11.3.tar.gz) = a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6 -SIZE (rust/crates/synom-0.11.3.tar.gz) = 17120 -SHA256 (rust/crates/synstructure-0.6.1.tar.gz) = 3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd -SIZE (rust/crates/synstructure-0.6.1.tar.gz) = 11257 -SHA256 (rust/crates/take_mut-0.2.0.tar.gz) = 50b910a1174df4aeb5738e8a0e7253883cf7801de40d094175a5a557e487f4c5 -SIZE (rust/crates/take_mut-0.2.0.tar.gz) = 4246 -SHA256 (rust/crates/tempdir-0.3.6.tar.gz) = f73eebdb68c14bcb24aef74ea96079830e7fa7b31a6106e42ea7ee887c1e134e -SIZE (rust/crates/tempdir-0.3.6.tar.gz) = 11368 +SHA256 (rust/crates/syn-0.15.39.tar.gz) = b4d960b829a55e56db167e861ddb43602c003c7be0bee1d345021703fac2fb7c +SIZE (rust/crates/syn-0.15.39.tar.gz) = 185194 +SHA256 (rust/crates/synstructure-0.10.2.tar.gz) = 02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f +SIZE (rust/crates/synstructure-0.10.2.tar.gz) = 17988 +SHA256 (rust/crates/take_mut-0.2.2.tar.gz) = f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60 +SIZE (rust/crates/take_mut-0.2.2.tar.gz) = 4263 +SHA256 (rust/crates/tempdir-0.3.7.tar.gz) = 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8 +SIZE (rust/crates/tempdir-0.3.7.tar.gz) = 11468 SHA256 (rust/crates/term-0.4.6.tar.gz) = fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1 SIZE (rust/crates/term-0.4.6.tar.gz) = 38250 -SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 -SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659 SHA256 (rust/crates/textwrap-0.9.0.tar.gz) = c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693 SIZE (rust/crates/textwrap-0.9.0.tar.gz) = 15795 -SHA256 (rust/crates/thread_local-0.3.5.tar.gz) = 279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963 -SIZE (rust/crates/thread_local-0.3.5.tar.gz) = 11794 -SHA256 (rust/crates/time-0.1.39.tar.gz) = a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098 -SIZE (rust/crates/time-0.1.39.tar.gz) = 29295 +SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b +SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388 +SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f +SIZE (rust/crates/time-0.1.42.tar.gz) = 30005 SHA256 (rust/crates/unicode-bidi-0.3.4.tar.gz) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5 SIZE (rust/crates/unicode-bidi-0.3.4.tar.gz) = 32228 -SHA256 (rust/crates/unicode-normalization-0.1.5.tar.gz) = 51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f -SIZE (rust/crates/unicode-normalization-0.1.5.tar.gz) = 290328 -SHA256 (rust/crates/unicode-width-0.1.4.tar.gz) = bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f -SIZE (rust/crates/unicode-width-0.1.4.tar.gz) = 15283 -SHA256 (rust/crates/unicode-xid-0.0.4.tar.gz) = 8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc -SIZE (rust/crates/unicode-xid-0.0.4.tar.gz) = 16034 -SHA256 (rust/crates/unreachable-1.0.0.tar.gz) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 -SIZE (rust/crates/unreachable-1.0.0.tar.gz) = 6355 -SHA256 (rust/crates/url-1.6.0.tar.gz) = fa35e768d4daf1d85733418a49fb42e10d7f633e394fccab4ab7aba897053fe2 -SIZE (rust/crates/url-1.6.0.tar.gz) = 72377 -SHA256 (rust/crates/vcpkg-0.2.2.tar.gz) = 9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b -SIZE (rust/crates/vcpkg-0.2.2.tar.gz) = 5870 -SHA256 (rust/crates/vec_map-0.8.0.tar.gz) = 887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c -SIZE (rust/crates/vec_map-0.8.0.tar.gz) = 13742 -SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d -SIZE (rust/crates/void-1.0.2.tar.gz) = 2356 +SHA256 (rust/crates/unicode-normalization-0.1.8.tar.gz) = 141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426 +SIZE (rust/crates/unicode-normalization-0.1.8.tar.gz) = 71158 +SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 +SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 +SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc +SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 +SHA256 (rust/crates/url-1.7.2.tar.gz) = dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a +SIZE (rust/crates/url-1.7.2.tar.gz) = 68597 +SHA256 (rust/crates/vcpkg-0.2.7.tar.gz) = 33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95 +SIZE (rust/crates/vcpkg-0.2.7.tar.gz) = 11012 +SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a +SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959 SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145 -SHA256 (rust/crates/winapi-0.3.4.tar.gz) = 04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3 -SIZE (rust/crates/winapi-0.3.4.tar.gz) = 905247 +SHA256 (rust/crates/winapi-0.3.7.tar.gz) = f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770 +SIZE (rust/crates/winapi-0.3.7.tar.gz) = 1075776 SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SHA256 (tummychow-git-absorb-0.3.0_GH0.tar.gz) = 94d540a7febd37cd74e95e7cab71ee3514df020989208ce3fe83560699072730 -SIZE (tummychow-git-absorb-0.3.0_GH0.tar.gz) = 15726 +SHA256 (tummychow-git-absorb-0.5.0_GH0.tar.gz) = c4ef4fa28222773d695aab7711abbfac7e81c35a37eafe45f79d045516df28b1 +SIZE (tummychow-git-absorb-0.5.0_GH0.tar.gz) = 18064 -- cgit From 8df86ecf8bd506e941e5f4438d8949380e48f062 Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 14:00:25 +0000 Subject: - Update to 1.2.2 --- textproc/R-cran-xml2/Makefile | 5 +---- textproc/R-cran-xml2/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/textproc/R-cran-xml2/Makefile b/textproc/R-cran-xml2/Makefile index 4cf67cbcf4b0..d83854e16f23 100644 --- a/textproc/R-cran-xml2/Makefile +++ b/textproc/R-cran-xml2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xml2 -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -18,7 +18,4 @@ RUN_DEPENDS= ${CRAN_DEPENDS} USES= cran:auto-plist,compiles gnome USE_GNOME= libxml2 -post-patch: - @${REINPLACE_CMD} -e 's|bin/bash|bin/sh|' ${WRKSRC}/configure - .include diff --git a/textproc/R-cran-xml2/distinfo b/textproc/R-cran-xml2/distinfo index 87989ac22610..dc41647bacf9 100644 --- a/textproc/R-cran-xml2/distinfo +++ b/textproc/R-cran-xml2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564836754 -SHA256 (xml2_1.2.1.tar.gz) = 5615bbc94607efc3bc192551992b349091df802ae34b855cfa817733f2690605 -SIZE (xml2_1.2.1.tar.gz) = 259233 +TIMESTAMP = 1565616974 +SHA256 (xml2_1.2.2.tar.gz) = 3050f147c4335be2925a576557bbda36bd52a5bba3110d47b740a2dd811a78f4 +SIZE (xml2_1.2.2.tar.gz) = 261081 -- cgit From 86dec165d4f23e02254d21e91d21fb52e351cae1 Mon Sep 17 00:00:00 2001 From: krion Date: Mon, 12 Aug 2019 14:04:08 +0000 Subject: Upgrade to 2.0.17 PR: 239640 Submitted by: adamw --- www/miniflux/Makefile | 10 +++------- www/miniflux/distinfo | 6 +++--- www/miniflux/files/miniflux.in | 8 ++------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile index b027bbc47940..94e65431b302 100644 --- a/www/miniflux/Makefile +++ b/www/miniflux/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= miniflux -DISTVERSION= 2.0.16 -PORTREVISION= 1 +DISTVERSION= 2.0.17 CATEGORIES= www MAINTAINER= krion@FreeBSD.org -COMMENT= Miniflux is a self-hosted software to read RSS/Atom/JSON feeds +COMMENT= Self-hosted software to read RSS/Atom/JSON feeds LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -30,11 +29,8 @@ GO_BUILDFLAGS= -ldflags="-X miniflux.app/version.Version=${DISTVERSION} \ -X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')" OPTIONS_DEFINE= PGSQL_SERVER -OPTIONS_DEFAULT= PGSQL_SERVER_DESC= Install the PostgreSQL Server Component -PGSQL_SERVER_VARS= WANT_PGSQL=server - -.include +PGSQL_SERVER_VARS= WANT_PGSQL=server,contrib do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/miniflux.app ${STAGEDIR}${PREFIX}/bin/miniflux diff --git a/www/miniflux/distinfo b/www/miniflux/distinfo index 0c013d27c3f2..335da0b4e04f 100644 --- a/www/miniflux/distinfo +++ b/www/miniflux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560084908 -SHA256 (miniflux-miniflux-2.0.16_GH0.tar.gz) = 0f255172fcf7442c835a00333943b291ef921a63711e16ab33f712bf577391dc -SIZE (miniflux-miniflux-2.0.16_GH0.tar.gz) = 2777845 +TIMESTAMP = 1564927301 +SHA256 (miniflux-miniflux-2.0.17_GH0.tar.gz) = 2d0cd7c5ec1b7a083c306902b56f63fd786ece675b2874f22df29d025a5e4cc9 +SIZE (miniflux-miniflux-2.0.17_GH0.tar.gz) = 2778635 diff --git a/www/miniflux/files/miniflux.in b/www/miniflux/files/miniflux.in index d8546f4ae3f0..4f5ea621a43c 100644 --- a/www/miniflux/files/miniflux.in +++ b/www/miniflux/files/miniflux.in @@ -21,15 +21,11 @@ rcvar=miniflux_enable load_rc_config $name : ${miniflux_enable="NO"} - -# Miniflux doesn't use any config file, only environment variables. -set -a -. %%PREFIX%%/etc/miniflux.env -set +a +: ${miniflux_config="%%PREFIX%%/etc/miniflux.env"} pidfile="/var/run/miniflux.pid" procname="%%PREFIX%%/bin/miniflux" command="/usr/sbin/daemon" -command_args="-f -T miniflux -p ${pidfile} -u miniflux %%PREFIX%%/bin/miniflux" +command_args="-f -T miniflux -p ${pidfile} -u miniflux %%PREFIX%%/bin/miniflux -c ${miniflux_config}" run_rc_command "$1" -- cgit From b2468aa59c03847944cd80f6f8ef493f31f7ac96 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 14:05:29 +0000 Subject: Add an entry for the Perl default version change. --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UPDATING b/UPDATING index 443f33eb4574..17a29a290231 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190812: + AFFECTS: users of lang/perl5* + AUTHOR: mat@FreeBSD.org + + The default Perl version has been switched to Perl 5.30. If you are using + binary packages to upgrade your system, you do not have anything to do, pkg + upgrade will do the right thing. For the other people, follow the + instructions in entry 20161103, it should still be the same. 20190801: AFFECTS: users of www/ot-recorder -- cgit From 993dedd0dc773fd282ab8ba40cb9dc3a0a04c146 Mon Sep 17 00:00:00 2001 From: nobutaka Date: Mon, 12 Aug 2019 14:11:47 +0000 Subject: - Switch to the version maintained by the developers of Wanderlust. - Update to the snapshot on 2019-04-07. --- editors/apel/Makefile | 9 +- editors/apel/distinfo | 5 +- editors/apel/files/patch-broken.el | 84 -- editors/apel/files/patch-filename.el | 51 -- editors/apel/files/patch-pccl.el | 268 ------- editors/apel/files/patch-poe.el | 1443 ---------------------------------- editors/apel/files/patch-product.el | 83 -- editors/apel/files/patch-pym.el | 282 ------- editors/apel/files/patch-static.el | 71 -- editors/apel/pkg-descr | 5 +- 10 files changed, 9 insertions(+), 2292 deletions(-) delete mode 100644 editors/apel/files/patch-broken.el delete mode 100644 editors/apel/files/patch-filename.el delete mode 100644 editors/apel/files/patch-pccl.el delete mode 100644 editors/apel/files/patch-poe.el delete mode 100644 editors/apel/files/patch-product.el delete mode 100644 editors/apel/files/patch-pym.el delete mode 100644 editors/apel/files/patch-static.el diff --git a/editors/apel/Makefile b/editors/apel/Makefile index d6f4b68175fd..0e49f402fe64 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= apel -PORTVERSION= ${APEL_VER} -PORTREVISION= 18 +PORTVERSION= 10.8.${SNAPDATE} CATEGORIES= editors elisp -MASTER_SITES= http://git.chise.org/elisp/dist/apel/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org @@ -14,10 +12,13 @@ COMMENT= Portable Emacs Library LICENSE= GPLv2 USES= emacs +USE_GITHUB= yes +GH_ACCOUNT= wanderlust +GH_TAGNAME= d146ddb +SNAPDATE= 20190407 NO_ARCH= yes -APEL_VER= 10.8 ALL_TARGET= elc MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" \ LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ diff --git a/editors/apel/distinfo b/editors/apel/distinfo index 641abd695c16..e871183bf4ba 100644 --- a/editors/apel/distinfo +++ b/editors/apel/distinfo @@ -1,2 +1,3 @@ -SHA256 (apel-10.8.tar.gz) = a511cc36bb51dc32b4915c9e03c67a994060b3156ceeab6fafa0be7874b9ccfe -SIZE (apel-10.8.tar.gz) = 126326 +TIMESTAMP = 1565577043 +SHA256 (wanderlust-apel-10.8.20190407-d146ddb_GH0.tar.gz) = 9709b1ed326a51c98f1f28722b03db725b904e0dbd771d441e098837266af7dd +SIZE (wanderlust-apel-10.8.20190407-d146ddb_GH0.tar.gz) = 94730 diff --git a/editors/apel/files/patch-broken.el b/editors/apel/files/patch-broken.el deleted file mode 100644 index 607a405ec734..000000000000 --- a/editors/apel/files/patch-broken.el +++ /dev/null @@ -1,84 +0,0 @@ -Index: broken.el -=================================================================== ---- broken.el.orig 2005-07-06 02:08:52 UTC -+++ broken.el -@@ -58,51 +58,51 @@ FACILITY must be symbol. - - If ASSERTION is not omitted and evaluated to nil and NO-NOTICE is nil, - it is noticed." -- (` (static-if (, assertion) -- (eval-and-compile -- (broken-facility-internal '(, facility) (, docstring) t)) -- (eval-when-compile -- (when (and '(, assertion) (not '(, no-notice)) -- notice-non-obvious-broken-facility) -- (message "BROKEN FACILITY DETECTED: %s" (, docstring))) -- nil) -- (eval-and-compile -- (broken-facility-internal '(, facility) (, docstring) nil))))) -+ `(static-if ,assertion -+ (eval-and-compile -+ (broken-facility-internal ',facility ,docstring t)) -+ (eval-when-compile -+ (when (and ',assertion (not ',no-notice) -+ notice-non-obvious-broken-facility) -+ (message "BROKEN FACILITY DETECTED: %s" ,docstring)) -+ nil) -+ (eval-and-compile -+ (broken-facility-internal ',facility ,docstring nil)))) - - (put 'if-broken 'lisp-indent-function 2) - (defmacro if-broken (facility then &rest else) - "If FACILITY is broken, expand to THEN, otherwise (progn . ELSE)." -- (` (static-if (broken-p '(, facility)) -- (, then) -- (,@ else)))) -+ `(static-if (broken-p ',facility) -+ ,then -+ ,@else)) - - - (put 'when-broken 'lisp-indent-function 1) - (defmacro when-broken (facility &rest body) - "If FACILITY is broken, expand to (progn . BODY), otherwise nil." -- (` (static-when (broken-p '(, facility)) -- (,@ body)))) -+ `(static-when (broken-p ',facility) -+ ,@body)) - - (put 'unless-broken 'lisp-indent-function 1) - (defmacro unless-broken (facility &rest body) - "If FACILITY is not broken, expand to (progn . BODY), otherwise nil." -- (` (static-unless (broken-p '(, facility)) -- (,@ body)))) -+ `(static-unless (broken-p ',facility) -+ ,@body)) - - (defmacro check-broken-facility (facility) - "Check FACILITY is broken or not. If the status is different on - compile(macro expansion) time and run time, warn it." -- (` (if-broken (, facility) -- (unless (broken-p '(, facility)) -- (message "COMPILE TIME ONLY BROKEN FACILITY DETECTED: %s" -- (or -- '(, (broken-facility-description facility)) -- (broken-facility-description '(, facility))))) -- (when (broken-p '(, facility)) -- (message "RUN TIME ONLY BROKEN FACILITY DETECTED: %s" -- (or -- (broken-facility-description '(, facility)) -- '(, (broken-facility-description facility)))))))) -+ `(if-broken ,facility -+ (unless (broken-p ',facility) -+ (message "COMPILE TIME ONLY BROKEN FACILITY DETECTED: %s" -+ (or -+ ',(broken-facility-description facility) -+ (broken-facility-description ',facility)))) -+ (when (broken-p ',facility) -+ (message "RUN TIME ONLY BROKEN FACILITY DETECTED: %s" -+ (or -+ (broken-facility-description ',facility) -+ ',(broken-facility-description facility)))))) - - - ;;; @ end diff --git a/editors/apel/files/patch-filename.el b/editors/apel/files/patch-filename.el deleted file mode 100644 index d3414d1b1018..000000000000 --- a/editors/apel/files/patch-filename.el +++ /dev/null @@ -1,51 +0,0 @@ -Index: filename.el -=================================================================== ---- filename.el.orig 2005-07-06 02:08:52 UTC -+++ filename.el -@@ -102,26 +102,26 @@ Moreover, if you want to convert Japanes - inc-i '(1+ i)) - (setq sref 'aref - inc-i '(+ i (char-length chr)))) -- (` (let ((len (length (, string))) -- (b 0)(i 0) -- (dest "")) -- (while (< i len) -- (let ((chr ((, sref) (, string) i)) -- (lst filename-replacement-alist) -- ret) -- (while (and lst (not ret)) -- (if (if (functionp (car (car lst))) -- (setq ret (funcall (car (car lst)) chr)) -- (setq ret (memq chr (car (car lst))))) -- t ; quit this loop. -- (setq lst (cdr lst)))) -- (if ret -- (setq dest (concat dest (substring (, string) b i) -- (cdr (car lst))) -- i (, inc-i) -- b i) -- (setq i (, inc-i))))) -- (concat dest (substring (, string) b))))))) -+ `(let ((len (length ,string)) -+ (b 0)(i 0) -+ (dest "")) -+ (while (< i len) -+ (let ((chr (,sref ,string i)) -+ (lst filename-replacement-alist) -+ ret) -+ (while (and lst (not ret)) -+ (if (if (functionp (car (car lst))) -+ (setq ret (funcall (car (car lst)) chr)) -+ (setq ret (memq chr (car (car lst))))) -+ t ; quit this loop. -+ (setq lst (cdr lst)))) -+ (if ret -+ (setq dest (concat dest (substring ,string b i) -+ (cdr (car lst))) -+ i ,inc-i -+ b i) -+ (setq i ,inc-i)))) -+ (concat dest (substring ,string b)))))) - - (defun filename-special-filter (string) - (filename-special-filter-1 string)) diff --git a/editors/apel/files/patch-pccl.el b/editors/apel/files/patch-pccl.el deleted file mode 100644 index 204d68e30355..000000000000 --- a/editors/apel/files/patch-pccl.el +++ /dev/null @@ -1,268 +0,0 @@ -Index: pccl.el -=================================================================== ---- pccl.el.orig 2005-07-06 02:08:53 UTC -+++ pccl.el -@@ -27,138 +27,138 @@ - (require 'broken) - - (broken-facility ccl-usable -- "Emacs has not CCL." -- (and (featurep 'mule) -- (if (featurep 'xemacs) -- (>= emacs-major-version 21) -- (>= emacs-major-version 19)))) -+ "Emacs has not CCL." -+ (and (featurep 'mule) -+ (if (featurep 'xemacs) -+ (>= emacs-major-version 21) -+ (>= emacs-major-version 19)))) - - (unless-broken ccl-usable -- (require 'advice) -+ (require 'advice) - -- (if (featurep 'mule) -- (progn -- (require 'ccl) -- (if (featurep 'xemacs) -- (if (>= emacs-major-version 21) -- ;; for XEmacs 21 with mule -- (require 'pccl-20)) -- (if (>= emacs-major-version 20) -- ;; for Emacs 20 -- (require 'pccl-20) -- ;; for Mule 2.* -- (require 'pccl-om))))) -+ (if (featurep 'mule) -+ (progn -+ (require 'ccl) -+ (if (featurep 'xemacs) -+ (if (>= emacs-major-version 21) -+ ;; for XEmacs 21 with mule -+ (require 'pccl-20)) -+ (if (>= emacs-major-version 20) -+ ;; for Emacs 20 -+ (require 'pccl-20) -+ ;; for Mule 2.* -+ (require 'pccl-om))))) - -- (static-if (or (featurep 'xemacs) (< emacs-major-version 21)) -- (defadvice define-ccl-program -- (before accept-long-ccl-program activate) -- "When CCL-PROGRAM is too long, internal buffer is extended automatically." -- (let ((try-ccl-compile t) -- (prog (eval (ad-get-arg 1)))) -- (ad-set-arg 1 (` '(, prog))) -- (while try-ccl-compile -- (setq try-ccl-compile nil) -- (condition-case sig -- (ccl-compile prog) -- (args-out-of-range -- (if (and (eq (car (cdr sig)) ccl-program-vector) -- (= (car (cdr (cdr sig))) (length ccl-program-vector))) -- (setq ccl-program-vector -- (make-vector (* 2 (length ccl-program-vector)) 0) -- try-ccl-compile t) -- (signal (car sig) (cdr sig))))))))) -+ (static-if (or (featurep 'xemacs) (< emacs-major-version 21)) -+ (defadvice define-ccl-program -+ (before accept-long-ccl-program activate) -+ "When CCL-PROGRAM is too long, internal buffer is extended automatically." -+ (let ((try-ccl-compile t) -+ (prog (eval (ad-get-arg 1)))) -+ (ad-set-arg 1 `',prog) -+ (while try-ccl-compile -+ (setq try-ccl-compile nil) -+ (condition-case sig -+ (ccl-compile prog) -+ (args-out-of-range -+ (if (and (eq (car (cdr sig)) ccl-program-vector) -+ (= (car (cdr (cdr sig))) (length ccl-program-vector))) -+ (setq ccl-program-vector -+ (make-vector (* 2 (length ccl-program-vector)) 0) -+ try-ccl-compile t) -+ (signal (car sig) (cdr sig))))))))) - -- (static-when (and (not (featurep 'xemacs)) (< emacs-major-version 21)) -- (defun-maybe transform-make-coding-system-args (name type &optional doc-string props) -- "For internal use only. -+ (static-when (and (not (featurep 'xemacs)) (< emacs-major-version 21)) -+ (defun-maybe transform-make-coding-system-args (name type &optional doc-string props) -+ "For internal use only. - Transform XEmacs style args for `make-coding-system' to Emacs style. - Value is a list of transformed arguments." -- (let ((mnemonic (string-to-char (or (plist-get props 'mnemonic) "?"))) -- (eol-type (plist-get props 'eol-type)) -- properties tmp) -- (cond -- ((eq eol-type 'lf) (setq eol-type 'unix)) -- ((eq eol-type 'crlf) (setq eol-type 'dos)) -- ((eq eol-type 'cr) (setq eol-type 'mac))) -- (if (setq tmp (plist-get props 'post-read-conversion)) -- (setq properties (plist-put properties 'post-read-conversion tmp))) -- (if (setq tmp (plist-get props 'pre-write-conversion)) -- (setq properties (plist-put properties 'pre-write-conversion tmp))) -- (cond -- ((eq type 'shift-jis) -- (` ((, name) 1 (, mnemonic) (, doc-string) -- nil (, properties) (, eol-type)))) -- ((eq type 'iso2022) ; This is not perfect. -- (if (plist-get props 'escape-quoted) -- (error "escape-quoted is not supported: %S" -- (` ((, name) (, type) (, doc-string) (, props))))) -- (let ((g0 (plist-get props 'charset-g0)) -- (g1 (plist-get props 'charset-g1)) -- (g2 (plist-get props 'charset-g2)) -- (g3 (plist-get props 'charset-g3)) -- (use-roman -- (and -- (eq (cadr (assoc 'latin-jisx0201 -- (plist-get props 'input-charset-conversion))) -- 'ascii) -- (eq (cadr (assoc 'ascii -- (plist-get props 'output-charset-conversion))) -- 'latin-jisx0201))) -- (use-oldjis -- (and -- (eq (cadr (assoc 'japanese-jisx0208-1978 -- (plist-get props 'input-charset-conversion))) -- 'japanese-jisx0208) -- (eq (cadr (assoc 'japanese-jisx0208 -- (plist-get props 'output-charset-conversion))) -- 'japanese-jisx0208-1978)))) -- (if (charsetp g0) -- (if (plist-get props 'force-g0-on-output) -- (setq g0 (` (nil (, g0)))) -- (setq g0 (` ((, g0) t))))) -- (if (charsetp g1) -- (if (plist-get props 'force-g1-on-output) -- (setq g1 (` (nil (, g1)))) -- (setq g1 (` ((, g1) t))))) -- (if (charsetp g2) -- (if (plist-get props 'force-g2-on-output) -- (setq g2 (` (nil (, g2)))) -- (setq g2 (` ((, g2) t))))) -- (if (charsetp g3) -- (if (plist-get props 'force-g3-on-output) -- (setq g3 (` (nil (, g3)))) -- (setq g3 (` ((, g3) t))))) -- (` ((, name) 2 (, mnemonic) (, doc-string) -- ((, g0) (, g1) (, g2) (, g3) -- (, (plist-get props 'short)) -- (, (not (plist-get props 'no-ascii-eol))) -- (, (not (plist-get props 'no-ascii-cntl))) -- (, (plist-get props 'seven)) -- t -- (, (not (plist-get props 'lock-shift))) -- (, use-roman) -- (, use-oldjis) -- (, (plist-get props 'no-iso6429)) -- nil nil nil nil) -- (, properties) (, eol-type))))) -- ((eq type 'big5) -- (` ((, name) 3 (, mnemonic) (, doc-string) -- nil (, properties) (, eol-type)))) -- ((eq type 'ccl) -- (` ((, name) 4 (, mnemonic) (, doc-string) -- ((, (plist-get props 'decode)) . (, (plist-get props 'encode))) -- (, properties) (, eol-type)))) -- (t -- (error "unsupported XEmacs style make-coding-style arguments: %S" -- (` ((, name) (, type) (, doc-string) (, props)))))))) -- (defadvice make-coding-system -- (before ccl-compat (name type &rest ad-subr-args) activate) -- "Emulate XEmacs style make-coding-system." -- (when (and (symbolp type) (not (memq type '(t nil)))) -- (let ((args (apply 'transform-make-coding-system-args -- name type ad-subr-args))) -- (setq type (cadr args) -- ad-subr-args (cddr args))))))) -+ (let ((mnemonic (string-to-char (or (plist-get props 'mnemonic) "?"))) -+ (eol-type (plist-get props 'eol-type)) -+ properties tmp) -+ (cond -+ ((eq eol-type 'lf) (setq eol-type 'unix)) -+ ((eq eol-type 'crlf) (setq eol-type 'dos)) -+ ((eq eol-type 'cr) (setq eol-type 'mac))) -+ (if (setq tmp (plist-get props 'post-read-conversion)) -+ (setq properties (plist-put properties 'post-read-conversion tmp))) -+ (if (setq tmp (plist-get props 'pre-write-conversion)) -+ (setq properties (plist-put properties 'pre-write-conversion tmp))) -+ (cond -+ ((eq type 'shift-jis) -+ `(,name 1 ,mnemonic ,doc-string -+ nil ,properties ,eol-type)) -+ ((eq type 'iso2022) ; This is not perfect. -+ (if (plist-get props 'escape-quoted) -+ (error "escape-quoted is not supported: %S" -+ `(,name ,type ,doc-string ,props))) -+ (let ((g0 (plist-get props 'charset-g0)) -+ (g1 (plist-get props 'charset-g1)) -+ (g2 (plist-get props 'charset-g2)) -+ (g3 (plist-get props 'charset-g3)) -+ (use-roman -+ (and -+ (eq (cadr (assoc 'latin-jisx0201 -+ (plist-get props 'input-charset-conversion))) -+ 'ascii) -+ (eq (cadr (assoc 'ascii -+ (plist-get props 'output-charset-conversion))) -+ 'latin-jisx0201))) -+ (use-oldjis -+ (and -+ (eq (cadr (assoc 'japanese-jisx0208-1978 -+ (plist-get props 'input-charset-conversion))) -+ 'japanese-jisx0208) -+ (eq (cadr (assoc 'japanese-jisx0208 -+ (plist-get props 'output-charset-conversion))) -+ 'japanese-jisx0208-1978)))) -+ (if (charsetp g0) -+ (if (plist-get props 'force-g0-on-output) -+ (setq g0 `(nil ,g0)) -+ (setq g0 `(,g0 t)))) -+ (if (charsetp g1) -+ (if (plist-get props 'force-g1-on-output) -+ (setq g1 `(nil ,g1)) -+ (setq g1 `(,g1 t)))) -+ (if (charsetp g2) -+ (if (plist-get props 'force-g2-on-output) -+ (setq g2 `(nil ,g2)) -+ (setq g2 `(,g2 t)))) -+ (if (charsetp g3) -+ (if (plist-get props 'force-g3-on-output) -+ (setq g3 `(nil ,g3)) -+ (setq g3 `(,g3 t)))) -+ `(,name 2 ,mnemonic ,doc-string -+ (,g0 ,g1 ,g2 ,g3 -+ ,(plist-get props 'short) -+ ,(not (plist-get props 'no-ascii-eol)) -+ ,(not (plist-get props 'no-ascii-cntl)) -+ ,(plist-get props 'seven) -+ t -+ ,(not (plist-get props 'lock-shift)) -+ ,use-roman -+ ,use-oldjis -+ ,(plist-get props 'no-iso6429) -+ nil nil nil nil) -+ ,properties ,eol-type))) -+ ((eq type 'big5) -+ `(,name 3 ,mnemonic ,doc-string -+ nil ,properties ,eol-type)) -+ ((eq type 'ccl) -+ `(,name 4 ,mnemonic ,doc-string -+ (,(plist-get props 'decode) . ,(plist-get props 'encode)) -+ ,properties ,eol-type)) -+ (t -+ (error "unsupported XEmacs style make-coding-style arguments: %S" -+ `(,name ,type ,doc-string ,props)))))) -+ (defadvice make-coding-system -+ (before ccl-compat (name type &rest ad-subr-args) activate) -+ "Emulate XEmacs style make-coding-system." -+ (when (and (symbolp type) (not (memq type '(t nil)))) -+ (let ((args (apply 'transform-make-coding-system-args -+ name type ad-subr-args))) -+ (setq type (cadr args) -+ ad-subr-args (cddr args))))))) - - - ;;; @ end diff --git a/editors/apel/files/patch-poe.el b/editors/apel/files/patch-poe.el deleted file mode 100644 index 656a4f5829f5..000000000000 --- a/editors/apel/files/patch-poe.el +++ /dev/null @@ -1,1443 +0,0 @@ ---- poe.el.orig 2008-09-06 15:16:14 UTC -+++ poe.el -@@ -38,22 +38,22 @@ - ;;; - - (static-when (= emacs-major-version 18) -- (require 'poe-18)) -+ (require 'poe-18)) - - ;; Some ancient version of XEmacs did not provide 'xemacs. - (static-when (string-match "XEmacs" emacs-version) -- (provide 'xemacs)) -+ (provide 'xemacs)) - - ;; `file-coding' was appeared in the spring of 1998, just before XEmacs - ;; 21.0. Therefore it is not provided in XEmacs with MULE versions 20.4 - ;; or earlier. - (static-when (featurep 'xemacs) -- ;; must be load-time check to share .elc between w/ MULE and w/o MULE. -- (when (featurep 'mule) -- (provide 'file-coding))) -+ ;; must be load-time check to share .elc between w/ MULE and w/o MULE. -+ (when (featurep 'mule) -+ (provide 'file-coding))) - - (static-when (featurep 'xemacs) -- (require 'poe-xemacs)) -+ (require 'poe-xemacs)) - - ;; must be load-time check to share .elc between different systems. - (or (fboundp 'open-network-stream) -@@ -66,18 +66,18 @@ - ;; Emacs 20.3 and earlier: (require FEATURE &optional FILENAME) - ;; Emacs 20.4 and later: (require FEATURE &optional FILENAME NOERROR) - (static-condition-case nil -- ;; compile-time check. -- (progn -- (require 'nofeature "nofile" 'noerror) -- (if (get 'require 'defun-maybe) -- (error "`require' is already redefined"))) -- (error -- ;; load-time check. -- (or (fboundp 'si:require) -- (progn -- (fset 'si:require (symbol-function 'require)) -- (defun require (feature &optional filename noerror) -- "\ -+ ;; compile-time check. -+ (progn -+ (require 'nofeature "nofile" 'noerror) -+ (if (get 'require 'defun-maybe) -+ (error "`require' is already redefined"))) -+ (error -+ ;; load-time check. -+ (or (fboundp 'si:require) -+ (progn -+ (fset 'si:require (symbol-function 'require)) -+ (defun require (feature &optional filename noerror) -+ "\ - If feature FEATURE is not loaded, load it from FILENAME. - If FEATURE is not a member of the list `features', then the feature - is not loaded; so load the file FILENAME. -@@ -86,14 +86,14 @@ but in this case `load' insists on addin - If the optional third argument NOERROR is non-nil, - then return nil if the file is not found. - Normally the return value is FEATURE." -- (if noerror -- (condition-case nil -- (si:require feature filename) -- (file-error)) -- (si:require feature filename))) -- ;; for `load-history'. -- (setq current-load-list (cons 'require current-load-list)) -- (put 'require 'defun-maybe t))))) -+ (if noerror -+ (condition-case nil -+ (si:require feature filename) -+ (file-error)) -+ (si:require feature filename))) -+ ;; for `load-history'. -+ (setq current-load-list (cons 'require current-load-list)) -+ (put 'require 'defun-maybe t))))) - - ;; Emacs 19.29 and later: (plist-get PLIST PROP) - ;; (defun-maybe plist-get (plist prop) -@@ -103,21 +103,21 @@ Normally the return value is FEATURE." - ;; (car (cdr plist))) - (static-unless (and (fboundp 'plist-get) - (not (get 'plist-get 'defun-maybe))) -- (or (fboundp 'plist-get) -- (progn -- (defvar plist-get-internal-symbol) -- (defun plist-get (plist prop) -- "\ -+ (or (fboundp 'plist-get) -+ (progn -+ (defvar plist-get-internal-symbol) -+ (defun plist-get (plist prop) -+ "\ - Extract a value from a property list. - PLIST is a property list, which is a list of the form - \(PROP1 VALUE1 PROP2 VALUE2...\). This function returns the value - corresponding to the given PROP, or nil if PROP is not - one of the properties on the list." -- (setplist 'plist-get-internal-symbol plist) -- (get 'plist-get-internal-symbol prop)) -- ;; for `load-history'. -- (setq current-load-list (cons 'plist-get current-load-list)) -- (put 'plist-get 'defun-maybe t)))) -+ (setplist 'plist-get-internal-symbol plist) -+ (get 'plist-get-internal-symbol prop)) -+ ;; for `load-history'. -+ (setq current-load-list (cons 'plist-get current-load-list)) -+ (put 'plist-get 'defun-maybe t)))) - - ;; Emacs 19.29 and later: (plist-put PLIST PROP VAL) - ;; (defun-maybe plist-put (plist prop val) -@@ -138,11 +138,11 @@ one of the properties on the list." - ;; (list prop val))))) - (static-unless (and (fboundp 'plist-put) - (not (get 'plist-put 'defun-maybe))) -- (or (fboundp 'plist-put) -- (progn -- (defvar plist-put-internal-symbol) -- (defun plist-put (plist prop val) -- "\ -+ (or (fboundp 'plist-put) -+ (progn -+ (defvar plist-put-internal-symbol) -+ (defun plist-put (plist prop val) -+ "\ - Change value in PLIST of PROP to VAL. - PLIST is a property list, which is a list of the form - \(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol and VAL is any object. -@@ -150,12 +150,12 @@ If PROP is already a property on the lis - otherwise the new PROP VAL pair is added. The new plist is returned; - use `\(setq x \(plist-put x prop val\)\)' to be sure to use the new value. - The PLIST is modified by side effects." -- (setplist 'plist-put-internal-symbol plist) -- (put 'plist-put-internal-symbol prop val) -- (symbol-plist 'plist-put-internal-symbol)) -- ;; for `load-history'. -- (setq current-load-list (cons 'plist-put current-load-list)) -- (put 'plist-put 'defun-maybe t)))) -+ (setplist 'plist-put-internal-symbol plist) -+ (put 'plist-put-internal-symbol prop val) -+ (symbol-plist 'plist-put-internal-symbol)) -+ ;; for `load-history'. -+ (setq current-load-list (cons 'plist-put current-load-list)) -+ (put 'plist-put 'defun-maybe t)))) - - ;; Emacs 19.23 and later: (minibuffer-prompt-width) - (defun-maybe minibuffer-prompt-width () -@@ -170,16 +170,16 @@ The PLIST is modified by side effects." - (>= emacs-major-version 20) - (and (= emacs-major-version 19) - (>= emacs-minor-version 29))) -- (or (fboundp 'si:read-string) -- (progn -- (fset 'si:read-string (symbol-function 'read-string)) -- (defun read-string (prompt &optional initial-input history) -- "\ -+ (or (fboundp 'si:read-string) -+ (progn -+ (fset 'si:read-string (symbol-function 'read-string)) -+ (defun read-string (prompt &optional initial-input history) -+ "\ - Read a string from the minibuffer, prompting with string PROMPT. - If non-nil, second arg INITIAL-INPUT is a string to insert before reading. - The third arg HISTORY, is dummy for compatibility. - See `read-from-minibuffer' for details of HISTORY argument." -- (si:read-string prompt initial-input))))) -+ (si:read-string prompt initial-input))))) - - ;; (completing-read prompt table &optional - ;; FSF Emacs -@@ -203,8 +203,8 @@ See `read-from-minibuffer' for details o - (fset 'si:completing-read (symbol-function 'completing-read)) - (defun completing-read - (prompt table &optional predicate require-match init -- hist def) -- "Read a string in the minibuffer, with completion. -+ hist def) -+ "Read a string in the minibuffer, with completion. - PROMPT is a string to prompt with; normally it ends in a colon and a space. - TABLE is an alist whose elements' cars are strings, or an obarray. - PREDICATE limits completion to a subset of TABLE. -@@ -225,10 +225,10 @@ DEF, if non-nil, is the default value. - - Completion ignores case if the ambient value of - `completion-ignore-case' is non-nil." -- (let ((string (si:completing-read prompt table predicate -- require-match init))) -- (if (and (string= string "") def) -- def string)))))) -+ (let ((string (si:completing-read prompt table predicate -+ require-match init))) -+ (if (and (string= string "") def) -+ def string)))))) - ;; add 'def' argument. - ((or (and (featurep 'xemacs) - (or (and (eq emacs-major-version 21) -@@ -240,8 +240,8 @@ Completion ignores case if the ambient v - (fset 'si:completing-read (symbol-function 'completing-read)) - (defun completing-read - (prompt table &optional predicate require-match init -- hist def) -- "Read a string in the minibuffer, with completion. -+ hist def) -+ "Read a string in the minibuffer, with completion. - PROMPT is a string to prompt with; normally it ends in a colon and a space. - TABLE is an alist whose elements' cars are strings, or an obarray. - PREDICATE limits completion to a subset of TABLE. -@@ -269,10 +269,10 @@ DEF, if non-nil, is the default value. - - Completion ignores case if the ambient value of - `completion-ignore-case' is non-nil." -- (let ((string (si:completing-read prompt table predicate -- require-match init hist))) -- (if (and (string= string "") def) -- def string))))))) -+ (let ((string (si:completing-read prompt table predicate -+ require-match init hist))) -+ (if (and (string= string "") def) -+ def string))))))) - - ;; v18: (string-to-int STRING) - ;; v19: (string-to-number STRING) -@@ -281,24 +281,24 @@ Completion ignores case if the ambient v - ;; XXX: `string-to-number' of Emacs 20.3 and earlier is broken. - ;; (string-to-number "1e1" 16) => 10.0, should be 481. - (static-condition-case nil -- ;; compile-time check. -- (if (= (string-to-number "1e1" 16) 481) -- (if (get 'string-to-number 'defun-maybe) -- (error "`string-to-number' is already redefined")) -- (error "`string-to-number' is broken")) -- (error -- ;; load-time check. -- (or (fboundp 'si:string-to-number) -- (progn -- (if (fboundp 'string-to-number) -- (fset 'si:string-to-number (symbol-function 'string-to-number)) -- (fset 'si:string-to-number (symbol-function 'string-to-int)) -- ;; XXX: In v18, this causes infinite loop while byte-compiling. -- ;; (defalias 'string-to-int 'string-to-number) -- ) -- (put 'string-to-number 'defun-maybe t) -- (defun string-to-number (string &optional base) -- "\ -+ ;; compile-time check. -+ (if (= (string-to-number "1e1" 16) 481) -+ (if (get 'string-to-number 'defun-maybe) -+ (error "`string-to-number' is already redefined")) -+ (error "`string-to-number' is broken")) -+ (error -+ ;; load-time check. -+ (or (fboundp 'si:string-to-number) -+ (progn -+ (if (fboundp 'string-to-number) -+ (fset 'si:string-to-number (symbol-function 'string-to-number)) -+ (fset 'si:string-to-number (symbol-function 'string-to-int)) -+ ;; XXX: In v18, this causes infinite loop while byte-compiling. -+ ;; (defalias 'string-to-int 'string-to-number) -+ ) -+ (put 'string-to-number 'defun-maybe t) -+ (defun string-to-number (string &optional base) -+ "\ - Convert STRING to a number by parsing it as a decimal number. - This parses both integers and floating point numbers. - It ignores leading spaces and tabs. -@@ -306,39 +306,39 @@ It ignores leading spaces and tabs. - If BASE, interpret STRING as a number in that base. If BASE isn't - present, base 10 is used. BASE must be between 2 and 16 (inclusive). - If the base used is not 10, floating point is not recognized." -- (if (or (null base) (= base 10)) -- (si:string-to-number string) -- (if (or (< base 2)(> base 16)) -- (signal 'args-out-of-range (cons base nil))) -- (let ((len (length string)) -- (pos 0)) -- ;; skip leading whitespace. -- (while (and (< pos len) -- (memq (aref string pos) '(?\ ?\t))) -- (setq pos (1+ pos))) -- (if (= pos len) -- 0 -- (let ((number 0)(negative 1) -- chr num) -- (if (eq (aref string pos) ?-) -- (setq negative -1 -- pos (1+ pos)) -- (if (eq (aref string pos) ?+) -- (setq pos (1+ pos)))) -- (while (and (< pos len) -- (setq chr (aref string pos) -- num (cond -- ((and (<= ?0 chr)(<= chr ?9)) -- (- chr ?0)) -- ((and (<= ?A chr)(<= chr ?F)) -- (+ (- chr ?A) 10)) -- ((and (<= ?a chr)(<= chr ?f)) -- (+ (- chr ?a) 10)) -- (t nil))) -- (< num base)) -- (setq number (+ (* number base) num) -- pos (1+ pos))) -- (* negative number)))))))))) -+ (if (or (null base) (= base 10)) -+ (si:string-to-number string) -+ (if (or (< base 2)(> base 16)) -+ (signal 'args-out-of-range (cons base nil))) -+ (let ((len (length string)) -+ (pos 0)) -+ ;; skip leading whitespace. -+ (while (and (< pos len) -+ (memq (aref string pos) '(?\ ?\t))) -+ (setq pos (1+ pos))) -+ (if (= pos len) -+ 0 -+ (let ((number 0)(negative 1) -+ chr num) -+ (if (eq (aref string pos) ?-) -+ (setq negative -1 -+ pos (1+ pos)) -+ (if (eq (aref string pos) ?+) -+ (setq pos (1+ pos)))) -+ (while (and (< pos len) -+ (setq chr (aref string pos) -+ num (cond -+ ((and (<= ?0 chr)(<= chr ?9)) -+ (- chr ?0)) -+ ((and (<= ?A chr)(<= chr ?F)) -+ (+ (- chr ?A) 10)) -+ ((and (<= ?a chr)(<= chr ?f)) -+ (+ (- chr ?a) 10)) -+ (t nil))) -+ (< num base)) -+ (setq number (+ (* number base) num) -+ pos (1+ pos))) -+ (* negative number)))))))))) - - ;; Emacs 20.1 and 20.2: (concat-chars &rest CHARS) - ;; Emacs 20.3/XEmacs 21.0 and later: (string &rest CHARS) -@@ -362,130 +362,130 @@ If the base used is not 10, floating poi - ;; Mule: (char-before POS) - ;; v20: (char-before &optional POS) - (static-condition-case nil -- ;; compile-time check. -- (progn -- (char-before) -- (if (get 'char-before 'defun-maybe) -- (error "`char-before' is already defined"))) -- (wrong-number-of-arguments ; Mule. -- ;; load-time check. -- (or (fboundp 'si:char-before) -- (progn -- (fset 'si:char-before (symbol-function 'char-before)) -- (put 'char-before 'defun-maybe t) -- ;; takes IGNORED for backward compatibility. -- (defun char-before (&optional pos ignored) -- "\ -+ ;; compile-time check. -+ (progn -+ (char-before) -+ (if (get 'char-before 'defun-maybe) -+ (error "`char-before' is already defined"))) -+ (wrong-number-of-arguments ; Mule. -+ ;; load-time check. -+ (or (fboundp 'si:char-before) -+ (progn -+ (fset 'si:char-before (symbol-function 'char-before)) -+ (put 'char-before 'defun-maybe t) -+ ;; takes IGNORED for backward compatibility. -+ (defun char-before (&optional pos ignored) -+ "\ - Return character in current buffer preceding position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (si:char-before (or pos (point))))))) -- (void-function ; non-Mule. -- ;; load-time check. -- (defun-maybe char-before (&optional pos) -- "\ -+ (si:char-before (or pos (point))))))) -+ (void-function ; non-Mule. -+ ;; load-time check. -+ (defun-maybe char-before (&optional pos) -+ "\ - Return character in current buffer preceding position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (if pos -- (save-excursion -- (and (= (goto-char pos) (point)) -- (not (bobp)) -- (preceding-char))) -- (and (not (bobp)) -- (preceding-char))))) -- (error ; found our definition at compile-time. -- ;; load-time check. -- (condition-case nil -- (char-before) -- (wrong-number-of-arguments ; Mule. -- (or (fboundp 'si:char-before) -- (progn -- (fset 'si:char-before (symbol-function 'char-before)) -- (put 'char-before 'defun-maybe t) -- ;; takes IGNORED for backward compatibility. -- (defun char-before (&optional pos ignored) -- "\ -+ (if pos -+ (save-excursion -+ (and (= (goto-char pos) (point)) -+ (not (bobp)) -+ (preceding-char))) -+ (and (not (bobp)) -+ (preceding-char))))) -+ (error ; found our definition at compile-time. -+ ;; load-time check. -+ (condition-case nil -+ (char-before) -+ (wrong-number-of-arguments ; Mule. -+ (or (fboundp 'si:char-before) -+ (progn -+ (fset 'si:char-before (symbol-function 'char-before)) -+ (put 'char-before 'defun-maybe t) -+ ;; takes IGNORED for backward compatibility. -+ (defun char-before (&optional pos ignored) -+ "\ - Return character in current buffer preceding position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (si:char-before (or pos (point))))))) -- (void-function ; non-Mule. -- (defun-maybe char-before (&optional pos) -- "\ -+ (si:char-before (or pos (point))))))) -+ (void-function ; non-Mule. -+ (defun-maybe char-before (&optional pos) -+ "\ - Return character in current buffer preceding position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (if pos -- (save-excursion -- (and (= (goto-char pos) (point)) -- (not (bobp)) -- (preceding-char))) -- (and (not (bobp)) -- (preceding-char)))))))) -+ (if pos -+ (save-excursion -+ (and (= (goto-char pos) (point)) -+ (not (bobp)) -+ (preceding-char))) -+ (and (not (bobp)) -+ (preceding-char)))))))) - - ;; v18, v19: (char-after POS) - ;; v20: (char-after &optional POS) - (static-condition-case nil -- ;; compile-time check. -- (progn -- (char-after) -- (if (get 'char-after 'defun-maybe) -- (error "`char-after' is already redefined"))) -- (wrong-number-of-arguments ; v18, v19 -- ;; load-time check. -- (or (fboundp 'si:char-after) -- (progn -- (fset 'si:char-after (symbol-function 'char-after)) -- (put 'char-after 'defun-maybe t) -- (defun char-after (&optional pos) -- "\ -+ ;; compile-time check. -+ (progn -+ (char-after) -+ (if (get 'char-after 'defun-maybe) -+ (error "`char-after' is already redefined"))) -+ (wrong-number-of-arguments ; v18, v19 -+ ;; load-time check. -+ (or (fboundp 'si:char-after) -+ (progn -+ (fset 'si:char-after (symbol-function 'char-after)) -+ (put 'char-after 'defun-maybe t) -+ (defun char-after (&optional pos) -+ "\ - Return character in current buffer at position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (si:char-after (or pos (point))))))) -- (void-function ; NEVER happen? -- ;; load-time check. -- (defun-maybe char-after (&optional pos) -- "\ -+ (si:char-after (or pos (point))))))) -+ (void-function ; NEVER happen? -+ ;; load-time check. -+ (defun-maybe char-after (&optional pos) -+ "\ - Return character in current buffer at position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (if pos -- (save-excursion -- (and (= (goto-char pos) (point)) -- (not (eobp)) -- (following-char))) -- (and (not (eobp)) -- (following-char))))) -- (error ; found our definition at compile-time. -- ;; load-time check. -- (condition-case nil -- (char-after) -- (wrong-number-of-arguments ; v18, v19 -- (or (fboundp 'si:char-after) -- (progn -- (fset 'si:char-after (symbol-function 'char-after)) -- (put 'char-after 'defun-maybe t) -- (defun char-after (&optional pos) -- "\ -+ (if pos -+ (save-excursion -+ (and (= (goto-char pos) (point)) -+ (not (eobp)) -+ (following-char))) -+ (and (not (eobp)) -+ (following-char))))) -+ (error ; found our definition at compile-time. -+ ;; load-time check. -+ (condition-case nil -+ (char-after) -+ (wrong-number-of-arguments ; v18, v19 -+ (or (fboundp 'si:char-after) -+ (progn -+ (fset 'si:char-after (symbol-function 'char-after)) -+ (put 'char-after 'defun-maybe t) -+ (defun char-after (&optional pos) -+ "\ - Return character in current buffer at position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (si:char-after (or pos (point))))))) -- (void-function ; NEVER happen? -- (defun-maybe char-after (&optional pos) -- "\ -+ (si:char-after (or pos (point))))))) -+ (void-function ; NEVER happen? -+ (defun-maybe char-after (&optional pos) -+ "\ - Return character in current buffer at position POS. - POS is an integer or a buffer pointer. - If POS is out of range, the value is nil." -- (if pos -- (save-excursion -- (and (= (goto-char pos) (point)) -- (not (eobp)) -- (following-char))) -- (and (not (eobp)) -- (following-char)))))))) -+ (if pos -+ (save-excursion -+ (and (= (goto-char pos) (point)) -+ (not (eobp)) -+ (following-char))) -+ (and (not (eobp)) -+ (following-char)))))))) - - ;; Emacs 19.29 and later: (buffer-substring-no-properties START END) - (defun-maybe buffer-substring-no-properties (start end) -@@ -813,7 +813,7 @@ the value of `foo'." - ;; So, in Emacs 19.29, `run-hooks' and others will be overrided. - ;; But, who cares it? - (static-unless (subrp (symbol-function 'run-hooks)) -- (require 'localhook)) -+ (require 'localhook)) - - ;; Emacs 19.29/XEmacs 19.14(?) and later: (add-to-list LIST-VAR ELEMENT) - (defun-maybe add-to-list (list-var element) -@@ -916,20 +916,20 @@ APEL provides this as dummy for compatib - (defmacro-maybe save-current-buffer (&rest body) - "Save the current buffer; execute BODY; restore the current buffer. - Executes BODY just like `progn'." -- (` (let ((orig-buffer (current-buffer))) -- (unwind-protect -- (progn (,@ body)) -- (if (buffer-live-p orig-buffer) -- (set-buffer orig-buffer)))))) -+ `(let ((orig-buffer (current-buffer))) -+ (unwind-protect -+ (progn ,@body) -+ (if (buffer-live-p orig-buffer) -+ (set-buffer orig-buffer))))) - - ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-current-buffer BUFFER &rest BODY) - (defmacro-maybe with-current-buffer (buffer &rest body) - "Execute the forms in BODY with BUFFER as the current buffer. - The value returned is the value of the last form in BODY. - See also `with-temp-buffer'." -- (` (save-current-buffer -- (set-buffer (, buffer)) -- (,@ body)))) -+ `(save-current-buffer -+ (set-buffer ,buffer) -+ ,@body)) - - ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-temp-file FILE &rest FORMS) - (defmacro-maybe with-temp-file (file &rest forms) -@@ -938,68 +938,68 @@ The value of the last form in FORMS is r - See also `with-temp-buffer'." - (let ((temp-file (make-symbol "temp-file")) - (temp-buffer (make-symbol "temp-buffer"))) -- (` (let (((, temp-file) (, file)) -- ((, temp-buffer) -- (get-buffer-create (generate-new-buffer-name " *temp file*")))) -- (unwind-protect -- (prog1 -- (with-current-buffer (, temp-buffer) -- (,@ forms)) -- (with-current-buffer (, temp-buffer) -- (widen) -- (write-region (point-min) (point-max) (, temp-file) nil 0))) -- (and (buffer-name (, temp-buffer)) -- (kill-buffer (, temp-buffer)))))))) -+ `(let ((,temp-file ,file) -+ (,temp-buffer -+ (get-buffer-create (generate-new-buffer-name " *temp file*")))) -+ (unwind-protect -+ (prog1 -+ (with-current-buffer ,temp-buffer -+ ,@forms) -+ (with-current-buffer ,temp-buffer -+ (widen) -+ (write-region (point-min) (point-max) ,temp-file nil 0))) -+ (and (buffer-name ,temp-buffer) -+ (kill-buffer ,temp-buffer)))))) - - ;; Emacs 20.4 and later: (with-temp-message MESSAGE &rest BODY) - ;; This macro uses `current-message', which appears in v20. - (static-when (and (fboundp 'current-message) - (subrp (symbol-function 'current-message))) -- (defmacro-maybe with-temp-message (message &rest body) -- "\ -+ (defmacro-maybe with-temp-message (message &rest body) -+ "\ - Display MESSAGE temporarily if non-nil while BODY is evaluated. - The original message is restored to the echo area after BODY has finished. - The value returned is the value of the last form in BODY. - MESSAGE is written to the message log buffer if `message-log-max' is non-nil. - If MESSAGE is nil, the echo area and message log buffer are unchanged. - Use a MESSAGE of \"\" to temporarily clear the echo area." -- (let ((current-message (make-symbol "current-message")) -- (temp-message (make-symbol "with-temp-message"))) -- (` (let (((, temp-message) (, message)) -- ((, current-message))) -- (unwind-protect -- (progn -- (when (, temp-message) -- (setq (, current-message) (current-message)) -- (message "%s" (, temp-message)) -- (,@ body)) -- (and (, temp-message) (, current-message) -- (message "%s" (, current-message)))))))))) -+ (let ((current-message (make-symbol "current-message")) -+ (temp-message (make-symbol "with-temp-message"))) -+ `(let ((,temp-message ,message) -+ (,current-message)) -+ (unwind-protect -+ (progn -+ (when ,temp-message -+ (setq ,current-message (current-message)) -+ (message "%s" ,temp-message) -+ ,@body) -+ (and ,temp-message ,current-message -+ (message "%s" ,current-message)))))))) - - ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-temp-buffer &rest FORMS) - (defmacro-maybe with-temp-buffer (&rest forms) - "Create a temporary buffer, and evaluate FORMS there like `progn'. - See also `with-temp-file' and `with-output-to-string'." - (let ((temp-buffer (make-symbol "temp-buffer"))) -- (` (let (((, temp-buffer) -- (get-buffer-create (generate-new-buffer-name " *temp*")))) -- (unwind-protect -- (with-current-buffer (, temp-buffer) -- (,@ forms)) -- (and (buffer-name (, temp-buffer)) -- (kill-buffer (, temp-buffer)))))))) -+ `(let ((,temp-buffer -+ (get-buffer-create (generate-new-buffer-name " *temp*")))) -+ (unwind-protect -+ (with-current-buffer ,temp-buffer -+ ,@forms) -+ (and (buffer-name ,temp-buffer) -+ (kill-buffer ,temp-buffer)))))) - - ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-output-to-string &rest BODY) - (defmacro-maybe with-output-to-string (&rest body) - "Execute BODY, return the text it sent to `standard-output', as a string." -- (` (let ((standard-output -- (get-buffer-create (generate-new-buffer-name " *string-output*")))) -- (let ((standard-output standard-output)) -- (,@ body)) -- (with-current-buffer standard-output -- (prog1 -- (buffer-string) -- (kill-buffer nil)))))) -+ `(let ((standard-output -+ (get-buffer-create (generate-new-buffer-name " *string-output*")))) -+ (let ((standard-output standard-output)) -+ ,@body) -+ (with-current-buffer standard-output -+ (prog1 -+ (buffer-string) -+ (kill-buffer nil))))) - - ;; Emacs 20.1 and later: (combine-after-change-calls &rest BODY) - (defmacro-maybe combine-after-change-calls (&rest body) -@@ -1056,20 +1056,20 @@ STRING should be given if the last searc - ;; We support following API. - ;; (replace-match NEWTEXT &optional FIXEDCASE LITERAL STRING) - (static-condition-case nil -- ;; compile-time check -- (progn -- (string-match "" "") -- (replace-match "" nil nil "") -- (if (get 'replace-match 'defun-maybe) -- (error "`replace-match' is already defined"))) -- (wrong-number-of-arguments ; Emacs 19.28 and earlier -- ;; load-time check. -- (or (fboundp 'si:replace-match) -- (progn -- (fset 'si:replace-match (symbol-function 'replace-match)) -- (put 'replace-match 'defun-maybe t) -- (defun replace-match (newtext &optional fixedcase literal string) -- "Replace text matched by last search with NEWTEXT. -+ ;; compile-time check -+ (progn -+ (string-match "" "") -+ (replace-match "" nil nil "") -+ (if (get 'replace-match 'defun-maybe) -+ (error "`replace-match' is already defined"))) -+ (wrong-number-of-arguments ; Emacs 19.28 and earlier -+ ;; load-time check. -+ (or (fboundp 'si:replace-match) -+ (progn -+ (fset 'si:replace-match (symbol-function 'replace-match)) -+ (put 'replace-match 'defun-maybe t) -+ (defun replace-match (newtext &optional fixedcase literal string) -+ "Replace text matched by last search with NEWTEXT. - If second arg FIXEDCASE is non-nil, do not alter case of replacement text. - Otherwise maybe capitalize the whole text, or maybe just word initials, - based on the replaced text. -@@ -1080,48 +1080,48 @@ then capitalize each word in NEWTEXT. - - If third arg LITERAL is non-nil, insert NEWTEXT literally. - Otherwise treat `\' as special: -- `\&' in NEWTEXT means substitute original matched text. -- `\N' means substitute what matched the Nth `\(...\)'. -+ `\\&' in NEWTEXT means substitute original matched text. -+ `\\N' means substitute what matched the Nth `\\(...\\)'. - If Nth parens didn't match, substitute nothing. -- `\\' means insert one `\'. -+ `\\\\' means insert one `\\'. - FIXEDCASE and LITERAL are optional arguments. - Leaves point at end of replacement text. - - The optional fourth argument STRING can be a string to modify. - In that case, this function creates and returns a new string - which is made by replacing the part of STRING that was matched." -- (if string -- (with-temp-buffer -- (save-match-data -- (insert string) -- (let* ((matched (match-data)) -- (beg (nth 0 matched)) -- (end (nth 1 matched))) -- (store-match-data -- (list -- (if (markerp beg) -- (move-marker beg (1+ (match-beginning 0))) -- (1+ (match-beginning 0))) -- (if (markerp end) -- (move-marker end (1+ (match-end 0))) -- (1+ (match-end 0)))))) -- (si:replace-match newtext fixedcase literal) -- (buffer-string))) -- (si:replace-match newtext fixedcase literal)))))) -- (error ; found our definition at compile-time. -- ;; load-time check. -- (condition-case nil -- (progn -- (string-match "" "") -- (replace-match "" nil nil "")) -- (wrong-number-of-arguments ; Emacs 19.28 and earlier -- ;; load-time check. -- (or (fboundp 'si:replace-match) -- (progn -- (fset 'si:replace-match (symbol-function 'replace-match)) -- (put 'replace-match 'defun-maybe t) -- (defun replace-match (newtext &optional fixedcase literal string) -- "Replace text matched by last search with NEWTEXT. -+ (if string -+ (with-temp-buffer -+ (save-match-data -+ (insert string) -+ (let* ((matched (match-data)) -+ (beg (nth 0 matched)) -+ (end (nth 1 matched))) -+ (store-match-data -+ (list -+ (if (markerp beg) -+ (move-marker beg (1+ (match-beginning 0))) -+ (1+ (match-beginning 0))) -+ (if (markerp end) -+ (move-marker end (1+ (match-end 0))) -+ (1+ (match-end 0)))))) -+ (si:replace-match newtext fixedcase literal) -+ (buffer-string))) -+ (si:replace-match newtext fixedcase literal)))))) -+ (error ; found our definition at compile-time. -+ ;; load-time check. -+ (condition-case nil -+ (progn -+ (string-match "" "") -+ (replace-match "" nil nil "")) -+ (wrong-number-of-arguments ; Emacs 19.28 and earlier -+ ;; load-time check. -+ (or (fboundp 'si:replace-match) -+ (progn -+ (fset 'si:replace-match (symbol-function 'replace-match)) -+ (put 'replace-match 'defun-maybe t) -+ (defun replace-match (newtext &optional fixedcase literal string) -+ "Replace text matched by last search with NEWTEXT. - If second arg FIXEDCASE is non-nil, do not alter case of replacement text. - Otherwise maybe capitalize the whole text, or maybe just word initials, - based on the replaced text. -@@ -1132,34 +1132,34 @@ then capitalize each word in NEWTEXT. - - If third arg LITERAL is non-nil, insert NEWTEXT literally. - Otherwise treat `\' as special: -- `\&' in NEWTEXT means substitute original matched text. -- `\N' means substitute what matched the Nth `\(...\)'. -+ `\\&' in NEWTEXT means substitute original matched text. -+ `\\N' means substitute what matched the Nth `\\(...\\)'. - If Nth parens didn't match, substitute nothing. -- `\\' means insert one `\'. -+ `\\\\' means insert one `\'. - FIXEDCASE and LITERAL are optional arguments. - Leaves point at end of replacement text. - - The optional fourth argument STRING can be a string to modify. - In that case, this function creates and returns a new string - which is made by replacing the part of STRING that was matched." -- (if string -- (with-temp-buffer -- (save-match-data -- (insert string) -- (let* ((matched (match-data)) -- (beg (nth 0 matched)) -- (end (nth 1 matched))) -- (store-match-data -- (list -- (if (markerp beg) -- (move-marker beg (1+ (match-beginning 0))) -- (1+ (match-beginning 0))) -- (if (markerp end) -- (move-marker end (1+ (match-end 0))) -- (1+ (match-end 0)))))) -- (si:replace-match newtext fixedcase literal) -- (buffer-string))) -- (si:replace-match newtext fixedcase literal))))))))) -+ (if string -+ (with-temp-buffer -+ (save-match-data -+ (insert string) -+ (let* ((matched (match-data)) -+ (beg (nth 0 matched)) -+ (end (nth 1 matched))) -+ (store-match-data -+ (list -+ (if (markerp beg) -+ (move-marker beg (1+ (match-beginning 0))) -+ (1+ (match-beginning 0))) -+ (if (markerp end) -+ (move-marker end (1+ (match-end 0))) -+ (1+ (match-end 0)))))) -+ (si:replace-match newtext fixedcase literal) -+ (buffer-string))) -+ (si:replace-match newtext fixedcase literal))))))))) - - ;; Emacs 20: (format-time-string FORMAT &optional TIME UNIVERSAL) - ;; Those format constructs are yet to be implemented. -@@ -1167,26 +1167,26 @@ which is made by replacing the part of S - ;; Not fully compatible especially when invalid format is specified. - (static-unless (and (fboundp 'format-time-string) - (not (get 'format-time-string 'defun-maybe))) -- (or (fboundp 'format-time-string) -- (progn -- (defconst format-time-month-list -- '(( "Zero" . ("Zero" . 0)) -- ("Jan" . ("January" . 1)) ("Feb" . ("February" . 2)) -- ("Mar" . ("March" . 3)) ("Apr" . ("April" . 4)) ("May" . ("May" . 5)) -- ("Jun" . ("June" . 6))("Jul" . ("July" . 7)) ("Aug" . ("August" . 8)) -- ("Sep" . ("September" . 9)) ("Oct" . ("October" . 10)) -- ("Nov" . ("November" . 11)) ("Dec" . ("December" . 12))) -- "Alist of months and their number.") -+ (or (fboundp 'format-time-string) -+ (progn -+ (defconst format-time-month-list -+ '(( "Zero" . ("Zero" . 0)) -+ ("Jan" . ("January" . 1)) ("Feb" . ("February" . 2)) -+ ("Mar" . ("March" . 3)) ("Apr" . ("April" . 4)) ("May" . ("May" . 5)) -+ ("Jun" . ("June" . 6))("Jul" . ("July" . 7)) ("Aug" . ("August" . 8)) -+ ("Sep" . ("September" . 9)) ("Oct" . ("October" . 10)) -+ ("Nov" . ("November" . 11)) ("Dec" . ("December" . 12))) -+ "Alist of months and their number.") - -- (defconst format-time-week-list -- '(("Sun" . ("Sunday" . 0)) ("Mon" . ("Monday" . 1)) -- ("Tue" . ("Tuesday" . 2)) ("Wed" . ("Wednesday" . 3)) -- ("Thu" . ("Thursday" . 4)) ("Fri" . ("Friday" . 5)) -- ("Sat" . ("Saturday" . 6))) -- "Alist of weeks and their number.") -+ (defconst format-time-week-list -+ '(("Sun" . ("Sunday" . 0)) ("Mon" . ("Monday" . 1)) -+ ("Tue" . ("Tuesday" . 2)) ("Wed" . ("Wednesday" . 3)) -+ ("Thu" . ("Thursday" . 4)) ("Fri" . ("Friday" . 5)) -+ ("Sat" . ("Saturday" . 6))) -+ "Alist of weeks and their number.") - -- (defun format-time-string (format &optional time universal) -- "Use FORMAT-STRING to format the time TIME, or now if omitted. -+ (defun format-time-string (format &optional time universal) -+ "Use FORMAT-STRING to format the time TIME, or now if omitted. - TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as returned by - `current-time' or `file-attributes'. - The third, optional, argument UNIVERSAL, if non-nil, means describe TIME -@@ -1238,250 +1238,250 @@ Compatibility Note. - Those format constructs are yet to be implemented. - %c, %C, %j, %U, %W, %x, %X - Not fully compatible especially when invalid format is specified." -- (let ((fmt-len (length format)) -- (ind 0) -- prev-ind -- cur-char -- (prev-char nil) -- strings-so-far -- (result "") -- field-width -- field-result -- pad-left change-case -- (paren-level 0) -- hour ms ls -- (tz (car (current-time-zone))) -- time-string) -- (if universal -- (progn -- (or time -- (setq time (current-time))) -- (setq ms (car time) -- ls (- (nth 1 time) tz)) -- (cond ((< ls 0) -- (setq ms (1- ms) -- ls (+ ls 65536))) -- ((>= ls 65536) -- (setq ms (1+ ms) -- ls (- ls 65536)))) -- (setq time (append (list ms ls) (nth 2 time))))) -- (setq time-string (current-time-string time) -- hour (string-to-int (substring time-string 11 13))) -- (while (< ind fmt-len) -- (setq cur-char (aref format ind)) -- (setq -- result -- (concat result -- (cond -- ((eq cur-char ?%) -- ;; eat any additional args to allow for future expansion, not!! -- (setq pad-left nil change-case nil field-width "" prev-ind ind -- strings-so-far "") --; (catch 'invalid -- (while (progn -- (setq ind (1+ ind)) -- (setq cur-char (if (< ind fmt-len) -- (aref format ind) -- ?\0)) -- (or (eq ?- cur-char) ; pad on left -- (eq ?# cur-char) ; case change -- (if (and (string-equal field-width "") -- (<= ?0 cur-char) (>= ?9 cur-char)) -- ;; get format width -- (let ((field-index ind)) -- (while (progn -- (setq ind (1+ ind)) -- (setq cur-char (if (< ind fmt-len) -- (aref format ind) -- ?\0)) -- (and (<= ?0 cur-char) (>= ?9 cur-char)))) -- (setq field-width -- (substring format field-index ind)) -- (setq ind (1- ind) -- cur-char nil) -- t)))) -- (setq prev-char cur-char -- strings-so-far (concat strings-so-far -- (if cur-char -- (char-to-string cur-char) -- field-width))) -- ;; characters we actually use -- (cond ((eq cur-char ?-) -- ;; padding to left must be specified before field-width -- (setq pad-left (string-equal field-width ""))) -- ((eq cur-char ?#) -- (setq change-case t)))) -- (setq field-result -- (cond -- ((eq cur-char ?%) -- "%") -- ;; the abbreviated name of the day of week. -- ((eq cur-char ?a) -- (substring time-string 0 3)) -- ;; the full name of the day of week -- ((eq cur-char ?A) -- (cadr (assoc (substring time-string 0 3) -- format-time-week-list))) -- ;; the abbreviated name of the month -- ((eq cur-char ?b) -- (substring time-string 4 7)) -- ;; the full name of the month -- ((eq cur-char ?B) -- (cadr (assoc (substring time-string 4 7) -- format-time-month-list))) -- ;; a synonym for `%x %X' (yet to come) -- ((eq cur-char ?c) -- "") -- ;; locale specific (yet to come) -- ((eq cur-char ?C) -- "") -- ;; the day of month, zero-padded -- ((eq cur-char ?d) -- (format "%02d" (string-to-int (substring time-string 8 10)))) -- ;; a synonym for `%m/%d/%y' -- ((eq cur-char ?D) -- (format "%02d/%02d/%s" -- (cddr (assoc (substring time-string 4 7) -- format-time-month-list)) -- (string-to-int (substring time-string 8 10)) -- (substring time-string -2))) -- ;; the day of month, blank-padded -- ((eq cur-char ?e) -- (format "%2d" (string-to-int (substring time-string 8 10)))) -- ;; a synonym for `%b' -- ((eq cur-char ?h) -- (substring time-string 4 7)) -- ;; the hour (00-23) -- ((eq cur-char ?H) -- (substring time-string 11 13)) -- ;; the hour (00-12) -- ((eq cur-char ?I) -- (format "%02d" (if (> hour 12) (- hour 12) hour))) -- ;; the day of the year (001-366) (yet to come) -- ((eq cur-char ?j) -- "") -- ;; the hour (0-23), blank padded -- ((eq cur-char ?k) -- (format "%2d" hour)) -- ;; the hour (1-12), blank padded -- ((eq cur-char ?l) -- (format "%2d" (if (> hour 12) (- hour 12) hour))) -- ;; the month (01-12) -- ((eq cur-char ?m) -- (format "%02d" (cddr (assoc (substring time-string 4 7) -- format-time-month-list)))) -- ;; the minute (00-59) -- ((eq cur-char ?M) -- (substring time-string 14 16)) -- ;; a newline -- ((eq cur-char ?n) -- "\n") -- ;; `AM' or `PM', as appropriate -- ((eq cur-char ?p) -- (setq change-case (not change-case)) -- (if (> hour 12) "pm" "am")) -- ;; a synonym for `%I:%M:%S %p' -- ((eq cur-char ?r) -- (format "%02d:%s:%s %s" -- (if (> hour 12) (- hour 12) hour) -- (substring time-string 14 16) -- (substring time-string 17 19) -- (if (> hour 12) "PM" "AM"))) -- ;; a synonym for `%H:%M' -- ((eq cur-char ?R) -- (format "%s:%s" -- (substring time-string 11 13) -- (substring time-string 14 16))) -- ;; the seconds (00-60) -- ((eq cur-char ?S) -- (substring time-string 17 19)) -- ;; a tab character -- ((eq cur-char ?t) -- "\t") -- ;; a synonym for `%H:%M:%S' -- ((eq cur-char ?T) -- (format "%s:%s:%s" -- (substring time-string 11 13) -- (substring time-string 14 16) -- (substring time-string 17 19))) -- ;; the week of the year (01-52), assuming that weeks -- ;; start on Sunday (yet to come) -- ((eq cur-char ?U) -- "") -- ;; the numeric day of week (0-6). Sunday is day 0 -- ((eq cur-char ?w) -- (format "%d" (cddr (assoc (substring time-string 0 3) -- format-time-week-list)))) -- ;; the week of the year (01-52), assuming that weeks -- ;; start on Monday (yet to come) -- ((eq cur-char ?W) -- "") -- ;; locale specific (yet to come) -- ((eq cur-char ?x) -- "") -- ;; locale specific (yet to come) -- ((eq cur-char ?X) -- "") -- ;; the year without century (00-99) -- ((eq cur-char ?y) -- (substring time-string -2)) -- ;; the year with century -- ((eq cur-char ?Y) -- (substring time-string -4)) -- ;; the time zone abbreviation -- ((eq cur-char ?Z) -- (if universal -- "UTC" -- (setq change-case (not change-case)) -- (downcase (cadr (current-time-zone))))) -- ((eq cur-char ?z) -- (if universal -- "+0000" -- (if (< tz 0) -- (format "-%02d%02d" -- (/ (- tz) 3600) (/ (% (- tz) 3600) 60)) -- (format "+%02d%02d" -- (/ tz 3600) (/ (% tz 3600) 60))))) -- (t -- (concat -- "%" -- strings-so-far -- (char-to-string cur-char))))) --; (setq ind prev-ind) --; (throw 'invalid "%")))) -- (if (string-equal field-width "") -- (if change-case (upcase field-result) field-result) -- (let ((padded-result -- (format (format "%%%s%s%c" -- "" ; pad on left is ignored --; (if pad-left "-" "") -- field-width -- ?s) -- (or field-result "")))) -- (let ((initial-length (length padded-result)) -- (desired-length (string-to-int field-width))) -- (when (and (string-match "^0" field-width) -- (string-match "^ +" padded-result)) -- (setq padded-result -- (replace-match -- (make-string -- (length (match-string 0 padded-result)) ?0) -- nil nil padded-result))) -- (if (> initial-length desired-length) -- ;; truncate strings on right, years on left -- (if (stringp field-result) -- (substring padded-result 0 desired-length) -- (if (eq cur-char ?y) -- (substring padded-result (- desired-length)) -- padded-result))) ;non-year numbers don't truncate -- (if change-case (upcase padded-result) padded-result))))) ;) -- (t -- (char-to-string cur-char))))) -- (setq ind (1+ ind))) -- result)) -- ;; for `load-history'. -- (setq current-load-list (cons 'format-time-string current-load-list)) -- (put 'format-time-string 'defun-maybe t)))) -+ (let ((fmt-len (length format)) -+ (ind 0) -+ prev-ind -+ cur-char -+ (prev-char nil) -+ strings-so-far -+ (result "") -+ field-width -+ field-result -+ pad-left change-case -+ (paren-level 0) -+ hour ms ls -+ (tz (car (current-time-zone))) -+ time-string) -+ (if universal -+ (progn -+ (or time -+ (setq time (current-time))) -+ (setq ms (car time) -+ ls (- (nth 1 time) tz)) -+ (cond ((< ls 0) -+ (setq ms (1- ms) -+ ls (+ ls 65536))) -+ ((>= ls 65536) -+ (setq ms (1+ ms) -+ ls (- ls 65536)))) -+ (setq time (append (list ms ls) (nth 2 time))))) -+ (setq time-string (current-time-string time) -+ hour (string-to-int (substring time-string 11 13))) -+ (while (< ind fmt-len) -+ (setq cur-char (aref format ind)) -+ (setq -+ result -+ (concat result -+ (cond -+ ((eq cur-char ?%) -+ ;; eat any additional args to allow for future expansion, not!! -+ (setq pad-left nil change-case nil field-width "" prev-ind ind -+ strings-so-far "") -+ ; (catch 'invalid -+ (while (progn -+ (setq ind (1+ ind)) -+ (setq cur-char (if (< ind fmt-len) -+ (aref format ind) -+ ?\0)) -+ (or (eq ?- cur-char) ; pad on left -+ (eq ?# cur-char) ; case change -+ (if (and (string-equal field-width "") -+ (<= ?0 cur-char) (>= ?9 cur-char)) -+ ;; get format width -+ (let ((field-index ind)) -+ (while (progn -+ (setq ind (1+ ind)) -+ (setq cur-char (if (< ind fmt-len) -+ (aref format ind) -+ ?\0)) -+ (and (<= ?0 cur-char) (>= ?9 cur-char)))) -+ (setq field-width -+ (substring format field-index ind)) -+ (setq ind (1- ind) -+ cur-char nil) -+ t)))) -+ (setq prev-char cur-char -+ strings-so-far (concat strings-so-far -+ (if cur-char -+ (char-to-string cur-char) -+ field-width))) -+ ;; characters we actually use -+ (cond ((eq cur-char ?-) -+ ;; padding to left must be specified before field-width -+ (setq pad-left (string-equal field-width ""))) -+ ((eq cur-char ?#) -+ (setq change-case t)))) -+ (setq field-result -+ (cond -+ ((eq cur-char ?%) -+ "%") -+ ;; the abbreviated name of the day of week. -+ ((eq cur-char ?a) -+ (substring time-string 0 3)) -+ ;; the full name of the day of week -+ ((eq cur-char ?A) -+ (cadr (assoc (substring time-string 0 3) -+ format-time-week-list))) -+ ;; the abbreviated name of the month -+ ((eq cur-char ?b) -+ (substring time-string 4 7)) -+ ;; the full name of the month -+ ((eq cur-char ?B) -+ (cadr (assoc (substring time-string 4 7) -+ format-time-month-list))) -+ ;; a synonym for `%x %X' (yet to come) -+ ((eq cur-char ?c) -+ "") -+ ;; locale specific (yet to come) -+ ((eq cur-char ?C) -+ "") -+ ;; the day of month, zero-padded -+ ((eq cur-char ?d) -+ (format "%02d" (string-to-int (substring time-string 8 10)))) -+ ;; a synonym for `%m/%d/%y' -+ ((eq cur-char ?D) -+ (format "%02d/%02d/%s" -+ (cddr (assoc (substring time-string 4 7) -+ format-time-month-list)) -+ (string-to-int (substring time-string 8 10)) -+ (substring time-string -2))) -+ ;; the day of month, blank-padded -+ ((eq cur-char ?e) -+ (format "%2d" (string-to-int (substring time-string 8 10)))) -+ ;; a synonym for `%b' -+ ((eq cur-char ?h) -+ (substring time-string 4 7)) -+ ;; the hour (00-23) -+ ((eq cur-char ?H) -+ (substring time-string 11 13)) -+ ;; the hour (00-12) -+ ((eq cur-char ?I) -+ (format "%02d" (if (> hour 12) (- hour 12) hour))) -+ ;; the day of the year (001-366) (yet to come) -+ ((eq cur-char ?j) -+ "") -+ ;; the hour (0-23), blank padded -+ ((eq cur-char ?k) -+ (format "%2d" hour)) -+ ;; the hour (1-12), blank padded -+ ((eq cur-char ?l) -+ (format "%2d" (if (> hour 12) (- hour 12) hour))) -+ ;; the month (01-12) -+ ((eq cur-char ?m) -+ (format "%02d" (cddr (assoc (substring time-string 4 7) -+ format-time-month-list)))) -+ ;; the minute (00-59) -+ ((eq cur-char ?M) -+ (substring time-string 14 16)) -+ ;; a newline -+ ((eq cur-char ?n) -+ "\n") -+ ;; `AM' or `PM', as appropriate -+ ((eq cur-char ?p) -+ (setq change-case (not change-case)) -+ (if (> hour 12) "pm" "am")) -+ ;; a synonym for `%I:%M:%S %p' -+ ((eq cur-char ?r) -+ (format "%02d:%s:%s %s" -+ (if (> hour 12) (- hour 12) hour) -+ (substring time-string 14 16) -+ (substring time-string 17 19) -+ (if (> hour 12) "PM" "AM"))) -+ ;; a synonym for `%H:%M' -+ ((eq cur-char ?R) -+ (format "%s:%s" -+ (substring time-string 11 13) -+ (substring time-string 14 16))) -+ ;; the seconds (00-60) -+ ((eq cur-char ?S) -+ (substring time-string 17 19)) -+ ;; a tab character -+ ((eq cur-char ?t) -+ "\t") -+ ;; a synonym for `%H:%M:%S' -+ ((eq cur-char ?T) -+ (format "%s:%s:%s" -+ (substring time-string 11 13) -+ (substring time-string 14 16) -+ (substring time-string 17 19))) -+ ;; the week of the year (01-52), assuming that weeks -+ ;; start on Sunday (yet to come) -+ ((eq cur-char ?U) -+ "") -+ ;; the numeric day of week (0-6). Sunday is day 0 -+ ((eq cur-char ?w) -+ (format "%d" (cddr (assoc (substring time-string 0 3) -+ format-time-week-list)))) -+ ;; the week of the year (01-52), assuming that weeks -+ ;; start on Monday (yet to come) -+ ((eq cur-char ?W) -+ "") -+ ;; locale specific (yet to come) -+ ((eq cur-char ?x) -+ "") -+ ;; locale specific (yet to come) -+ ((eq cur-char ?X) -+ "") -+ ;; the year without century (00-99) -+ ((eq cur-char ?y) -+ (substring time-string -2)) -+ ;; the year with century -+ ((eq cur-char ?Y) -+ (substring time-string -4)) -+ ;; the time zone abbreviation -+ ((eq cur-char ?Z) -+ (if universal -+ "UTC" -+ (setq change-case (not change-case)) -+ (downcase (cadr (current-time-zone))))) -+ ((eq cur-char ?z) -+ (if universal -+ "+0000" -+ (if (< tz 0) -+ (format "-%02d%02d" -+ (/ (- tz) 3600) (/ (% (- tz) 3600) 60)) -+ (format "+%02d%02d" -+ (/ tz 3600) (/ (% tz 3600) 60))))) -+ (t -+ (concat -+ "%" -+ strings-so-far -+ (char-to-string cur-char))))) -+ ; (setq ind prev-ind) -+ ; (throw 'invalid "%")))) -+ (if (string-equal field-width "") -+ (if change-case (upcase field-result) field-result) -+ (let ((padded-result -+ (format (format "%%%s%s%c" -+ "" ; pad on left is ignored -+ ; (if pad-left "-" "") -+ field-width -+ ?s) -+ (or field-result "")))) -+ (let ((initial-length (length padded-result)) -+ (desired-length (string-to-int field-width))) -+ (when (and (string-match "^0" field-width) -+ (string-match "^ +" padded-result)) -+ (setq padded-result -+ (replace-match -+ (make-string -+ (length (match-string 0 padded-result)) ?0) -+ nil nil padded-result))) -+ (if (> initial-length desired-length) -+ ;; truncate strings on right, years on left -+ (if (stringp field-result) -+ (substring padded-result 0 desired-length) -+ (if (eq cur-char ?y) -+ (substring padded-result (- desired-length)) -+ padded-result))) ;non-year numbers don't truncate -+ (if change-case (upcase padded-result) padded-result))))) ;) -+ (t -+ (char-to-string cur-char))))) -+ (setq ind (1+ ind))) -+ result)) -+ ;; for `load-history'. -+ (setq current-load-list (cons 'format-time-string current-load-list)) -+ (put 'format-time-string 'defun-maybe t)))) - - ;; Emacs 19.29-19.34/XEmacs: `format-time-string' neither supports the - ;; format string "%z" nor the third argument `universal'. -@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MI - ))) - ;; arglist: (prefix &optional dir-flag suffix) - (cond -- ((not arglist) -+ ((or (not arglist) (not (listp arglist))) - ;; `make-temp-file' is a built-in; expects 3-args. - (put 'make-temp-file 'defun-maybe '3-args)) - ((> (length arglist) 3) diff --git a/editors/apel/files/patch-product.el b/editors/apel/files/patch-product.el deleted file mode 100644 index 56aa05331836..000000000000 --- a/editors/apel/files/patch-product.el +++ /dev/null @@ -1,83 +0,0 @@ -Index: product.el -=================================================================== ---- product.el.orig 2006-04-24 05:53:58 UTC -+++ product.el -@@ -232,21 +232,21 @@ PRODUCT-DEF is a definition of the produ - (product-version (product-version product)) - (product-code-name (product-code-name product)) - (product-version-string (product-version-string product))) -- (` (progn -- (, product-def) -- (put (, feature) 'product -- (let ((product (product-find-by-name (, product-name)))) -- (product-run-checkers product '(, product-version)) -- (and (, product-family) -- (product-add-to-family (, product-family) -- (, product-name))) -- (product-add-feature product (, feature)) -- (if (equal '(, product-version) (product-version product)) -- product -- (vector (, product-name) (, product-family) -- '(, product-version) (, product-code-name) -- nil nil nil (, product-version-string))))) -- (, feature-def))))) -+ `(progn -+ ,product-def -+ (put ,feature 'product -+ (let ((product (product-find-by-name ,product-name))) -+ (product-run-checkers product ',product-version) -+ (and ,product-family -+ (product-add-to-family ,product-family -+ ,product-name)) -+ (product-add-feature product ,feature) -+ (if (equal ',product-version (product-version product)) -+ product -+ (vector ,product-name ,product-family -+ ',product-version ,product-code-name -+ nil nil nil ,product-version-string)))) -+ ,feature-def))) - - (defun product-version-as-string (product) - "Return version number of product as a string. -@@ -293,13 +293,13 @@ The 1st argument is a product structure. - PRODUCT is a product structure which returned by `product-define'." - (let (dest) - (product-for-each product nil -- (function -- (lambda (product) -- (let ((str (product-string-1 product nil))) -- (if str -- (setq dest (if dest -- (concat dest " " str) -- str))))))) -+ (function -+ (lambda (product) -+ (let ((str (product-string-1 product nil))) -+ (if str -+ (setq dest (if dest -+ (concat dest " " str) -+ str))))))) - dest)) - - (defun product-string-verbose (product) -@@ -307,13 +307,13 @@ PRODUCT is a product structure which ret - PRODUCT is a product structure which returned by `product-define'." - (let (dest) - (product-for-each product nil -- (function -- (lambda (product) -- (let ((str (product-string-1 product t))) -- (if str -- (setq dest (if dest -- (concat dest " " str) -- str))))))) -+ (function -+ (lambda (product) -+ (let ((str (product-string-1 product t))) -+ (if str -+ (setq dest (if dest -+ (concat dest " " str) -+ str))))))) - dest)) - - (defun product-version-compare (v1 v2) diff --git a/editors/apel/files/patch-pym.el b/editors/apel/files/patch-pym.el deleted file mode 100644 index bb76ba06392f..000000000000 --- a/editors/apel/files/patch-pym.el +++ /dev/null @@ -1,282 +0,0 @@ -Index: pym.el -=================================================================== ---- pym.el.orig 2005-07-06 02:08:53 UTC -+++ pym.el -@@ -63,15 +63,15 @@ - See also the function `defun'." - (or (and (fboundp name) - (not (get name 'defun-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (defun (, name) (,@ everything-else)) -- ;; This `defun' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defun-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (defun ,name ,@everything-else) -+ ;; This `defun' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defun-maybe t))))) - - (put 'defmacro-maybe 'lisp-indent-function 'defun) - (defmacro defmacro-maybe (name &rest everything-else) -@@ -79,15 +79,15 @@ See also the function `defun'." - See also the function `defmacro'." - (or (and (fboundp name) - (not (get name 'defmacro-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (defmacro (, name) (,@ everything-else)) -- ;; This `defmacro' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defmacro-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (defmacro ,name ,@everything-else) -+ ;; This `defmacro' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defmacro-maybe t))))) - - (put 'defsubst-maybe 'lisp-indent-function 'defun) - (defmacro defsubst-maybe (name &rest everything-else) -@@ -95,15 +95,15 @@ See also the function `defmacro'." - See also the macro `defsubst'." - (or (and (fboundp name) - (not (get name 'defsubst-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (defsubst (, name) (,@ everything-else)) -- ;; This `defsubst' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defsubst-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (defsubst ,name ,@everything-else) -+ ;; This `defsubst' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defsubst-maybe t))))) - - (defmacro defalias-maybe (symbol definition) - "Define SYMBOL as an alias for DEFINITION if SYMBOL is not defined. -@@ -111,35 +111,35 @@ See also the function `defalias'." - (setq symbol (eval symbol)) - (or (and (fboundp symbol) - (not (get symbol 'defalias-maybe))) -- (` (or (fboundp (quote (, symbol))) -- (prog1 -- (defalias (quote (, symbol)) (, definition)) -- ;; `defalias' updates `load-history' internally. -- (put (quote (, symbol)) 'defalias-maybe t)))))) -+ `(or (fboundp (quote ,symbol)) -+ (prog1 -+ (defalias (quote ,symbol) ,definition) -+ ;; `defalias' updates `load-history' internally. -+ (put (quote ,symbol) 'defalias-maybe t))))) - - (defmacro defvar-maybe (name &rest everything-else) - "Define NAME as a variable if NAME is not defined. - See also the function `defvar'." - (or (and (boundp name) - (not (get name 'defvar-maybe))) -- (` (or (boundp (quote (, name))) -- (prog1 -- (defvar (, name) (,@ everything-else)) -- ;; byte-compiler will generate code to update -- ;; `load-history'. -- (put (quote (, name)) 'defvar-maybe t)))))) -+ `(or (boundp (quote ,name)) -+ (prog1 -+ (defvar ,name ,@everything-else) -+ ;; byte-compiler will generate code to update -+ ;; `load-history'. -+ (put (quote ,name) 'defvar-maybe t))))) - - (defmacro defconst-maybe (name &rest everything-else) - "Define NAME as a constant variable if NAME is not defined. - See also the function `defconst'." - (or (and (boundp name) - (not (get name 'defconst-maybe))) -- (` (or (boundp (quote (, name))) -- (prog1 -- (defconst (, name) (,@ everything-else)) -- ;; byte-compiler will generate code to update -- ;; `load-history'. -- (put (quote (, name)) 'defconst-maybe t)))))) -+ `(or (boundp (quote ,name)) -+ (prog1 -+ (defconst ,name ,@everything-else) -+ ;; byte-compiler will generate code to update -+ ;; `load-history'. -+ (put (quote ,name) 'defconst-maybe t))))) - - (defmacro defun-maybe-cond (name args &optional doc &rest clauses) - "Define NAME as a function if NAME is not defined. -@@ -152,26 +152,26 @@ See also the function `defun'." - doc nil)) - (or (and (fboundp name) - (not (get name 'defun-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (static-cond -- (,@ (mapcar -- (function -- (lambda (case) -- (list (car case) -- (if doc -- (` (defun (, name) (, args) -- (, doc) -- (,@ (cdr case)))) -- (` (defun (, name) (, args) -- (,@ (cdr case)))))))) -- clauses))) -- ;; This `defun' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defun-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (static-cond -+ ,@(mapcar -+ (function -+ (lambda (case) -+ (list (car case) -+ (if doc -+ `(defun ,name ,args -+ ,doc -+ ,@(cdr case)) -+ `(defun ,name ,args -+ ,@ (cdr case)))))) -+ clauses)) -+ ;; This `defun' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defun-maybe t))))) - - (defmacro defmacro-maybe-cond (name args &optional doc &rest clauses) - "Define NAME as a macro if NAME is not defined. -@@ -184,26 +184,26 @@ See also the function `defmacro'." - doc nil)) - (or (and (fboundp name) - (not (get name 'defmacro-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (static-cond -- (,@ (mapcar -- (function -- (lambda (case) -- (list (car case) -- (if doc -- (` (defmacro (, name) (, args) -- (, doc) -- (,@ (cdr case)))) -- (` (defmacro (, name) (, args) -- (,@ (cdr case)))))))) -- clauses))) -- ;; This `defmacro' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defmacro-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (static-cond -+ ,@(mapcar -+ (function -+ (lambda (case) -+ (list (car case) -+ (if doc -+ `(defmacro ,name ,args -+ ,doc -+ ,@(cdr case)) -+ `(defmacro ,name ,args -+ @(cdr case)))))) -+ clauses)) -+ ;; This `defmacro' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defmacro-maybe t))))) - - (defmacro defsubst-maybe-cond (name args &optional doc &rest clauses) - "Define NAME as an inline function if NAME is not defined. -@@ -216,26 +216,26 @@ See also the macro `defsubst'." - doc nil)) - (or (and (fboundp name) - (not (get name 'defsubst-maybe))) -- (` (or (fboundp (quote (, name))) -- (prog1 -- (static-cond -- (,@ (mapcar -- (function -- (lambda (case) -- (list (car case) -- (if doc -- (` (defsubst (, name) (, args) -- (, doc) -- (,@ (cdr case)))) -- (` (defsubst (, name) (, args) -- (,@ (cdr case)))))))) -- clauses))) -- ;; This `defsubst' will be compiled to `fset', -- ;; which does not update `load-history'. -- ;; We must update `current-load-list' explicitly. -- (setq current-load-list -- (cons (quote (, name)) current-load-list)) -- (put (quote (, name)) 'defsubst-maybe t)))))) -+ `(or (fboundp (quote ,name)) -+ (prog1 -+ (static-cond -+ ,@ (mapcar -+ (function -+ (lambda (case) -+ (list (car case) -+ (if doc -+ `(defsubst ,name ,args -+ ,doc -+ ,@ (cdr case)) -+ `(defsubst ,name ,args -+ ,@(cdr case)))))) -+ clauses)) -+ ;; This `defsubst' will be compiled to `fset', -+ ;; which does not update `load-history'. -+ ;; We must update `current-load-list' explicitly. -+ (setq current-load-list -+ (cons (quote ,name) current-load-list)) -+ (put (quote ,name) 'defsubst-maybe t))))) - - - ;;; Edebug spec. -@@ -246,7 +246,7 @@ See also the macro `defsubst'." - "Set the edebug-form-spec property of SYMBOL according to SPEC. - Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol - \(naming a function\), or a list." -- (` (put (quote (, symbol)) 'edebug-form-spec (quote (, spec))))) -+ `(put (quote ,symbol) 'edebug-form-spec (quote ,spec))) - - ;; edebug-spec for `def*-maybe' macros. - (def-edebug-spec defun-maybe defun) diff --git a/editors/apel/files/patch-static.el b/editors/apel/files/patch-static.el deleted file mode 100644 index abc5306317eb..000000000000 --- a/editors/apel/files/patch-static.el +++ /dev/null @@ -1,71 +0,0 @@ -Index: static.el -=================================================================== ---- static.el.orig 2005-07-06 02:08:53 UTC -+++ static.el -@@ -29,38 +29,38 @@ - "Like `if', but evaluate COND at compile time." - (if (eval cond) - then -- (` (progn (,@ else))))) -+ `(progn ,@else))) - - (put 'static-when 'lisp-indent-function 1) - (defmacro static-when (cond &rest body) - "Like `when', but evaluate COND at compile time." - (if (eval cond) -- (` (progn (,@ body))))) -+ `(progn ,@body))) - - (put 'static-unless 'lisp-indent-function 1) - (defmacro static-unless (cond &rest body) - "Like `unless', but evaluate COND at compile time." - (if (eval cond) - nil -- (` (progn (,@ body))))) -+ `(progn ,@body))) - - (put 'static-condition-case 'lisp-indent-function 2) - (defmacro static-condition-case (var bodyform &rest handlers) - "Like `condition-case', but evaluate BODYFORM at compile time." -- (eval (` (condition-case (, var) -- (list (quote quote) (, bodyform)) -- (,@ (mapcar -- (if var -- (function -- (lambda (h) -- (` ((, (car h)) -- (list (quote funcall) -- (function (lambda ((, var)) (,@ (cdr h)))) -- (list (quote quote) (, var))))))) -- (function -- (lambda (h) -- (` ((, (car h)) (quote (progn (,@ (cdr h))))))))) -- handlers)))))) -+ (eval `(condition-case ,var -+ (list (quote quote) ,bodyform) -+ ,@(mapcar -+ (if var -+ (function -+ (lambda (h) -+ `(,(car h) -+ (list (quote funcall) -+ (function (lambda (,var) ,@(cdr h))) -+ (list (quote quote) ,var))))) -+ (function -+ (lambda (h) -+ `(,(car h) (quote (progn ,@(cdr h))))))) -+ handlers)))) - - (put 'static-defconst 'lisp-indent-function 'defun) - (defmacro static-defconst (symbol initvalue &optional docstring) -@@ -68,8 +68,8 @@ - - The variable SYMBOL can be referred at both compile time and run time." - (let ((value (eval initvalue))) -- (eval (` (defconst (, symbol) (quote (, value)) (, docstring)))) -- (` (defconst (, symbol) (quote (, value)) (, docstring))))) -+ (eval `(defconst ,symbol (quote ,value) ,docstring)) -+ `(defconst ,symbol (quote ,value) ,docstring))) - - (defmacro static-cond (&rest clauses) - "Like `cond', but evaluate CONDITION part of each clause at compile time." diff --git a/editors/apel/pkg-descr b/editors/apel/pkg-descr index 35859c84a01d..2c0e26797500 100644 --- a/editors/apel/pkg-descr +++ b/editors/apel/pkg-descr @@ -17,7 +17,4 @@ APEL stands for "A Portable Emacs Library" and contains these modules: - poem: provide basic functions to write portable MULE programs - static: utility for static evaluation -To use apel, put the following setup into your ~/.emacs: - (require 'apel-setupel) - -WWW: http://git.chise.org/elisp/apel/index.html.en +WWW: https://github.com/wanderlust/apel -- cgit From 33ff0e9c1d4710f3afc932ecf588fcf7f85f82e8 Mon Sep 17 00:00:00 2001 From: nobutaka Date: Mon, 12 Aug 2019 14:13:10 +0000 Subject: Bump PORTREVISION in accordance with editors/apel update. --- misc/elscreen/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index b682af07f7f7..cf93b8f8cf50 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -3,6 +3,7 @@ PORTNAME= elscreen PORTVERSION= 1.4.6.20180320 +PORTREVISION= 1 CATEGORIES= misc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} -- cgit From 260b2d8755cebcda1b2bf402e4d1b4bb00de66cd Mon Sep 17 00:00:00 2001 From: nobutaka Date: Mon, 12 Aug 2019 14:14:54 +0000 Subject: - Switch to the version maintained by the developers of Wanderlust. - Update to the snapshot on 2019-05-26. --- editors/flim/Makefile | 17 ++-- editors/flim/distinfo | 5 +- editors/flim/files/patch-FLIM-CFG | 11 --- editors/flim/files/patch-eword-encode.el | 78 --------------- editors/flim/files/patch-hex-util.el | 26 ----- editors/flim/files/patch-hmac-def.el | 89 ----------------- editors/flim/files/patch-md4.el | 42 -------- editors/flim/files/patch-md5-el.el | 26 ----- editors/flim/files/patch-mime-en.texi | 20 ++-- editors/flim/files/patch-mime-ja.texi | 20 ++-- editors/flim/files/patch-sha1-el.el | 165 ------------------------------- editors/flim/pkg-descr | 2 +- editors/flim/pkg-plist | 2 - 13 files changed, 29 insertions(+), 474 deletions(-) delete mode 100644 editors/flim/files/patch-FLIM-CFG delete mode 100644 editors/flim/files/patch-eword-encode.el delete mode 100644 editors/flim/files/patch-hex-util.el delete mode 100644 editors/flim/files/patch-hmac-def.el delete mode 100644 editors/flim/files/patch-md4.el delete mode 100644 editors/flim/files/patch-md5-el.el delete mode 100644 editors/flim/files/patch-sha1-el.el diff --git a/editors/flim/Makefile b/editors/flim/Makefile index d600d3ff7041..2d331e0c1a8b 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= flim -PORTVERSION= 1.14.9 -PORTREVISION= 21 +PORTVERSION= 1.14.9.${SNAPDATE} PORTEPOCH= 1 CATEGORIES= editors elisp -MASTER_SITES= http://git.chise.org/elisp/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION:R}/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org @@ -14,12 +12,15 @@ COMMENT= Message representation or encoding elisp library for emacs LICENSE= GPLv2 -BUILD_DEPENDS= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR} \ - nkf:japanese/nkf +BUILD_DEPENDS= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR} RUN_DEPENDS= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR} -USES= cpe emacs makeinfo +USES= cpe emacs iconv makeinfo +USE_GITHUB= yes +GH_ACCOUNT= wanderlust +GH_TAGNAME= e4bd54f +SNAPDATE= 20190526 CPE_VENDOR= gnu NO_ARCH= yes @@ -36,8 +37,8 @@ OPTIONS_DEFINE= DOCS post-build: @(cd ${WRKSRC} ; \ for i in mime-en.texi mime-ja.texi; do \ - ${CAT} $${i} | nkf -e > $${i}.jis ; \ - ${MAKEINFO} --no-split --no-validate $${i}.jis ; \ + ${ICONV_CMD} -f ISO-2022-JP -t UTF-8 $${i} > $${i}.utf8 ; \ + ${MAKEINFO} --no-split --no-validate $${i}.utf8 ; \ done) post-install: diff --git a/editors/flim/distinfo b/editors/flim/distinfo index c4228e5f1267..fddf9bf7dd06 100644 --- a/editors/flim/distinfo +++ b/editors/flim/distinfo @@ -1,2 +1,3 @@ -SHA256 (flim-1.14.9.tar.gz) = bbd5a8729ea27457c7c2ffdcb1be6219ad38fdfa323341f4fad2d298780070ec -SIZE (flim-1.14.9.tar.gz) = 182065 +TIMESTAMP = 1565575779 +SHA256 (wanderlust-flim-1.14.9.20190526-e4bd54f_GH0.tar.gz) = ff232c895fa447388d2a14f2588a75d3ea2356c84d4299b781a70e041e4d55e5 +SIZE (wanderlust-flim-1.14.9.20190526-e4bd54f_GH0.tar.gz) = 173153 diff --git a/editors/flim/files/patch-FLIM-CFG b/editors/flim/files/patch-FLIM-CFG deleted file mode 100644 index 308c9ef35e4e..000000000000 --- a/editors/flim/files/patch-FLIM-CFG +++ /dev/null @@ -1,11 +0,0 @@ ---- FLIM-CFG.orig 2006-12-20 17:40:42 UTC -+++ FLIM-CFG -@@ -8,6 +8,8 @@ - - (add-to-list 'load-path - (expand-file-name "../../site-lisp/apel" data-directory)) -+(add-to-list 'load-path -+ (expand-file-name "../site-lisp/emu" data-directory)) - - (if (boundp 'LISPDIR) - (progn diff --git a/editors/flim/files/patch-eword-encode.el b/editors/flim/files/patch-eword-encode.el deleted file mode 100644 index 08db886877b6..000000000000 --- a/editors/flim/files/patch-eword-encode.el +++ /dev/null @@ -1,78 +0,0 @@ -Index: eword-encode.el -=================================================================== ---- eword-encode.el.orig 2007-09-06 07:48:50 UTC -+++ eword-encode.el -@@ -162,15 +162,15 @@ MODE is allows `text', `comment', `phras - ;;; - - (defmacro make-ew-rword (text charset encoding type) -- (` (list (, text)(, charset)(, encoding)(, type)))) -+ `(list ,text ,charset ,encoding ,type)) - (defmacro ew-rword-text (rword) -- (` (car (, rword)))) -+ `(car ,rword)) - (defmacro ew-rword-charset (rword) -- (` (car (cdr (, rword))))) -+ `(car (cdr ,rword))) - (defmacro ew-rword-encoding (rword) -- (` (car (cdr (cdr (, rword)))))) -+ `(car (cdr (cdr ,rword)))) - (defmacro ew-rword-type (rword) -- (` (car (cdr (cdr (cdr (, rword))))))) -+ `(car (cdr (cdr (cdr ,rword))))) - - (defun ew-find-charset-rule (charsets) - (if charsets -@@ -184,30 +184,30 @@ MODE is allows `text', `comment', `phras - ;; which is not depended on the Mule model. We should redesign - ;; `eword-encode-split-string' to avoid to depend on the Mule model. - (if (featurep 'utf-2000) --;; for CHISE Architecture --(defun tm-eword::words-to-ruled-words (wl &optional mode) -- (let (mcs) -+ ;; for CHISE Architecture -+ (defun tm-eword::words-to-ruled-words (wl &optional mode) -+ (let (mcs) -+ (mapcar (function -+ (lambda (word) -+ (setq mcs (detect-mime-charset-string (cdr word))) -+ (make-ew-rword -+ (cdr word) -+ mcs -+ (cdr (or (assq mcs mime-header-charset-encoding-alist) -+ (cons mcs mime-header-default-charset-encoding))) -+ mode) -+ )) -+ wl))) -+ -+ ;; for legacy Mule -+ (defun tm-eword::words-to-ruled-words (wl &optional mode) - (mapcar (function - (lambda (word) -- (setq mcs (detect-mime-charset-string (cdr word))) -- (make-ew-rword -- (cdr word) -- mcs -- (cdr (or (assq mcs mime-header-charset-encoding-alist) -- (cons mcs mime-header-default-charset-encoding))) -- mode) -- )) -- wl))) -- --;; for legacy Mule --(defun tm-eword::words-to-ruled-words (wl &optional mode) -- (mapcar (function -- (lambda (word) -- (let ((ret (ew-find-charset-rule (car word)))) -- (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode) -- ))) -- wl)) --) -+ (let ((ret (ew-find-charset-rule (car word)))) -+ (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode) -+ ))) -+ wl)) -+ ) - - (defun ew-space-process (seq) - (let (prev a ac b c cc) diff --git a/editors/flim/files/patch-hex-util.el b/editors/flim/files/patch-hex-util.el deleted file mode 100644 index 2912be8008a0..000000000000 --- a/editors/flim/files/patch-hex-util.el +++ /dev/null @@ -1,26 +0,0 @@ -Index: hex-util.el -=================================================================== ---- hex-util.el.orig 2007-09-05 23:39:48 UTC -+++ hex-util.el -@@ -28,14 +28,14 @@ - - (eval-when-compile - (defmacro hex-char-to-num (chr) -- (` (let ((chr (, chr))) -- (cond -- ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10)) -- ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10)) -- ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0)) -- (t (error "Invalid hexadecimal digit `%c'" chr)))))) -+ `(let ((chr ,chr)) -+ (cond -+ ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10)) -+ ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10)) -+ ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0)) -+ (t (error "Invalid hexadecimal digit `%c'" chr))))) - (defmacro num-to-hex-char (num) -- (` (aref "0123456789abcdef" (, num))))) -+ `(aref "0123456789abcdef" ,num))) - - (defun decode-hex-string (string) - "Decode hexadecimal STRING to octet string." diff --git a/editors/flim/files/patch-hmac-def.el b/editors/flim/files/patch-hmac-def.el deleted file mode 100644 index 837ab287bdce..000000000000 --- a/editors/flim/files/patch-hmac-def.el +++ /dev/null @@ -1,89 +0,0 @@ ---- hmac-def.el.orig 2007-09-05 23:39:48 UTC -+++ hmac-def.el -@@ -39,46 +39,46 @@ a string and return a digest of it (in b - B is a byte-length of a block size of H. (B=64 for both SHA1 and MD5.) - L is a byte-length of hash outputs. (L=16 for MD5, L=20 for SHA1.) - If BIT is non-nil, truncate output to specified bits." -- (` (defun (, name) (text key) -- (, (concat "Compute " -- (upcase (symbol-name name)) -- " over TEXT with KEY.")) -- (let ((key-xor-ipad (make-string (, B) ?\x36)) -- (key-xor-opad (make-string (, B) ?\x5C)) -- (len (length key)) -- (pos 0)) -- (unwind-protect -- (progn -- ;; if `key' is longer than the block size, apply hash function -- ;; to `key' and use the result as a real `key'. -- (if (> len (, B)) -- (setq key ((, H) key) -- len (, L))) -- (while (< pos len) -- (aset key-xor-ipad pos (logxor (aref key pos) ?\x36)) -- (aset key-xor-opad pos (logxor (aref key pos) ?\x5C)) -- (setq pos (1+ pos))) -- (setq key-xor-ipad (unwind-protect -- (concat key-xor-ipad text) -- (fillarray key-xor-ipad 0)) -- key-xor-ipad (unwind-protect -- ((, H) key-xor-ipad) -- (fillarray key-xor-ipad 0)) -- key-xor-opad (unwind-protect -- (concat key-xor-opad key-xor-ipad) -- (fillarray key-xor-opad 0)) -- key-xor-opad (unwind-protect -- ((, H) key-xor-opad) -- (fillarray key-xor-opad 0))) -- ;; now `key-xor-opad' contains -- ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)). -- (, (if (and bit (< (/ bit 8) L)) -- (` (substring key-xor-opad 0 (, (/ bit 8)))) -- ;; return a copy of `key-xor-opad'. -- (` (concat key-xor-opad))))) -- ;; cleanup. -- (fillarray key-xor-ipad 0) -- (fillarray key-xor-opad 0)))))) -+ `(defun ,name (text key) -+ ,(concat "Compute " -+ (upcase (symbol-name name)) -+ " over TEXT with KEY.") -+ (let ((key-xor-ipad (make-string ,B ?\x36)) -+ (key-xor-opad (make-string ,B ?\x5C)) -+ (len (length key)) -+ (pos 0)) -+ (unwind-protect -+ (progn -+ ;; if `key' is longer than the block size, apply hash function -+ ;; to `key' and use the result as a real `key'. -+ (if (> len ,B) -+ (setq key (,H key) -+ len ,L)) -+ (while (< pos len) -+ (aset key-xor-ipad pos (logxor (aref key pos) ?\x36)) -+ (aset key-xor-opad pos (logxor (aref key pos) ?\x5C)) -+ (setq pos (1+ pos))) -+ (setq key-xor-ipad (unwind-protect -+ (concat key-xor-ipad text) -+ (fillarray key-xor-ipad 0)) -+ key-xor-ipad (unwind-protect -+ (,H key-xor-ipad) -+ (fillarray key-xor-ipad 0)) -+ key-xor-opad (unwind-protect -+ (concat key-xor-opad key-xor-ipad) -+ (fillarray key-xor-opad 0)) -+ key-xor-opad (unwind-protect -+ (,H key-xor-opad) -+ (fillarray key-xor-opad 0))) -+ ;; now `key-xor-opad' contains -+ ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)). -+ ,(if (and bit (< (/ bit 8) L)) -+ `(substring key-xor-opad 0 ,(/ bit 8)) -+ ;; return a copy of `key-xor-opad'. -+ `(concat key-xor-opad))) -+ ;; cleanup. -+ (fillarray key-xor-ipad 0) -+ (fillarray key-xor-opad 0))))) - - (provide 'hmac-def) - diff --git a/editors/flim/files/patch-md4.el b/editors/flim/files/patch-md4.el deleted file mode 100644 index ce834f2aef49..000000000000 --- a/editors/flim/files/patch-md4.el +++ /dev/null @@ -1,42 +0,0 @@ -Index: md4.el -=================================================================== ---- md4.el.orig 2007-09-05 23:39:48 UTC -+++ md4.el -@@ -78,21 +78,20 @@ bytes long. N is required to handle str - (setq m (md4-copy64 (substring buf 64))) - (md4-64 m))) - -- (concat (md4-pack-int32 (aref md4-buffer 0)) -- (md4-pack-int32 (aref md4-buffer 1)) -- (md4-pack-int32 (aref md4-buffer 2)) -- (md4-pack-int32 (aref md4-buffer 3)))) -+ (concat (md4-pack-int32 (aref md4-buffer 0)) -+ (md4-pack-int32 (aref md4-buffer 1)) -+ (md4-pack-int32 (aref md4-buffer 2)) -+ (md4-pack-int32 (aref md4-buffer 3)))) - - (defsubst md4-F (x y z) (logior (logand x y) (logand (lognot x) z))) - (defsubst md4-G (x y z) (logior (logand x y) (logand x z) (logand y z))) - (defsubst md4-H (x y z) (logxor x y z)) - - (defmacro md4-make-step (name func) -- (` -- (defun (, name) (a b c d xk s ac) -+ `(defun ,name (a b c d xk s ac) - (let* -- ((h1 (+ (car a) ((, func) (car b) (car c) (car d)) (car xk) (car ac))) -- (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac))) -+ ((h1 (+ (car a) (,func (car b) (car c) (car d)) (car xk) (car ac))) -+ (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac))) - (h2 (logand 65535 (+ h1 (lsh l1 -16)))) - (l2 (logand 65535 l1)) - ;; cyclic shift of 32 bits integer -@@ -102,7 +101,7 @@ bytes long. N is required to handle str - (l3 (logand 65535 (if (> s 15) - (+ (lsh l2 (- s 32)) (lsh h2 (- s 16))) - (+ (lsh l2 s) (lsh h2 (- s 16))))))) -- (cons h3 l3))))) -+ (cons h3 l3)))) - - (md4-make-step md4-round1 md4-F) - (md4-make-step md4-round2 md4-G) diff --git a/editors/flim/files/patch-md5-el.el b/editors/flim/files/patch-md5-el.el deleted file mode 100644 index 4c3f552a74c7..000000000000 --- a/editors/flim/files/patch-md5-el.el +++ /dev/null @@ -1,26 +0,0 @@ ---- md5-el.el.orig 2000-11-06 13:03:19 UTC -+++ md5-el.el -@@ -169,11 +169,10 @@ Returns a vector of 16 bytes containing - (defsubst md5-I (x y z) (logxor y (logior x (logand 65535 (lognot z))))) - - (defmacro md5-make-step (name func) -- (` -- (defun (, name) (a b c d x s ac) -+ `(defun ,name (a b c d x s ac) - (let* -- ((m1 (+ (car a) ((, func) (car b) (car c) (car d)) (car x) (car ac))) -- (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac))) -+ ((m1 (+ (car a) (,func (car b) (car c) (car d)) (car x) (car ac))) -+ (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac))) - (m2 (logand 65535 (+ m1 (lsh l1 -16)))) - (l2 (logand 65535 l1)) - (m3 (logand 65535 (if (> s 15) -@@ -182,7 +181,7 @@ Returns a vector of 16 bytes containing - (l3 (logand 65535 (if (> s 15) - (+ (lsh l2 (- s 32)) (lsh m2 (- s 16))) - (+ (lsh l2 s) (lsh m2 (- s 16))))))) -- (md5-add (cons m3 l3) b))))) -+ (md5-add (cons m3 l3) b)))) - - (md5-make-step md5-FF md5-F) - (md5-make-step md5-GG md5-G) diff --git a/editors/flim/files/patch-mime-en.texi b/editors/flim/files/patch-mime-en.texi index 69721b14b298..7fa43db0efc1 100644 --- a/editors/flim/files/patch-mime-en.texi +++ b/editors/flim/files/patch-mime-en.texi @@ -1,15 +1,11 @@ ---- mime-en.texi.orig 2002-10-08 15:50:05 UTC +--- mime-en.texi.orig 2019-05-26 10:34:29 UTC +++ mime-en.texi -@@ -1,7 +1,11 @@ - \input texinfo.tex +@@ -2,7 +2,7 @@ @c Generated automatically from mime-en.sgml by sinfo 3.7. @setfilename mime-en.info --@settitle{FLIM 1.14 Reference Manual about MIME Features} -+@settitle FLIM 1.14 Reference Manual about MIME Features -+@dircategory The Emacs editor and associated tools -+@direntry -+* mime-en: (mime-en). MIME features for GNU Emacs. (English) -+@end direntry - @titlepage - @title FLIM 1.14 Reference Manual about MIME Features - @author MORIOKA Tomohiko + @settitle FLIM 1.14 Reference Manual about MIME Features +-@documentencoding iso-2022-jp ++@documentencoding utf-8 + @documentlanguage en + @dircategory GNU Emacs Lisp + @direntry diff --git a/editors/flim/files/patch-mime-ja.texi b/editors/flim/files/patch-mime-ja.texi index 2acd1d947d55..f1d7fadffaa8 100644 --- a/editors/flim/files/patch-mime-ja.texi +++ b/editors/flim/files/patch-mime-ja.texi @@ -1,15 +1,11 @@ ---- mime-ja.texi.orig 2002-10-08 15:50:05 UTC +--- mime-ja.texi.orig 2019-05-26 10:34:29 UTC +++ mime-ja.texi -@@ -1,7 +1,11 @@ - \input texinfo.tex +@@ -2,7 +2,7 @@ @c Generated automatically from mime-ja.sgml by sinfo 3.7. @setfilename mime-ja.info --@settitle{FLIM 1.14 MIME $B5!G=@bL@=q(B} -+@settitle FLIM 1.14 MIME $B5!G=@bL@=q(B -+@dircategory The Emacs editor and associated tools -+@direntry -+* mime-ja: (mime-ja). MIME features for GNU Emacs. (Japanese) -+@end direntry - @titlepage - @title FLIM 1.14 MIME $B5!G=@bL@=q(B - @author $B + @documentlanguage ja +-@documentencoding iso-2022-jp ++@documentencoding utf-8 + @settitle FLIM 1.14 MIME $B5!G=@bL@=q(B + @dircategory GNU Emacs Lisp + @direntry diff --git a/editors/flim/files/patch-sha1-el.el b/editors/flim/files/patch-sha1-el.el deleted file mode 100644 index 6346a936b548..000000000000 --- a/editors/flim/files/patch-sha1-el.el +++ /dev/null @@ -1,165 +0,0 @@ -Index: sha1-el.el -=================================================================== ---- sha1-el.el.orig 2007-09-05 23:39:48 UTC -+++ sha1-el.el -@@ -125,91 +125,91 @@ If this variable is set to nil, use inte - - ;;; original definition of sha1-F0. - ;;; (defmacro sha1-F0 (B C D) --;;; (` (logior (logand (, B) (, C)) --;;; (logand (lognot (, B)) (, D))))) -+;;; `(logior (logand ,B ,C) -+;;; (logand (lognot ,B) ,D))) - ;;; a little optimization from GnuPG/cipher/sha1.c. - (defmacro sha1-F0 (B C D) -- (` (logxor (, D) (logand (, B) (logxor (, C) (, D)))))) -+ `(logxor ,D (logand ,B (logxor ,C ,D)))) - (defmacro sha1-F1 (B C D) -- (` (logxor (, B) (, C) (, D)))) -+ `(logxor ,B ,C ,D)) - ;;; original definition of sha1-F2. - ;;; (defmacro sha1-F2 (B C D) --;;; (` (logior (logand (, B) (, C)) --;;; (logand (, B) (, D)) --;;; (logand (, C) (, D))))) -+;;; `(logior (logand ,B ,C) -+;;; (logand ,B ,D) -+;;; (logand ,C ,D))) - ;;; a little optimization from GnuPG/cipher/sha1.c. - (defmacro sha1-F2 (B C D) -- (` (logior (logand (, B) (, C)) -- (logand (, D) (logior (, B) (, C)))))) -+ `(logior (logand ,B ,C) -+ (logand ,D (logior ,B ,C)))) - (defmacro sha1-F3 (B C D) -- (` (logxor (, B) (, C) (, D)))) -+ `(logxor ,B ,C ,D)) - - (defmacro sha1-S1 (W-high W-low) -- (` (let ((W-high (, W-high)) -- (W-low (, W-low))) -- (setq S1W-high (+ (% (* W-high 2) 65536) -- (/ W-low (, (/ 65536 2))))) -- (setq S1W-low (+ (/ W-high (, (/ 65536 2))) -- (% (* W-low 2) 65536)))))) -+ `(let ((W-high ,W-high) -+ (W-low ,W-low)) -+ (setq S1W-high (+ (% (* W-high 2) 65536) -+ (/ W-low ,(/ 65536 2)))) -+ (setq S1W-low (+ (/ W-high ,(/ 65536 2)) -+ (% (* W-low 2) 65536))))) - (defmacro sha1-S5 (A-high A-low) -- (` (progn -- (setq S5A-high (+ (% (* (, A-high) 32) 65536) -- (/ (, A-low) (, (/ 65536 32))))) -- (setq S5A-low (+ (/ (, A-high) (, (/ 65536 32))) -- (% (* (, A-low) 32) 65536)))))) -+ `(progn -+ (setq S5A-high (+ (% (* ,A-high 32) 65536) -+ (/ ,A-low ,(/ 65536 32)))) -+ (setq S5A-low (+ (/ ,A-high , (/ 65536 32)) -+ (% (* ,A-low 32) 65536))))) - (defmacro sha1-S30 (B-high B-low) -- (` (progn -- (setq S30B-high (+ (/ (, B-high) 4) -- (* (% (, B-low) 4) (, (/ 65536 4))))) -- (setq S30B-low (+ (/ (, B-low) 4) -- (* (% (, B-high) 4) (, (/ 65536 4)))))))) -+ `(progn -+ (setq S30B-high (+ (/ ,B-high 4) -+ (* (% ,B-low 4) ,(/ 65536 4)))) -+ (setq S30B-low (+ (/ ,B-low 4) -+ (* (% ,B-high 4) ,(/ 65536 4)))))) - - (defmacro sha1-OP (round) -- (` (progn -- (sha1-S5 sha1-A-high sha1-A-low) -- (sha1-S30 sha1-B-high sha1-B-low) -- (setq sha1-A-low (+ ((, (intern (format "sha1-F%d" round))) -- sha1-B-low sha1-C-low sha1-D-low) -- sha1-E-low -- (, (symbol-value -- (intern (format "sha1-K%d-low" round)))) -- (aref block-low idx) -- (progn -- (setq sha1-E-low sha1-D-low) -- (setq sha1-D-low sha1-C-low) -- (setq sha1-C-low S30B-low) -- (setq sha1-B-low sha1-A-low) -- S5A-low))) -- (setq carry (/ sha1-A-low 65536)) -- (setq sha1-A-low (% sha1-A-low 65536)) -- (setq sha1-A-high (% (+ ((, (intern (format "sha1-F%d" round))) -- sha1-B-high sha1-C-high sha1-D-high) -- sha1-E-high -- (, (symbol-value -- (intern (format "sha1-K%d-high" round)))) -- (aref block-high idx) -- (progn -- (setq sha1-E-high sha1-D-high) -- (setq sha1-D-high sha1-C-high) -- (setq sha1-C-high S30B-high) -- (setq sha1-B-high sha1-A-high) -- S5A-high) -- carry) -- 65536))))) -+ `(progn -+ (sha1-S5 sha1-A-high sha1-A-low) -+ (sha1-S30 sha1-B-high sha1-B-low) -+ (setq sha1-A-low (+ (,(intern (format "sha1-F%d" round)) -+ sha1-B-low sha1-C-low sha1-D-low) -+ sha1-E-low -+ ,(symbol-value -+ (intern (format "sha1-K%d-low" round))) -+ (aref block-low idx) -+ (progn -+ (setq sha1-E-low sha1-D-low) -+ (setq sha1-D-low sha1-C-low) -+ (setq sha1-C-low S30B-low) -+ (setq sha1-B-low sha1-A-low) -+ S5A-low))) -+ (setq carry (/ sha1-A-low 65536)) -+ (setq sha1-A-low (% sha1-A-low 65536)) -+ (setq sha1-A-high (% (+ (,(intern (format "sha1-F%d" round)) -+ sha1-B-high sha1-C-high sha1-D-high) -+ sha1-E-high -+ ,(symbol-value -+ (intern (format "sha1-K%d-high" round))) -+ (aref block-high idx) -+ (progn -+ (setq sha1-E-high sha1-D-high) -+ (setq sha1-D-high sha1-C-high) -+ (setq sha1-C-high S30B-high) -+ (setq sha1-B-high sha1-A-high) -+ S5A-high) -+ carry) -+ 65536)))) - - (defmacro sha1-add-to-H (H X) -- (` (progn -- (setq (, (intern (format "sha1-%s-low" H))) -- (+ (, (intern (format "sha1-%s-low" H))) -- (, (intern (format "sha1-%s-low" X))))) -- (setq carry (/ (, (intern (format "sha1-%s-low" H))) 65536)) -- (setq (, (intern (format "sha1-%s-low" H))) -- (% (, (intern (format "sha1-%s-low" H))) 65536)) -- (setq (, (intern (format "sha1-%s-high" H))) -- (% (+ (, (intern (format "sha1-%s-high" H))) -- (, (intern (format "sha1-%s-high" X))) -- carry) -- 65536))))) -+ `(progn -+ (setq ,(intern (format "sha1-%s-low" H)) -+ (+ ,(intern (format "sha1-%s-low" H)) -+ ,(intern (format "sha1-%s-low" X)))) -+ (setq carry (/ ,(intern (format "sha1-%s-low" H)) 65536)) -+ (setq ,(intern (format "sha1-%s-low" H)) -+ (% ,(intern (format "sha1-%s-low" H)) 65536)) -+ (setq ,(intern (format "sha1-%s-high" H)) -+ (% (+ ,(intern (format "sha1-%s-high" H)) -+ ,(intern (format "sha1-%s-high" X)) -+ carry) -+ 65536)))) - ) - - ;;; buffers (H0 H1 H2 H3 H4). diff --git a/editors/flim/pkg-descr b/editors/flim/pkg-descr index fbb46459964d..ecd84bee1219 100644 --- a/editors/flim/pkg-descr +++ b/editors/flim/pkg-descr @@ -9,4 +9,4 @@ FLIM, message representation or encoding emacs lisp library for emacs20. Ported by shige@FreeBSD.ORG -WWW: http://git.chise.org/elisp/flim/ (in Japanese) +WWW: https://github.com/wanderlust/flim diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist index 4bafb5d6cd35..16dfc21a50a8 100644 --- a/editors/flim/pkg-plist +++ b/editors/flim/pkg-plist @@ -62,8 +62,6 @@ %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc %%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el %%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc %%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el -- cgit From 067f9bd6092f94946bf49dedd0b84671f316fd4e Mon Sep 17 00:00:00 2001 From: nobutaka Date: Mon, 12 Aug 2019 14:16:56 +0000 Subject: - Switch to the version maintained by the developers of Wanderlust. - Update to the snapshot on 2019-07-08. --- editors/semi/Makefile | 17 +++++++++-------- editors/semi/distinfo | 5 +++-- editors/semi/files/_pkg.el | 4 ---- editors/semi/files/patch-SEMI-CFG | 11 ----------- editors/semi/files/patch-mime-ui-en.texi | 14 -------------- editors/semi/files/patch-mime-ui-ja.texi | 18 +++++++----------- editors/semi/pkg-descr | 2 +- editors/semi/pkg-plist | 21 +++++++-------------- 8 files changed, 27 insertions(+), 65 deletions(-) delete mode 100644 editors/semi/files/_pkg.el delete mode 100644 editors/semi/files/patch-SEMI-CFG delete mode 100644 editors/semi/files/patch-mime-ui-en.texi diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 5fbf65f93713..591291d32e1a 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= semi -PORTVERSION= ${SEMI_VER} -PORTREVISION= 23 +PORTVERSION= ${SEMI_VER}.${SNAPDATE} CATEGORIES= editors elisp -MASTER_SITES= http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org @@ -13,12 +11,15 @@ COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs LICENSE= GPLv2 -BUILD_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} \ - nkf:japanese/nkf +BUILD_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} RUN_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} -USES= emacs makeinfo +USES= emacs iconv makeinfo +USE_GITHUB= yes +GH_ACCOUNT= wanderlust +GH_TAGNAME= 16228dc +SNAPDATE= 20190708 NO_ARCH= yes FLIM_TRUNK= 1.14 @@ -38,8 +39,8 @@ OPTIONS_DEFINE= DOCS post-build: @(cd ${WRKSRC} ; \ for i in mime-ui-en.texi mime-ui-ja.texi; do \ - ${CAT} $${i} | nkf -e > $${i}.jis ; \ - ${MAKEINFO} --no-split --no-validate $${i}.jis ; \ + ${ICONV_CMD} -f ISO-2022-JP -t UTF-8 $${i} > $${i}.utf8 ; \ + ${MAKEINFO} --no-split --no-validate $${i}.utf8 ; \ done) post-install: diff --git a/editors/semi/distinfo b/editors/semi/distinfo index f14ad95cf1d7..595e001cbacd 100644 --- a/editors/semi/distinfo +++ b/editors/semi/distinfo @@ -1,2 +1,3 @@ -SHA256 (semi-1.14.6.tar.gz) = 717fe9261863b2a36cf5882cc669452848d6b91f48ce6a695d81118500ed1bfb -SIZE (semi-1.14.6.tar.gz) = 142549 +TIMESTAMP = 1565575398 +SHA256 (wanderlust-semi-1.14.6.20190708-16228dc_GH0.tar.gz) = 8b27eb7e3ab4d2a250237b496c77cf89a77d583e484c577c99448535abb52228 +SIZE (wanderlust-semi-1.14.6.20190708-16228dc_GH0.tar.gz) = 153183 diff --git a/editors/semi/files/_pkg.el b/editors/semi/files/_pkg.el deleted file mode 100644 index 5bc3c1a4a951..000000000000 --- a/editors/semi/files/_pkg.el +++ /dev/null @@ -1,4 +0,0 @@ -;;;###autoload -(package-provide 'semi - :version 1.18 - :type 'regular) diff --git a/editors/semi/files/patch-SEMI-CFG b/editors/semi/files/patch-SEMI-CFG deleted file mode 100644 index 3ba0e756d74e..000000000000 --- a/editors/semi/files/patch-SEMI-CFG +++ /dev/null @@ -1,11 +0,0 @@ ---- SEMI-CFG.orig 2003-01-10 18:12:05 UTC -+++ SEMI-CFG -@@ -9,6 +9,8 @@ - (add-to-list 'load-path - (expand-file-name "../../site-lisp/apel" data-directory)) - (add-to-list 'load-path -+ (expand-file-name "../site-lisp/emu" data-directory)) -+(add-to-list 'load-path - (expand-file-name "." data-directory)) - - (if (boundp 'LISPDIR) diff --git a/editors/semi/files/patch-mime-ui-en.texi b/editors/semi/files/patch-mime-ui-en.texi deleted file mode 100644 index 5c14551723e5..000000000000 --- a/editors/semi/files/patch-mime-ui-en.texi +++ /dev/null @@ -1,14 +0,0 @@ ---- mime-ui-en.texi.orig 2002-10-15 06:59:21 UTC -+++ mime-ui-en.texi -@@ -1,6 +1,10 @@ - \input texinfo.tex - @setfilename mime-ui-en.info --@settitle{SEMI 1.14 Manual} -+@settitle SEMI 1.14 Manual -+@dircategory The Emacs editor and associated tools -+@direntry -+* mime-ui-en: (mime-ui-en). MIME user interface for GNU Emacs. (English) -+@end direntry - @titlepage - @title SEMI 1.14 Manual - @author MORIOKA Tomohiko diff --git a/editors/semi/files/patch-mime-ui-ja.texi b/editors/semi/files/patch-mime-ui-ja.texi index 83e52d68ed81..42c9f5f6250c 100644 --- a/editors/semi/files/patch-mime-ui-ja.texi +++ b/editors/semi/files/patch-mime-ui-ja.texi @@ -1,14 +1,10 @@ ---- mime-ui-ja.texi.orig 2002-10-15 06:59:21 UTC +--- mime-ui-ja.texi.orig 2019-08-11 16:55:18 UTC +++ mime-ui-ja.texi -@@ -1,6 +1,10 @@ +@@ -1,6 +1,6 @@ \input texinfo.tex @setfilename mime-ui-ja.info --@settitle{SEMI 1.14 $B@bL@=q(B} -+@settitle SEMI 1.14 $B@bL@=q(B -+@dircategory The Emacs editor and associated tools -+@direntry -+* mime-ui-ja: (mime-ui-ja). MIME user interface for GNU Emacs. (Japanese) -+@end direntry - @titlepage - @title SEMI 1.14 $B@bL@=q(B - @author $B +-@documentencoding iso-2022-jp ++@documentencoding utf-8 + @documentlanguage ja + + @dircategory GNU Emacs Lisp diff --git a/editors/semi/pkg-descr b/editors/semi/pkg-descr index 52cb3e53c265..cbb6833fbf1d 100644 --- a/editors/semi/pkg-descr +++ b/editors/semi/pkg-descr @@ -20,4 +20,4 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20. Ported by shige@FreeBSD.ORG -WWW: http://git.chise.org/elisp/semi/ (in Japanese) +WWW: https://github.com/wanderlust/semi diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist index 72005c440419..51fd252cc1f0 100644 --- a/editors/semi/pkg-plist +++ b/editors/semi/pkg-plist @@ -13,21 +13,16 @@ %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.el +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.elc +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.el +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.elc +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.el +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.elc +%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-vcard.el %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc %%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el %%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc %%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el @@ -36,8 +31,6 @@ %%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc %%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el %%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.en -- cgit From c9af2bb3d0a6d4c5fd4bd8b111544209ce756757 Mon Sep 17 00:00:00 2001 From: nobutaka Date: Mon, 12 Aug 2019 14:18:07 +0000 Subject: Bump PORTREVISION in accordance with editors/semi update. --- mail/wanderlust/Makefile | 1 + www/emacs-w3m/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index 9c7b12fddb58..7d86abaf62dc 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -3,6 +3,7 @@ PORTNAME= wanderlust PORTVERSION= 2.15.9.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 16f1bd8fb706..4b3bc854a5de 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -3,6 +3,7 @@ PORTNAME= emacs-w3m PORTVERSION= 1.4.632.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= www elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} -- cgit From 20722fd214d8ea1a4794bb181cc8978d11942d62 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 14:20:17 +0000 Subject: Mark Perl 5.28 as DEPRECATED. --- lang/perl5.28/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl5.28/Makefile b/lang/perl5.28/Makefile index efd89d3252c3..279dfbfb85db 100644 --- a/lang/perl5.28/Makefile +++ b/lang/perl5.28/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE_ART10= ${WRKSRC}/Artistic LICENSE_FILE_GPLv1+ = ${WRKSRC}/Copying # Uncomment when the default Perl is switched to 5.30 -#DEPRECATED= Support end three years after .0 release, please upgrade to a more recent version of Perl -#EXPIRATION_DATE= 2021-06-22 +DEPRECATED= Support end three years after .0 release, please upgrade to a more recent version of Perl +EXPIRATION_DATE= 2021-06-22 TEST_TARGET= test_harness TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ -- cgit From 56737c1d8d418e52c0a486c9d3a056a76334e4a7 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 14:20:27 +0000 Subject: Update to v5.31.2-94-g96684a73b5. --- lang/perl5-devel/Makefile | 2 +- lang/perl5-devel/distinfo | 6 +++--- lang/perl5-devel/files/patch-perl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index d2ed1dfb3051..696853363fdc 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -35,7 +35,7 @@ USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.31.2-60-g5de6cd706e +GH_TAGNAME= v5.31.2-94-g96684a73b5 TEST_TARGET= test_harness TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index b7c17d3748ee..87db639ed88a 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565093656 -SHA256 (perl/Perl-perl5-v5.31.2-60-g5de6cd706e_GH0.tar.gz) = d438f01ba9c6123c4fe47fe5258906d084c52e7d62995b63f5c467ad61e115ca -SIZE (perl/Perl-perl5-v5.31.2-60-g5de6cd706e_GH0.tar.gz) = 19251285 +TIMESTAMP = 1565618808 +SHA256 (perl/Perl-perl5-v5.31.2-94-g96684a73b5_GH0.tar.gz) = 64df614f32045f5db576d0db1bb1b7a7eb21547ee56856032fce10b4f5fd7865 +SIZE (perl/Perl-perl5-v5.31.2-94-g96684a73b5_GH0.tar.gz) = 19255374 diff --git a/lang/perl5-devel/files/patch-perl.c b/lang/perl5-devel/files/patch-perl.c index 82b7168167e2..1c9a22b9d6bd 100644 --- a/lang/perl5-devel/files/patch-perl.c +++ b/lang/perl5-devel/files/patch-perl.c @@ -1,8 +1,8 @@ Remove compile time information (reproducible builds) ---- perl.c.orig 2019-07-14 14:40:03 UTC +--- perl.c.orig 2019-08-12 09:27:18 UTC +++ perl.c -@@ -1994,23 +1994,7 @@ S_Internals_V(pTHX_ CV *cv) +@@ -2005,23 +2005,7 @@ S_Internals_V(pTHX_ CV *cv) PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, sizeof(non_bincompat_options) - 1, SVs_TEMP)); -- cgit From cf8956545aff1770120cc6628f0d116f946aec39 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 12 Aug 2019 14:20:30 +0000 Subject: Update to latest commit. --- dns/bind9-devel/Makefile | 4 ++-- dns/bind9-devel/distinfo | 6 +++--- dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 16 +++++++++------- .../files/patch-bin_tests_system_dlzexternal_Makefile.in | 2 ++ dns/bind9-devel/files/patch-configure | 10 ++++++---- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index a4ba7e4712ab..e4a640c54b81 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.15.0a0.2019.08.06 +ISCVERSION= 9.15.0a0.2019.08.12 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 48213633ce13299d4e5934dfc90f4f7dd5ec4730 +GL_COMMIT= d60557be82d061849cc062b5ef3ab2fc82423684 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 27d8a4339aff..860e927fda15 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565095080 -SHA256 (isc-projects-bind9-48213633ce13299d4e5934dfc90f4f7dd5ec4730_GL0.tar.gz) = b37a3e6024b56a3c30a8e1dc971e5b4399a05159ae2909afec3f4ecc245d6847 -SIZE (isc-projects-bind9-48213633ce13299d4e5934dfc90f4f7dd5ec4730_GL0.tar.gz) = 6328648 +TIMESTAMP = 1565619108 +SHA256 (isc-projects-bind9-d60557be82d061849cc062b5ef3ab2fc82423684_GL0.tar.gz) = ece0e1d98c11eee2ee6441f72c12cbc5e420cc3ba1812b5846448ceb126f2c4d +SIZE (isc-projects-bind9-d60557be82d061849cc062b5ef3ab2fc82423684_GL0.tar.gz) = 6326649 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index a45c82abd171..70c5bce86955 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,4 +1,6 @@ ---- bin/named/config.c.orig 2019-07-29 20:10:44 UTC +Add the override-cache-ttl feature. + +--- bin/named/config.c.orig 2019-08-12 08:39:30 UTC +++ bin/named/config.c @@ -177,6 +177,7 @@ options {\n\ notify-source *;\n\ @@ -8,9 +10,9 @@ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2019-07-29 20:10:44 UTC +--- bin/named/server.c.orig 2019-08-12 08:39:30 UTC +++ bin/named/server.c -@@ -4218,6 +4218,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4217,6 +4217,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -22,7 +24,7 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2019-07-29 20:10:44 UTC +--- lib/dns/include/dns/view.h.orig 2019-08-12 08:39:30 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -32,9 +34,9 @@ dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2019-07-29 20:10:44 UTC +--- lib/dns/resolver.c.orig 2019-08-12 08:39:30 UTC +++ lib/dns/resolver.c -@@ -6022,6 +6022,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6011,6 +6011,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -47,7 +49,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2019-07-29 20:10:44 UTC +--- lib/isccfg/namedconf.c.orig 2019-08-12 08:39:30 UTC +++ lib/isccfg/namedconf.c @@ -1907,6 +1907,7 @@ view_clauses[] = { #endif diff --git a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in index ab39836bb768..5fbeafc70626 100644 --- a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in +++ b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in @@ -1,3 +1,5 @@ +BIND9 seems to be abusing LDFLAGS here, and it breaks our linker. + --- bin/tests/system/dlzexternal/Makefile.in.orig 2019-06-28 12:33:29 UTC +++ bin/tests/system/dlzexternal/Makefile.in @@ -35,7 +35,7 @@ OBJS = diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure index 5388015c9f46..228618f74756 100644 --- a/dns/bind9-devel/files/patch-configure +++ b/dns/bind9-devel/files/patch-configure @@ -1,6 +1,8 @@ ---- configure.orig 2019-08-06 04:55:46 UTC +Fixup gssapi and db detection. + +--- configure.orig 2019-08-12 08:39:30 UTC +++ configure -@@ -17183,27 +17183,9 @@ done +@@ -17216,27 +17216,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +32,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -17246,47 +17228,7 @@ $as_echo "no" >&6; } ;; +@@ -17279,47 +17261,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +81,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22676,7 +22618,7 @@ $as_echo "" >&6; } +@@ -22709,7 +22651,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). -- cgit From 20a354421cad957566ac26ed786f4ccb67b851cb Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 14:21:37 +0000 Subject: - Update to 1.4.1 --- www/R-cran-httr/Makefile | 5 ++--- www/R-cran-httr/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/www/R-cran-httr/Makefile b/www/R-cran-httr/Makefile index 2e0036ad9b12..bc5d97d97ae8 100644 --- a/www/R-cran-httr/Makefile +++ b/www/R-cran-httr/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= httr -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= www DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -12,7 +11,7 @@ COMMENT= Tools for Working with URLs and HTTP LICENSE= MIT -CRAN_DEPENDS= R-cran-curl>=0.9.1:ftp/R-cran-curl \ +CRAN_DEPENDS= R-cran-curl>=3.0.0:ftp/R-cran-curl \ R-cran-jsonlite>0:converters/R-cran-jsonlite \ R-cran-mime>0:misc/R-cran-mime \ R-cran-openssl>=0.8:security/R-cran-openssl \ diff --git a/www/R-cran-httr/distinfo b/www/R-cran-httr/distinfo index 33f6b9e987fd..a6ce151510be 100644 --- a/www/R-cran-httr/distinfo +++ b/www/R-cran-httr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563087923 -SHA256 (httr_1.4.0.tar.gz) = d633f1425da514f65f3b8c034ae0a8b6911995009840c6bb9657ceedb99ddb48 -SIZE (httr_1.4.0.tar.gz) = 156356 +TIMESTAMP = 1565618515 +SHA256 (httr_1.4.1.tar.gz) = 675c7e07bbe82c48284ee1ab929bb14a6e653abae2860d854dc41a3c028de156 +SIZE (httr_1.4.1.tar.gz) = 158465 -- cgit From aa66567a2ddbbd99e68c19513ff56355fc5d288b Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 15:08:07 +0000 Subject: - Update to 0.4-1 --- devel/R-cran-classInt/Makefile | 3 +-- devel/R-cran-classInt/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/R-cran-classInt/Makefile b/devel/R-cran-classInt/Makefile index 4f07824c55cf..65f83da8f167 100644 --- a/devel/R-cran-classInt/Makefile +++ b/devel/R-cran-classInt/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= classInt -DISTVERSION= 0.3-3 -PORTREVISION= 1 +DISTVERSION= 0.4-1 CATEGORIES= devel DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/devel/R-cran-classInt/distinfo b/devel/R-cran-classInt/distinfo index 949af2da9809..4c302bc3bfc5 100644 --- a/devel/R-cran-classInt/distinfo +++ b/devel/R-cran-classInt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559460237 -SHA256 (classInt_0.3-3.tar.gz) = a93e685ef9c40d5977bb91d7116505a25303b229897a20544722a94ea1365f30 -SIZE (classInt_0.3-3.tar.gz) = 18231 +TIMESTAMP = 1565619763 +SHA256 (classInt_0.4-1.tar.gz) = 39c63f8e37b379033d73d57929b5b8ea41b0023626cc1cec648d66bade5d0103 +SIZE (classInt_0.4-1.tar.gz) = 19048 -- cgit From 83eacf1f3501583166ddc9af04fae37e0ba9335f Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 15:37:28 +0000 Subject: - Update to 1.1 --- textproc/R-cran-markdown/Makefile | 6 +++--- textproc/R-cran-markdown/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/textproc/R-cran-markdown/Makefile b/textproc/R-cran-markdown/Makefile index c764d26006a0..93f65cd3c6ff 100644 --- a/textproc/R-cran-markdown/Makefile +++ b/textproc/R-cran-markdown/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= markdown -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -12,7 +11,8 @@ COMMENT= Markdown Rendering for R LICENSE= GPLv2 -CRAN_DEPENDS= R-cran-mime>=0.3:misc/R-cran-mime +CRAN_DEPENDS= R-cran-xfun>0:misc/R-cran-xfun \ + R-cran-mime>=0.3:misc/R-cran-mime BUILD_DEPENDS= ${CRAN_DEPENDS} RUN_DEPENDS= ${CRAN_DEPENDS} diff --git a/textproc/R-cran-markdown/distinfo b/textproc/R-cran-markdown/distinfo index 893294e47cf2..9361accbc11d 100644 --- a/textproc/R-cran-markdown/distinfo +++ b/textproc/R-cran-markdown/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563082384 -SHA256 (markdown_1.0.tar.gz) = 172d8072d1829644ee6cdf54282a55718e2cfe9c9915d3589ca5f9a016f8d9a6 -SIZE (markdown_1.0.tar.gz) = 80843 +TIMESTAMP = 1565620048 +SHA256 (markdown_1.1.tar.gz) = 8d8cd47472a37362e615dbb8865c3780d7b7db694d59050e19312f126e5efc1b +SIZE (markdown_1.1.tar.gz) = 81050 -- cgit From 705ffb3819bdbf41223d2c07bb6c71891aaf72f2 Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 15:38:36 +0000 Subject: - Update to 5.51 --- math/R-cran-quantreg/Makefile | 2 +- math/R-cran-quantreg/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/math/R-cran-quantreg/Makefile b/math/R-cran-quantreg/Makefile index ae6a4e2fc631..2fb05ba43fd7 100644 --- a/math/R-cran-quantreg/Makefile +++ b/math/R-cran-quantreg/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= quantreg -PORTVERSION= 5.42.1 +PORTVERSION= 5.51 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/math/R-cran-quantreg/distinfo b/math/R-cran-quantreg/distinfo index 0a3f85bd5442..29deafdc52a9 100644 --- a/math/R-cran-quantreg/distinfo +++ b/math/R-cran-quantreg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564836158 -SHA256 (quantreg_5.42.1.tar.gz) = 4cc2b0883c52694e58fcfde83e30e4a54be9f4d9cbcf6138f6498cc8e0b3ccab -SIZE (quantreg_5.42.1.tar.gz) = 995216 +TIMESTAMP = 1565623032 +SHA256 (quantreg_5.51.tar.gz) = df1330d245f66ee6d924b209bd4c15d44ff8cce52667959ec0d299975428bdb1 +SIZE (quantreg_5.51.tar.gz) = 995236 -- cgit From e7f3fa0c571ab38465620b90e03fd24f5483f118 Mon Sep 17 00:00:00 2001 From: pizzamig Date: Mon, 12 Aug 2019 16:33:14 +0000 Subject: sysutils/potnet: Update to 0.3.1 Changes: https://github.com/pizzamig/potnet/releases/tag/0.3.1 Sponsored by: trivago N.V. --- sysutils/potnet/Makefile | 2 +- sysutils/potnet/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile index 93bd57f7c94c..710a67286e91 100644 --- a/sysutils/potnet/Makefile +++ b/sysutils/potnet/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= potnet -DISTVERSION= 0.3.0 +DISTVERSION= 0.3.1 PORTREVISION= 0 CATEGORIES= sysutils diff --git a/sysutils/potnet/distinfo b/sysutils/potnet/distinfo index 3cc9fd2e9b66..50e58279b167 100644 --- a/sysutils/potnet/distinfo +++ b/sysutils/potnet/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1564737144 +TIMESTAMP = 1565627112 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/argon2rs-0.2.5.tar.gz) = 3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392 @@ -151,5 +151,5 @@ SHA256 (rust/crates/winapi-util-0.1.2.tar.gz) = 7168bab6e1daee33b4557efd0e95d5ca SIZE (rust/crates/winapi-util-0.1.2.tar.gz) = 7810 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SHA256 (pizzamig-potnet-0.3.0_GH0.tar.gz) = 410ef15223ce28021ed8e1022d6f6855cdcd9b9add74358fd875896df0b96197 -SIZE (pizzamig-potnet-0.3.0_GH0.tar.gz) = 14483 +SHA256 (pizzamig-potnet-0.3.1_GH0.tar.gz) = 823b8c92631157368e151f5e01afd7a1921a2cfd0fc812e0736c04c34db8d8df +SIZE (pizzamig-potnet-0.3.1_GH0.tar.gz) = 14585 -- cgit From 290aeadf10048125baf47caa8c64c69f679cc280 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 12 Aug 2019 16:44:39 +0000 Subject: New port: science/py-tensorflow-estimator: TensorFlow Estimator, an API to simplify machine learning programming Dependencies are unusual for science/py-tensorflow-estimator: science/py-tensorflow imports science/py-tensorflow-estimator in its python code, but science/py-tensorflow-estimator is a separate project that depends on science/py-tensorflow in order to build. PR: 226400 Submitted by: Anthony --- science/Makefile | 1 + science/py-tensorflow-estimator/Makefile | 47 ++++++++ science/py-tensorflow-estimator/distinfo | 3 + ...mator_tools_pip__package_build__pip__package.sh | 20 ++++ science/py-tensorflow-estimator/pkg-descr | 5 + science/py-tensorflow-estimator/pkg-plist | 133 +++++++++++++++++++++ 6 files changed, 209 insertions(+) create mode 100644 science/py-tensorflow-estimator/Makefile create mode 100644 science/py-tensorflow-estimator/distinfo create mode 100644 science/py-tensorflow-estimator/files/patch-tensorflow__estimator_tools_pip__package_build__pip__package.sh create mode 100644 science/py-tensorflow-estimator/pkg-descr create mode 100644 science/py-tensorflow-estimator/pkg-plist diff --git a/science/Makefile b/science/Makefile index d7d2e8276a0a..1a440775788c 100644 --- a/science/Makefile +++ b/science/Makefile @@ -283,6 +283,7 @@ SUBDIR += py-scoria SUBDIR += py-spglib SUBDIR += py-tensorflow + SUBDIR += py-tensorflow-estimator SUBDIR += py-veusz SUBDIR += py-ws2300 SUBDIR += pybrain diff --git a/science/py-tensorflow-estimator/Makefile b/science/py-tensorflow-estimator/Makefile new file mode 100644 index 000000000000..c275399c9870 --- /dev/null +++ b/science/py-tensorflow-estimator/Makefile @@ -0,0 +1,47 @@ +# $FreeBSD$ + +PORTNAME= tensorflow-estimator +DISTVERSIONPREFIX= v +DISTVERSION= 1.14.0 +CATEGORIES= science python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= amzo1337@gmail.com +COMMENT= TensorFlow Estimator, an API to simplify machine learning programming + +LICENSE= APACHE20 + +BUILD_DEPENDS= bash:shells/bash \ + bazel:devel/bazel \ + ${PYTHON_PKGNAMEPREFIX}tensorflow>=1.14.0:science/py-tensorflow@${PY_FLAVOR} + +USES= python shebangfix +SHEBANG_GLOB= *.py +USE_GITHUB= yes +GH_ACCOUNT= tensorflow +GH_PROJECT= estimator + +BAZEL_BOOT= --output_user_root=${WRKDIR}/bazel_out + +post-patch: + @${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" \ + ${WRKSRC}/tensorflow_estimator/tools/pip_package/build_pip_package.sh + +do-build: + @cd ${WRKSRC} && \ + bazel ${BAZEL_BOOT} build -s \ + //tensorflow_estimator/tools/pip_package:build_pip_package + @cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} && \ + bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package \ + ${WRKDIR}/whl + +do-install: + @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR} + @${MKDIR} ${WRKDIR}/tmp + @${UNZIP_NATIVE_CMD} -d ${WRKDIR}/tmp ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl + cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME} \ + ${STAGEDIR}${PYTHON_SITELIBDIR} + cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME}-${PORTVERSION}.dist-info \ + ${STAGEDIR}${PYTHON_SITELIBDIR} + +.include diff --git a/science/py-tensorflow-estimator/distinfo b/science/py-tensorflow-estimator/distinfo new file mode 100644 index 000000000000..eedb8d467e96 --- /dev/null +++ b/science/py-tensorflow-estimator/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565118650 +SHA256 (tensorflow-estimator-v1.14.0_GH0.tar.gz) = 1f0b80b8067a52cc33bbe390d34791eb3e12453c506daa1b4c8fc07fbf962d9f +SIZE (tensorflow-estimator-v1.14.0_GH0.tar.gz) = 670750 diff --git a/science/py-tensorflow-estimator/files/patch-tensorflow__estimator_tools_pip__package_build__pip__package.sh b/science/py-tensorflow-estimator/files/patch-tensorflow__estimator_tools_pip__package_build__pip__package.sh new file mode 100644 index 000000000000..f7d51529f643 --- /dev/null +++ b/science/py-tensorflow-estimator/files/patch-tensorflow__estimator_tools_pip__package_build__pip__package.sh @@ -0,0 +1,20 @@ +--- tensorflow_estimator/tools/pip_package/build_pip_package.sh.orig 2019-06-11 17:18:02 UTC ++++ tensorflow_estimator/tools/pip_package/build_pip_package.sh +@@ -38,7 +38,7 @@ function prepare_src() { + + # Verifies all expected files are in pip. + # Creates init files in all directory in pip. +- python tensorflow_estimator/tools/pip_package/create_pip_helper.py --pip-root "${TMPDIR}/tensorflow_estimator/" --bazel-root "./tensorflow_estimator" ++ %%PYTHON%% tensorflow_estimator/tools/pip_package/create_pip_helper.py --pip-root "${TMPDIR}/tensorflow_estimator/" --bazel-root "./tensorflow_estimator" + } + + function build_wheel() { +@@ -53,7 +53,7 @@ function build_wheel() { + + pushd ${TMPDIR} > /dev/null + echo $(date) : "=== Building wheel" +- "${PYTHON_BIN_PATH:-python}" setup.py bdist_wheel --universal --project_name $PROJECT_NAME ++ %%PYTHON%% setup.py bdist_wheel --universal --project_name $PROJECT_NAME + mkdir -p ${DEST} + cp dist/* ${DEST} + popd > /dev/null diff --git a/science/py-tensorflow-estimator/pkg-descr b/science/py-tensorflow-estimator/pkg-descr new file mode 100644 index 000000000000..7f650a3d96a4 --- /dev/null +++ b/science/py-tensorflow-estimator/pkg-descr @@ -0,0 +1,5 @@ +TensorFlow Estimator is a high-level TensorFlow API that greatly +simplifies machine learning programming. Estimators encapsulate +training, evaluation, prediction, and exporting for your model. + +WWW: https://github.com/tensorflow/estimator diff --git a/science/py-tensorflow-estimator/pkg-plist b/science/py-tensorflow-estimator/pkg-plist new file mode 100644 index 000000000000..1dfcd430389f --- /dev/null +++ b/science/py-tensorflow-estimator/pkg-plist @@ -0,0 +1,133 @@ +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/DESCRIPTION.rst +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/WHEEL +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/metadata.json +%%PYTHON_SITELIBDIR%%/tensorflow_estimator-1.14.0.dist-info/top_level.txt +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/estimator/experimental/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/estimator/export/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/estimator/inputs/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/estimator/tpu/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v1/v1.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/estimator/experimental/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/estimator/export/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/estimator/inputs/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/_api/v2/v2.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/boosted_trees.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/dnn_with_layer_annotations.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/export.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/exporter.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/extenders.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/logit_fns.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/multi_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/replicate_model_fn.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/rnn.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/rnn_v2.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/contrib/estimator/python/estimator/saved_model_estimator.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/estimator/experimental/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/estimator/export/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/estimator/inputs/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/estimator/tpu/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v1/v1.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/estimator/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/estimator/experimental/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/estimator/export/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/estimator/inputs/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/api/_v2/v2.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/baseline.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/boosted_trees.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/boosted_trees_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/dnn.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/dnn_linear_combined.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/dnn_testing_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/kmeans.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_optimizer/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_optimizer/python/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_optimizer/python/utils/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_optimizer/python/utils/sdca_ops.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_optimizer/python/utils/sharded_mutable_dense_hashtable.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/linear_testing_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/metric_keys.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/optimizers.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/parsing_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/prediction_keys.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/saved_model_estimator.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/ar_model.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/estimators.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/feature_keys.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/math_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/model.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/model_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/saved_model_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/timeseries/state_management.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/v1/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/v1/dnn_testing_utils_v1.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/canned/v1/linear_testing_utils_v1.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/early_stopping.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/estimator.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/estimator_lib.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/export/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/export/export.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/export/export_lib.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/export/export_output.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/export/function.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/exporter.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/extenders.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/gc.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/base_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/binary_class_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/head_utils.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/multi_class_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/multi_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/multi_label_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/regression_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/head/sequential_head.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/hooks/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/hooks/basic_session_run_hooks.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/hooks/fake_summary_writer.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/hooks/hooks.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/hooks/session_run_hook.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/inputs.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/numpy_io.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/pandas_io.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/queues/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/queues/feeding_functions.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/inputs/queues/feeding_queue_runner.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/keras.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/mode_keys.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/model_fn.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/run_config.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/__init__.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/_tpu_estimator_embedding.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/error_handling.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/iteration_count_estimator.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/tpu_config.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/tpu_context.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/tpu_estimator.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/tpu/util.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/training.py +%%PYTHON_SITELIBDIR%%/tensorflow_estimator/python/estimator/util.py -- cgit From 6d41d4b8f72952b5cac42fbd5386d2b94d458c4c Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 17:28:39 +0000 Subject: ports-mgmt/modules2tuple: Update to 1.8.0 Changes: https://github.com/dmgk/modules2tuple/releases/tag/v1.8.0 PR: 239804 Submitted by: Dmitri Goutnik (maintainer) --- ports-mgmt/modules2tuple/Makefile | 3 +-- ports-mgmt/modules2tuple/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/modules2tuple/Makefile b/ports-mgmt/modules2tuple/Makefile index a37a3007e146..d5666040c71c 100644 --- a/ports-mgmt/modules2tuple/Makefile +++ b/ports-mgmt/modules2tuple/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= modules2tuple -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.0 DISTVERSIONPREFIX= v CATEGORIES= ports-mgmt @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} GO_BUILDFLAGS= -ldflags="-X main.version=${PORTVERSION}" USE_GITHUB= yes diff --git a/ports-mgmt/modules2tuple/distinfo b/ports-mgmt/modules2tuple/distinfo index 712fa2a4dee8..771a558362e6 100644 --- a/ports-mgmt/modules2tuple/distinfo +++ b/ports-mgmt/modules2tuple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562770025 -SHA256 (dmgk-modules2tuple-v1.7.3_GH0.tar.gz) = d9d9df136fa146eff77198019205d451abc9c5bc9bb99f427b571d5d743dacba -SIZE (dmgk-modules2tuple-v1.7.3_GH0.tar.gz) = 8017 +TIMESTAMP = 1565626763 +SHA256 (dmgk-modules2tuple-v1.8.0_GH0.tar.gz) = 8c9faaa9fec5e80b1b293a011659c30c378ddcd2d309528b86aabbcd66c732d6 +SIZE (dmgk-modules2tuple-v1.8.0_GH0.tar.gz) = 8045 -- cgit From cd0e6d4eefbbbde8932cb2259fbebe9452f2f356 Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 12 Aug 2019 17:43:35 +0000 Subject: www/chromium: Sync sndio backend with OpenBSD and unbreak build after r508722 ../../media/audio/openbsd/audio_manager_openbsd.cc:158:14: error: allocating an object of abstract class type 'media::SndioAudioOutputStream' return new SndioAudioOutputStream(params, this); ^ ../../media/audio/audio_io.h:117:16: note: unimplemented pure virtual method 'Flush' in 'SndioAudioOutputStream' virtual void Flush() = 0; PR: 239802 Submitted by: tobik Reported by: kib Tested by: kib Approved by: chromium (cpm) MFH: 2019Q3 (together with r508722) --- www/chromium/files/sndio_output.cc | 8 ++++++-- www/chromium/files/sndio_output.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/www/chromium/files/sndio_output.cc b/www/chromium/files/sndio_output.cc index d806113e6216..fd299a845bfc 100644 --- a/www/chromium/files/sndio_output.cc +++ b/www/chromium/files/sndio_output.cc @@ -58,7 +58,7 @@ bool SndioAudioOutputStream::Open() { sio_initpar(&par); par.rate = params.sample_rate(); par.pchan = params.channels(); - par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); par.bps = par.bits / 8; par.sig = sig = par.bits != 8 ? 1 : 0; par.le = SIO_LE_NATIVE; @@ -139,6 +139,10 @@ void SndioAudioOutputStream::GetVolume(double* v) { pthread_mutex_unlock(&mutex); } +// This stream is always used with sub second buffer sizes, where it's +// sufficient to simply always flush upon Start(). +void SndioAudioOutputStream::Flush() {} + void SndioAudioOutputStream::ThreadLoop(void) { int avail, count, result; @@ -153,7 +157,7 @@ void SndioAudioOutputStream::ThreadLoop(void) { // Get data to play const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, - params.sample_rate()); + params.sample_rate()); count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); if (count == 0) { diff --git a/www/chromium/files/sndio_output.h b/www/chromium/files/sndio_output.h index eef460ef65b5..ead220ca96e7 100644 --- a/www/chromium/files/sndio_output.h +++ b/www/chromium/files/sndio_output.h @@ -31,6 +31,7 @@ class SndioAudioOutputStream : public AudioOutputStream { void Stop() override; void SetVolume(double volume) override; void GetVolume(double* volume) override; + void Flush() override; friend void sndio_onmove(void *arg, int delta); friend void sndio_onvol(void *arg, unsigned int vol); -- cgit From 1161164ea4e08c87ad69bad3acee6793abd37509 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 17:44:18 +0000 Subject: Remove expired port: 2019-05-08 cad/elmerfem: Broken for more than 6 months --- MOVED | 1 + cad/Makefile | 1 - cad/elmerfem/Makefile | 54 ----- cad/elmerfem/distinfo | 3 - cad/elmerfem/files/patch-CMakeLists.txt | 11 - .../files/patch-elmergrid_src_CMakeLists.txt | 11 - cad/elmerfem/files/patch-fem_src_CMakeLists.txt | 49 ----- cad/elmerfem/files/patch-matc_src_CMakeLists.txt | 11 - cad/elmerfem/files/patch-post-src-elmerpost.h | 10 - cad/elmerfem/files/patch-post-src-screensave.c | 10 - cad/elmerfem/pkg-descr | 14 -- cad/elmerfem/pkg-plist | 222 --------------------- 12 files changed, 1 insertion(+), 396 deletions(-) delete mode 100644 cad/elmerfem/Makefile delete mode 100644 cad/elmerfem/distinfo delete mode 100644 cad/elmerfem/files/patch-CMakeLists.txt delete mode 100644 cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt delete mode 100644 cad/elmerfem/files/patch-fem_src_CMakeLists.txt delete mode 100644 cad/elmerfem/files/patch-matc_src_CMakeLists.txt delete mode 100644 cad/elmerfem/files/patch-post-src-elmerpost.h delete mode 100644 cad/elmerfem/files/patch-post-src-screensave.c delete mode 100644 cad/elmerfem/pkg-descr delete mode 100644 cad/elmerfem/pkg-plist diff --git a/MOVED b/MOVED index 8b12a4ee6067..732fc80f9d25 100644 --- a/MOVED +++ b/MOVED @@ -12866,3 +12866,4 @@ www/rubygem-turbolinks-rails5|www/rubygem-turbolinks|2019-08-11|Remove unnecessa www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix textproc/sphinxsearch-devel|textproc/sphinxsearch|2019-08-11|Has expired: Broken for more than 6 months lang/dmd2||2019-08-11|Has expired: Broken for more than 6 months and upstream has no fix for statfs64 +cad/elmerfem||2019-08-12|Has expired: Broken for more than 6 months diff --git a/cad/Makefile b/cad/Makefile index 9fca7ffd98bc..f124677ec2e8 100644 --- a/cad/Makefile +++ b/cad/Makefile @@ -23,7 +23,6 @@ SUBDIR += dxf2fig SUBDIR += electric SUBDIR += electric-ng - SUBDIR += elmerfem SUBDIR += feappv SUBDIR += fidocadj SUBDIR += freecad diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile deleted file mode 100644 index cc3d0d89478e..000000000000 --- a/cad/elmerfem/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# Created by: Pedro Giffuni -# $FreeBSD$ - -PORTNAME= elmerfem -PORTVERSION= 8.3.20170524 -PORTREVISION= 6 -CATEGORIES= cad science - -MAINTAINER= ports@FreeBSD.org -COMMENT= ELMER FEM package - -LICENSE= GPLv2 - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 - -LIB_DEPENDS= libparpack.so:math/arpack-ng \ - libmpich.so:net/mpich - -USE_GITHUB= yes -GH_ACCOUNT= ElmerCSC -GH_TAGNAME= release-8.3 - -USES= blaslapack:netlib cmake fortran gmake tcl - -USE_LDCONFIG= ${PREFIX}/lib/elmersolver -ALL_TARGET= # empty - -CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON -.if !defined(MAINTAINER_MODE) -CMAKE_ARGS+= -Wno-dev -.endif - -.include - -.if ${ARCH} == "amd64" -CFLAGS_${ARCH}= -fPIC -CXXFLAGS_${ARCH}= -fPIC -FCFLAGS+= -fPIC -FFLAGS+= -fPIC -.endif - -LDFLAGS+= -L${LOCALBASE}/lib -FCPPFLAGS+= -ansi - -post-install: - ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver - @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid - -do-test: - cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source - -.include diff --git a/cad/elmerfem/distinfo b/cad/elmerfem/distinfo deleted file mode 100644 index dc199ad1fa9d..000000000000 --- a/cad/elmerfem/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1522698688 -SHA256 (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 78aee1f7a364baf7dc26c738eb0e613e9b496e105a6ff88f48d0c281ec8c3cde -SIZE (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 57956283 diff --git a/cad/elmerfem/files/patch-CMakeLists.txt b/cad/elmerfem/files/patch-CMakeLists.txt deleted file mode 100644 index b50e7194c125..000000000000 --- a/cad/elmerfem/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2017-05-19 12:19:26 UTC -+++ CMakeLists.txt -@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack) - ADD_SUBDIRECTORY(fhutiter) - ADD_SUBDIRECTORY(meshgen2d) - ADD_SUBDIRECTORY(fem) --ADD_SUBDIRECTORY(mathlibs) -+#ADD_SUBDIRECTORY(mathlibs) - ADD_SUBDIRECTORY(elmergrid) - ADD_SUBDIRECTORY(license_texts) - diff --git a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt b/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt deleted file mode 100644 index 5c75223da129..000000000000 --- a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- elmergrid/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC -+++ elmergrid/src/CMakeLists.txt -@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC - - TARGET_LINK_LIBRARIES(ElmerGrid metis m) - IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") - ENDIF() - - INSTALL(TARGETS ElmerGrid RUNTIME DESTINATION "bin") diff --git a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt deleted file mode 100644 index cf919d4b3f18..000000000000 --- a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- fem/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC -+++ fem/src/CMakeLists.txt -@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack - - - ADD_EXECUTABLE(Solver_TGT Solver.F90) --SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME}) -+SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}") - - IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) -- SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") -+ SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") - ENDIF() - - IF(NOT(WITH_MPI)) -@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME - INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") - - IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") - ENDIF() - - # GebhardFactors -@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ - mpi_stubs elmersolver) - - IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") - ENDIF() - - IF(WITH_Trilinos) -@@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE - - IF(WITH_MPI) - IF(NOT(WIN32)) -- INSTALL(CODE " -- EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver -- WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") -+ # Create symlink after, to respect STAGEDIR -+ #INSTALL(CODE " -+ #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver -+ #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") - ELSE() - INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy - \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe diff --git a/cad/elmerfem/files/patch-matc_src_CMakeLists.txt b/cad/elmerfem/files/patch-matc_src_CMakeLists.txt deleted file mode 100644 index e5a9710a11bc..000000000000 --- a/cad/elmerfem/files/patch-matc_src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- matc/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC -+++ matc/src/CMakeLists.txt -@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc) - - SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc) - IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") - ENDIF() - - INSTALL(TARGETS matc Matc_bin RUNTIME DESTINATION "bin" LIBRARY DESTINATION ${ELMER_INSTALL_LIB_DIR}) diff --git a/cad/elmerfem/files/patch-post-src-elmerpost.h b/cad/elmerfem/files/patch-post-src-elmerpost.h deleted file mode 100644 index d73397662797..000000000000 --- a/cad/elmerfem/files/patch-post-src-elmerpost.h +++ /dev/null @@ -1,10 +0,0 @@ ---- post/src/elmerpost.h.orig 2017-05-19 12:19:26 UTC -+++ post/src/elmerpost.h -@@ -62,6 +62,7 @@ - - #include - -+#define USE_INTERP_RESULT - - #if defined(MINGW32) || defined(WIN32) - diff --git a/cad/elmerfem/files/patch-post-src-screensave.c b/cad/elmerfem/files/patch-post-src-screensave.c deleted file mode 100644 index e241be074f14..000000000000 --- a/cad/elmerfem/files/patch-post-src-screensave.c +++ /dev/null @@ -1,10 +0,0 @@ ---- post/src/screensave.c.orig 2017-05-19 12:19:26 UTC -+++ post/src/screensave.c -@@ -32,6 +32,7 @@ - #include - - -+#define USE_INTERP_RESULT - #include "tcl.h" - - #if !(defined(WIN32) || defined(win32)) diff --git a/cad/elmerfem/pkg-descr b/cad/elmerfem/pkg-descr deleted file mode 100644 index 1d4938093881..000000000000 --- a/cad/elmerfem/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Elmer - Open Source Finite Element Software for Multiphysical Problems. - -Elmer is an open source multiphysical simulation software mainly -developed by CSC - IT Center for Science (CSC). Elmer development was -started 1995 in collaboration with Finnish Universities, research institutes -and industry. After it's open source publication in 2005, the use and -development of Elmer has become international. - -Elmer includes physical models of fluid dynamics, structural mechanics, -electromagnetics, heat transfer and acoustics, for example. These are -described by partial differential equations which Elmer solves by the -Finite Element Method (FEM). - -WWW: https://www.csc.fi/web/elmer/ diff --git a/cad/elmerfem/pkg-plist b/cad/elmerfem/pkg-plist deleted file mode 100644 index c078c28a3d09..000000000000 --- a/cad/elmerfem/pkg-plist +++ /dev/null @@ -1,222 +0,0 @@ -bin/ElmerGrid -bin/ElmerSolver -bin/ElmerSolver_mpi -bin/GebhardtFactors -bin/Mesh2D -bin/ViewFactors -bin/elmerf90 -bin/elmerld -bin/matc -lib/elmersolver/libamd.a -lib/elmersolver/libamdf77.a -lib/elmersolver/libelmersolver.so -lib/elmersolver/libfhuti.so -lib/elmersolver/libmatc.so -lib/elmersolver/libmpi_stubs.so -lib/elmersolver/libumfpack.a -share/elmersolver/include/adaptive.mod -share/elmersolver/include/ascbinoutpututils.mod -share/elmersolver/include/bandmatrix.mod -share/elmersolver/include/bandwidthoptimize.mod -share/elmersolver/include/binio.mod -share/elmersolver/include/blocksolve.mod -share/elmersolver/include/blowers.mod -share/elmersolver/include/circmatinitmod.mod -share/elmersolver/include/circuitsmod.mod -share/elmersolver/include/circuitutils.mod -share/elmersolver/include/clusteringmethods.mod -share/elmersolver/include/componentutils.mod -share/elmersolver/include/coordinatesystems.mod -share/elmersolver/include/crsmatrix.mod -share/elmersolver/include/defutils.mod -share/elmersolver/include/differentials.mod -share/elmersolver/include/diffuseconvective.mod -share/elmersolver/include/diffuseconvectivegeneral.mod -share/elmersolver/include/directsolve.mod -share/elmersolver/include/dxfile.mod -share/elmersolver/include/eigensolve.mod -share/elmersolver/include/elementdescription.mod -share/elmersolver/include/elementutils.mod -share/elmersolver/include/exchangecorrelations.mod -share/elmersolver/include/fetisolve.mod -share/elmersolver/include/freesurface.mod -share/elmersolver/include/gebhardtfactorglobals.mod -share/elmersolver/include/generalutils.mod -share/elmersolver/include/globmat.mod -share/elmersolver/include/globmatc.mod -share/elmersolver/include/h1basis.mod -share/elmersolver/include/harmutils.mod -share/elmersolver/include/hashtable.mod -share/elmersolver/include/huti_aux.mod -share/elmersolver/include/huti_bicgstab.mod -share/elmersolver/include/huti_bicgstab_2.mod -share/elmersolver/include/huti_cg.mod -share/elmersolver/include/huti_cgs.mod -share/elmersolver/include/huti_gmres.mod -share/elmersolver/include/huti_interfaces.mod -share/elmersolver/include/huti_qmr.mod -share/elmersolver/include/huti_sfe.mod -share/elmersolver/include/huti_tfqmr.mod -share/elmersolver/include/integration.mod -share/elmersolver/include/interpolation.mod -share/elmersolver/include/iso_varying_string.mod -share/elmersolver/include/iterativemethods.mod -share/elmersolver/include/itersolve.mod -share/elmersolver/include/kinds.mod -share/elmersolver/include/linearalgebra.mod -share/elmersolver/include/linearforms.mod -share/elmersolver/include/listmatrix.mod -share/elmersolver/include/lists.mod -share/elmersolver/include/loadmod.mod -share/elmersolver/include/ludecomposition.mod -share/elmersolver/include/magnetodynamicsutils.mod -share/elmersolver/include/mainutils.mod -share/elmersolver/include/materialmodels.mod -share/elmersolver/include/maxwell.mod -share/elmersolver/include/maxwellaxis.mod -share/elmersolver/include/maxwellgeneral.mod -share/elmersolver/include/meshutils.mod -share/elmersolver/include/messages.mod -share/elmersolver/include/mgdynmaterialutils.mod -share/elmersolver/include/modeldescription.mod -share/elmersolver/include/multigrid.mod -share/elmersolver/include/navierstokes.mod -share/elmersolver/include/navierstokescylindrical.mod -share/elmersolver/include/navierstokesgeneral.mod -share/elmersolver/include/paralleleigensolve.mod -share/elmersolver/include/parallelutils.mod -share/elmersolver/include/particledynamicsstuff.mod -share/elmersolver/include/particleutils.mod -share/elmersolver/include/pelementbase.mod -share/elmersolver/include/pelementmaps.mod -share/elmersolver/include/porousmaterials.mod -share/elmersolver/include/radiation.mod -share/elmersolver/include/radiationfactorglobals.mod -share/elmersolver/include/smoothers.mod -share/elmersolver/include/solverutils.mod -share/elmersolver/include/sparitercomm.mod -share/elmersolver/include/spariterglobals.mod -share/elmersolver/include/spariterprecond.mod -share/elmersolver/include/sparitersolve.mod -share/elmersolver/include/statelecboundaryutils.mod -share/elmersolver/include/stressgeneral.mod -share/elmersolver/include/stresslocal.mod -share/elmersolver/include/timeintegrate.mod -share/elmersolver/include/toroidcurrents.mod -share/elmersolver/include/types.mod -share/elmersolver/include/vectorhelmholtzutils.mod -share/elmersolver/include/vecutils.mod -share/elmersolver/include/viewfactorglobals.mod -share/elmersolver/include/vtklegacyfile.mod -share/elmersolver/lib/Acoustics.so -share/elmersolver/lib/AdvectionDiffusion.so -share/elmersolver/lib/AdvectionReaction.so -share/elmersolver/lib/ArteryOutlet.so -share/elmersolver/lib/ArtificialCompressibility.so -share/elmersolver/lib/CircuitsAndDynamics.so -share/elmersolver/lib/CoilSolver.so -share/elmersolver/lib/CompressibleNS.so -share/elmersolver/lib/CoordinateTransform.so -share/elmersolver/lib/CoupledNSUpdate.so -share/elmersolver/lib/CraigBamptonSolver.so -share/elmersolver/lib/DCRComplexSolve.so -share/elmersolver/lib/DFTSolver.so -share/elmersolver/lib/DataToFieldSolver.so -share/elmersolver/lib/DirectionSolver.so -share/elmersolver/lib/DistanceSolve.so -share/elmersolver/lib/DivProjection.so -share/elmersolver/lib/DivergenceSolver.so -share/elmersolver/lib/ElasticSolve.so -share/elmersolver/lib/ElectricForce.so -share/elmersolver/lib/Electrokinetics.so -share/elmersolver/lib/ElementSizeSolver.so -share/elmersolver/lib/ElementStats.so -share/elmersolver/lib/EliminateDirichlet.so -share/elmersolver/lib/EliminatePeriodic.so -share/elmersolver/lib/Elmer2OpenFoamIO.so -share/elmersolver/lib/EnergyRelease.so -share/elmersolver/lib/FDiffusion.so -share/elmersolver/lib/FDiffusion3D.so -share/elmersolver/lib/FacetShellSolve.so -share/elmersolver/lib/FilterTimeSeries.so -share/elmersolver/lib/FindOptimum.so -share/elmersolver/lib/FlowSolve.so -share/elmersolver/lib/FluidicForce.so -share/elmersolver/lib/FluxSolver.so -share/elmersolver/lib/FourierLoss.so -share/elmersolver/lib/FreeSurfaceReduced.so -share/elmersolver/lib/FreeSurfaceSolver.so -share/elmersolver/lib/HarmonicSignals.so -share/elmersolver/lib/HeatSolve.so -share/elmersolver/lib/HelmholtzBEM.so -share/elmersolver/lib/HelmholtzSolve.so -share/elmersolver/lib/Isosurface.so -share/elmersolver/lib/KESolver.so -share/elmersolver/lib/Komega.so -share/elmersolver/lib/LevelSet.so -share/elmersolver/lib/MagneticSolve.so -share/elmersolver/lib/MagnetoDynamics.so -share/elmersolver/lib/MagnetoDynamics2D.so -share/elmersolver/lib/MeshSolve.so -share/elmersolver/lib/ModelPDE.so -share/elmersolver/lib/MovingElstatSolver.so -share/elmersolver/lib/NonphysicalMeshSolve.so -share/elmersolver/lib/NormalSolver.so -share/elmersolver/lib/OdeSolver.so -share/elmersolver/lib/ParStokes.so -share/elmersolver/lib/ParticleAdvector.so -share/elmersolver/lib/ParticleDynamics.so -share/elmersolver/lib/PartitionMesh.so -share/elmersolver/lib/PhaseChangeSolve.so -share/elmersolver/lib/Poisson.so -share/elmersolver/lib/PoissonBEM.so -share/elmersolver/lib/PoissonBoltzmannSolve.so -share/elmersolver/lib/PressurePrecond.so -share/elmersolver/lib/PressureUpdate.so -share/elmersolver/lib/ProjectToPlane.so -share/elmersolver/lib/RateOfChange.so -share/elmersolver/lib/ReloadData.so -share/elmersolver/lib/ReloadInput.so -share/elmersolver/lib/ResultOutputSolve.so -share/elmersolver/lib/ReynoldsSolver.so -share/elmersolver/lib/RichardsSolver.so -share/elmersolver/lib/RigidBodyReduction.so -share/elmersolver/lib/RigidMeshMapper.so -share/elmersolver/lib/SOLVER.KEYWORDS -share/elmersolver/lib/SSTKomega.so -share/elmersolver/lib/SaveData.so -share/elmersolver/lib/SaveGridData.so -share/elmersolver/lib/SaveMesh.so -share/elmersolver/lib/ScalarPotentialSolver.so -share/elmersolver/lib/ScannedFieldSolver.so -share/elmersolver/lib/ShallowWaterNS.so -share/elmersolver/lib/ShearrateSolver.so -share/elmersolver/lib/ShellSolver.so -share/elmersolver/lib/Smitc.so -share/elmersolver/lib/Spalart-Allmaras.so -share/elmersolver/lib/StatCurrentSolve.so -share/elmersolver/lib/StatElecBoundary.so -share/elmersolver/lib/StatElecSolve.so -share/elmersolver/lib/StatMagSolve.so -share/elmersolver/lib/SteadyPhaseChange.so -share/elmersolver/lib/Stokes.so -share/elmersolver/lib/StreamSolver.so -share/elmersolver/lib/StressSolve.so -share/elmersolver/lib/StructuredFlowLine.so -share/elmersolver/lib/StructuredMeshMapper.so -share/elmersolver/lib/StructuredProjectToPlane.so -share/elmersolver/lib/ThermoElectricSolver.so -share/elmersolver/lib/TransientPhaseChange.so -share/elmersolver/lib/TransportEquation.so -share/elmersolver/lib/V2FSolver.so -share/elmersolver/lib/VectorHelmholtz.so -share/elmersolver/lib/VelocityPrecond.so -share/elmersolver/lib/ViscousCompressibility.so -share/elmersolver/lib/VorticitySolver.so -share/elmersolver/lib/WPotentialSolver.so -share/elmersolver/lib/WaveSolver.so -share/elmersolver/lib/elements.def -share/elmersolver/license_texts/GPL-2.txt -share/elmersolver/license_texts/LGPL-2.1.txt -share/elmersolver/license_texts/LICENSES -share/elmersolver/license_texts/fem/LICENSES -- cgit From cac554a8216fa9199321f326758e22613db5f463 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 17:55:13 +0000 Subject: sysutils/cluster-glue: remove support for expired sysutils/openhpi --- sysutils/cluster-glue/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile index 59b0d9af3d66..74b2ef9cbd24 100644 --- a/sysutils/cluster-glue/Makefile +++ b/sysutils/cluster-glue/Makefile @@ -35,13 +35,14 @@ WRKSRC= ${WRKDIR}/Reusable-Cluster-Components-glue--${DISTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-fatal-warnings \ --with-initdir=${PREFIX}/etc/rc.d \ - --with-ocf-root=${PREFIX}/etc/ocf + --with-ocf-root=${PREFIX}/etc/ocf \ + ac_cv_header_openhpi_SaHpi_h=no INSTALL_TARGET= install-strip USERS= hacluster GROUPS= haclient -OPTIONS_DEFINE= DOCS DRAC3 HPI IPMI MANPAGES SNMP +OPTIONS_DEFINE= DOCS DRAC3 IPMI MANPAGES SNMP OPTIONS_DEFAULT= DRAC3 IPMI MANPAGES SNMP OPTIONS_SUB= yes @@ -49,10 +50,6 @@ DRAC3_CONFIGURE_OFF= ac_cv_header_curl_curl_h=no DRAC3_DESC= Dell DRAC III support DRAC3_LIB_DEPENDS= libcurl.so:ftp/curl -HPI_CONFIGURE_OFF= ac_cv_header_openhpi_SaHpi_h=no -HPI_DESC= SAF Hardware Platform Interface support -HPI_LIB_DEPENDS= libopenhpi.so:sysutils/openhpi - IPMI_CONFIGURE_ENABLE= ipmilan IPMI_DESC= Intelligent Platform Management Interface support IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi -- cgit From d9e3629bc1fc043dcfc7cdb428e7f5a0cf9d8864 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 18:01:09 +0000 Subject: Remove expired port: 2019-05-08 sysutils/openhpi: Broken for more than 6 months --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/openhpi/Makefile | 55 - sysutils/openhpi/distinfo | 2 - sysutils/openhpi/files/openhpid.in | 25 - sysutils/openhpi/files/patch-baselib-session.cpp | 11 - sysutils/openhpi/files/patch-configure | 65 - .../patch-plugins-dynamic_simulator-new_sim.cpp | 1273 -------------------- .../files/patch-plugins-ipmidirect-ipmi.cpp | 692 ----------- sysutils/openhpi/pkg-descr | 10 - sysutils/openhpi/pkg-plist | 136 --- 11 files changed, 1 insertion(+), 2270 deletions(-) delete mode 100644 sysutils/openhpi/Makefile delete mode 100644 sysutils/openhpi/distinfo delete mode 100644 sysutils/openhpi/files/openhpid.in delete mode 100644 sysutils/openhpi/files/patch-baselib-session.cpp delete mode 100644 sysutils/openhpi/files/patch-configure delete mode 100644 sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp delete mode 100644 sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp delete mode 100644 sysutils/openhpi/pkg-descr delete mode 100644 sysutils/openhpi/pkg-plist diff --git a/MOVED b/MOVED index 732fc80f9d25..84594b01ffb4 100644 --- a/MOVED +++ b/MOVED @@ -12867,3 +12867,4 @@ www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecess textproc/sphinxsearch-devel|textproc/sphinxsearch|2019-08-11|Has expired: Broken for more than 6 months lang/dmd2||2019-08-11|Has expired: Broken for more than 6 months and upstream has no fix for statfs64 cad/elmerfem||2019-08-12|Has expired: Broken for more than 6 months +sysutils/openhpi||2019-08-12|Has expired: Broken for more than 6 months diff --git a/sysutils/Makefile b/sysutils/Makefile index 4411c139e2cf..28181a240ff3 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -757,7 +757,6 @@ SUBDIR += ohmu SUBDIR += omnibackup SUBDIR += open - SUBDIR += openhpi SUBDIR += openipmi SUBDIR += openupsd SUBDIR += openzfs diff --git a/sysutils/openhpi/Makefile b/sysutils/openhpi/Makefile deleted file mode 100644 index abde86b19a5f..000000000000 --- a/sysutils/openhpi/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# $FreeBSD$ - -PORTNAME= openhpi -PORTVERSION= 3.6.1 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= SF/openhpi/openhpi-stable/${PORTVERSION}/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Hardware Platform Interface implementation - -LICENSE= OPENHPI -LICENSE_NAME= OpenHPI license -LICENSE_FILE= ${WRKSRC}/COPYING -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 - -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libnetsnmp.so:net-mgmt/net-snmp \ - libgcrypt.so:security/libgcrypt - -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip -USES= gmake gnome libtool pathfix perl5 pkgconfig shebangfix ssl -SHEBANG_FILES= plugins/snmp_bc/eventmap2code.pl scripts/text2cstr.pl -USE_GNOME= glib20 libxml2 -USE_LDCONFIG= yes -USE_PERL5= build -USE_RC_SUBR= openhpid - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} 's/-lstdc++//' \ - ${WRKSRC}/baselib/Makefile.in \ - ${WRKSRC}/openhpid/Makefile.in \ - ${WRKSRC}/plugins/dynamic_simulator/Makefile.in \ - ${WRKSRC}/plugins/ipmidirect/Makefile.in - @${REINPLACE_CMD} '/XML2_INCLUDE=/s|=.*|=-I${LOCALBASE}/include/libxml2|' \ - ${WRKSRC}/configure - -post-install: - ${MV} ${STAGEDIR}${ETCDIR}/openhpi.conf \ - ${STAGEDIR}${ETCDIR}/openhpi.conf.sample - ${MV} ${STAGEDIR}${ETCDIR}/openhpiclient.conf \ - ${STAGEDIR}${ETCDIR}/openhpiclient.conf.sample - ${MV} ${STAGEDIR}${ETCDIR}/simulation.data \ - ${STAGEDIR}${ETCDIR}/simulation.data.sample - -.include diff --git a/sysutils/openhpi/distinfo b/sysutils/openhpi/distinfo deleted file mode 100644 index 415219b0cbf9..000000000000 --- a/sysutils/openhpi/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (openhpi-3.6.1.tar.gz) = e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc -SIZE (openhpi-3.6.1.tar.gz) = 7718590 diff --git a/sysutils/openhpi/files/openhpid.in b/sysutils/openhpi/files/openhpid.in deleted file mode 100644 index 7ff9b6bfd7cf..000000000000 --- a/sysutils/openhpi/files/openhpid.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: openhpid -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following to /etc/rc.conf[.local] to enable this service -# -# openhpid_enable="YES" -# - -. /etc/rc.subr - -: ${openhpid_enable:=NO} ${openhpid_config:=%%ETCDIR%%/openhpi.conf} - -name=openhpid -rcvar=openhpid_enable -command="%%PREFIX%%/sbin/openhpid" -command_args="-c ${openhpid_config}" -required_files="${openhpid_config}" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/openhpi/files/patch-baselib-session.cpp b/sysutils/openhpi/files/patch-baselib-session.cpp deleted file mode 100644 index 2cf06cf0aea8..000000000000 --- a/sysutils/openhpi/files/patch-baselib-session.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- baselib/session.cpp.orig 2015-09-14 22:48:33 UTC -+++ baselib/session.cpp -@@ -118,7 +118,7 @@ cSession::cSession() - m_remote_sid( 0 ) - { - #if GLIB_CHECK_VERSION (2, 32, 0) -- m_sockets = G_PRIVATE_INIT (g_free); -+ m_sockets = (GPrivate) G_PRIVATE_INIT (g_free); - #else - wrap_g_static_private_init( &m_sockets ); - #endif diff --git a/sysutils/openhpi/files/patch-configure b/sysutils/openhpi/files/patch-configure deleted file mode 100644 index c956e60798a9..000000000000 --- a/sysutils/openhpi/files/patch-configure +++ /dev/null @@ -1,65 +0,0 @@ ---- configure.orig 2015-09-14 22:59:50 UTC -+++ configure -@@ -15704,51 +15704,6 @@ fi - fi - - --# check for gcc version -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc >= 3.2" >&5 --$as_echo_n "checking gcc >= 3.2... " >&6; } -- -- GCCVERSIONOK=`gcc -dumpversion | \ -- sed 's/\./ /g' | \ -- awk '{ \ -- if ( $1 > 3) { \ -- print "OK"; \ -- } \ -- if ( $1 == 3 ) { \ -- if( $2 > 2 ) { \ -- print "OK"; \ -- } \ -- if( $2 == 2 ) { \ -- print "OK"; \ -- } \ -- } \ -- }'` \ -- -- if test "$GCCVERSIONOK" = "OK"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- -- OH_MSG=`echo -e "- gcc >= 3.2 is required to build OpenHPI not found!\n"` -- if test "x" != "x"; then -- OH_MSG=`echo -e "$OH_MSG\n- "` -- fi -- if test "x" != "x"; then -- OH_MSG=`echo -e "$OH_MSG\n- Try installing the package\n"` -- fi -- if test "x" != "x"; then -- OH_MSG=`echo -e "$OH_MSG\n- or get the latest software from \n"` -- fi -- -- as_fn_error $? "! --************************************************************ --$OH_MSG --************************************************************ --" "$LINENO" 5 -- -- -- fi - - - GLIB_REQUIRED_VERSION=2.12 -@@ -17337,10 +17292,6 @@ if test "${enable_werror+set}" = set; th - fi - - --if test -n "`gcc --version | grep ' 3.2'`" ; then -- CC_WARNINGS=`echo $CC_WARNINGS | sed -e 's/-Wno-strict-aliasing//g'` -- CXX_WARNINGS=`echo $CC_WARNINGS | sed -e 's/-Wno-strict-aliasing//g'` --fi - - case $host_os in - solaris*) diff --git a/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp b/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp deleted file mode 100644 index 16fde92bc69f..000000000000 --- a/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp +++ /dev/null @@ -1,1273 +0,0 @@ ---- plugins/dynamic_simulator/new_sim.cpp.orig 2015-09-14 22:48:28 UTC -+++ plugins/dynamic_simulator/new_sim.cpp -@@ -411,11 +411,8 @@ static NewSimulatorDimi *VerifyDimiAndEn - //@{ - // new plugin_loader - extern "C" { -+#pragma GCC visibility push(hidden) - --/** -- * Alias for @ref öh_open(), implemented by @ref NewSimulatorOpen(). -- **/ --static void * NewSimulatorOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used)); - - /** - * @fn NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, -@@ -431,7 +428,7 @@ static void * NewSimulatorOpen( GHashTab - * - * @return pointer on handler if everything works successfully. - **/ --static void * NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, -+void * NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, - oh_evt_queue *eventq ) { - // open log - const char *logfile = 0; -@@ -528,17 +525,12 @@ static void * NewSimulatorOpen( GHashTab - } - - /** -- * Alias for @ref öh_close(), implemented by @ref NewSimulatorClose(). -- **/ --static void NewSimulatorClose( void * ) __attribute__((used)); -- --/** - * @relate NewSimulatorClose - * Close the plugin and clean up the allocated memory. - * - * @param hnd pointer on handler - **/ --static void NewSimulatorClose( void *hnd ) { -+void NewSimulatorClose( void *hnd ) { - dbg( "NewSimulatorClose" ); - - NewSimulator *newsim = VerifyNewSimulator( hnd ); -@@ -585,9 +577,7 @@ static void NewSimulatorClose( void *hnd - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetEvent( void * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetEvent( void *hnd ) { -+SaErrorT NewSimulatorGetEvent( void *hnd ) { - dbg( "NewSimulatorGetEvent" ); - - NewSimulator *newsim = VerifyNewSimulator( hnd ); -@@ -613,9 +603,7 @@ static SaErrorT NewSimulatorGetEvent( vo - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorDiscoverResources( void * ) __attribute__((used)); -- --static SaErrorT NewSimulatorDiscoverResources( void *hnd ) { -+SaErrorT NewSimulatorDiscoverResources( void *hnd ) { - dbg( "NewSimulatorDiscoverResources" ); - NewSimulator *newsim = VerifyNewSimulator( hnd ); - -@@ -641,9 +629,7 @@ static SaErrorT NewSimulatorDiscoverReso - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetResourceTag( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetResourceTag( void *hnd, SaHpiResourceIdT id, - SaHpiTextBufferT *tag ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -669,9 +655,7 @@ static SaErrorT NewSimulatorSetResourceT - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetResourceSeverity( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetResourceSeverity( void *hnd, SaHpiResourceIdT id, - SaHpiSeverityT sev ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -699,13 +683,7 @@ static SaErrorT NewSimulatorSetResourceS - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSensorReading( void *, -- SaHpiResourceIdT id, -- SaHpiSensorNumT num, -- SaHpiSensorReadingT *data, -- SaHpiEventStateT *state ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSensorReading( void *hnd, -+SaErrorT NewSimulatorGetSensorReading( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiSensorReadingT *data, -@@ -735,12 +713,7 @@ static SaErrorT NewSimulatorGetSensorRea - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSensorThresholds( void *hnd, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiSensorThresholdsT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSensorThresholds( void *hnd, -+SaErrorT NewSimulatorGetSensorThresholds( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiSensorThresholdsT *thres ) { -@@ -774,12 +747,7 @@ static SaErrorT NewSimulatorGetSensorThr - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSensorThresholds( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- const SaHpiSensorThresholdsT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSensorThresholds( void *hnd, -+SaErrorT NewSimulatorSetSensorThresholds( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - const SaHpiSensorThresholdsT *thres ) { -@@ -812,12 +780,7 @@ static SaErrorT NewSimulatorSetSensorThr - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSensorEnable( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSensorEnable( void *hnd, -+SaErrorT NewSimulatorGetSensorEnable( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiBoolT *enable ) { -@@ -846,12 +809,7 @@ static SaErrorT NewSimulatorGetSensorEna - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSensorEnable( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSensorEnable( void *hnd, -+SaErrorT NewSimulatorSetSensorEnable( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiBoolT enable ) { -@@ -880,12 +838,7 @@ static SaErrorT NewSimulatorSetSensorEna - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSensorEventEnables( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSensorEventEnables( void *hnd, -+SaErrorT NewSimulatorGetSensorEventEnables( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiBoolT *enables ) { -@@ -913,12 +866,7 @@ static SaErrorT NewSimulatorGetSensorEve - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSensorEventEnables( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSensorEventEnables( void *hnd, -+SaErrorT NewSimulatorSetSensorEventEnables( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiBoolT enables ) { -@@ -948,13 +896,7 @@ static SaErrorT NewSimulatorSetSensorEve - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSensorEventMasks( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiEventStateT *, -- SaHpiEventStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSensorEventMasks( void *hnd, -+SaErrorT NewSimulatorGetSensorEventMasks( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiEventStateT *AssertEventMask, -@@ -985,14 +927,7 @@ static SaErrorT NewSimulatorGetSensorEve - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSensorEventMasks( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiSensorEventMaskActionT, -- SaHpiEventStateT, -- SaHpiEventStateT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSensorEventMasks( void *hnd, -+SaErrorT NewSimulatorSetSensorEventMasks( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, - SaHpiSensorEventMaskActionT act, -@@ -1023,12 +958,7 @@ static SaErrorT NewSimulatorSetSensorEve - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetControlState( void *, SaHpiResourceIdT, -- SaHpiCtrlNumT, -- SaHpiCtrlModeT *, -- SaHpiCtrlStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetControlState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetControlState( void *hnd, SaHpiResourceIdT id, - SaHpiCtrlNumT num, - SaHpiCtrlModeT *mode, - SaHpiCtrlStateT *state ) { -@@ -1058,12 +988,7 @@ static SaErrorT NewSimulatorGetControlSt - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetControlState( void *, SaHpiResourceIdT, -- SaHpiCtrlNumT, -- SaHpiCtrlModeT, -- SaHpiCtrlStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetControlState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetControlState( void *hnd, SaHpiResourceIdT id, - SaHpiCtrlNumT num, - SaHpiCtrlModeT mode, - SaHpiCtrlStateT *state ) { -@@ -1094,14 +1019,7 @@ static SaErrorT NewSimulatorSetControlSt - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetNextAnnouncement(void *, -- SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiSeverityT, -- SaHpiBoolT, -- SaHpiAnnouncementT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetNextAnnouncement(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetNextAnnouncement(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiSeverityT severity, - SaHpiBoolT unAckOnly, -@@ -1132,12 +1050,7 @@ static SaErrorT NewSimulatorGetNextAnnou - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetAnnouncement(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiEntryIdT, -- SaHpiAnnouncementT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetAnnouncement(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetAnnouncement(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiEntryIdT entryId, - SaHpiAnnouncementT *ann) { -@@ -1168,12 +1081,7 @@ static SaErrorT NewSimulatorGetAnnouncem - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAckAnnouncement(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiEntryIdT, -- SaHpiSeverityT) __attribute__((used)); -- --static SaErrorT NewSimulatorAckAnnouncement(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorAckAnnouncement(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiEntryIdT entryId, - SaHpiSeverityT severity) { -@@ -1203,11 +1111,7 @@ static SaErrorT NewSimulatorAckAnnouncem - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddAnnouncement(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiAnnouncementT *) __attribute__((used)); -- --static SaErrorT NewSimulatorAddAnnouncement(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorAddAnnouncement(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiAnnouncementT *ann) { - NewSimulator *newsim; -@@ -1236,12 +1140,7 @@ static SaErrorT NewSimulatorAddAnnouncem - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorDelAnnouncement(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiEntryIdT, -- SaHpiSeverityT) __attribute__((used)); -- --static SaErrorT NewSimulatorDelAnnouncement(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorDelAnnouncement(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiEntryIdT entryId, - SaHpiSeverityT severity) { -@@ -1271,11 +1170,7 @@ static SaErrorT NewSimulatorDelAnnouncem - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetAnnMode(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiAnnunciatorModeT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetAnnMode(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetAnnMode(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiAnnunciatorModeT *mode) { - -@@ -1304,11 +1199,7 @@ static SaErrorT NewSimulatorGetAnnMode(v - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetAnnMode(void *, SaHpiResourceIdT, -- SaHpiAnnunciatorNumT, -- SaHpiAnnunciatorModeT) __attribute__((used)); -- --static SaErrorT NewSimulatorSetAnnMode(void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetAnnMode(void *hnd, SaHpiResourceIdT id, - SaHpiAnnunciatorNumT num, - SaHpiAnnunciatorModeT mode) { - -@@ -1337,12 +1228,7 @@ static SaErrorT NewSimulatorSetAnnMode(v - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetIdrInfo( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrInfoT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetIdrInfo( void *hnd, -+SaErrorT NewSimulatorGetIdrInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrInfoT *idrinfo ) { -@@ -1374,15 +1260,7 @@ static SaErrorT NewSimulatorGetIdrInfo( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetIdrAreaHeader( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrAreaTypeT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiIdrAreaHeaderT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetIdrAreaHeader( void *hnd, -+SaErrorT NewSimulatorGetIdrAreaHeader( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrAreaTypeT areatype, -@@ -1415,13 +1293,7 @@ static SaErrorT NewSimulatorGetIdrAreaHe - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddIdrArea( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrAreaTypeT, -- SaHpiEntryIdT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorAddIdrArea( void *hnd, -+SaErrorT NewSimulatorAddIdrArea( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrAreaTypeT areatype, -@@ -1452,13 +1324,7 @@ static SaErrorT NewSimulatorAddIdrArea( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddIdrAreaById( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrAreaTypeT, -- SaHpiEntryIdT ) __attribute__((used)); -- --static SaErrorT NewSimulatorAddIdrAreaById( void *hnd, -+SaErrorT NewSimulatorAddIdrAreaById( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrAreaTypeT areatype, -@@ -1487,12 +1353,7 @@ static SaErrorT NewSimulatorAddIdrAreaBy - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorDelIdrArea( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT ) __attribute__((used)); -- --static SaErrorT NewSimulatorDelIdrArea( void *hnd, -+SaErrorT NewSimulatorDelIdrArea( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiEntryIdT areaid ) { -@@ -1525,16 +1386,7 @@ static SaErrorT NewSimulatorDelIdrArea( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT, -- SaHpiIdrFieldTypeT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetIdrField( void *hnd, -+SaErrorT NewSimulatorGetIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiEntryIdT areaid, -@@ -1567,12 +1419,7 @@ static SaErrorT NewSimulatorGetIdrField( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorAddIdrField( void *hnd, -+SaErrorT NewSimulatorAddIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrFieldT *field ) { -@@ -1601,12 +1448,7 @@ static SaErrorT NewSimulatorAddIdrField( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddIdrFieldById( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorAddIdrFieldById( void *hnd, -+SaErrorT NewSimulatorAddIdrFieldById( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrFieldT *field ) { -@@ -1634,12 +1476,7 @@ static SaErrorT NewSimulatorAddIdrFieldB - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetIdrField( void *hnd, -+SaErrorT NewSimulatorSetIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiIdrFieldT *field ) { -@@ -1668,13 +1505,7 @@ static SaErrorT NewSimulatorSetIdrField( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorDelIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT, -- SaHpiEntryIdT ) __attribute__((used)); -- --static SaErrorT NewSimulatorDelIdrField( void *hnd, -+SaErrorT NewSimulatorDelIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, - SaHpiEntryIdT areaid, -@@ -1702,11 +1533,7 @@ static SaErrorT NewSimulatorDelIdrField( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSelInfo( void *, -- SaHpiResourceIdT, -- SaHpiEventLogInfoT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSelInfo( void *hnd, -+SaErrorT NewSimulatorGetSelInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiEventLogInfoT *info ) { - -@@ -1736,9 +1563,7 @@ static SaErrorT NewSimulatorGetSelInfo( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) { -+SaErrorT NewSimulatorSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) { - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - - NewSimulator *newsim = VerifyNewSimulator( hnd ); -@@ -1766,9 +1591,7 @@ static SaErrorT NewSimulatorSetSelTime( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorAddSelEntry( void *, SaHpiResourceIdT, const SaHpiEventT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorAddSelEntry( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorAddSelEntry( void *hnd, SaHpiResourceIdT id, - const SaHpiEventT *Event ) { - - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; -@@ -1803,15 +1626,7 @@ static SaErrorT NewSimulatorAddSelEntry( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT, -- SaHpiEventLogEntryIdT, -- SaHpiEventLogEntryIdT *, -- SaHpiEventLogEntryIdT *, -- SaHpiEventLogEntryT *, -- SaHpiRdrT *, -- SaHpiRptEntryT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT id, - SaHpiEventLogEntryIdT current, - SaHpiEventLogEntryIdT *prev, - SaHpiEventLogEntryIdT *next, -@@ -1844,9 +1659,7 @@ static SaErrorT NewSimulatorGetSelEntry( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorClearSel( void *, SaHpiResourceIdT ) __attribute__((used)); -- --static SaErrorT NewSimulatorClearSel( void *hnd, SaHpiResourceIdT id ) { -+SaErrorT NewSimulatorClearSel( void *hnd, SaHpiResourceIdT id ) { - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - - NewSimulator *newsim = VerifyNewSimulator( hnd ); -@@ -1874,10 +1687,7 @@ static SaErrorT NewSimulatorClearSel( vo - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetSelState(void *, SaHpiResourceIdT, -- SaHpiBoolT) __attribute__((used)); -- --static SaErrorT NewSimulatorSetSelState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetSelState( void *hnd, SaHpiResourceIdT id, - SaHpiBoolT state ) { - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - -@@ -1906,10 +1716,7 @@ static SaErrorT NewSimulatorSetSelState( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSelState(void *, SaHpiResourceIdT, -- SaHpiBoolT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSelState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetSelState( void *hnd, SaHpiResourceIdT id, - SaHpiBoolT *state ) { - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - -@@ -1938,10 +1745,7 @@ static SaErrorT NewSimulatorGetSelState( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetSelCapability(void *, SaHpiResourceIdT, -- SaHpiEventLogCapabilitiesT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetSelCapability( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetSelCapability( void *hnd, SaHpiResourceIdT id, - SaHpiEventLogCapabilitiesT *caps ) { - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - -@@ -1969,10 +1773,7 @@ static SaErrorT NewSimulatorGetSelCapabi - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorResetSelOverflow(void *, SaHpiResourceIdT) -- __attribute__((used)); -- --static SaErrorT NewSimulatorResetSelOverflow( void *hnd, SaHpiResourceIdT id ) { -+SaErrorT NewSimulatorResetSelOverflow( void *hnd, SaHpiResourceIdT id ) { - - SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; - -@@ -2001,10 +1802,7 @@ static SaErrorT NewSimulatorResetSelOver - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorHotswapPolicyCancel( void *, SaHpiResourceIdT, -- SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT NewSimulatorHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT timeout) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -2031,10 +1829,7 @@ static SaErrorT NewSimulatorHotswapPolic - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetHotswapState( void *, SaHpiResourceIdT , -- SaHpiHsStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetHotswapState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetHotswapState( void *hnd, SaHpiResourceIdT id, - SaHpiHsStateT *state ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -2062,10 +1857,7 @@ static SaErrorT NewSimulatorGetHotswapSt - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetHotswapState( void *, SaHpiResourceIdT, -- SaHpiHsStateT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetHotswapState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetHotswapState( void *hnd, SaHpiResourceIdT id, - SaHpiHsStateT state ) { - SaErrorT rv = SA_OK; - NewSimulator *newsim = 0; -@@ -2104,10 +1896,7 @@ static SaErrorT NewSimulatorSetHotswapSt - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorRequestHotswapAction( void *, SaHpiResourceIdT, -- SaHpiHsActionT ) __attribute__((used)); -- --static SaErrorT NewSimulatorRequestHotswapAction( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorRequestHotswapAction( void *hnd, SaHpiResourceIdT id, - SaHpiHsActionT act ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -2136,12 +1925,7 @@ static SaErrorT NewSimulatorRequestHotsw - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetWatchdogInfo(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT, -- SaHpiWatchdogT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetWatchdogInfo(void *hnd, -+SaErrorT NewSimulatorGetWatchdogInfo(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num, - SaHpiWatchdogT *watchdog) { -@@ -2167,12 +1951,7 @@ static SaErrorT NewSimulatorGetWatchdogI - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetWatchdogInfo(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT, -- SaHpiWatchdogT *) __attribute__((used)); -- --static SaErrorT NewSimulatorSetWatchdogInfo(void *hnd, -+SaErrorT NewSimulatorSetWatchdogInfo(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num, - SaHpiWatchdogT *watchdog) { -@@ -2197,11 +1976,7 @@ static SaErrorT NewSimulatorSetWatchdogI - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorResetWatchdog(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorResetWatchdog(void *hnd, -+SaErrorT NewSimulatorResetWatchdog(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num) { - NewSimulator *newsim = 0; -@@ -2226,12 +2001,7 @@ static SaErrorT NewSimulatorResetWatchdo - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiSpec(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiFumiSpecInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiSpec(void *hnd, -+SaErrorT NewSimulatorGetFumiSpec(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiFumiSpecInfoT *spec) { -@@ -2257,12 +2027,7 @@ static SaErrorT NewSimulatorGetFumiSpec( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiServImpact(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiFumiServiceImpactDataT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiServImpact(void *hnd, -+SaErrorT NewSimulatorGetFumiServImpact(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiFumiServiceImpactDataT *impact) { -@@ -2290,13 +2055,7 @@ static SaErrorT NewSimulatorGetFumiServI - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetFumiSource(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiTextBufferT *) __attribute__((used)); -- --static SaErrorT NewSimulatorSetFumiSource(void *hnd, -+SaErrorT NewSimulatorSetFumiSource(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2324,12 +2083,7 @@ static SaErrorT NewSimulatorSetFumiSourc - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorValidateFumiSource(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorValidateFumiSource(void *hnd, -+SaErrorT NewSimulatorValidateFumiSource(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank) { -@@ -2357,13 +2111,7 @@ static SaErrorT NewSimulatorValidateFumi - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiSource(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiFumiSourceInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiSource(void *hnd, -+SaErrorT NewSimulatorGetFumiSource(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2394,15 +2142,7 @@ static SaErrorT NewSimulatorGetFumiSourc - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiSourceComponent(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiFumiComponentInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiSourceComponent(void *hnd, -+SaErrorT NewSimulatorGetFumiSourceComponent(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2433,13 +2173,7 @@ static SaErrorT NewSimulatorGetFumiSourc - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiTarget(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiFumiBankInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiTarget(void *hnd, -+SaErrorT NewSimulatorGetFumiTarget(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2470,15 +2204,7 @@ static SaErrorT NewSimulatorGetFumiTarge - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiTargetComponent(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiFumiComponentInfoT *) __attribute__((used)); -- -- static SaErrorT NewSimulatorGetFumiTargetComponent(void *hnd, -+SaErrorT NewSimulatorGetFumiTargetComponent(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2508,12 +2234,7 @@ static SaErrorT NewSimulatorGetFumiTarge - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiLogicalTarget(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiFumiLogicalBankInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiLogicalTarget(void *hnd, -+SaErrorT NewSimulatorGetFumiLogicalTarget(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiFumiLogicalBankInfoT *trg) { -@@ -2542,14 +2263,7 @@ static SaErrorT NewSimulatorGetFumiLogic - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiFumiLogicalComponentInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *hnd, -+SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiEntryIdT comp, -@@ -2577,11 +2291,7 @@ static SaErrorT NewSimulatorGetFumiLogic - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiBackup(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiBackup(void *hnd, -+SaErrorT NewSimulatorStartFumiBackup(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num) { - -@@ -2608,13 +2318,7 @@ static SaErrorT NewSimulatorStartFumiBac - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetFumiBankOrder(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiUint32T) __attribute__((used)); -- --static SaErrorT NewSimulatorSetFumiBankOrder(void *hnd, -+SaErrorT NewSimulatorSetFumiBankOrder(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2643,13 +2347,7 @@ static SaErrorT NewSimulatorSetFumiBankO - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiBankCopy(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiBankCopy(void *hnd, -+SaErrorT NewSimulatorStartFumiBankCopy(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2677,12 +2375,7 @@ static SaErrorT NewSimulatorStartFumiBan - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiInstall(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiInstall(void *hnd, -+SaErrorT NewSimulatorStartFumiInstall(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank) { -@@ -2710,13 +2403,7 @@ static SaErrorT NewSimulatorStartFumiIns - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiStatus(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT, -- SaHpiFumiUpgradeStatusT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiStatus(void *hnd, -+SaErrorT NewSimulatorGetFumiStatus(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank, -@@ -2744,12 +2431,7 @@ static SaErrorT NewSimulatorGetFumiStatu - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiVerification(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiVerification(void *hnd, -+SaErrorT NewSimulatorStartFumiVerification(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank) { -@@ -2774,11 +2456,7 @@ static SaErrorT NewSimulatorStartFumiVer - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiVerificationMain(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiVerificationMain(void *hnd, -+SaErrorT NewSimulatorStartFumiVerificationMain(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num) { - -@@ -2804,12 +2482,7 @@ static SaErrorT NewSimulatorStartFumiVer - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorCancelFumiUpgrade(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorCancelFumiUpgrade(void *hnd, -+SaErrorT NewSimulatorCancelFumiUpgrade(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank) { -@@ -2835,12 +2508,7 @@ static SaErrorT NewSimulatorCancelFumiUp - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetFumiRollback(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBoolT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetFumiRollback(void *hnd, -+SaErrorT NewSimulatorGetFumiRollback(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBoolT *rollb) { -@@ -2867,12 +2535,7 @@ static SaErrorT NewSimulatorGetFumiRollb - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetFumiRollback(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBoolT) __attribute__((used)); -- --static SaErrorT NewSimulatorSetFumiRollback(void *hnd, -+SaErrorT NewSimulatorSetFumiRollback(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBoolT rollb) { -@@ -2898,11 +2561,7 @@ static SaErrorT NewSimulatorSetFumiRollb - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiRollback(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiRollback(void *hnd, -+SaErrorT NewSimulatorStartFumiRollback(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num) { - -@@ -2927,11 +2586,7 @@ static SaErrorT NewSimulatorStartFumiRol - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorActivateFumi(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorActivateFumi(void *hnd, -+SaErrorT NewSimulatorActivateFumi(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num) { - -@@ -2957,12 +2612,7 @@ static SaErrorT NewSimulatorActivateFumi - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartFumiActivation(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBoolT) __attribute__((used)); -- --static SaErrorT NewSimulatorStartFumiActivation(void *hnd, -+SaErrorT NewSimulatorStartFumiActivation(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBoolT log) { -@@ -2989,12 +2639,7 @@ static SaErrorT NewSimulatorStartFumiAct - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorCleanupFumi(void *, -- SaHpiResourceIdT, -- SaHpiFumiNumT, -- SaHpiBankNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorCleanupFumi(void *hnd, -+SaErrorT NewSimulatorCleanupFumi(void *hnd, - SaHpiResourceIdT id, - SaHpiFumiNumT num, - SaHpiBankNumT bank) { -@@ -3020,12 +2665,7 @@ static SaErrorT NewSimulatorCleanupFumi( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetDimiInfo( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiInfoT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetDimiInfo( void *hnd, -+SaErrorT NewSimulatorGetDimiInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiInfoT *info) { -@@ -3053,13 +2693,7 @@ static SaErrorT NewSimulatorGetDimiInfo( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetDimiTestInfo( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT, -- SaHpiDimiTestT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetDimiTestInfo( void *hnd, -+SaErrorT NewSimulatorGetDimiTestInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum, -@@ -3088,13 +2722,7 @@ static SaErrorT NewSimulatorGetDimiTestI - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetDimiTestReadiness( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT, -- SaHpiDimiReadyT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetDimiTestReadiness( void *hnd, -+SaErrorT NewSimulatorGetDimiTestReadiness( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum, -@@ -3124,14 +2752,7 @@ static SaErrorT NewSimulatorGetDimiTestR - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorStartDimiTest( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT, -- SaHpiUint8T, -- SaHpiDimiTestVariableParamsT *) __attribute__((used)); -- --static SaErrorT NewSimulatorStartDimiTest( void *hnd, -+SaErrorT NewSimulatorStartDimiTest( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum, -@@ -3160,12 +2781,7 @@ static SaErrorT NewSimulatorStartDimiTes - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorCancelDimiTest( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT) __attribute__((used)); -- --static SaErrorT NewSimulatorCancelDimiTest( void *hnd, -+SaErrorT NewSimulatorCancelDimiTest( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum) { -@@ -3194,14 +2810,7 @@ static SaErrorT NewSimulatorCancelDimiTe - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetDimiTestStatus( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT, -- SaHpiDimiTestPercentCompletedT *, -- SaHpiDimiTestRunStatusT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetDimiTestStatus( void *hnd, -+SaErrorT NewSimulatorGetDimiTestStatus( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum, -@@ -3230,13 +2839,7 @@ static SaErrorT NewSimulatorGetDimiTestS - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetDimiTestResults( void *, -- SaHpiResourceIdT, -- SaHpiDimiNumT, -- SaHpiDimiTestNumT, -- SaHpiDimiTestResultsT *) __attribute__((used)); -- --static SaErrorT NewSimulatorGetDimiTestResults( void *hnd, -+SaErrorT NewSimulatorGetDimiTestResults( void *hnd, - SaHpiResourceIdT id, - SaHpiDimiNumT num, - SaHpiDimiTestNumT tnum, -@@ -3262,10 +2865,7 @@ static SaErrorT NewSimulatorGetDimiTestR - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetAutoInsertTimeout( void *, -- SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) { -+SaErrorT NewSimulatorSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) { - NewSimulator *newsim = VerifyNewSimulator( hnd ); - - if ( !newsim ) { -@@ -3288,10 +2888,7 @@ static SaErrorT NewSimulatorSetAutoInser - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetAutoExtractTimeout( void *, SaHpiResourceIdT, -- SaHpiTimeoutT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT *timeout ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3318,10 +2915,7 @@ static SaErrorT NewSimulatorGetAutoExtra - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetAutoExtractTimeout( void *, SaHpiResourceIdT, -- SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT timeout ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3349,10 +2943,7 @@ static SaErrorT NewSimulatorSetAutoExtra - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetPowerState( void *, SaHpiResourceIdT, -- SaHpiPowerStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetPowerState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetPowerState( void *hnd, SaHpiResourceIdT id, - SaHpiPowerStateT *state ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3381,10 +2972,7 @@ static SaErrorT NewSimulatorGetPowerStat - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetPowerState( void *, SaHpiResourceIdT, -- SaHpiPowerStateT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetPowerState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetPowerState( void *hnd, SaHpiResourceIdT id, - SaHpiPowerStateT state ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3413,10 +3001,7 @@ static SaErrorT NewSimulatorSetPowerStat - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetIndicatorState( void *, SaHpiResourceIdT, -- SaHpiHsIndicatorStateT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetIndicatorState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetIndicatorState( void *hnd, SaHpiResourceIdT id, - SaHpiHsIndicatorStateT *state ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3445,10 +3030,7 @@ static SaErrorT NewSimulatorGetIndicator - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetIndicatorState( void *, SaHpiResourceIdT, -- SaHpiHsIndicatorStateT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetIndicatorState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorSetIndicatorState( void *hnd, SaHpiResourceIdT id, - SaHpiHsIndicatorStateT state ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3477,11 +3059,7 @@ static SaErrorT NewSimulatorSetIndicator - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorControlParm( void *, -- SaHpiResourceIdT, -- SaHpiParmActionT ) __attribute__((used)); -- --static SaErrorT NewSimulatorControlParm( void *hnd, -+SaErrorT NewSimulatorControlParm( void *hnd, - SaHpiResourceIdT id, - SaHpiParmActionT act ) { - NewSimulator *newsim = 0; -@@ -3511,10 +3089,7 @@ static SaErrorT NewSimulatorControlParm( - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorGetResetState( void *, SaHpiResourceIdT, -- SaHpiResetActionT * ) __attribute__((used)); -- --static SaErrorT NewSimulatorGetResetState( void *hnd, SaHpiResourceIdT id, -+SaErrorT NewSimulatorGetResetState( void *hnd, SaHpiResourceIdT id, - SaHpiResetActionT *act ) { - NewSimulator *newsim = 0; - NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); -@@ -3543,11 +3118,7 @@ static SaErrorT NewSimulatorGetResetStat - * - * @return HPI error code - **/ --static SaErrorT NewSimulatorSetResetState( void *, -- SaHpiResourceIdT, -- SaHpiResetActionT ) __attribute__((used)); -- --static SaErrorT NewSimulatorSetResetState( void *hnd, -+SaErrorT NewSimulatorSetResetState( void *hnd, - SaHpiResourceIdT id, - SaHpiResetActionT act ) { - NewSimulator *newsim = 0; -@@ -3563,6 +3134,7 @@ static SaErrorT NewSimulatorSetResetStat - return rv; - } - -+#pragma GCC visibility pop - } // new plugin_loader - //@} - diff --git a/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp b/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp deleted file mode 100644 index 195283d9f102..000000000000 --- a/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp +++ /dev/null @@ -1,692 +0,0 @@ ---- plugins/ipmidirect/ipmi.cpp.orig 2015-09-14 22:48:31 UTC -+++ plugins/ipmidirect/ipmi.cpp -@@ -275,13 +275,11 @@ VerifySelAndEnter( void *hnd, SaHpiResou - - // new plugin_loader - extern "C" { -+#pragma GCC visibility push(hidden) - - // ABI Interface functions - --static void * --IpmiOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used)); -- --static void * -+void * - IpmiOpen( GHashTable *handler_config, unsigned int hid, oh_evt_queue *eventq ) - { - // open log -@@ -387,10 +385,7 @@ IpmiOpen( GHashTable *handler_config, un - } - - --static void --IpmiClose( void * ) __attribute__((used)); -- --static void -+void - IpmiClose( void *hnd ) - { - dbg( "IpmiClose" ); -@@ -435,10 +430,7 @@ IpmiClose( void *hnd ) - } - - --static SaErrorT --IpmiGetEvent( void * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetEvent( void *hnd ) - { - cIpmi *ipmi = VerifyIpmi( hnd ); -@@ -457,10 +449,7 @@ IpmiGetEvent( void *hnd ) - } - - --static SaErrorT --IpmiDiscoverResources( void * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiDiscoverResources( void *hnd ) - { - cIpmi *ipmi = VerifyIpmi( hnd ); -@@ -478,10 +467,7 @@ IpmiDiscoverResources( void *hnd ) - } - - --static SaErrorT --IpmiSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetResourceTag( void *hnd, SaHpiResourceIdT id, SaHpiTextBufferT *tag ) - { - cIpmi *ipmi = 0; -@@ -498,10 +484,7 @@ IpmiSetResourceTag( void *hnd, SaHpiReso - } - - --static SaErrorT --IpmiSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetResourceSeverity( void *hnd, SaHpiResourceIdT id, SaHpiSeverityT sev ) - { - cIpmi *ipmi = 0; -@@ -518,14 +501,7 @@ IpmiSetResourceSeverity( void *hnd, SaHp - } - - --static SaErrorT --IpmiGetSensorReading( void *, -- SaHpiResourceIdT id, -- SaHpiSensorNumT num, -- SaHpiSensorReadingT *data, -- SaHpiEventStateT *state ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSensorReading( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -546,13 +522,7 @@ IpmiGetSensorReading( void *hnd, - } - - --static SaErrorT --IpmiGetSensorThresholds( void *hnd, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiSensorThresholdsT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSensorThresholds( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -577,13 +547,7 @@ IpmiGetSensorThresholds( void - } - - --static SaErrorT --IpmiSetSensorThresholds( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- const SaHpiSensorThresholdsT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetSensorThresholds( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -608,13 +572,7 @@ IpmiSetSensorThresholds( void *hnd, - } - - --static SaErrorT --IpmiGetSensorEnable( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSensorEnable( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -634,13 +592,7 @@ IpmiGetSensorEnable( void *hnd, - } - - --static SaErrorT --IpmiSetSensorEnable( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetSensorEnable( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -660,13 +612,7 @@ IpmiSetSensorEnable( void *hnd, - } - - --static SaErrorT --IpmiGetSensorEventEnables( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSensorEventEnables( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -686,13 +632,7 @@ IpmiGetSensorEventEnables( void *hnd, - } - - --static SaErrorT --IpmiSetSensorEventEnables( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiBoolT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetSensorEventEnables( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -712,14 +652,7 @@ IpmiSetSensorEventEnables( void *hnd, - } - - --static SaErrorT --IpmiGetSensorEventMasks( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiEventStateT *, -- SaHpiEventStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSensorEventMasks( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -741,15 +674,7 @@ IpmiGetSensorEventMasks( void *hnd, - } - - --static SaErrorT --IpmiSetSensorEventMasks( void *, -- SaHpiResourceIdT, -- SaHpiSensorNumT, -- SaHpiSensorEventMaskActionT, -- SaHpiEventStateT, -- SaHpiEventStateT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetSensorEventMasks( void *hnd, - SaHpiResourceIdT id, - SaHpiSensorNumT num, -@@ -772,13 +697,7 @@ IpmiSetSensorEventMasks( void *hnd, - } - - --static SaErrorT --IpmiGetControlState( void *, SaHpiResourceIdT, -- SaHpiCtrlNumT, -- SaHpiCtrlModeT *, -- SaHpiCtrlStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetControlState( void *hnd, SaHpiResourceIdT id, - SaHpiCtrlNumT num, - SaHpiCtrlModeT *mode, -@@ -798,13 +717,7 @@ IpmiGetControlState( void *hnd, SaHpiRes - } - - --static SaErrorT --IpmiSetControlState( void *, SaHpiResourceIdT, -- SaHpiCtrlNumT, -- SaHpiCtrlModeT, -- SaHpiCtrlStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetControlState( void *hnd, SaHpiResourceIdT id, - SaHpiCtrlNumT num, - SaHpiCtrlModeT mode, -@@ -824,13 +737,7 @@ IpmiSetControlState( void *hnd, SaHpiRes - } - - --static SaErrorT --IpmiGetIdrInfo( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrInfoT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetIdrInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -850,16 +757,7 @@ IpmiGetIdrInfo( void *hnd, - } - - --static SaErrorT --IpmiGetIdrAreaHeader( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrAreaTypeT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiIdrAreaHeaderT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetIdrAreaHeader( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -882,14 +780,7 @@ IpmiGetIdrAreaHeader( void *hnd, - } - - --static SaErrorT --IpmiAddIdrArea( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrAreaTypeT, -- SaHpiEntryIdT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiAddIdrArea( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -910,13 +801,7 @@ IpmiAddIdrArea( void *hnd, - } - - --static SaErrorT --IpmiDelIdrArea( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiDelIdrArea( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -936,17 +821,7 @@ IpmiDelIdrArea( void *hnd, - } - - --static SaErrorT --IpmiGetIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT, -- SaHpiIdrFieldTypeT, -- SaHpiEntryIdT, -- SaHpiEntryIdT *, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -970,13 +845,7 @@ IpmiGetIdrField( void *hnd, - } - - --static SaErrorT --IpmiAddIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiAddIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -996,13 +865,7 @@ IpmiAddIdrField( void *hnd, - } - - --static SaErrorT --IpmiSetIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiIdrFieldT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -1022,14 +885,7 @@ IpmiSetIdrField( void *hnd, - } - - --static SaErrorT --IpmiDelIdrField( void *, -- SaHpiResourceIdT, -- SaHpiIdrIdT, -- SaHpiEntryIdT, -- SaHpiEntryIdT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiDelIdrField( void *hnd, - SaHpiResourceIdT id, - SaHpiIdrIdT idrid, -@@ -1050,12 +906,7 @@ IpmiDelIdrField( void *hnd, - } - - --static SaErrorT --IpmiGetSelInfo( void *, -- SaHpiResourceIdT, -- SaHpiEventLogInfoT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSelInfo( void *hnd, - SaHpiResourceIdT id, - SaHpiEventLogInfoT *info ) -@@ -1074,10 +925,7 @@ IpmiGetSelInfo( void *hnd, - } - - --static SaErrorT --IpmiSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) - { - cIpmi *ipmi = 0; -@@ -1094,11 +942,7 @@ IpmiSetSelTime( void *hnd, SaHpiResource - } - - --static SaErrorT --IpmiAddSelEntry( void *, SaHpiResourceIdT, -- const SaHpiEventT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiAddSelEntry( void *hnd, SaHpiResourceIdT id, - const SaHpiEventT *Event ) - { -@@ -1116,11 +960,7 @@ IpmiAddSelEntry( void *hnd, SaHpiResourc - } - - #ifdef NOTUSED --static SaErrorT --IpmiDelSelEntry( void *, SaHpiResourceIdT, -- SaHpiEventLogEntryIdT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiDelSelEntry( void *hnd, SaHpiResourceIdT id, - SaHpiEventLogEntryIdT sid ) - { -@@ -1139,15 +979,7 @@ IpmiDelSelEntry( void *hnd, SaHpiResourc - #endif - - --static SaErrorT --IpmiGetSelEntry( void *hnd, SaHpiResourceIdT, -- SaHpiEventLogEntryIdT, -- SaHpiEventLogEntryIdT *, SaHpiEventLogEntryIdT *, -- SaHpiEventLogEntryT *, -- SaHpiRdrT *, -- SaHpiRptEntryT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetSelEntry( void *hnd, SaHpiResourceIdT id, - SaHpiEventLogEntryIdT current, - SaHpiEventLogEntryIdT *prev, SaHpiEventLogEntryIdT *next, -@@ -1169,10 +1001,7 @@ IpmiGetSelEntry( void *hnd, SaHpiResourc - } - - --static SaErrorT --IpmiClearSel( void *, SaHpiResourceIdT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiClearSel( void *hnd, SaHpiResourceIdT id ) - { - cIpmi *ipmi = 0; -@@ -1188,11 +1017,7 @@ IpmiClearSel( void *hnd, SaHpiResourceId - return rv; - } - --static SaErrorT --IpmiHotswapPolicyCancel( void *, SaHpiResourceIdT, -- SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT timeout) - { -@@ -1209,10 +1034,7 @@ IpmiHotswapPolicyCancel( void *hnd, SaHp - return rv; - } - --static SaErrorT --IpmiSetAutoInsertTimeout( void *, SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) - { - cIpmi *ipmi = VerifyIpmi( hnd ); -@@ -1227,11 +1049,7 @@ IpmiSetAutoInsertTimeout( void *hnd, SaH - return rv; - } - --static SaErrorT --IpmiGetAutoExtractTimeout( void *, SaHpiResourceIdT, -- SaHpiTimeoutT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT *timeout ) - { -@@ -1248,11 +1066,7 @@ IpmiGetAutoExtractTimeout( void *hnd, Sa - return rv; - } - --static SaErrorT --IpmiSetAutoExtractTimeout( void *, SaHpiResourceIdT, -- SaHpiTimeoutT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, - SaHpiTimeoutT timeout ) - { -@@ -1269,11 +1083,7 @@ IpmiSetAutoExtractTimeout( void *hnd, Sa - return rv; - } - --static SaErrorT --IpmiGetHotswapState( void *, SaHpiResourceIdT , -- SaHpiHsStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetHotswapState( void *hnd, SaHpiResourceIdT id, - SaHpiHsStateT *state ) - { -@@ -1291,11 +1101,7 @@ IpmiGetHotswapState( void *hnd, SaHpiRes - } - - --static SaErrorT --IpmiSetHotswapState( void *, SaHpiResourceIdT, -- SaHpiHsStateT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetHotswapState( void *hnd, SaHpiResourceIdT id, - SaHpiHsStateT state ) - { -@@ -1313,11 +1119,7 @@ IpmiSetHotswapState( void *hnd, SaHpiRes - } - - --static SaErrorT --IpmiRequestHotswapAction( void *, SaHpiResourceIdT, -- SaHpiHsActionT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiRequestHotswapAction( void *hnd, SaHpiResourceIdT id, - SaHpiHsActionT act ) - { -@@ -1335,11 +1137,7 @@ IpmiRequestHotswapAction( void *hnd, SaH - } - - --static SaErrorT --IpmiGetPowerState( void *, SaHpiResourceIdT, -- SaHpiPowerStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetPowerState( void *hnd, SaHpiResourceIdT id, - SaHpiPowerStateT *state ) - { -@@ -1357,11 +1155,7 @@ IpmiGetPowerState( void *hnd, SaHpiResou - } - - --static SaErrorT --IpmiSetPowerState( void *, SaHpiResourceIdT, -- SaHpiPowerStateT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetPowerState( void *hnd, SaHpiResourceIdT id, - SaHpiPowerStateT state ) - { -@@ -1379,11 +1173,7 @@ IpmiSetPowerState( void *hnd, SaHpiResou - } - - --static SaErrorT --IpmiGetIndicatorState( void *, SaHpiResourceIdT, -- SaHpiHsIndicatorStateT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetIndicatorState( void *hnd, SaHpiResourceIdT id, - SaHpiHsIndicatorStateT *state ) - { -@@ -1401,11 +1191,7 @@ IpmiGetIndicatorState( void *hnd, SaHpiR - } - - --static SaErrorT --IpmiSetIndicatorState( void *, SaHpiResourceIdT, -- SaHpiHsIndicatorStateT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetIndicatorState( void *hnd, SaHpiResourceIdT id, - SaHpiHsIndicatorStateT state ) - { -@@ -1423,12 +1209,7 @@ IpmiSetIndicatorState( void *hnd, SaHpiR - } - - --static SaErrorT --IpmiControlParm( void *, -- SaHpiResourceIdT, -- SaHpiParmActionT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiControlParm( void *hnd, - SaHpiResourceIdT id, - SaHpiParmActionT act ) -@@ -1447,11 +1228,7 @@ IpmiControlParm( void *hnd, - } - - --static SaErrorT --IpmiGetResetState( void *, SaHpiResourceIdT, -- SaHpiResetActionT * ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetResetState( void *hnd, SaHpiResourceIdT id, - SaHpiResetActionT *act ) - { -@@ -1469,12 +1246,7 @@ IpmiGetResetState( void *hnd, SaHpiResou - } - - --static SaErrorT --IpmiSetResetState( void *, -- SaHpiResourceIdT, -- SaHpiResetActionT ) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetResetState( void *hnd, - SaHpiResourceIdT id, - SaHpiResetActionT act ) -@@ -1492,13 +1264,7 @@ IpmiSetResetState( void *hnd, - return rv; - } - --static SaErrorT --IpmiGetWatchdogInfo(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT, -- SaHpiWatchdogT *) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiGetWatchdogInfo(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num, -@@ -1513,13 +1279,7 @@ IpmiGetWatchdogInfo(void *hnd, - return rv; - } - --static SaErrorT --IpmiSetWatchdogInfo(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT, -- SaHpiWatchdogT *) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiSetWatchdogInfo(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num, -@@ -1534,12 +1294,7 @@ IpmiSetWatchdogInfo(void *hnd, - return rv; - } - --static SaErrorT --IpmiResetWatchdog(void *, -- SaHpiResourceIdT, -- SaHpiWatchdogNumT) __attribute__((used)); -- --static SaErrorT -+SaErrorT - IpmiResetWatchdog(void *hnd, - SaHpiResourceIdT id, - SaHpiWatchdogNumT num) -@@ -1554,6 +1309,7 @@ IpmiResetWatchdog(void *hnd, - } - - -+#pragma GCC visibility pop - } // new plugin_loader - - extern "C" { diff --git a/sysutils/openhpi/pkg-descr b/sysutils/openhpi/pkg-descr deleted file mode 100644 index 75752c48db0c..000000000000 --- a/sysutils/openhpi/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -OpenHPI provides an open source implementation of the Service Availability -Forum (SAF) Hardware Platform Interface (HPI). - -HPI is an abstracted interface for managing computer hardware, typically -chassis and rack based servers. HPI includes resource modeling; access to -and control over sensor, control, watchdog, and inventory data associated -with resources; abstracted System Event Log interfaces; hardware events and -alarms; and a managed hotswap interface. - -WWW: http://openhpi.org/ diff --git a/sysutils/openhpi/pkg-plist b/sysutils/openhpi/pkg-plist deleted file mode 100644 index 2ef3c1a7d995..000000000000 --- a/sysutils/openhpi/pkg-plist +++ /dev/null @@ -1,136 +0,0 @@ -bin/hpi_shell -bin/hpialarms -bin/hpicrypt -bin/hpidomain -bin/hpiel -bin/hpievents -bin/hpifan -bin/hpigensimdata -bin/hpiinv -bin/hpionIBMblade -bin/hpipower -bin/hpireset -bin/hpisensor -bin/hpisettime -bin/hpithres -bin/hpitop -bin/hpitree -bin/hpiwdt -bin/hpixml -bin/ohdomainlist -bin/ohhandler -bin/ohparam -@comment etc/init.d/openhpid -@sample %%ETCDIR%%/openhpi.conf.sample -@sample %%ETCDIR%%/openhpiclient.conf.sample -@sample %%ETCDIR%%/simulation.data.sample -include/openhpi/SaHpi.h -include/openhpi/SaHpiAtca.h -include/openhpi/SaHpiBladeCenter.h -include/openhpi/SaHpiXtca.h -include/openhpi/announcement_utils.h -include/openhpi/el_utils.h -include/openhpi/epath_utils.h -include/openhpi/event_utils.h -include/openhpi/oHpi.h -include/openhpi/oh_clients.h -include/openhpi/oh_utils.h -include/openhpi/rpt_utils.h -include/openhpi/sahpi_enum_utils.h -include/openhpi/sahpi_event_encode.h -include/openhpi/sahpi_event_utils.h -include/openhpi/sahpi_gcrypt_utils.h -include/openhpi/sahpi_struct_utils.h -include/openhpi/sahpi_time_utils.h -include/openhpi/sahpiatca_enum_utils.h -include/openhpi/sahpixtca_enum_utils.h -include/openhpi/uid_utils.h -lib/libopenhpi.a -lib/libopenhpi.so -lib/libopenhpi.so.3 -lib/libopenhpi.so.3.6.1 -lib/libopenhpi_snmp.a -lib/libopenhpi_snmp.so -lib/libopenhpi_snmp.so.3 -lib/libopenhpi_snmp.so.3.6.1 -lib/libopenhpi_ssl.a -lib/libopenhpi_ssl.so -lib/libopenhpi_ssl.so.3 -lib/libopenhpi_ssl.so.3.6.1 -lib/libopenhpimarshal.a -lib/libopenhpimarshal.so -lib/libopenhpimarshal.so.3 -lib/libopenhpimarshal.so.3.6.1 -lib/libopenhpitransport.a -lib/libopenhpitransport.so -lib/libopenhpitransport.so.3 -lib/libopenhpitransport.so.3.6.1 -lib/libopenhpiutils.a -lib/libopenhpiutils.so -lib/libopenhpiutils.so.3 -lib/libopenhpiutils.so.3.6.1 -lib/openhpi/libdyn_simulator.a -lib/openhpi/libdyn_simulator.so -lib/openhpi/libdyn_simulator.so.3 -lib/openhpi/libdyn_simulator.so.3.6.1 -lib/openhpi/libilo2_ribcl.a -lib/openhpi/libilo2_ribcl.so -lib/openhpi/libilo2_ribcl.so.3 -lib/openhpi/libilo2_ribcl.so.3.6.1 -lib/openhpi/libipmidirect.a -lib/openhpi/libipmidirect.so -lib/openhpi/libipmidirect.so.3 -lib/openhpi/libipmidirect.so.3.6.1 -lib/openhpi/liboa_soap.a -lib/openhpi/liboa_soap.so -lib/openhpi/liboa_soap.so.3 -lib/openhpi/liboa_soap.so.3.6.1 -lib/openhpi/libsimulator.a -lib/openhpi/libsimulator.so -lib/openhpi/libsimulator.so.3 -lib/openhpi/libsimulator.so.3.6.1 -lib/openhpi/libslave.a -lib/openhpi/libslave.so -lib/openhpi/libslave.so.3 -lib/openhpi/libslave.so.3.6.1 -lib/openhpi/libsnmp_bc.a -lib/openhpi/libsnmp_bc.so -lib/openhpi/libsnmp_bc.so.3 -lib/openhpi/libsnmp_bc.so.3.6.1 -lib/openhpi/libtest_agent.a -lib/openhpi/libtest_agent.so -lib/openhpi/libtest_agent.so.3 -lib/openhpi/libtest_agent.so.3.6.1 -libdata/pkgconfig/openhpi.pc -libdata/pkgconfig/openhpiutils.pc -man/man1/hpi_shell.1.gz -man/man1/hpialarms.1.gz -man/man1/hpicrypt.1.gz -man/man1/hpidomain.1.gz -man/man1/hpiel.1.gz -man/man1/hpievents.1.gz -man/man1/hpifan.1.gz -man/man1/hpigensimdata.1.gz -man/man1/hpiinv.1.gz -man/man1/hpionIBMblade.1.gz -man/man1/hpipower.1.gz -man/man1/hpireset.1.gz -man/man1/hpisensor.1.gz -man/man1/hpisettime.1.gz -man/man1/hpithres.1.gz -man/man1/hpitop.1.gz -man/man1/hpitree.1.gz -man/man1/hpiwdt.1.gz -man/man1/hpixml.1.gz -man/man1/ohdomainlist.1.gz -man/man1/ohhandler.1.gz -man/man1/ohparam.1.gz -man/man7/openhpi.7.gz -man/man8/openhpid.8.gz -sbin/openhpid -@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.daemon -@dir /var/lib/openhpi -@dir /var/lib -- cgit From 1f48267c9ec0df421c00dfc8316727384cc65f9b Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 18:30:49 +0000 Subject: www/yarn: remove support for expired www/node6 backend --- www/yarn/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/www/yarn/Makefile b/www/yarn/Makefile index bbd45b0164bd..fc6dbbbb6cae 100644 --- a/www/yarn/Makefile +++ b/www/yarn/Makefile @@ -16,20 +16,18 @@ CONFLICTS_INSTALL?= yarn-node10 yarn-node8 OPTIONS_DEFINE= HADOOPCOMPAT OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE6 NODE8 NODE10 NODE +OPTIONS_SINGLE_BACKEND= NODE8 NODE10 NODE OPTIONS_DEFAULT= NODE HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded NODE_DESC= Use www/node as backend NODE10_DESC= Use www/node10 as backend NODE8_DESC= Use www/node8 as backend -NODE6_DESC= Use www/node6 as backend OPTIONS_SUB= yes NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE10_RUN_DEPENDS= node10>=10.0.0:www/node10 NODE8_RUN_DEPENDS= node8>=0.8.0:www/node8 -NODE6_RUN_DEPENDS= node6>=0.8.0:www/node6 HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2* -- cgit From 176f61a9bc44aa3696c376cf55fd60c702db9551 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 18:34:01 +0000 Subject: textproc/kibana5* : schedule for removal on 2019-11-01, they depend on expired www/node6 --- textproc/kibana5-search-guard/Makefile | 3 +++ textproc/kibana5/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/textproc/kibana5-search-guard/Makefile b/textproc/kibana5-search-guard/Makefile index 66d404c3baf6..9b3b900779a2 100644 --- a/textproc/kibana5-search-guard/Makefile +++ b/textproc/kibana5-search-guard/Makefile @@ -13,6 +13,9 @@ COMMENT= Kibana 5.3 Search Guard plugin LICENSE= APACHE20 +DEPRECATED= Depends on expired www/node6 via textproc/kibana5 +EXPIRATION_DATE=2019-11-01 + RUN_DEPENDS= kibana5>=5.3.0:textproc/kibana5 NO_BUILD= yes diff --git a/textproc/kibana5/Makefile b/textproc/kibana5/Makefile index 11f825830f4d..272171f8f90a 100644 --- a/textproc/kibana5/Makefile +++ b/textproc/kibana5/Makefile @@ -15,6 +15,9 @@ COMMENT= Browser based analytics and search interface to ElasticSearch LICENSE= APACHE20 +DEPRECATED= depends on expired www/node6 +EXPIRATION_DATE=2019-11-01 + RUN_DEPENDS= node6>=6.12.2:www/node6 CONFLICTS= kibana[3-4]* -- cgit From c3760aefcfb1d0ea0c4116f2f2d6d535a99580d0 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 12 Aug 2019 18:37:37 +0000 Subject: net-mgmt/statsd: schedule for removal on 2019-11-01 due to expired www/node6 While here fix FATAL portlint error. --- net-mgmt/statsd/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-mgmt/statsd/Makefile b/net-mgmt/statsd/Makefile index 8eae3fc03bed..7ba00324d7c7 100644 --- a/net-mgmt/statsd/Makefile +++ b/net-mgmt/statsd/Makefile @@ -2,8 +2,8 @@ PORTNAME= statsd PORTVERSION= 0.7.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= kimor79@yahoo.com @@ -12,6 +12,9 @@ COMMENT= Simple daemon for easy stats aggregation LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= depends on expired www/node6 +EXPIRATION_DATE=2019-11-01 + RUN_DEPENDS= node6>=0:www/node6 NO_BUILD= yes -- cgit From 67b5058e1cb82279c8e00ff3397e4972aa4fffb5 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 12 Aug 2019 19:14:50 +0000 Subject: textproc/scdoc: drop DIST_SUBDIR Obtained from: mail/aerc --- textproc/scdoc/Makefile | 4 +--- textproc/scdoc/distinfo | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile index 2000cc44620b..59ac9e6febaf 100644 --- a/textproc/scdoc/Makefile +++ b/textproc/scdoc/Makefile @@ -3,9 +3,7 @@ PORTNAME= scdoc DISTVERSION= 1.9.6 CATEGORIES= textproc -MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/ -DISTFILES= ${DISTVERSIONFULL}${EXTRACT_SUFX} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Simple man page generator for POSIX systems written in C99 diff --git a/textproc/scdoc/distinfo b/textproc/scdoc/distinfo index 2980c42fbc48..cb4e4ca97ca0 100644 --- a/textproc/scdoc/distinfo +++ b/textproc/scdoc/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1562782167 -SHA256 (scdoc/1.9.6.tar.gz) = 89a5f2294b4b72ee1d20b8a478d16bee1f96b6202bfeedb6df76c27881ed5928 -SIZE (scdoc/1.9.6.tar.gz) = 11950 +SHA256 (scdoc-1.9.6.tar.gz) = 89a5f2294b4b72ee1d20b8a478d16bee1f96b6202bfeedb6df76c27881ed5928 +SIZE (scdoc-1.9.6.tar.gz) = 11950 -- cgit From 50263073cb5251b72e5a1a31a73e53780f1349c2 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 12 Aug 2019 19:14:58 +0000 Subject: textproc/scdoc: switch to dynamic linking Let binary packages take advantage of newer libc. --- textproc/scdoc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile index 59ac9e6febaf..43a5fa1de695 100644 --- a/textproc/scdoc/Makefile +++ b/textproc/scdoc/Makefile @@ -2,6 +2,7 @@ PORTNAME= scdoc DISTVERSION= 1.9.6 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -21,6 +22,7 @@ PLIST_FILES= bin/${PORTNAME} \ man/man5/${PORTNAME}.5.gz post-patch: + @${REINPLACE_CMD} '/-static/d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -i '' -e 's,--date=,-jf "%F %T" ,' \ ${WRKSRC}/test/preamble -- cgit From a5850abf53650c7c8f6bfe5421746049dbeaed0f Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 12 Aug 2019 19:15:04 +0000 Subject: x11/virtboard: add new port Virtboard is an on screen keyboard based on wayland-keyboard, and serving as a test bed for new input method protocols. https://source.puri.sm/Librem5/virtboard --- x11/Makefile | 1 + x11/virtboard/Makefile | 37 +++++++++++++++++++++++++++++++++++++ x11/virtboard/distinfo | 7 +++++++ x11/virtboard/pkg-descr | 4 ++++ 4 files changed, 49 insertions(+) create mode 100644 x11/virtboard/Makefile create mode 100644 x11/virtboard/distinfo create mode 100644 x11/virtboard/pkg-descr diff --git a/x11/Makefile b/x11/Makefile index eef9ef367b4b..cbe49044d0db 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -330,6 +330,7 @@ SUBDIR += urxvt-perls SUBDIR += vdesk SUBDIR += viewres + SUBDIR += virtboard SUBDIR += virtualgl SUBDIR += waybar SUBDIR += wbar diff --git a/x11/virtboard/Makefile b/x11/virtboard/Makefile new file mode 100644 index 000000000000..c17ea1e64901 --- /dev/null +++ b/x11/virtboard/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= virtboard +DISTVERSIONPREFIX= v +DISTVERSION= 0.0.5-26 +CATEGORIES= x11 + +PATCH_SITES= ${GL_SITE}/jbeich/${GL_PROJECT}/commit/ +PATCHFILES+= 42e698964e42.patch:-p1 +PATCHFILES+= 86e6915d4920.patch:-p1 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Basic keyboard, blazing the path of modern Wayland keyboards + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ + wayland-protocols>=1.14:graphics/wayland-protocols +LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ + libpng.so:graphics/png \ + libwayland-client.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas + +USES= compiler:c11 gettext-tools gnome meson pkgconfig +USE_GITLAB= yes +USE_GNOME= cairo glib20 +USE_XORG= pixman +GL_SITE= https://source.puri.sm +GL_ACCOUNT= Librem5 +GL_COMMIT= 576fffc61bcfa8e24f9dcf10d8bf3b32240cc36d +PLIST_FILES= bin/${PORTNAME} \ + share/applications/sm.puri.Virtboard.desktop \ + share/dbus-1/interfaces/sm.puri.OSK0.xml + +.include diff --git a/x11/virtboard/distinfo b/x11/virtboard/distinfo new file mode 100644 index 000000000000..80aabaec84d3 --- /dev/null +++ b/x11/virtboard/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1543864393 +SHA256 (Librem5-virtboard-576fffc61bcfa8e24f9dcf10d8bf3b32240cc36d_GL0.tar.gz) = 34d15918ea9e788f4b311dc34a9c5aecafad7ef466b2158ca9fa603bb936da9c +SIZE (Librem5-virtboard-576fffc61bcfa8e24f9dcf10d8bf3b32240cc36d_GL0.tar.gz) = 128500 +SHA256 (42e698964e42.patch) = 20eda9ca7c6359bff8b8202e29f958735839fa9258da944b7d2a7459dd5c4ab7 +SIZE (42e698964e42.patch) = 832 +SHA256 (86e6915d4920.patch) = f97bf3f30f84d973056ba1f6d59bc6519310637cbbc65d3677fca0da881c5b39 +SIZE (86e6915d4920.patch) = 1696 diff --git a/x11/virtboard/pkg-descr b/x11/virtboard/pkg-descr new file mode 100644 index 000000000000..89499085cdf5 --- /dev/null +++ b/x11/virtboard/pkg-descr @@ -0,0 +1,4 @@ +Virtboard is an on screen keyboard based on wayland-keyboard, and +serving as a test bed for new input method protocols. + +WWW: https://source.puri.sm/Librem5/virtboard -- cgit From 844420ff1cf7bedd5d2e1810cb3bb8d4e2f291a1 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 12 Aug 2019 19:15:11 +0000 Subject: x11/wev: add new port --- x11/Makefile | 1 + x11/wev/Makefile | 29 +++++++++++++++++++++++++++++ x11/wev/distinfo | 3 +++ x11/wev/pkg-descr | 4 ++++ 4 files changed, 37 insertions(+) create mode 100644 x11/wev/Makefile create mode 100644 x11/wev/distinfo create mode 100644 x11/wev/pkg-descr diff --git a/x11/Makefile b/x11/Makefile index cbe49044d0db..02fb0c38f0b7 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -336,6 +336,7 @@ SUBDIR += wbar SUBDIR += wbarconf SUBDIR += wdm + SUBDIR += wev SUBDIR += wf-shell SUBDIR += wl-clipboard SUBDIR += wmappl diff --git a/x11/wev/Makefile b/x11/wev/Makefile new file mode 100644 index 000000000000..1ae475dd857d --- /dev/null +++ b/x11/wev/Makefile @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= wev +PORTVERSION= s20190811 +DISTVERSIONSUFFIX= -0-g47d1739 +CATEGORIES= x11 +MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Wayland event viewer + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ + wayland-protocols>0:graphics/wayland-protocols \ + scdoc:textproc/scdoc +LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon + +USES= compiler:c11 gmake pkgconfig +MAKE_ENV= MANDIR='$$(PREFIX)/man' +PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz + +post-patch: + @${REINPLACE_CMD} -e 's/ -lrt//' ${WRKSRC}/Makefile + +.include diff --git a/x11/wev/distinfo b/x11/wev/distinfo new file mode 100644 index 000000000000..482080c6b04b --- /dev/null +++ b/x11/wev/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565511866 +SHA256 (wev-s20190811-0-g47d1739.tar.gz) = 33e6210a0fbd5527a60303ddd33b2b1a445c9c6f49ed5e236369ce692814fcb6 +SIZE (wev-s20190811-0-g47d1739.tar.gz) = 7766 diff --git a/x11/wev/pkg-descr b/x11/wev/pkg-descr new file mode 100644 index 000000000000..0b68c5321326 --- /dev/null +++ b/x11/wev/pkg-descr @@ -0,0 +1,4 @@ +This is a tool for debugging events on a Wayland window, analagous to +the X11 tool xev. + +WWW: https://git.sr.ht/~sircmpwn/wev -- cgit From 05662c96a6f06dd10c1467c8bc6a0962e1537123 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:39:53 +0000 Subject: Add rubygem-chromedriver-helper 2.1.1 chromedriver-helper installs an executable, chromedriver-helper, in your gem path, and configures Selenium to invoke it as the web driver. This script will, if necessary, download the appropriate binary for your platform and install it into ~/.chromedriver-helper, then exec it. Easy peasy! Individual projects can even select which version of chromedriver they want to run. WWW: https://github.com/flavorjones/chromedriver-helper --- www/Makefile | 1 + www/rubygem-chromedriver-helper/Makefile | 26 ++++++++++++++++++++++++++ www/rubygem-chromedriver-helper/distinfo | 3 +++ www/rubygem-chromedriver-helper/pkg-descr | 10 ++++++++++ 4 files changed, 40 insertions(+) create mode 100644 www/rubygem-chromedriver-helper/Makefile create mode 100644 www/rubygem-chromedriver-helper/distinfo create mode 100644 www/rubygem-chromedriver-helper/pkg-descr diff --git a/www/Makefile b/www/Makefile index 1cf7da0e8ebe..c09a46b13d42 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1973,6 +1973,7 @@ SUBDIR += rubygem-carrierwave SUBDIR += rubygem-cgi_multipart_eof_fix SUBDIR += rubygem-chosen-rails + SUBDIR += rubygem-chromedriver-helper SUBDIR += rubygem-cookiejar SUBDIR += rubygem-crass SUBDIR += rubygem-cuba diff --git a/www/rubygem-chromedriver-helper/Makefile b/www/rubygem-chromedriver-helper/Makefile new file mode 100644 index 000000000000..93c58d90c63a --- /dev/null +++ b/www/rubygem-chromedriver-helper/Makefile @@ -0,0 +1,26 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= chromedriver-helper +PORTVERSION= 2.1.1 +CATEGORIES= www rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Easy installation and use of chromedriver + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-archive-zip>=0.10:archivers/rubygem-archive-zip \ + rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +PLIST_FILES= bin/chromedriver-helper \ + bin/chromedriver-update + +.include diff --git a/www/rubygem-chromedriver-helper/distinfo b/www/rubygem-chromedriver-helper/distinfo new file mode 100644 index 000000000000..d0c374442d25 --- /dev/null +++ b/www/rubygem-chromedriver-helper/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565622489 +SHA256 (rubygem/chromedriver-helper-2.1.1.gem) = 3a3a424f9ffa69f5281b723449a8618b6a9b8e49b9aa2141c819f38b75a7476f +SIZE (rubygem/chromedriver-helper-2.1.1.gem) = 20480 diff --git a/www/rubygem-chromedriver-helper/pkg-descr b/www/rubygem-chromedriver-helper/pkg-descr new file mode 100644 index 000000000000..1692ac170454 --- /dev/null +++ b/www/rubygem-chromedriver-helper/pkg-descr @@ -0,0 +1,10 @@ +chromedriver-helper installs an executable, chromedriver-helper, in your gem +path, and configures Selenium to invoke it as the web driver. + +This script will, if necessary, download the appropriate binary for your +platform and install it into ~/.chromedriver-helper, then exec it. Easy peasy! + +Individual projects can even select which version of chromedriver they want to +run. + +WWW: https://github.com/flavorjones/chromedriver-helper -- cgit From 8ff4bd753c736bb93299480ab4201509914be615 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:39:59 +0000 Subject: Update to 7.1.0 - Add LICENSE_FILE - Convert PORTEXAMPLES to PLIST entries Changes: https://github.com/leethomason/tinyxml2/commits/master --- textproc/tinyxml2/Makefile | 10 +++++----- textproc/tinyxml2/distinfo | 6 +++--- textproc/tinyxml2/pkg-descr | 1 + textproc/tinyxml2/pkg-plist | 10 ++++++++++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile index abf37b352f9c..3b5643d787fc 100644 --- a/textproc/tinyxml2/Makefile +++ b/textproc/tinyxml2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tinyxml2 -PORTVERSION= 7.0.1 -PORTREVISION= 2 +PORTVERSION= 7.1.0 PORTEPOCH= 1 CATEGORIES= textproc @@ -11,20 +10,21 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small C++ XML Parser LICENSE= ZLIB +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -OPTIONS_DEFINE= EXAMPLES +USES= cmake:insource compiler:c++11-lang dos2unix pathfix CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_SHARED_LIBS -USES= cmake:insource compiler:c++11-lang dos2unix pathfix USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -PORTEXAMPLES= * GH_ACCOUNT= leethomason USE_GITHUB= yes +OPTIONS_DEFINE= EXAMPLES + post-patch: @${REINPLACE_CMD} -e '/CMAKE_DEBUG_POSTFIX/d' ${WRKSRC}/CMakeLists.txt diff --git a/textproc/tinyxml2/distinfo b/textproc/tinyxml2/distinfo index d04057cc5341..c5799b4065f1 100644 --- a/textproc/tinyxml2/distinfo +++ b/textproc/tinyxml2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542571957 -SHA256 (leethomason-tinyxml2-7.0.1_GH0.tar.gz) = a381729e32b6c2916a23544c04f342682d38b3f6e6c0cad3c25e900c3a7ef1a6 -SIZE (leethomason-tinyxml2-7.0.1_GH0.tar.gz) = 590384 +TIMESTAMP = 1565627606 +SHA256 (leethomason-tinyxml2-7.1.0_GH0.tar.gz) = 68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3 +SIZE (leethomason-tinyxml2-7.1.0_GH0.tar.gz) = 592717 diff --git a/textproc/tinyxml2/pkg-descr b/textproc/tinyxml2/pkg-descr index 8657158d265b..bace36622544 100644 --- a/textproc/tinyxml2/pkg-descr +++ b/textproc/tinyxml2/pkg-descr @@ -5,3 +5,4 @@ use DTDs or XSL. It doesn't have the STL support of TinyXML-1, but uses less memory, has a proper namespace, and is faster. WWW: http://grinninglizard.com/tinyxml2/index.html +WWW: https://github.com/leethomason/tinyxml2 diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist index 2c001c750dc3..6bf8355ac1be 100644 --- a/textproc/tinyxml2/pkg-plist +++ b/textproc/tinyxml2/pkg-plist @@ -1,5 +1,6 @@ include/tinyxml2.h lib/cmake/tinyxml2/tinyxml2Config.cmake +lib/cmake/tinyxml2/tinyxml2ConfigVersion.cmake lib/cmake/tinyxml2/tinyxml2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/tinyxml2/tinyxml2Targets.cmake lib/libtinyxml2.a @@ -7,3 +8,12 @@ lib/libtinyxml2.so lib/libtinyxml2.so.7 lib/libtinyxml2.so.%%PORTVERSION%% libdata/pkgconfig/tinyxml2.pc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/out/readme.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/utf8test.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/utf8testverify.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-4636783552757760.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5330.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5662204197076992.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5720541257269248.xml -- cgit From fb72bdc0bb5f5b1bfd7f988c8e323506cb639acb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:40:05 +0000 Subject: Update to 2.5.7 Changes: https://metacpan.org/changes/distribution/Mouse --- devel/p5-Mouse/Makefile | 4 ++-- devel/p5-Mouse/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile index 710159b1b43b..1067e31d861e 100644 --- a/devel/p5-Mouse/Makefile +++ b/devel/p5-Mouse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mouse -PORTVERSION= 2.5.6 +PORTVERSION= 2.5.7 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= devel perl5 @@ -17,7 +17,7 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-Module-Build-XSUtil>=0:devel/p5-Module-Build-XSUtil +BUILD_DEPENDS= p5-Module-Build-XSUtil>=0.19:devel/p5-Module-Build-XSUtil TEST_DEPENDS= p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \ p5-HTTP-Message>=0:www/p5-HTTP-Message \ p5-IO-String>=0:devel/p5-IO-String \ diff --git a/devel/p5-Mouse/distinfo b/devel/p5-Mouse/distinfo index fd2eb3a8b15c..570512f9d4aa 100644 --- a/devel/p5-Mouse/distinfo +++ b/devel/p5-Mouse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534255247 -SHA256 (Mouse-v2.5.6.tar.gz) = 14002e682e65d8f344bce5d7fe35fc4d92681ecddcbcd87248322473232260c8 -SIZE (Mouse-v2.5.6.tar.gz) = 219891 +TIMESTAMP = 1565627610 +SHA256 (Mouse-v2.5.7.tar.gz) = 8a667f82f65d8184e993c3163cfc22f24349fbbbae516821f2b4fef2b5e2dc7b +SIZE (Mouse-v2.5.7.tar.gz) = 219926 -- cgit From c7c8f4880cf0239c8b0ab3ac3363925df71cebe3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:40:10 +0000 Subject: Update to 2019.2 Changes: https://pecl.php.net/package-changelog.php?package=timezonedb --- misc/pecl-timezonedb/Makefile | 2 +- misc/pecl-timezonedb/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/pecl-timezonedb/Makefile b/misc/pecl-timezonedb/Makefile index d2eaed38288f..85e4e2210dd7 100644 --- a/misc/pecl-timezonedb/Makefile +++ b/misc/pecl-timezonedb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= timezonedb -PORTVERSION= 2019.1 +PORTVERSION= 2019.2 CATEGORIES= misc MAINTAINER= sunpoet@FreeBSD.org diff --git a/misc/pecl-timezonedb/distinfo b/misc/pecl-timezonedb/distinfo index a54d255a669e..15f1fff001e6 100644 --- a/misc/pecl-timezonedb/distinfo +++ b/misc/pecl-timezonedb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558782877 -SHA256 (PECL/timezonedb-2019.1.tgz) = 451cab3b1be74cdff0f5295a0e120df155b693fe70261e38afb1b61f8b763d67 -SIZE (PECL/timezonedb-2019.1.tgz) = 421301 +TIMESTAMP = 1565627615 +SHA256 (PECL/timezonedb-2019.2.tgz) = 80921bf6a8235925320773a24f23f2b5cdef5948d0e4f468c67384b351f243cc +SIZE (PECL/timezonedb-2019.2.tgz) = 413162 -- cgit From ff69a2369ca5e06877817db0abd1fe11c74efcf5 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:40:15 +0000 Subject: Update to 0.4.2.9 Changes: https://github.com/KimiNewt/pyshark/releases https://github.com/KimiNewt/pyshark/commits/master --- net/py-pyshark/Makefile | 5 ++--- net/py-pyshark/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index 6d9a67def4da..05924ec419dc 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyshark -PORTVERSION= 0.4.2.8 +PORTVERSION= 0.4.2.9 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,8 +12,7 @@ COMMENT= Pyhon packet parsing using wireshark dissectors LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}logbook>=0:devel/py-logbook@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py>=0:devel/py-py@${PY_FLAVOR} \ tshark:net/tshark TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ diff --git a/net/py-pyshark/distinfo b/net/py-pyshark/distinfo index a1325380986d..ff41238578ad 100644 --- a/net/py-pyshark/distinfo +++ b/net/py-pyshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565441533 -SHA256 (pyshark-0.4.2.8.tar.gz) = 46ee30c6f23fb18c7ed6dd26a86e76c223b40e3dcc66d51c34f6df3915bc41cc -SIZE (pyshark-0.4.2.8.tar.gz) = 19909 +TIMESTAMP = 1565627618 +SHA256 (pyshark-0.4.2.9.tar.gz) = e7bfb1bd0c12a13cb573de103b177ef7efe4143e1ebb5a02c6b185da7dd7edd0 +SIZE (pyshark-0.4.2.9.tar.gz) = 20384 -- cgit From 73f8791a057bbba5ffecbe335ab3c69f42deb83b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:00 +0000 Subject: Take maintainership --- archivers/rubygem-archive-zip/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivers/rubygem-archive-zip/Makefile b/archivers/rubygem-archive-zip/Makefile index c5db9da2a385..9c373a106d39 100644 --- a/archivers/rubygem-archive-zip/Makefile +++ b/archivers/rubygem-archive-zip/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.12.0 CATEGORIES= archivers rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Provides interface to working with ZIP archives LICENSE= MIT -- cgit From 19ccec61002196a69519d8ff5dca28b2bc7a20e9 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:05 +0000 Subject: Update to 1.4.1 - Take maintainership Changes: https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.rdoc https://github.com/sparklemotion/sqlite3-ruby/commits/master --- databases/rubygem-sqlite3/Makefile | 9 +++++---- databases/rubygem-sqlite3/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile index 57ebfd39513c..7b99f7b04fcb 100644 --- a/databases/rubygem-sqlite3/Makefile +++ b/databases/rubygem-sqlite3/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTVERSION= 1.3.13 +PORTVERSION= 1.4.1 CATEGORIES= databases rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Ruby interface to the SQLite DB engine version 3 LICENSE= BSD3CLAUSE @@ -15,9 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libsqlite3.so:databases/sqlite3 -CONFIGURE_ARGS= --with-sqlite3-dir=${LOCALBASE} -USE_RUBY= yes USES= gem +USE_RUBY= yes + +CONFIGURE_ARGS= --with-sqlite3-dir=${LOCALBASE} BINARY_ALIAS= swig=swig3.0 .include diff --git a/databases/rubygem-sqlite3/distinfo b/databases/rubygem-sqlite3/distinfo index 74a00d010595..899c7357be63 100644 --- a/databases/rubygem-sqlite3/distinfo +++ b/databases/rubygem-sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483558458 -SHA256 (rubygem/sqlite3-1.3.13.gem) = b138a22e0dbbb69be08540671dabf602599437e389a54054bb177f6ed1fd2e06 -SIZE (rubygem/sqlite3-1.3.13.gem) = 64512 +TIMESTAMP = 1565627647 +SHA256 (rubygem/sqlite3-1.4.1.gem) = 2491f5af05d6f9456135c1c54547170f07fa2e732d772b4d757168ce961d20ed +SIZE (rubygem/sqlite3-1.4.1.gem) = 70144 -- cgit From bcb92b739f86070634407bb05250ac5f5cc695cb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:11 +0000 Subject: Update to 0.3.4 - Add LICENSE - Update version requirement of RUN_DEPENDS - Add NO_ARCH - Take maintainership Changes: https://github.com/brooklynDev/airborne/blob/master/CHANGELOG.md --- devel/rubygem-airborne/Makefile | 15 ++++++++++----- devel/rubygem-airborne/distinfo | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/devel/rubygem-airborne/Makefile b/devel/rubygem-airborne/Makefile index 167fb0335467..60acef283f84 100644 --- a/devel/rubygem-airborne/Makefile +++ b/devel/rubygem-airborne/Makefile @@ -1,20 +1,25 @@ # $FreeBSD$ PORTNAME= airborne -PORTVERSION= 0.2.13 +PORTVERSION= 0.3.4 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= RSpec driven API testing framework +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + RUN_DEPENDS= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \ rubygem-rack>=0:www/rubygem-rack \ - rubygem-rack-test>=0.6.2:www/rubygem-rack-test \ - rubygem-rest-client>=1.7.3:www/rubygem-rest-client \ - rubygem-rspec>=3.1:devel/rubygem-rspec + rubygem-rack-test>=1.1.0<2.0:www/rubygem-rack-test \ + rubygem-rest-client>=2.0.2<3.0:www/rubygem-rest-client \ + rubygem-rspec>=3.8<4.0:devel/rubygem-rspec USES= gem USE_RUBY= yes +NO_ARCH= yes + .include diff --git a/devel/rubygem-airborne/distinfo b/devel/rubygem-airborne/distinfo index 08d704bf3102..fc48be036024 100644 --- a/devel/rubygem-airborne/distinfo +++ b/devel/rubygem-airborne/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519865950 -SHA256 (rubygem/airborne-0.2.13.gem) = 8f1986eca8f18a1e301e4b536de3526ec9464db01271a8b9e0c05eaddde09eec -SIZE (rubygem/airborne-0.2.13.gem) = 19968 +TIMESTAMP = 1565629641 +SHA256 (rubygem/airborne-0.3.4.gem) = 4344076a8158431b40ecc15a643c573d4f61333e6ecf9800ce59b5e4d50294e3 +SIZE (rubygem/airborne-0.3.4.gem) = 26112 -- cgit From bdf12f431003fd4b86a3108e555ae4496fefad21 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:16 +0000 Subject: Update to 1.4.4 - Update version requirement of RUN_DEPENDS - Take maintainership Changes: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md --- devel/rubygem-bootsnap/Makefile | 7 +++---- devel/rubygem-bootsnap/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/devel/rubygem-bootsnap/Makefile b/devel/rubygem-bootsnap/Makefile index f2549814af04..f98036c6a4c8 100644 --- a/devel/rubygem-bootsnap/Makefile +++ b/devel/rubygem-bootsnap/Makefile @@ -1,18 +1,17 @@ # $FreeBSD$ PORTNAME= bootsnap -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.4.4 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Boot large ruby/rails apps faster LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-msgpack>=1.0:devel/rubygem-msgpack +RUN_DEPENDS= rubygem-msgpack>=1.0<2.0:devel/rubygem-msgpack USES= gem shebangfix USE_RUBY= yes diff --git a/devel/rubygem-bootsnap/distinfo b/devel/rubygem-bootsnap/distinfo index 10e10d334c47..aed17dfa62b3 100644 --- a/devel/rubygem-bootsnap/distinfo +++ b/devel/rubygem-bootsnap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536690403 -SHA256 (rubygem/bootsnap-1.3.2.gem) = 1ed6954af9e975de1a1d38c8c913f68b103135bc02714340e4d0c94a093ad93c -SIZE (rubygem/bootsnap-1.3.2.gem) = 36352 +TIMESTAMP = 1565627650 +SHA256 (rubygem/bootsnap-1.4.4.gem) = 5b0d01f3dd0d0275bfaca9d47b19446c2428294949068a32ba0acb4141078cc9 +SIZE (rubygem/bootsnap-1.4.4.gem) = 39424 -- cgit From 538d1204cda088e129afe241d9d23c1bc208f12c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:22 +0000 Subject: Update to 3.28.0 - Update version requirement of RUN_DEPENDS Changes: https://github.com/teamcapybara/capybara/blob/master/History.md --- devel/rubygem-capybara/Makefile | 11 ++++++----- devel/rubygem-capybara/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/devel/rubygem-capybara/Makefile b/devel/rubygem-capybara/Makefile index fa5c27149d85..0999c39a9b90 100644 --- a/devel/rubygem-capybara/Makefile +++ b/devel/rubygem-capybara/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= capybara -PORTVERSION= 2.18.0 +PORTVERSION= 3.28.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,10 +14,11 @@ LICENSE_FILE= ${WRKSRC}/License.txt RUN_DEPENDS= rubygem-addressable>=0:www/rubygem-addressable \ rubygem-mini_mime>=0.1.3:mail/rubygem-mini_mime \ - rubygem-nokogiri>=1.3.3:textproc/rubygem-nokogiri \ - rubygem-rack>=1.0.0:www/rubygem-rack \ - rubygem-rack-test>=0.5.4:www/rubygem-rack-test \ - rubygem-xpath>=2.0:devel/rubygem-xpath + rubygem-nokogiri>=1.8<2:textproc/rubygem-nokogiri \ + rubygem-rack>=1.6.0:www/rubygem-rack \ + rubygem-rack-test>=0.6.3:www/rubygem-rack-test \ + rubygem-regexp_parser>=1.5<2:textproc/rubygem-regexp_parser \ + rubygem-xpath>=3.2<4:devel/rubygem-xpath USES= gem USE_RUBY= yes diff --git a/devel/rubygem-capybara/distinfo b/devel/rubygem-capybara/distinfo index 6dd0c39db9c4..4b0e4101caf6 100644 --- a/devel/rubygem-capybara/distinfo +++ b/devel/rubygem-capybara/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518537024 -SHA256 (rubygem/capybara-2.18.0.gem) = 084a2064b23ff1b8b47e09f00e797f2a2d0383dbc526eb2e467a53a96d3e677b -SIZE (rubygem/capybara-2.18.0.gem) = 274432 +TIMESTAMP = 1565543292 +SHA256 (rubygem/capybara-3.28.0.gem) = ec5a506ffc9c7c87b48080c13ad9f87bf53557ec83a0fb59cac3a9284f0b4d3b +SIZE (rubygem/capybara-3.28.0.gem) = 355328 -- cgit From fbee83ef9fae2306846083adac8a662795eac4a0 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:27 +0000 Subject: Update to 1.0.1 - Take maintainership Changes: https://github.com/enkessler/childprocess/blob/master/CHANGELOG.md --- devel/rubygem-childprocess/Makefile | 11 ++++++----- devel/rubygem-childprocess/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/devel/rubygem-childprocess/Makefile b/devel/rubygem-childprocess/Makefile index 0bd9bd03d1ef..f73428a6de79 100644 --- a/devel/rubygem-childprocess/Makefile +++ b/devel/rubygem-childprocess/Makefile @@ -2,20 +2,21 @@ # $FreeBSD$ PORTNAME= childprocess -PORTVERSION= 0.9.0 +PORTVERSION= 1.0.1 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= External background process controller LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-ffi>=1.0.11:devel/rubygem-ffi +RUN_DEPENDS= rubygem-rake>=0<13.0:devel/rubygem-rake -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/devel/rubygem-childprocess/distinfo b/devel/rubygem-childprocess/distinfo index 660643d31bc1..6f9cf07ecc6c 100644 --- a/devel/rubygem-childprocess/distinfo +++ b/devel/rubygem-childprocess/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520786570 -SHA256 (rubygem/childprocess-0.9.0.gem) = 17893660db6562970bc2d74dfa7f0bff1d94af62de81438bf49ded3a8548c128 -SIZE (rubygem/childprocess-0.9.0.gem) = 32768 +TIMESTAMP = 1565627621 +SHA256 (rubygem/childprocess-1.0.1.gem) = 7fe65b8d220967e8b47d8027274db40667641829f12ce9c6145022949c564fb4 +SIZE (rubygem/childprocess-1.0.1.gem) = 34816 -- cgit From b8cc3316aa48290e599b515c4aa1a2fa9b7d4e2c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:33 +0000 Subject: Update to 8.0.0 Changes: https://github.com/cucumber/cucumber-expressions-ruby/commits/master --- devel/rubygem-cucumber-expressions/Makefile | 2 +- devel/rubygem-cucumber-expressions/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-cucumber-expressions/Makefile b/devel/rubygem-cucumber-expressions/Makefile index 39f3f5825a79..bd08d28535dd 100644 --- a/devel/rubygem-cucumber-expressions/Makefile +++ b/devel/rubygem-cucumber-expressions/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cucumber-expressions -PORTVERSION= 7.0.0 +PORTVERSION= 8.0.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-cucumber-expressions/distinfo b/devel/rubygem-cucumber-expressions/distinfo index 37c1746869db..61e875e75ba4 100644 --- a/devel/rubygem-cucumber-expressions/distinfo +++ b/devel/rubygem-cucumber-expressions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553341101 -SHA256 (rubygem/cucumber-expressions-7.0.0.gem) = b1daf0fd71c9dd853cef0cd433946acddafc325b6a3bb8f52d0c6f9fc0025c4d -SIZE (rubygem/cucumber-expressions-7.0.0.gem) = 21504 +TIMESTAMP = 1565627624 +SHA256 (rubygem/cucumber-expressions-8.0.0.gem) = 26381f9270b85ef900daa6c4c2795ecaf3f3ae5840d9ea34a2defc53acf56bab +SIZE (rubygem/cucumber-expressions-8.0.0.gem) = 22016 -- cgit From e1cccd58768a12101a4337d860a24b91d1d73a41 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:38 +0000 Subject: Update to 2.1.2 - Update WWW Changes: https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md --- devel/rubygem-faker/Makefile | 4 ++-- devel/rubygem-faker/distinfo | 6 +++--- devel/rubygem-faker/pkg-descr | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile index 102f49a01cea..859b495822ca 100644 --- a/devel/rubygem-faker/Makefile +++ b/devel/rubygem-faker/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= faker -PORTVERSION= 1.9.6 +PORTVERSION= 2.1.2 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ COMMENT= Library for generating fake data: names, addresses, phone numbers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt -RUN_DEPENDS= rubygem-i18n>=0.7:devel/rubygem-i18n +RUN_DEPENDS= rubygem-i18n>=0.8:devel/rubygem-i18n USES= gem USE_RUBY= yes diff --git a/devel/rubygem-faker/distinfo b/devel/rubygem-faker/distinfo index 59be5c89b3b6..56f88e3fb6d0 100644 --- a/devel/rubygem-faker/distinfo +++ b/devel/rubygem-faker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562501205 -SHA256 (rubygem/faker-1.9.6.gem) = a76fc93e10036cbba29462cae44bb562717931456ab05830203db036991597b3 -SIZE (rubygem/faker-1.9.6.gem) = 847872 +TIMESTAMP = 1565625874 +SHA256 (rubygem/faker-2.1.2.gem) = 1ac75980a4a4a6a0e92ea266b482b12387ece4fbcb2d25f882c1416ced042917 +SIZE (rubygem/faker-2.1.2.gem) = 853504 diff --git a/devel/rubygem-faker/pkg-descr b/devel/rubygem-faker/pkg-descr index a91cdc25b3e2..0fb846abeb48 100644 --- a/devel/rubygem-faker/pkg-descr +++ b/devel/rubygem-faker/pkg-descr @@ -1,4 +1,4 @@ This gem is a port of Perl's Data::Faker library that generates fake data. It is used to easily generate fake data: names, addresses, phone numbers, etc. -WWW: https://github.com/stympy/faker +WWW: https://github.com/faker-ruby/faker -- cgit From 4bbb8cee3a3d30b9b4d40bafccaafb5d7a5c6e82 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:44 +0000 Subject: Update version requirement of RUN_DEPENDS --- devel/rubygem-gettext_i18n_rails_js-rails5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/rubygem-gettext_i18n_rails_js-rails5/Makefile b/devel/rubygem-gettext_i18n_rails_js-rails5/Makefile index e0b486b65d56..58ef06dbb8a4 100644 --- a/devel/rubygem-gettext_i18n_rails_js-rails5/Makefile +++ b/devel/rubygem-gettext_i18n_rails_js-rails5/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gettext>=3.0.2:devel/rubygem-gettext \ rubygem-gettext_i18n_rails>=0.7.1:devel/rubygem-gettext_i18n_rails \ rubygem-po_to_json>=1.0.0:converters/rubygem-po_to_json \ - rubygem-rails5>=5.0.7:www/rubygem-rails5 + rubygem-rails5>=3.2.0:www/rubygem-rails5 USES= gem USE_RUBY= yes -- cgit From a4a3b53e56809a0479a3b439d5dbf3ec30ec8822 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:50 +0000 Subject: Update to 1.6.0 - Update WWW - Take maintainership Changes: https://github.com/ruby-i18n/i18n/releases --- devel/rubygem-i18n/Makefile | 4 ++-- devel/rubygem-i18n/distinfo | 6 +++--- devel/rubygem-i18n/pkg-descr | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-i18n/Makefile b/devel/rubygem-i18n/Makefile index 7de8e99f310d..162df408a5ce 100644 --- a/devel/rubygem-i18n/Makefile +++ b/devel/rubygem-i18n/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= i18n -PORTVERSION= 1.1.1 +PORTVERSION= 1.6.0 PORTEPOCH= 2 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= New wave Internationalization support for Ruby LICENSE= MIT diff --git a/devel/rubygem-i18n/distinfo b/devel/rubygem-i18n/distinfo index 2ed7deca5498..2ec3ea046f65 100644 --- a/devel/rubygem-i18n/distinfo +++ b/devel/rubygem-i18n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539714797 -SHA256 (rubygem/i18n-1.1.1.gem) = a7b7e411cd9dbbfd0c4e2cfda9353dffbd149940528bef98d7ea3673430d97bd -SIZE (rubygem/i18n-1.1.1.gem) = 61952 +TIMESTAMP = 1565627653 +SHA256 (rubygem/i18n-1.6.0.gem) = 941b77be3243ae41091349c0c598bc170ba4aeaf893b757b111a05933db5ddc1 +SIZE (rubygem/i18n-1.6.0.gem) = 41984 diff --git a/devel/rubygem-i18n/pkg-descr b/devel/rubygem-i18n/pkg-descr index 36c51b94b812..4de186120b1e 100644 --- a/devel/rubygem-i18n/pkg-descr +++ b/devel/rubygem-i18n/pkg-descr @@ -1,3 +1,3 @@ New wave Internationalization support for Ruby. -WWW: https://github.com/svenfuchs/i18n +WWW: https://github.com/ruby-i18n/i18n -- cgit From 9c8295a26d72664e5e4fd9a73741b0845f7a866a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:45:56 +0000 Subject: Update to 0.3.3 - Take maintainership Changes: https://github.com/minad/mimemagic/blob/master/CHANGELOG.md --- misc/rubygem-mimemagic/Makefile | 10 +++++----- misc/rubygem-mimemagic/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/rubygem-mimemagic/Makefile b/misc/rubygem-mimemagic/Makefile index d6d82d653cb7..f8fdfb15dd6d 100644 --- a/misc/rubygem-mimemagic/Makefile +++ b/misc/rubygem-mimemagic/Makefile @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= mimemagic -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= misc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= MIME detection by extension or content in pure ruby -COMMENT= Detects the mime type of a file by extension or by content LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/misc/rubygem-mimemagic/distinfo b/misc/rubygem-mimemagic/distinfo index 5da363a166fc..5b9cad4bcd88 100644 --- a/misc/rubygem-mimemagic/distinfo +++ b/misc/rubygem-mimemagic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483285126 -SHA256 (rubygem/mimemagic-0.3.2.gem) = 78b0601d780a3a0f4bb48c88e03af6dc06610a59bc0f10a877deb50d6b602b02 -SIZE (rubygem/mimemagic-0.3.2.gem) = 366080 +TIMESTAMP = 1565627661 +SHA256 (rubygem/mimemagic-0.3.3.gem) = dcc5272237bd92cabf9fe395dc82479d5178583918d88ebd401d07b89c2e9711 +SIZE (rubygem/mimemagic-0.3.3.gem) = 402944 -- cgit From 952ed6728e57a07ad62a510b0055359cdb6dcb1f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:01 +0000 Subject: Update version requirement of RUN_DEPENDS --- security/rubygem-devise-two-factor/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/rubygem-devise-two-factor/Makefile b/security/rubygem-devise-two-factor/Makefile index 3af6088a7538..00e64d35499f 100644 --- a/security/rubygem-devise-two-factor/Makefile +++ b/security/rubygem-devise-two-factor/Makefile @@ -12,10 +12,10 @@ COMMENT= Barebones two-factor authentication with Devise LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ - rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \ - rubygem-devise>=4.0:devel/rubygem-devise \ - rubygem-railties50>=0:www/rubygem-railties50 \ +RUN_DEPENDS= rubygem-activesupport50>=0<6.1:devel/rubygem-activesupport50 \ + rubygem-attr_encrypted>=1.3<4:security/rubygem-attr_encrypted \ + rubygem-devise>=4.0<5:devel/rubygem-devise \ + rubygem-railties50>=0<6.1:www/rubygem-railties50 \ rubygem-rotp>=2.0:devel/rubygem-rotp USES= gem -- cgit From c9fabeb8f92369293112c50326472324d75dfbf2 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:06 +0000 Subject: Update version requirement of RUN_DEPENDS --- security/rubygem-devise-two-factor-rails5/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/rubygem-devise-two-factor-rails5/Makefile b/security/rubygem-devise-two-factor-rails5/Makefile index 201d2675038d..7455e4d2a7c4 100644 --- a/security/rubygem-devise-two-factor-rails5/Makefile +++ b/security/rubygem-devise-two-factor-rails5/Makefile @@ -13,10 +13,10 @@ COMMENT= Barebones two-factor authentication with Devise LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport5>=0:devel/rubygem-activesupport5 \ - rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \ - rubygem-devise-rails5>=4.0:devel/rubygem-devise-rails5 \ - rubygem-railties5>=0:www/rubygem-railties5 \ +RUN_DEPENDS= rubygem-activesupport5>=0<6.1:devel/rubygem-activesupport5 \ + rubygem-attr_encrypted>=1.3<4:security/rubygem-attr_encrypted \ + rubygem-devise-rails5>=4.0<5:devel/rubygem-devise-rails5 \ + rubygem-railties5>=0<6.1:www/rubygem-railties5 \ rubygem-rotp>=2.0:devel/rubygem-rotp USES= gem -- cgit From c5469a761bd8283daaf0dba9e799deea0d5e4dfb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:10 +0000 Subject: Update version requirement of RUN_DEPENDS --- security/rubygem-devise-two-factor30-rails5/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/rubygem-devise-two-factor30-rails5/Makefile b/security/rubygem-devise-two-factor30-rails5/Makefile index c306fce94e2e..55330d9d8086 100644 --- a/security/rubygem-devise-two-factor30-rails5/Makefile +++ b/security/rubygem-devise-two-factor30-rails5/Makefile @@ -13,10 +13,10 @@ COMMENT= Barebones two-factor authentication with Devise LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport5>=0:devel/rubygem-activesupport5 \ - rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \ - rubygem-devise-rails5>=4.0:devel/rubygem-devise-rails5 \ - rubygem-railties5>=0:www/rubygem-railties5 \ +RUN_DEPENDS= rubygem-activesupport5>=0<5.3:devel/rubygem-activesupport5 \ + rubygem-attr_encrypted>=1.3<4:security/rubygem-attr_encrypted \ + rubygem-devise-rails5>=4.0<5:devel/rubygem-devise-rails5 \ + rubygem-railties5>=0<5.3:www/rubygem-railties5 \ rubygem-rotp>=2.0:devel/rubygem-rotp USES= gem -- cgit From be59b3f29c9503b8400bbd97f3cdcb89eff50018 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:16 +0000 Subject: Update to 3.7.4 Changes: https://github.com/sass/ruby-sass/blob/stable/doc-src/SASS_CHANGELOG.md --- textproc/rubygem-sass/Makefile | 2 +- textproc/rubygem-sass/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/rubygem-sass/Makefile b/textproc/rubygem-sass/Makefile index 484c7d82ce77..1e7b37ecef31 100644 --- a/textproc/rubygem-sass/Makefile +++ b/textproc/rubygem-sass/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sass -PORTVERSION= 3.5.7 +PORTVERSION= 3.7.4 CATEGORIES= textproc ruby MASTER_SITES= RG diff --git a/textproc/rubygem-sass/distinfo b/textproc/rubygem-sass/distinfo index f90dd475705a..356bb01ece6b 100644 --- a/textproc/rubygem-sass/distinfo +++ b/textproc/rubygem-sass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532976213 -SHA256 (rubygem/sass-3.5.7.gem) = c144830959626b61774479c0bb2f39d7397afd31092feb8b04c9b3fb96eec7eb -SIZE (rubygem/sass-3.5.7.gem) = 320000 +TIMESTAMP = 1565627627 +SHA256 (rubygem/sass-3.7.4.gem) = 808b0d39053aa69068df939e24671fe84fd5a9d3314486e1a1457d0934a4255d +SIZE (rubygem/sass-3.7.4.gem) = 208896 -- cgit From 29f9a6731d186a459d35eb14536ade62e8a4aa7e Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:21 +0000 Subject: Fix gemspec for rubygem-rack-test 1.1.0 update - Bump PORTREVISION for package change --- www/rubygem-actionpack50/Makefile | 1 + www/rubygem-actionpack50/files/patch-gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/rubygem-actionpack50/Makefile b/www/rubygem-actionpack50/Makefile index 5762e349a320..57057435fb03 100644 --- a/www/rubygem-actionpack50/Makefile +++ b/www/rubygem-actionpack50/Makefile @@ -3,6 +3,7 @@ PORTNAME= actionpack PORTVERSION= 5.0.7.2 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 50 diff --git a/www/rubygem-actionpack50/files/patch-gemspec b/www/rubygem-actionpack50/files/patch-gemspec index c891bdb7066b..67c45c2b7103 100644 --- a/www/rubygem-actionpack50/files/patch-gemspec +++ b/www/rubygem-actionpack50/files/patch-gemspec @@ -5,7 +5,7 @@ s.add_runtime_dependency(%q.freeze, ["= 5.0.7.2"]) s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.6.3"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 0.6", ">= 0.6.3"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.6.3"]) s.add_runtime_dependency(%q.freeze, ["~> 1.0", ">= 1.0.2"]) s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) s.add_runtime_dependency(%q.freeze, ["= 5.0.7.2"]) -- cgit From 5e95b79a4c1da6e75b3b3fe1d9725ce6bd5b3076 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:27 +0000 Subject: Update to 0.7.1 - Update LICENSE - Take maintainership Changes: https://github.com/faye/websocket-driver-ruby/blob/master/CHANGELOG.md --- www/rubygem-websocket-driver/Makefile | 8 ++++---- www/rubygem-websocket-driver/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/rubygem-websocket-driver/Makefile b/www/rubygem-websocket-driver/Makefile index 654890796532..aebbc5b557c0 100644 --- a/www/rubygem-websocket-driver/Makefile +++ b/www/rubygem-websocket-driver/Makefile @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= websocket-driver -PORTVERSION= 0.7.0 +PORTVERSION= 0.7.1 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= WebSocket protocol handler with pluggable I/O -LICENSE= MIT +LICENSE= APACHE20 RUN_DEPENDS= rubygem-websocket-extensions>=0.1.0:www/rubygem-websocket-extensions -USE_RUBY= yes USES= gem +USE_RUBY= yes .include diff --git a/www/rubygem-websocket-driver/distinfo b/www/rubygem-websocket-driver/distinfo index e91be623f2f5..24575c6b1bba 100644 --- a/www/rubygem-websocket-driver/distinfo +++ b/www/rubygem-websocket-driver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505229728 -SHA256 (rubygem/websocket-driver-0.7.0.gem) = b685472c3905f9dedcdbf5db96fd4d6b46a02f2d764887e11b6bcea1dd98a194 -SIZE (rubygem/websocket-driver-0.7.0.gem) = 22016 +TIMESTAMP = 1565627631 +SHA256 (rubygem/websocket-driver-0.7.1.gem) = 42da9056faea05a4c143073233282441f366d5f00bdfa23b44c9d74631afaaaf +SIZE (rubygem/websocket-driver-0.7.1.gem) = 22016 -- cgit From 6c2fab2f179f3183caef858d50d851fe1a7c0ce7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:32 +0000 Subject: Update to 0.1.4 - Update LICENSE - Take maintainership Changes: https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md --- www/rubygem-websocket-extensions/Makefile | 12 ++++++------ www/rubygem-websocket-extensions/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/www/rubygem-websocket-extensions/Makefile b/www/rubygem-websocket-extensions/Makefile index 091b1fcfb547..0354b46b57ba 100644 --- a/www/rubygem-websocket-extensions/Makefile +++ b/www/rubygem-websocket-extensions/Makefile @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= websocket-extensions -PORTVERSION= 0.1.3 +PORTVERSION= 0.1.4 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generic extension manager for WebSocket connections -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.md +LICENSE= APACHE20 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/www/rubygem-websocket-extensions/distinfo b/www/rubygem-websocket-extensions/distinfo index 60ba4d59af19..31ef61f425c1 100644 --- a/www/rubygem-websocket-extensions/distinfo +++ b/www/rubygem-websocket-extensions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510422364 -SHA256 (rubygem/websocket-extensions-0.1.3.gem) = e0886634e49a5d0a790b43d49286af0f47b86636257843cb539e8ce64e6e9a0c -SIZE (rubygem/websocket-extensions-0.1.3.gem) = 11264 +TIMESTAMP = 1565627634 +SHA256 (rubygem/websocket-extensions-0.1.4.gem) = d53c14130d5648387082181087553f119adbbb476ec8c97cf873dbf02c112602 +SIZE (rubygem/websocket-extensions-0.1.4.gem) = 10752 -- cgit From b55279842d3a7109c404f6da2a55afda0b9f40c5 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:37 +0000 Subject: Update to 2019.08.11 --- german/mythes/Makefile | 2 +- german/mythes/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/german/mythes/Makefile b/german/mythes/Makefile index 749fccdd1450..e32eed3a6de4 100644 --- a/german/mythes/Makefile +++ b/german/mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2019.08.04 +PORTVERSION= 2019.08.11 CATEGORIES= german textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME} DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g} diff --git a/german/mythes/distinfo b/german/mythes/distinfo index 20df9afa50c2..2db891890f35 100644 --- a/german/mythes/distinfo +++ b/german/mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565012812 -SHA256 (mythes/Deutscher-Thesaurus-20190804.oxt) = 40347a8672caee71cbe12fc0305e475448423583e8e3a8b4d0c78ccbf3465220 -SIZE (mythes/Deutscher-Thesaurus-20190804.oxt) = 9451888 +TIMESTAMP = 1565627637 +SHA256 (mythes/Deutscher-Thesaurus-20190811.oxt) = 4c5f069e8e99da2c34a4128e55135d172b94e746dbb988ac82767534f6becff4 +SIZE (mythes/Deutscher-Thesaurus-20190811.oxt) = 9462525 -- cgit From a63e4183b726095b4460b943ee9aa93f9fbbe8c3 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:42 +0000 Subject: Update to 20190808 --- polish/hunspell/Makefile | 2 +- polish/hunspell/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile index b6e65e8458e1..5e8fc4d64d5d 100644 --- a/polish/hunspell/Makefile +++ b/polish/hunspell/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 20190801 +PORTVERSION= 20190808 CATEGORIES= polish textproc MASTER_SITES= https://sjp.pl/slownik/ort/ \ LOCAL/sunpoet/${PORTNAME} diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo index 3b9b1a719de6..3245ed374368 100644 --- a/polish/hunspell/distinfo +++ b/polish/hunspell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565012814 -SHA256 (hunspell/sjp-myspell-pl-20190801.zip) = 9b251ae849ad32e061dbc37e6dbd5765640a4f721173d7bbc3870eaf580dc04e -SIZE (hunspell/sjp-myspell-pl-20190801.zip) = 1223490 +TIMESTAMP = 1565627640 +SHA256 (hunspell/sjp-myspell-pl-20190808.zip) = c47a9fadac9ffaa5346eef43c33c4a871b22004aed3ca636c9d6635564edec9a +SIZE (hunspell/sjp-myspell-pl-20190808.zip) = 1223483 -- cgit From a1e8474285951d33d8ec9226a0c189fd2bc42563 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:47 +0000 Subject: Update to 1.64 Changes: https://metacpan.org/changes/distribution/DBD-SQLite --- databases/p5-DBD-SQLite/Makefile | 2 +- databases/p5-DBD-SQLite/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile index 1e552f142b9b..2a2debb5e163 100644 --- a/databases/p5-DBD-SQLite/Makefile +++ b/databases/p5-DBD-SQLite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= DBD-SQLite -PORTVERSION= 1.62 +PORTVERSION= 1.64 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-DBD-SQLite/distinfo b/databases/p5-DBD-SQLite/distinfo index e8ad8216b853..468cdffff81a 100644 --- a/databases/p5-DBD-SQLite/distinfo +++ b/databases/p5-DBD-SQLite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546483294 -SHA256 (DBD-SQLite-1.62.tar.gz) = bd82ef322a9e5469a7a62d845c32fad1188b76ccb49a88520cec768343cce85c -SIZE (DBD-SQLite-1.62.tar.gz) = 2386097 +TIMESTAMP = 1565627643 +SHA256 (DBD-SQLite-1.64.tar.gz) = f4ae8f7b50842305566aadd90f7bfd12a9e32b6c603a9b1c1529e73eb82aff01 +SIZE (DBD-SQLite-1.64.tar.gz) = 2416842 -- cgit From fd9bbf23b01cd5a48b6a50d1060b88c02797dbea Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:53 +0000 Subject: Update to 12.3.3 Changes: https://github.com/ruby/rake/blob/master/History.rdoc --- devel/rubygem-rake/Makefile | 2 +- devel/rubygem-rake/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile index 297d34736d83..9927ac45715c 100644 --- a/devel/rubygem-rake/Makefile +++ b/devel/rubygem-rake/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rake -PORTVERSION= 12.3.2 +PORTVERSION= 12.3.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-rake/distinfo b/devel/rubygem-rake/distinfo index 0c0de8cf2f42..df5289845d27 100644 --- a/devel/rubygem-rake/distinfo +++ b/devel/rubygem-rake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544284584 -SHA256 (rubygem/rake-12.3.2.gem) = 56362f144a29ffbc5e49161a80ca4e2e6b7da2946170067d624d7603ed51c5eb -SIZE (rubygem/rake-12.3.2.gem) = 87040 +TIMESTAMP = 1565627657 +SHA256 (rubygem/rake-12.3.3.gem) = f7694adb4fe638da35452300cee6c545e9c377a0e3190018ac04d590b3c26ab3 +SIZE (rubygem/rake-12.3.3.gem) = 87040 -- cgit From 4a17ff658eaab79a2d91862180bd8da3837b26c9 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:46:58 +0000 Subject: Revert rubygem-mini_portile2 change in r502877 - Bump PORTREVISION for dependency change We do not need mini_portile/mini_portile2. It was removed since r355100 and r494447. mini_portile2 is used to download and build the libraries which is already handled by our ports framework very well. Furthermore, it is not needed when using system libraries (CONFIGURE_ARGS=--use-system-libraries). Reference: https://lists.freebsd.org/pipermail/svn-ports-all/2019-March/209423.html https://github.com/sparklemotion/nokogiri/blob/v1.10.3/ext/nokogiri/extconf.rb#L447-L471 --- textproc/rubygem-nokogiri/Makefile | 7 ++++--- textproc/rubygem-nokogiri/files/patch-gemspec | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 textproc/rubygem-nokogiri/files/patch-gemspec diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile index e485d3d33bce..ce89a453dba8 100644 --- a/textproc/rubygem-nokogiri/Makefile +++ b/textproc/rubygem-nokogiri/Makefile @@ -2,7 +2,7 @@ PORTNAME= nokogiri PORTVERSION= 1.10.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -12,11 +12,12 @@ COMMENT= HTML, XML, SAX, and Reader parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md +# Do not add mini_portile2 to RUN_DEPENDS. Read ext/nokogiri/extconf.rb +# and https://lists.freebsd.org/pipermail/svn-ports-all/2019-March/209423.html BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error -RUN_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config \ - rubygem-mini_portile2>=2.4.0:devel/rubygem-mini_portile2 +RUN_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config USES= gem gnome pkgconfig gettext-runtime USE_GNOME= libxml2 libxslt diff --git a/textproc/rubygem-nokogiri/files/patch-gemspec b/textproc/rubygem-nokogiri/files/patch-gemspec new file mode 100644 index 000000000000..74be70e357f6 --- /dev/null +++ b/textproc/rubygem-nokogiri/files/patch-gemspec @@ -0,0 +1,10 @@ +--- nokogiri.gemspec.orig 2019-08-12 17:41:47 UTC ++++ nokogiri.gemspec +@@ -26,7 +26,6 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 2.4.0"]) + s.add_development_dependency(%q.freeze, ["~> 0.24"]) + s.add_development_dependency(%q.freeze, ["~> 1.2"]) + s.add_development_dependency(%q.freeze, ["~> 2.0"]) -- cgit From c3d80a1af3a5853f2307e8eac356ca205aee924d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:47:03 +0000 Subject: Update to 3.12.1 - Update WWW Changes: https://github.com/puma/puma/releases https://github.com/puma/puma/blob/master/History.md --- www/rubygem-puma/Makefile | 4 ++-- www/rubygem-puma/distinfo | 6 +++--- www/rubygem-puma/pkg-descr | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/rubygem-puma/Makefile b/www/rubygem-puma/Makefile index 1d06af89b852..2db74983be25 100644 --- a/www/rubygem-puma/Makefile +++ b/www/rubygem-puma/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= puma -PORTVERSION= 3.12.0 +PORTVERSION= 3.12.1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -12,8 +12,8 @@ COMMENT= Fast, multithreaded and highly concurrent ruby web server LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USE_RUBY= yes USES= gem shebangfix ssl +USE_RUBY= yes PLIST_FILES= bin/puma bin/pumactl diff --git a/www/rubygem-puma/distinfo b/www/rubygem-puma/distinfo index 3fa51a4fc7d4..d4614a9d1600 100644 --- a/www/rubygem-puma/distinfo +++ b/www/rubygem-puma/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532976272 -SHA256 (rubygem/puma-3.12.0.gem) = 38521e86ff1829da71b666e6a6e9816ad849999d39e9377b2ece36806dc7edcc -SIZE (rubygem/puma-3.12.0.gem) = 165376 +TIMESTAMP = 1565627677 +SHA256 (rubygem/puma-3.12.1.gem) = 634f3308783c9e014e0046a3370ae43ce33080d69fb48b0f098e6633d55e79de +SIZE (rubygem/puma-3.12.1.gem) = 165888 diff --git a/www/rubygem-puma/pkg-descr b/www/rubygem-puma/pkg-descr index 4e3518985cb1..5bb286554ce0 100644 --- a/www/rubygem-puma/pkg-descr +++ b/www/rubygem-puma/pkg-descr @@ -4,4 +4,4 @@ production environments. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like Rubinius or JRuby. -WWW: http://puma.io/ +WWW: https://puma.io/ -- cgit From c7a75c4e86b7a59aac76c84c2b327d1cc6dbbe2a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:47:09 +0000 Subject: Fix gemspec for rubygem-rack-test 1.1.0 update - Bump PORTREVISION for package change --- www/rubygem-actionpack4/Makefile | 1 + www/rubygem-actionpack4/files/patch-gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/rubygem-actionpack4/Makefile b/www/rubygem-actionpack4/Makefile index f312e80330a2..99ebd737925b 100644 --- a/www/rubygem-actionpack4/Makefile +++ b/www/rubygem-actionpack4/Makefile @@ -3,6 +3,7 @@ PORTNAME= actionpack PORTVERSION= 4.2.11.1 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 4 diff --git a/www/rubygem-actionpack4/files/patch-gemspec b/www/rubygem-actionpack4/files/patch-gemspec index f87d62c03c23..45ea2df0d1a0 100644 --- a/www/rubygem-actionpack4/files/patch-gemspec +++ b/www/rubygem-actionpack4/files/patch-gemspec @@ -5,7 +5,7 @@ s.add_runtime_dependency(%q.freeze, ["= 4.2.11.1"]) s.add_runtime_dependency(%q.freeze, ["~> 1.6"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.6.2"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 0.6", ">= 0.6.2"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.6.2"]) s.add_runtime_dependency(%q.freeze, ["~> 1.0", ">= 1.0.2"]) s.add_runtime_dependency(%q.freeze, ["~> 1.0", ">= 1.0.5"]) s.add_runtime_dependency(%q.freeze, ["= 4.2.11.1"]) -- cgit From 593c0ac623f7e9881c77f406d363e61701c2e17d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:47:14 +0000 Subject: Update to 1.1.0 - Update version requirement of RUN_DEPENDS Changes: https://github.com/rack-test/rack-test/releases --- www/rubygem-rack-test/Makefile | 9 +++++---- www/rubygem-rack-test/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/www/rubygem-rack-test/Makefile b/www/rubygem-rack-test/Makefile index 7bfe1d8318a2..3a5d51c779e3 100644 --- a/www/rubygem-rack-test/Makefile +++ b/www/rubygem-rack-test/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rack-test -PORTVERSION= 0.8.3 +PORTVERSION= 1.1.0 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,10 +11,11 @@ COMMENT= Small, simple testing API for Rack apps LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt -RUN_DEPENDS= rubygem-rack16>=1.0:www/rubygem-rack16 +RUN_DEPENDS= rubygem-rack16>=1.0<3:www/rubygem-rack16 -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/www/rubygem-rack-test/distinfo b/www/rubygem-rack-test/distinfo index a388dbb1ddd7..779f46b496fb 100644 --- a/www/rubygem-rack-test/distinfo +++ b/www/rubygem-rack-test/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519823380 -SHA256 (rubygem/rack-test-0.8.3.gem) = 2fec9a98d366017788dbcddb60430d58c4fec9733d6a695c8a216fee7f1a3292 -SIZE (rubygem/rack-test-0.8.3.gem) = 17408 +TIMESTAMP = 1565627680 +SHA256 (rubygem/rack-test-1.1.0.gem) = 154161f40f162b1c009a655b7b0c5de3a3102cc6d7d2e94b64e1f46ace800866 +SIZE (rubygem/rack-test-1.1.0.gem) = 17920 -- cgit From 39bbaa3080a49e7add695a5755e8813cbe4478f8 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 12 Aug 2019 19:47:19 +0000 Subject: Fix gemspec for rubygem-rack-test 1.1.0 update - Bump PORTREVISION for package change --- net-mgmt/rubygem-oxidized-web/Makefile | 1 + net-mgmt/rubygem-oxidized-web/files/patch-gemspec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile index d5b865d835d4..3ebaa7570151 100644 --- a/net-mgmt/rubygem-oxidized-web/Makefile +++ b/net-mgmt/rubygem-oxidized-web/Makefile @@ -3,6 +3,7 @@ PORTNAME= oxidized-web PORTVERSION= 0.13.1 +PORTREVISION= 1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-gemspec b/net-mgmt/rubygem-oxidized-web/files/patch-gemspec index 401e774e9d47..304ae99de32c 100644 --- a/net-mgmt/rubygem-oxidized-web/files/patch-gemspec +++ b/net-mgmt/rubygem-oxidized-web/files/patch-gemspec @@ -1,4 +1,4 @@ ---- oxidized-web.gemspec.orig 2019-04-06 14:15:21 UTC +--- oxidized-web.gemspec.orig 2019-08-12 17:14:24 UTC +++ oxidized-web.gemspec @@ -27,12 +27,12 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, ["~> 5.0"]) @@ -11,7 +11,7 @@ s.add_runtime_dependency(%q.freeze, ["~> 1.4", ">= 1.4.6"]) s.add_runtime_dependency(%q.freeze, [">= 1.7.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.7.0"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 0.7"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.7.0"]) s.add_development_dependency(%q.freeze, ["~> 2.0"]) s.add_development_dependency(%q.freeze, ["~> 1.19"]) s.add_development_dependency(%q.freeze, ["~> 10.0"]) -- cgit From 85bd54afc132d261380efa6603127ca13847a68e Mon Sep 17 00:00:00 2001 From: pkubaj Date: Mon, 12 Aug 2019 20:13:18 +0000 Subject: net/liveMedia: fix build with GCC-based architectures Use C++11 compiler: MPEG2TransportStreamParser.hh:107: error: a class-key must be used when declaring a friend Approved by: mentors (implicit approval) --- net/liveMedia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile index 16189bbacd14..46c0f07325af 100644 --- a/net/liveMedia/Makefile +++ b/net/liveMedia/Makefile @@ -25,7 +25,7 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= genMakefiles CONFIGURE_ARGS= fixed-freebsd -USES= gmake +USES= compiler:c++11-lang gmake USE_LDCONFIG= yes .include -- cgit From 3de68f8b931a64f1ee2bddc8166a783a801720c9 Mon Sep 17 00:00:00 2001 From: bsam Date: Mon, 12 Aug 2019 21:09:31 +0000 Subject: java/intellij: Update to version 2019.2. PR: 239790 Submitted by: Dmitry Wagin --- java/intellij/Makefile | 54 +- java/intellij/distinfo | 6 +- java/intellij/files/idea.1 | 2 +- java/intellij/files/idea.desktop.in | 4 +- java/intellij/files/idea.in | 2 +- java/intellij/files/pkg-message.in | 10 +- java/intellij/pkg-plist | 20071 +++++++++++++++++----------------- 7 files changed, 10263 insertions(+), 9886 deletions(-) diff --git a/java/intellij/Makefile b/java/intellij/Makefile index f148693b2218..b0ec6983c2d7 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -5,11 +5,11 @@ # Vadim Zhukov PORTNAME= intellij -PORTVERSION= 2019.1.3 +PORTVERSION= 2019.2 CATEGORIES= java devel -MASTER_SITES= https://download.jetbrains.com/idea/ \ - http://download.jetbrains.com/idea/ +MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr +DIST_SUBDIR= jetbrains MAINTAINER= bsam@FreeBSD.org COMMENT= IntelliJ IDEA Community Edition @@ -19,45 +19,47 @@ LICENSE= APACHE20 RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ intellij-pty4j>0:java/intellij-pty4j -USE_JAVA= yes -JAVA_VERSION= 1.7+ USES= python:run shebangfix + +USE_JAVA= yes +JAVA_VERSION= 1.8+ + SHEBANG_FILES= bin/printenv.py bin/restart.py NO_ARCH= yes NO_BUILD= yes INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/idea-IC-191.7479.19 - -.include "common.mk" +WRKSRC= ${WRKDIR}/idea-IC-192.5728.98 -PLIST_SUB+= IDEA_HOME=${IDEA_HOME} -SUB_FILES+= idea idea.desktop pkg-message -SUB_LIST+= IDEA_HOME=${IDEA_HOME} +SUB_FILES= idea idea.desktop pkg-message +SUB_LIST= DATADIR=${DATADIR} +CONFLICTS= intellij-ultimate-* do-install: - ${MKDIR} ${STAGEDIR}${IDEA_HOME} - @${TAR} -czf - -C ${WRKSRC} . | ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME} # Linux/Windows/OS X only so remove them - @${RM} ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier \ - ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier-arm \ - ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier64 \ - ${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-linux-*.jar \ - ${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-*.jar \ - ${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-*.jar + @${RM} -r ${WRKSRC}/bin/fsnotifier \ + ${WRKSRC}/bin/fsnotifier-arm \ + ${WRKSRC}/bin/fsnotifier64 \ + ${WRKSRC}/plugins/android/lib/libwebp \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native \ + ${WRKSRC}/plugins/performanceTesting/bin # Remove the bundled native Pty4J support libraries, they are replaced # by java/intellij-pty4j - @${RM} -r ${STAGEDIR}${IDEA_HOME}/lib/pty4j-native + @${RM} -r ${WRKSRC}/lib/pty4j-native +# Remove bundled linux JetBrains Runtime and OpenJDK + @${RM} -r ${WRKSRC}/jbr ${WRKSRC}/jre64 + ${MKDIR} ${STAGEDIR}${DATADIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ + "! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") + @(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh") ${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/ - cd ${WRKSRC}/lib && ${JAVA_HOME}/bin/jar xf icons.jar - ${INSTALL_DATA} ${WRKSRC}/lib/icon.png ${STAGEDIR}${IDEA_HOME}/idea.png -# TODO: Remove and enable fsnotifier when devel/libinotify is fixed -# Disable filewatcher warning message on IDEA startup - ${ECHO} "idea.filewatcher.disabled=true" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties # Use fsnotifier replacement provided by java/intellij-fsnotifier - ${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties + ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties +# Fix slow render + ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea.vmoptions + ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea64.vmoptions .include diff --git a/java/intellij/distinfo b/java/intellij/distinfo index 0ea0b966b793..abdec2193e6d 100644 --- a/java/intellij/distinfo +++ b/java/intellij/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560087044 -SHA256 (ideaIC-2019.1.3-no-jbr.tar.gz) = 6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff -SIZE (ideaIC-2019.1.3-no-jbr.tar.gz) = 496395133 +TIMESTAMP = 1565566115 +SHA256 (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 7ab6ad4b54b32425cd7e5a8554cb34443e37611b230b94c559f878b1e68030f5 +SIZE (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 531207945 diff --git a/java/intellij/files/idea.1 b/java/intellij/files/idea.1 index b4386407071b..5efacd6f74b4 100644 --- a/java/intellij/files/idea.1 +++ b/java/intellij/files/idea.1 @@ -1,6 +1,6 @@ .\" $OpenBSD: mdoc.template,v 1.10 2007/05/31 22:10:19 jmc Exp $ .Dd $Mdocdate: April 9 2010 $ -.Dt IDEA 1 +.Dt idea 1 .Os .Sh NAME .Nm idea diff --git a/java/intellij/files/idea.desktop.in b/java/intellij/files/idea.desktop.in index 0b11b1c44e58..388e9b35dba3 100644 --- a/java/intellij/files/idea.desktop.in +++ b/java/intellij/files/idea.desktop.in @@ -5,8 +5,8 @@ Type=Application Name=IntelliJ IDEA Community Edition GenericName=IntelliJ IDEA Community Edition Comment=IntelliJ Integrated Development Environment -Icon=%%IDEA_HOME%%/idea.png -Exec=%%IDEA_HOME%%/bin/idea.sh +Icon=%%DATADIR%%/bin/idea.png +Exec=%%DATADIR%%/bin/idea.sh Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/java/intellij/files/idea.in b/java/intellij/files/idea.in index 0b0ad81de31c..4d4ee54b0cda 100644 --- a/java/intellij/files/idea.in +++ b/java/intellij/files/idea.in @@ -1,3 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" "$@" +exec "%%DATADIR%%/bin/idea.sh" "$@" diff --git a/java/intellij/files/pkg-message.in b/java/intellij/files/pkg-message.in index a9e30976e1cc..3830266040c0 100644 --- a/java/intellij/files/pkg-message.in +++ b/java/intellij/files/pkg-message.in @@ -1,9 +1,9 @@ -There is experimental native (faster) file watching support which is -disabled by default. Currently there are problems with watching large -trees. To enable edit %%IDEA_HOME%%/bin/idea.properties and append +There is a native (faster) file watching support backed by kqueue which is +enabled by default. If you encounter problems with watching large +trees, you can disable it by appending the following property into +%%DATADIR%%/bin/idea.properties: - idea.filewatcher.disabled=false - idea.filewatcher.executable.path=%%IDEA_HOME%%/bin/fsnotifier + idea.filewatcher.disabled=true Only enable fsnotifier if your projects have < 600 files. diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist index 69e90462eb72..e8ceafd4a670 100644 --- a/java/intellij/pkg-plist +++ b/java/intellij/pkg-plist @@ -1,9851 +1,10226 @@ bin/idea man/man1/idea.1.gz share/applications/idea.desktop -%%IDEA_HOME%%/Install-Linux-tar.txt -%%IDEA_HOME%%/LICENSE.txt -%%IDEA_HOME%%/NOTICE.txt -%%IDEA_HOME%%/bin/appletviewer.policy -%%IDEA_HOME%%/bin/format.sh -%%IDEA_HOME%%/bin/idea.png -%%IDEA_HOME%%/bin/idea.properties -%%IDEA_HOME%%/bin/idea.sh -%%IDEA_HOME%%/bin/idea.svg -%%IDEA_HOME%%/bin/idea.vmoptions -%%IDEA_HOME%%/bin/idea64.vmoptions -%%IDEA_HOME%%/bin/inspect.sh -%%IDEA_HOME%%/bin/libdbm64.so -%%IDEA_HOME%%/bin/log.xml -%%IDEA_HOME%%/bin/printenv.py -%%IDEA_HOME%%/bin/restart.py -%%IDEA_HOME%%/build.txt -%%IDEA_HOME%%/idea.png -%%IDEA_HOME%%/lib/FastInfoset-1.2.15.jar -%%IDEA_HOME%%/lib/aapt-proto-jarjar.jar -%%IDEA_HOME%%/lib/aether-api-1.1.0.jar -%%IDEA_HOME%%/lib/aether-connector-basic-1.1.0.jar -%%IDEA_HOME%%/lib/aether-dependency-resolver.jar -%%IDEA_HOME%%/lib/aether-impl-1.1.0.jar -%%IDEA_HOME%%/lib/aether-spi-1.1.0.jar -%%IDEA_HOME%%/lib/aether-transport-file-1.1.0.jar -%%IDEA_HOME%%/lib/aether-transport-http-1.1.0.jar -%%IDEA_HOME%%/lib/aether-util-1.1.0.jar -%%IDEA_HOME%%/lib/annotations.jar -%%IDEA_HOME%%/lib/ant/CONTRIBUTORS -%%IDEA_HOME%%/lib/ant/INSTALL -%%IDEA_HOME%%/lib/ant/KEYS -%%IDEA_HOME%%/lib/ant/LICENSE -%%IDEA_HOME%%/lib/ant/NOTICE -%%IDEA_HOME%%/lib/ant/README -%%IDEA_HOME%%/lib/ant/WHATSNEW -%%IDEA_HOME%%/lib/ant/contributors.xml -%%IDEA_HOME%%/lib/ant/lib/README -%%IDEA_HOME%%/lib/ant/lib/ant-antlr.jar -%%IDEA_HOME%%/lib/ant/lib/ant-antlr.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-bcel.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-bcel.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-bsf.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-bsf.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-log4j.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-log4j.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-oro.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-oro.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-regexp.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-regexp.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-resolver.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-resolver.pom -%%IDEA_HOME%%/lib/ant/lib/ant-apache-xalan2.jar -%%IDEA_HOME%%/lib/ant/lib/ant-apache-xalan2.pom -%%IDEA_HOME%%/lib/ant/lib/ant-commons-logging.jar -%%IDEA_HOME%%/lib/ant/lib/ant-commons-logging.pom -%%IDEA_HOME%%/lib/ant/lib/ant-commons-net.jar -%%IDEA_HOME%%/lib/ant/lib/ant-commons-net.pom -%%IDEA_HOME%%/lib/ant/lib/ant-jai.jar -%%IDEA_HOME%%/lib/ant/lib/ant-jai.pom -%%IDEA_HOME%%/lib/ant/lib/ant-javamail.jar -%%IDEA_HOME%%/lib/ant/lib/ant-javamail.pom -%%IDEA_HOME%%/lib/ant/lib/ant-jdepend.jar -%%IDEA_HOME%%/lib/ant/lib/ant-jdepend.pom -%%IDEA_HOME%%/lib/ant/lib/ant-jmf.jar -%%IDEA_HOME%%/lib/ant/lib/ant-jmf.pom -%%IDEA_HOME%%/lib/ant/lib/ant-jsch.jar -%%IDEA_HOME%%/lib/ant/lib/ant-jsch.pom -%%IDEA_HOME%%/lib/ant/lib/ant-junit.jar -%%IDEA_HOME%%/lib/ant/lib/ant-junit.pom -%%IDEA_HOME%%/lib/ant/lib/ant-junit4.jar -%%IDEA_HOME%%/lib/ant/lib/ant-junit4.pom -%%IDEA_HOME%%/lib/ant/lib/ant-junitlauncher.jar -%%IDEA_HOME%%/lib/ant/lib/ant-junitlauncher.pom -%%IDEA_HOME%%/lib/ant/lib/ant-launcher.jar -%%IDEA_HOME%%/lib/ant/lib/ant-launcher.pom -%%IDEA_HOME%%/lib/ant/lib/ant-netrexx.jar -%%IDEA_HOME%%/lib/ant/lib/ant-netrexx.pom -%%IDEA_HOME%%/lib/ant/lib/ant-parent.pom -%%IDEA_HOME%%/lib/ant/lib/ant-swing.jar -%%IDEA_HOME%%/lib/ant/lib/ant-swing.pom -%%IDEA_HOME%%/lib/ant/lib/ant-testutil.jar -%%IDEA_HOME%%/lib/ant/lib/ant-testutil.pom -%%IDEA_HOME%%/lib/ant/lib/ant-xz.jar -%%IDEA_HOME%%/lib/ant/lib/ant-xz.pom -%%IDEA_HOME%%/lib/ant/lib/ant.jar -%%IDEA_HOME%%/lib/ant/lib/ant.pom -%%IDEA_HOME%%/lib/ant/lib/libraries.properties -%%IDEA_HOME%%/lib/ant/src.zip -%%IDEA_HOME%%/lib/asm-5.0.3.jar -%%IDEA_HOME%%/lib/asm-all-7.0.1.jar -%%IDEA_HOME%%/lib/asm-analysis-5.0.3.jar -%%IDEA_HOME%%/lib/asm-tree-5.0.3.jar -%%IDEA_HOME%%/lib/automaton-1.12-1.jar -%%IDEA_HOME%%/lib/baksmali-2.2.1.jar -%%IDEA_HOME%%/lib/batik-all-1.10.jar -%%IDEA_HOME%%/lib/bcprov-jdk15on-1.60.jar -%%IDEA_HOME%%/lib/bootstrap.jar -%%IDEA_HOME%%/lib/cglib-nodep-3.2.4.jar -%%IDEA_HOME%%/lib/cli-parser-1.1.2.jar -%%IDEA_HOME%%/lib/common-image-3.4.1.jar -%%IDEA_HOME%%/lib/common-io-3.4.1.jar -%%IDEA_HOME%%/lib/common-lang-3.4.1.jar -%%IDEA_HOME%%/lib/commons-codec-1.10.jar -%%IDEA_HOME%%/lib/commons-collections-3.2.2.jar -%%IDEA_HOME%%/lib/commons-compress-1.18.jar -%%IDEA_HOME%%/lib/commons-httpclient-3.1-patched.jar -%%IDEA_HOME%%/lib/commons-imaging-1.0-RC-1.jar -%%IDEA_HOME%%/lib/commons-io-2.6.jar -%%IDEA_HOME%%/lib/commons-lang-2.4.jar -%%IDEA_HOME%%/lib/commons-lang3-3.4.jar -%%IDEA_HOME%%/lib/commons-logging-1.2.jar -%%IDEA_HOME%%/lib/commons-net-3.6.jar -%%IDEA_HOME%%/lib/cucumber-core-1.2.4.jar -%%IDEA_HOME%%/lib/cucumber-java-1.2.5.jar -%%IDEA_HOME%%/lib/debugger-memory-agent-0.0.11.jar -%%IDEA_HOME%%/lib/delight-rhino-sandbox-0.0.9.jar -%%IDEA_HOME%%/lib/dexlib2-2.2.1.jar -%%IDEA_HOME%%/lib/ecj-4.10.jar -%%IDEA_HOME%%/lib/eddsa-0.2.0.jar -%%IDEA_HOME%%/lib/error_prone_annotations-2.3.1.jar -%%IDEA_HOME%%/lib/extensions.jar -%%IDEA_HOME%%/lib/external-system-impl.jar -%%IDEA_HOME%%/lib/external-system-rt.jar -%%IDEA_HOME%%/lib/fluent-hc-4.5.6.jar -%%IDEA_HOME%%/lib/forms-1.1-preview.jar -%%IDEA_HOME%%/lib/forms_rt.jar -%%IDEA_HOME%%/lib/fst-2.57.jar -%%IDEA_HOME%%/lib/gherkin-2.12.2.jar -%%IDEA_HOME%%/lib/groovy-all-2.4.15.jar -%%IDEA_HOME%%/lib/gson-2.8.5.jar -%%IDEA_HOME%%/lib/guava-25.1-jre.jar -%%IDEA_HOME%%/lib/hamcrest-core-1.3.jar -%%IDEA_HOME%%/lib/httpclient-4.5.6.jar -%%IDEA_HOME%%/lib/httpcore-4.4.10.jar -%%IDEA_HOME%%/lib/httpmime-4.5.6.jar -%%IDEA_HOME%%/lib/icons.jar -%%IDEA_HOME%%/lib/idea.jar -%%IDEA_HOME%%/lib/idea_rt.jar -%%IDEA_HOME%%/lib/imageio-core-3.4.1.jar -%%IDEA_HOME%%/lib/imageio-metadata-3.4.1.jar -%%IDEA_HOME%%/lib/imageio-tiff-3.4.1.jar -%%IDEA_HOME%%/lib/imgscalr-lib-4.2.jar -%%IDEA_HOME%%/lib/ini4j-0.5.5-2.jar -%%IDEA_HOME%%/lib/intellij-coverage-agent-1.0.495.jar -%%IDEA_HOME%%/lib/intellij-test-discovery-agent-1.0.495.jar -%%IDEA_HOME%%/lib/isorelax-20030108.jar -%%IDEA_HOME%%/lib/istack-commons-runtime-3.0.7.jar -%%IDEA_HOME%%/lib/jackson-annotations-2.9.0.jar -%%IDEA_HOME%%/lib/jackson-core-2.9.7.jar -%%IDEA_HOME%%/lib/jackson-databind-2.9.7.jar -%%IDEA_HOME%%/lib/java-api.jar -%%IDEA_HOME%%/lib/java-compatibility-1.0.1.jar -%%IDEA_HOME%%/lib/java-impl.jar -%%IDEA_HOME%%/lib/java_resources_en.jar -%%IDEA_HOME%%/lib/javac2.jar -%%IDEA_HOME%%/lib/javahelp-2.0.02.jar -%%IDEA_HOME%%/lib/javassist-3.22.0-GA.jar -%%IDEA_HOME%%/lib/javax.activation-1.2.0.jar -%%IDEA_HOME%%/lib/javax.annotation-api-1.3.2.jar -%%IDEA_HOME%%/lib/jaxb-api-2.3.1.jar -%%IDEA_HOME%%/lib/jaxb-runtime-2.3.1.jar -%%IDEA_HOME%%/lib/jaxen-1.1.6.jar -%%IDEA_HOME%%/lib/jbcrypt-1.0.0.jar -%%IDEA_HOME%%/lib/jcip-annotations-1.0.jar -%%IDEA_HOME%%/lib/jdkAnnotations.jar -%%IDEA_HOME%%/lib/jdom.jar -%%IDEA_HOME%%/lib/jediterm-pty-2.14.jar -%%IDEA_HOME%%/lib/jetCheck-0.2.1.jar -%%IDEA_HOME%%/lib/jgoodies-common-1.4.0.jar -%%IDEA_HOME%%/lib/jing-20030619.jar -%%IDEA_HOME%%/lib/jna-platform.jar -%%IDEA_HOME%%/lib/jna.jar -%%IDEA_HOME%%/lib/jps-builders-6.jar -%%IDEA_HOME%%/lib/jps-builders.jar -%%IDEA_HOME%%/lib/jps-launcher.jar -%%IDEA_HOME%%/lib/jps-model.jar -%%IDEA_HOME%%/lib/jsch-0.1.55.jar -%%IDEA_HOME%%/lib/jshell-frontend.jar -%%IDEA_HOME%%/lib/jshell-protocol.jar -%%IDEA_HOME%%/lib/jsoup-1.11.3.jar -%%IDEA_HOME%%/lib/jsr305.jar -%%IDEA_HOME%%/lib/junit-4.12.jar -%%IDEA_HOME%%/lib/junit.jar -%%IDEA_HOME%%/lib/kotlin-reflect-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-stdlib-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-stdlib-common-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-stdlib-jdk7-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-stdlib-jdk8-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-test-1.3.11.jar -%%IDEA_HOME%%/lib/kotlin-test-common-1.3.11.jar -%%IDEA_HOME%%/lib/kotlinx-coroutines-core-1.0.1.jar -%%IDEA_HOME%%/lib/kotlinx-coroutines-core-common-1.0.1.jar -%%IDEA_HOME%%/lib/kotlinx-coroutines-jdk8-1.0.1.jar -%%IDEA_HOME%%/lib/log4j.jar -%%IDEA_HOME%%/lib/lz4-1.3.0.jar -%%IDEA_HOME%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar -%%IDEA_HOME%%/lib/maven-aether-provider-3.3.9.jar -%%IDEA_HOME%%/lib/maven-artifact-3.3.9.jar -%%IDEA_HOME%%/lib/maven-builder-support-3.3.9.jar -%%IDEA_HOME%%/lib/maven-model-3.3.9.jar -%%IDEA_HOME%%/lib/maven-model-builder-3.3.9.jar -%%IDEA_HOME%%/lib/maven-repository-metadata-3.3.9.jar -%%IDEA_HOME%%/lib/microba.jar -%%IDEA_HOME%%/lib/miglayout-core-5.2.jar -%%IDEA_HOME%%/lib/miglayout-swing-5.2.jar -%%IDEA_HOME%%/lib/nanoxml-2.2.3.jar -%%IDEA_HOME%%/lib/nekohtml-1.9.22.jar -%%IDEA_HOME%%/lib/netty-buffer-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-codec-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-codec-http-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-common-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-handler-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-resolver-4.1.32.Final.jar -%%IDEA_HOME%%/lib/netty-transport-4.1.32.Final.jar -%%IDEA_HOME%%/lib/objenesis-2.6.jar -%%IDEA_HOME%%/lib/openapi.jar -%%IDEA_HOME%%/lib/oro-2.0.8.jar -%%IDEA_HOME%%/lib/picocontainer-1.2.jar -%%IDEA_HOME%%/lib/platform-api.jar -%%IDEA_HOME%%/lib/platform-impl.jar -%%IDEA_HOME%%/lib/plexus-component-annotations-1.6.jar -%%IDEA_HOME%%/lib/plexus-interpolation-1.21.jar -%%IDEA_HOME%%/lib/plexus-utils-3.0.22.jar -%%IDEA_HOME%%/lib/protobuf-java-3.5.1.jar -%%IDEA_HOME%%/lib/proxy-vole-1.0.6.jar -%%IDEA_HOME%%/lib/pty4j-0.9.3.jar -%%IDEA_HOME%%/lib/purejavacomm-0.0.11.1.jar -%%IDEA_HOME%%/lib/resources.jar -%%IDEA_HOME%%/lib/resources_en.jar -%%IDEA_HOME%%/lib/rhino-1.7.10.jar -%%IDEA_HOME%%/lib/rngom-20051226-patched.jar -%%IDEA_HOME%%/lib/rt/debugger-agent-storage.jar -%%IDEA_HOME%%/lib/rt/debugger-agent.jar -%%IDEA_HOME%%/lib/sa-jdwp-1.12.jar -%%IDEA_HOME%%/lib/serviceMessages.jar -%%IDEA_HOME%%/lib/slf4j-api-1.7.25.jar -%%IDEA_HOME%%/lib/slf4j-log4j12-1.7.25.jar -%%IDEA_HOME%%/lib/snakeyaml-1.23.jar -%%IDEA_HOME%%/lib/sqlite-jdbc-3.21.0.1.jar -%%IDEA_HOME%%/lib/stax-api-1.0.1.jar -%%IDEA_HOME%%/lib/stax-ex-1.8.jar -%%IDEA_HOME%%/lib/streamex-0.6.7.jar -%%IDEA_HOME%%/lib/swingx-core-1.6.2-2.jar -%%IDEA_HOME%%/lib/trang-core.jar -%%IDEA_HOME%%/lib/trilead-ssh2-build-217-jenkins-11.jar -%%IDEA_HOME%%/lib/trove4j.jar -%%IDEA_HOME%%/lib/txw2-2.3.1.jar -%%IDEA_HOME%%/lib/util-2.2.1.jar -%%IDEA_HOME%%/lib/util.jar -%%IDEA_HOME%%/lib/velocity-1.7.jar -%%IDEA_HOME%%/lib/wadl-core.jar -%%IDEA_HOME%%/lib/winp-1.28.jar -%%IDEA_HOME%%/lib/xercesImpl-2.12.0.jar -%%IDEA_HOME%%/lib/xml-apis-ext-1.3.04.jar -%%IDEA_HOME%%/lib/xml-resolver-1.2.jar -%%IDEA_HOME%%/lib/xmlbeans-2.6.0.jar -%%IDEA_HOME%%/lib/xmlgraphics-commons-2.3.jar -%%IDEA_HOME%%/lib/xmlpull-1.1.3.1.jar -%%IDEA_HOME%%/lib/xmlrpc-2.0.1.jar -%%IDEA_HOME%%/lib/xpp3_min-1.1.4c.jar -%%IDEA_HOME%%/lib/xstream-1.4.10.jar -%%IDEA_HOME%%/lib/xz-1.8.jar -%%IDEA_HOME%%/license/XStream_license.txt -%%IDEA_HOME%%/license/ant_license.txt -%%IDEA_HOME%%/license/asm_license.txt -%%IDEA_HOME%%/license/eclipse_license.txt -%%IDEA_HOME%%/license/eclipse_license2.txt -%%IDEA_HOME%%/license/growl.license -%%IDEA_HOME%%/license/gson_license.txt -%%IDEA_HOME%%/license/imgscalr_license.txt -%%IDEA_HOME%%/license/javahelp_license.txt -%%IDEA_HOME%%/license/javolution_license.txt -%%IDEA_HOME%%/license/jaxb_license.txt -%%IDEA_HOME%%/license/jaxen_license.txt -%%IDEA_HOME%%/license/jdom_license.txt -%%IDEA_HOME%%/license/jgoodies_forms_license.txt -%%IDEA_HOME%%/license/junit_license.txt -%%IDEA_HOME%%/license/kryo-license.txt -%%IDEA_HOME%%/license/log4j_license.txt -%%IDEA_HOME%%/license/microba_license.txt -%%IDEA_HOME%%/license/miglayout_swing_license.txt -%%IDEA_HOME%%/license/nanoxml_license.txt -%%IDEA_HOME%%/license/oromatcher_license.txt -%%IDEA_HOME%%/license/picoContainer_license.txt -%%IDEA_HOME%%/license/saxon-conditions.html -%%IDEA_HOME%%/license/swingx_license.txt -%%IDEA_HOME%%/license/third-party-libraries.html -%%IDEA_HOME%%/license/trove4j_license.txt -%%IDEA_HOME%%/license/winp_license.txt -%%IDEA_HOME%%/license/xerces_license.txt -%%IDEA_HOME%%/license/xmlrpc_license.txt -%%IDEA_HOME%%/license/yourkit-license-redist.txt -%%IDEA_HOME%%/plugins/ByteCodeViewer/lib/byteCodeViewer.jar -%%IDEA_HOME%%/plugins/ByteCodeViewer/lib/resources_en.jar -%%IDEA_HOME%%/plugins/Groovy/lib/Groovy.jar -%%IDEA_HOME%%/plugins/Groovy/lib/agent/gragent.jar -%%IDEA_HOME%%/plugins/Groovy/lib/console.groovy -%%IDEA_HOME%%/plugins/Groovy/lib/groovy-jps-plugin.jar -%%IDEA_HOME%%/plugins/Groovy/lib/groovy-rt-constants.jar -%%IDEA_HOME%%/plugins/Groovy/lib/groovy-starter.conf -%%IDEA_HOME%%/plugins/Groovy/lib/groovy_rt.jar -%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl -%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/closuresInMethod.gdsl -%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl -%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/gantScript.gdsl -%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/metaDsl.gdsl -%%IDEA_HOME%%/plugins/IntelliLang/lib/IntelliLang.jar -%%IDEA_HOME%%/plugins/IntelliLang/lib/intellilang-jps-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kapt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kapt.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlin -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlin-dce-js -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlin-dce-js.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlin.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc-js -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc-js.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc-jvm -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc-jvm.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc.bat -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/build.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/allopen-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/android-extensions-runtime.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/annotations-13.0.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/jvm-abi-gen.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-cli.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-runtime.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-android.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-imports-dumper-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-main-kts.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-preloader.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-common.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-compiler.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-jvm.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-source-sections-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk7-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk7.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk8-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk8.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit5-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit5.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-testng-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-testng.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlinx-serialization-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/mutability-annotations-compat.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/noarg-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/trove4j.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/NOTICE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/README.md -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/aosp_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/args4j_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/asm_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/boost_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/closure-compiler_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/dart_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/guava_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/gwt_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/jquery_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/jshashtable_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/maven_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/pcollections_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/prototype_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/qunit_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/findbugs_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/gradle_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/lombok_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/rxjava_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/testdata/spring_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/trove_license.txt -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/trove_readme_license.txt -%%IDEA_HOME%%/plugins/Kotlin/lib/allopen-ide-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/android-extensions-compiler.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/android-extensions-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/android-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/android-lint.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/android-output-parser-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/annotations-13.0.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/idea-git.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/j2k.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/javaslang-2.0.6.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/javaslang-match-2.0.6.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/javax.inject-1.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/jps-common-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/jvm-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kapt3-idea.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-allopen-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-compiler-client-embeddable.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-daemon-client.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-gradle-tooling.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-noarg-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-reflect.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-sam-with-receiver-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-script-runtime.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-script-util.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-common-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-common.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-compiler.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-idea.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-intellij.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-jvm-sources.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-scripting-jvm.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-stdlib-common.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-stdlib-jdk7.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-stdlib-jdk8.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-stdlib.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlinx-coroutines-core-1.0.1.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlinx-coroutines-jdk8-1.0.1.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlinx-serialization-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlinx-serialization-ide-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/markdown-0.1.25.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/maven-ide.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/noarg-ide-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar -%%IDEA_HOME%%/plugins/android/lib/adt-ui.jar -%%IDEA_HOME%%/plugins/android/lib/android-common.jar -%%IDEA_HOME%%/plugins/android/lib/android-extensions-ide.jar -%%IDEA_HOME%%/plugins/android/lib/android-kotlin.jar -%%IDEA_HOME%%/plugins/android/lib/android-profilers.jar -%%IDEA_HOME%%/plugins/android/lib/android-rt.jar -%%IDEA_HOME%%/plugins/android/lib/android.jar -%%IDEA_HOME%%/plugins/android/lib/androidAnnotations.jar -%%IDEA_HOME%%/plugins/android/lib/androidWidgets/theme-editor-widgets.jar -%%IDEA_HOME%%/plugins/android/lib/annotations-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/apkanalyzer-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/artwork.jar -%%IDEA_HOME%%/plugins/android/lib/asm-5.0.3.jar -%%IDEA_HOME%%/plugins/android/lib/asm-analysis-5.0.3.jar -%%IDEA_HOME%%/plugins/android/lib/asm-tree-5.0.3.jar -%%IDEA_HOME%%/plugins/android/lib/bcpkix-jdk15on-1.56.jar -%%IDEA_HOME%%/plugins/android/lib/bcprov-jdk15on-1.56.jar -%%IDEA_HOME%%/plugins/android/lib/build-common.jar -%%IDEA_HOME%%/plugins/android/lib/builder-model-3.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/builder-test-api-3.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/common-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/commons-compress-1.8.1.jar -%%IDEA_HOME%%/plugins/android/lib/crash-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/d8-master.jar -%%IDEA_HOME%%/plugins/android/lib/data-binding.jar -%%IDEA_HOME%%/plugins/android/lib/ddmlib-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/device-art.xml -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_10/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_4/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_5x/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_6p/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_9/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/button.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/power.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/power_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/volume_down.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/volume_down_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/volume_up.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_one/volume_up_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/button.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/power.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/power_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/thumb.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/volume_down.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/volume_down_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/volume_up.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/nexus_s/volume_up_land.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_back_simple_land.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_back_simple_port.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_land.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_port.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_2_xl/round_corners.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_silver/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_back_simple.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_land.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_port.9.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_1080p/back.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_1080p/fore.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_1080p/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_1080p/shadow.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_720p/back.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_720p/fore.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_720p/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/tv_720p/shadow.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/arrow_down.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/arrow_left.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/arrow_right.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/arrow_up.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/back.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/button.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_320px.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_380px.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_380px_onion.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/controls.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/fore.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/hardware.ini -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/key.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/mask.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/select.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_round/shadow.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_square/back.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_square/fore.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_square/layout -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_square/mask.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/wear_square/shadow.png -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/land_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/land_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/land_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/port_back.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/port_fore.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/port_shadow.webp -%%IDEA_HOME%%/plugins/android/lib/device-art-resources/xoom/thumb.png -%%IDEA_HOME%%/plugins/android/lib/freemarker-2.3.20.jar -%%IDEA_HOME%%/plugins/android/lib/instantapps-api-1.5.jar -%%IDEA_HOME%%/plugins/android/lib/jarutils.jar -%%IDEA_HOME%%/plugins/android/lib/javawriter-2.2.1.jar -%%IDEA_HOME%%/plugins/android/lib/jgraphx-3.4.1.3.jar -%%IDEA_HOME%%/plugins/android/lib/jps/android-jps-plugin.jar -%%IDEA_HOME%%/plugins/android/lib/kxml2-2.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/layoutlib-api-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/layoutlib-loader.jar -%%IDEA_HOME%%/plugins/android/lib/layoutlib.jar -%%IDEA_HOME%%/plugins/android/lib/layoutlib/build.prop -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/AndroidClock.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/CarroisGothicSC-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/ComingSoon.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/CutiveMono.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DancingScript-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DancingScript-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DroidSans-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DroidSans.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DroidSansFallback.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/DroidSansMono.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NanumGothic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoColorEmoji.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabic-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabicUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabicUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansAdlam-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansArmenian-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansArmenian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansAvestan-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBalinese-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBamum-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBatak-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengali-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengali-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengaliUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengaliUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBrahmi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBuginese-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBuhid-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCJK-Regular.ttc -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCanadianAboriginal-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCarian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansChakma-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCham-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCham-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCherokee-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCoptic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCuneiform-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCypriot-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDeseret-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagari-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagari-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagariUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagariUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEgyptianHieroglyphs-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEthiopic-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEthiopic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGeorgian-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGeorgian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGlagolitic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGothic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujarati-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujarati-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujaratiUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujaratiUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhi-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhiUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhiUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHanunoo-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHebrew-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHebrew-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansImperialAramaic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansInscriptionalPahlavi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansInscriptionalParthian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansJavanese-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKaithi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannada-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannada-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannadaUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannadaUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKayahLi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKharoshthi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmer-VF.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmerUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmerUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLao-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLao-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLaoUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLaoUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLepcha-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLimbu-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLinearB-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLisu-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLycian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLydian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalam-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalam-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalamUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalamUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMandaic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMeeteiMayek-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMongolian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmar-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmar-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmarUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmarUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansNKo-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansNewTaiLue-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOgham-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOlChiki-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldItalic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldPersian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldSouthArabian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldTurkic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriya-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriya-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriyaUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriyaUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOsage-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOsmanya-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansPhagsPa-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansPhoenician-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansRejang-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansRunic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSamaritan-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSaurashtra-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansShavian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSinhala-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSinhala-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSundanese-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSylotiNagri-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacEastern-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacEstrangela-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacWestern-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTagalog-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTagbanwa-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiLe-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiTham-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiViet-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamil-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamil-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamilUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamilUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTelugu-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTelugu-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTeluguUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTeluguUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaana-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaana-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThai-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThai-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaiUI-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaiUI-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTibetan-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTibetan-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTifinagh-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansUgaritic-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansVai-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSansYi-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-BoldItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Italic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifArmenian-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifArmenian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifBengali-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifBengali-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifDevanagari-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifDevanagari-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGeorgian-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGeorgian-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGujarati-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGujarati-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifHebrew-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifHebrew-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifKannada-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifKannada-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifLao-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifLao-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifMalayalam-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifMalayalam-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTamil-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTamil-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTelugu-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTelugu-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifThai-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifThai-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Black.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-BlackItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-BoldItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Italic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Light.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-LightItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Medium.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-MediumItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Thin.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/Roboto-ThinItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Bold.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-BoldItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Italic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Light.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-LightItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Medium.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-MediumItalic.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Regular.ttf -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/fonts.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/fonts/fontsInSdk.txt -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-watch/progress_indeterminate_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim-watch/progress_indeterminate_rotation_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/accelerate_decelerate_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/accelerate_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_translucent_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/activity_translucent_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/anticipate_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/anticipate_overshoot_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/app_starting_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/bounce_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_box_inner_merged_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_box_outer_merged_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_icon_null_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_box_inner_merged_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_check_path_merged_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_icon_null_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_dot_group_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_ring_outer_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_ring_outer_path_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_dot_group_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_ring_outer_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_ring_outer_path_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/button_state_list_anim_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/cross_profile_apps_thumbnail_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/cycle_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/date_picker_fade_in_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/date_picker_fade_out_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/decelerate_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dialog_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dialog_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_exit_keyguard.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_left_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_left_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_right_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_right_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_top_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/dock_top_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/fade_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/fast_fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/fast_fade_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/flat_button_state_list_anim_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_pivot_0_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_pivot_0_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_4_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_5_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_6_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_1_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_2_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_3_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_4_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_5_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_6_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_1_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_1_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_2_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_2_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_3_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_3_pivot_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_1_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_2_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_3_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in_center.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in_from_bottom.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_extract_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_extract_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_fancy_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/input_method_fancy_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/launch_task_behind_source.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/launch_task_behind_target.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/linear_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter_fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter_wallpaper.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_wallpaper_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/options_panel_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/options_panel_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/overshoot_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/popup_enter_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/popup_exit_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_horizontal_rect1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_horizontal_rect2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_rotation_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_down_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_down_in_no_alpha.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_down_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_down_out_no_alpha.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_up_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/push_up_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/recent_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/recent_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/recents_fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/recents_fade_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_jump_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_xfade_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_user_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/screen_user_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/search_bar_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/search_bar_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/seekbar_thumb_pressed_to_unpressed_thumb_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/seekbar_thumb_unpressed_to_pressed_thumb_0_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out_center.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out_from_bottom.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_child_bottom.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_enter_micro.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_exit_micro.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_left.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_right.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_up.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_down.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_left.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_micro.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_right.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/slow_fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/submenu_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/submenu_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/swipe_window_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/swipe_window_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/task_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/task_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/task_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/task_open_enter_cross_profile_apps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/task_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/toast_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/toast_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/tooltip_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/tooltip_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/translucent_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/translucent_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_layer_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/voice_layer_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/anim/window_move_from_decor.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fade_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fade_out.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_fade_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_fade_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/fragment_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_close_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_close_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_open_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_open_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color-watch/btn_watch_default_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color-watch/switch_thumb_watch_default_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color-watch/switch_track_watch_default_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_device_default.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_borderless_text_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_text_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/btn_default_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/btn_default_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/config_progress_background_tint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/control_checkable_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/control_default_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/control_highlight_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/decor_button_dark_color.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/decor_button_light_color.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/highlighted_text_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/hint_foreground_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/hint_foreground_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/list_highlight_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_disable_only.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_focused.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_nodisable.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_focused_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_inverse_when_activated_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_leanback_formwizard_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light_disable_only.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light_nodisable.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_nodisable_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_nodisable_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_secondary_when_activated_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/primary_text_secondary_when_activated_material_inverse.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/ratingbar_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/ripple_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/ripple_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/search_url_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_dark_nodisable.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_inverse_when_activated_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_light_nodisable.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nodisable_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nodisable_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nofocus.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/seekbar_track_progress_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/switch_thumb_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/switch_thumb_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/switch_track_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tab_highlight_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text_v4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/text_color_primary.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/text_color_secondary.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/white_disabled_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/color/widget_edittext_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-en-hdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-en-ldpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-en-ldpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-en-mdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_shadow_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_shadow_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/activity_title_bar.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/arrow_down_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/arrow_up_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/battery_charge_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/bottom_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_buttonless_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_buttonless_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_transparent_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_global_search_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_disabled_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_page_press.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/button_onoff_indicator_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/button_onoff_indicator_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/call_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/checkbox_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/checkbox_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_arrow_up.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_button_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_button_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_dial.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_hand_hour.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_hand_minute.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_bottom.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_top.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/combobox_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/combobox_nohighlight.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/compass_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/compass_base.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/contact_header_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/create_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dark_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/day_picker_week_view_dayline_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_full_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_full_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dim_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_textfield.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_strong_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_background_focus_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_dropdown_background_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_angel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_cool.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_crying.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_embarrassed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_foot_in_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_happy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_kissing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_laughing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_lips_are_sealed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_money_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_sad.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_surprised.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_tongue_sticking_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_undecided.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_winking.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_wtf.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_yelling.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_ic_maximized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_ic_minimized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_thumb_default_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_thumb_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/focused_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_unselected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_unselected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/grid_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/grid_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_ab_back_holo_dark_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_ab_back_holo_light_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_accessibility_magnification.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_action_assist_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_aggregated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_audio_notification_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_audio_notification_mute_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_round_more_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_round_more_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_search_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_speak_now.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_bullet_key_permission.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_checkmark_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_coins_l.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_coins_s.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_close_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_close_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_dialer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_map.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_time.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_grayedout_printer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_get.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer_and_end.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_decline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_sound_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_sound_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_unlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_vibrate_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_launcher_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_airplane_mode_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_airplane_mode_off_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_alarm_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_charging.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_lock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_low_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_lock_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_open_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_outline_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_power_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_ringer_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_ringer_on_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_embed_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_ff.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_fullscreen.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_next.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_pause.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_previous.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_rew.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_dark_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_light_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_0_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_1_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_2_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_video_poster.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_account_list.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_agenda.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_allfriends.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_always_landscape_portrait.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_archive.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_attachment.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_back.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_block.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_blocked_user.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_btn_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cc_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_chat_dashboard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_clear_playlist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_close_clear_cancel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_compass.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_compose.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_crop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_day.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_directions.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_edit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_emoticons.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_end_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_friendslist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_gallery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_goto.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_help_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_home.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_info_details.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_invite.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_login.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_manage.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mapmode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_month.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_my_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mylocation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_myplaces.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_notifications.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_play_clip.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_preferences.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_recent_history.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_report_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_revert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_rotate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_save.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_selectall_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_selectall_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_send.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_set_as.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_settings_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_slideshow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_sort_alphabetically.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_sort_by_size.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_star.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_start_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_today.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_upload.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_upload_you_tube.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_view.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_week.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_zoom.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_clear_all.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_ime_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_overlay.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_partial_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_reminder.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_category_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_settings_language.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sim_card_multi_24px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sim_card_multi_48px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sysbar_quicksettings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_user_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_vibrate_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_bluetooth_in_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_off_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/icon_highlight_rectangle.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/icon_highlight_square.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ime_qwerty.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/indicator_input_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_left_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_right_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_left.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_bg.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_dimple.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_dimple_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_key_feedback_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_popup_panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/light_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_activated_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_header_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_header_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_default_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_disabled_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_longpress.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_longpress_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_pressed_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_selected_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_multiselect_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_multiselect_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/magnified_region_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/maps_google_logo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_background_fill_parent_width.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_dropdown_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_hardkey_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_popup_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_popup_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_separator.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_submenu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_solid_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_solid_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_checkbox_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_unselected_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_selection_divider.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/password_field_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/password_keyboard_background_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_accessibility_features.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_affects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/picture_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/picture_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_anchor.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_hover.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_touch.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_background_mtrl_mult.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_full_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_full_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_top_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_top_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_invisible.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_offline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pressed_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_primary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_primary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_secondary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_secondary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_focused_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_normal_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_normal_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_pressed_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_pressed_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/radiobutton_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/radiobutton_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/recent_dialog_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/reticle.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_horizontal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_vertical.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_disabled_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_primary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_primary_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_secondary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_plate_global.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/settings_header_raw.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_orange.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_purple.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_orange.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_purple.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_16_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_16_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_48_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_48_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_76_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_76_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_dropdown_background_down.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_dropdown_background_up.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_select.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_ecb_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_car_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_email_generic.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_gmail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_missed_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_mmcc_indication_icn.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_rssi_in_range.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard_prepare.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sim_toolkit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_10.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_40.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_60.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_80.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_unknown.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_certificate_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_wimax_signal_3_fully.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_wimax_signal_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_gps_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_headset.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_general.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_throttled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_vp_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_warning.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_header_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_app_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/statusbar_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/submenu_arrow_nofocus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_incoming.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_missed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_outgoing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_contact_card.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_delete_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_enter.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num0_no_plus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_ok_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_bottom_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_indicator_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_left_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_right_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_side_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_suggestions_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_middle_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_longpress_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_portrait.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_tall.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/transportcontrol_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/unknown_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/vpn_connected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/vpn_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_14w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_15w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_16w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_17w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_18w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_track_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/zoom_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/btn_lock_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/btn_lock_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_sound_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_sound_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_unlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/btn_lock_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-land-xhdpi/btn_lock_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/activity_title_bar.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/arrow_down_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/arrow_up_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/battery_charge_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/bottom_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_buttonless_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_buttonless_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_transparent_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_global_search_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_disabled_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_toggle_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_toggle_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_page_press.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/button_onoff_indicator_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/button_onoff_indicator_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/call_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/checkbox_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/checkbox_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_dial.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_hand_hour.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_hand_minute.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_bottom.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_top.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/compass_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/compass_base.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/contact_header_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/create_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/dark_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/dialog_divider_horizontal_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dim_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_textfield.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_background_focus_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_dropdown_background_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_angel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_cool.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_crying.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_foot_in_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_happy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_kissing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_laughing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_lips_are_sealed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_money_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_sad.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_surprised.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_tongue_sticking_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_undecided.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_winking.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_wtf.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_yelling.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/expander_ic_maximized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/expander_ic_minimized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/focused_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_unselected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_unselected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/grid_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/grid_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_aggregated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_round_more_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_round_more_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_search_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_speak_now.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_fit_page_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_fit_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_page_overview_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_page_overview_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_bullet_key_permission.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_alert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_dialer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_map.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_time.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_get.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer_and_end.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer_and_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_decline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_sound_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_sound_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_unlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_vibrate_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_launcher_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_airplane_mode_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_airplane_mode_off_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_alarm_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_charging.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_lock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_low_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_lock_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_power_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_ringer_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_ringer_on_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_embed_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_ff.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_fullscreen.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_next.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_pause.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_previous.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_rew.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_video_poster.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_account_list.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_agenda.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_allfriends.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_always_landscape_portrait.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_archive.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_attachment.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_back.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_block.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_blocked_user.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_cc_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_chat_dashboard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_clear_playlist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_close_clear_cancel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_compass.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_compose.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_crop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_day.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_directions.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_edit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_emoticons.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_end_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_friendslist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_gallery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_goto.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_home.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_info_details.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_invite.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_login.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_manage.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mapmode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_month.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_my_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mylocation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_myplaces.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_notifications.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_play_clip.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_preferences.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_recent_history.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_report_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_revert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_rotate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_save.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_send.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_set_as.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_share.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_slideshow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_sort_alphabetically.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_sort_by_size.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_star.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_start_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_today.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_upload.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_upload_you_tube.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_view.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_week.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_zoom.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_notification_clear_all.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_notification_overlay.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_partial_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_reminder.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_search_category_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_vibrate_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_bluetooth_ad2p.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_bluetooth_in_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_off_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/icon_highlight_rectangle.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/icon_highlight_square.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ime_qwerty.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/indicator_input_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_left_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_left_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_middle_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_right_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_right_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_left.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_left_and_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_bg.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_dimple.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_dimple_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_accessory_bg_landscape.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_key_feedback_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_key_feedback_more_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_popup_panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_popup_panel_trans_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/light_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_longpress.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/maps_google_logo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_background_fill_parent_width.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_separator.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_submenu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_solid_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_solid_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_checkbox_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_focus_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_pressed_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/password_field_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/picture_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/picture_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_full_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_full_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_inline_error_above_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_inline_error_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_top_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_top_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_invisible.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_offline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/pressed_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/radiobutton_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/radiobutton_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/recent_dialog_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/reticle.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_accelerated_anim2.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_horizontal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_vertical.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_plate_global.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/settings_header_raw.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_dropdown_background_down.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_dropdown_background_up.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_select.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_ecb_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_car_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_email_generic.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_gmail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_missed_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard_prepare.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sim_toolkit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_10.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_40.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_60.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_80.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_unknown.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_data_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_data_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_gps_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_headset.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_general.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_throttled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_vp_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_vp_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_warning.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_header_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_app_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/submenu_arrow_nofocus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_incoming.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_missed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_outgoing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_contact_card.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_delete_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num0_no_plus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_ok_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_left_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_right_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_unselected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_portrait.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_tall.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/unknown_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/vpn_connected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/vpn_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/zoom_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_shadow_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_shadow_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/activity_title_bar.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/arrow_down_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/arrow_up_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/battery_charge_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/bottom_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_buttonless_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_buttonless_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_transparent_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_global_search_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_disabled_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_page_press.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/button_onoff_indicator_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/button_onoff_indicator_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/call_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/checkbox_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/checkbox_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_arrow_up.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_button_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_button_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_dial.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_hand_hour.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_hand_minute.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_bottom.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_top.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/combobox_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/combobox_nohighlight.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/compass_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/compass_base.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/contact_header_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/create_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dark_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/day_picker_week_view_dayline_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_full_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_full_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dim_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_textfield.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_strong_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_background_focus_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_dropdown_background_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_angel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_cool.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_crying.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_embarrassed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_foot_in_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_happy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_kissing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_laughing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_lips_are_sealed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_money_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_sad.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_surprised.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_tongue_sticking_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_undecided.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_winking.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_wtf.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_yelling.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_ic_maximized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_ic_minimized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_thumb_default_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_thumb_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/focused_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_unselected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_unselected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/grid_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/grid_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_ab_back_holo_dark_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_ab_back_holo_light_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_accessibility_magnification.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_action_assist_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_aggregated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_audio_notification_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_audio_notification_mute_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_round_more_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_round_more_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_search_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_speak_now.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_bullet_key_permission.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_checkmark_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_coins_l.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_coins_s.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_close_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_close_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_dialer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_map.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_time.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_grayedout_printer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_get.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer_and_end.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_decline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_sound_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_sound_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_unlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_vibrate_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_launcher_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_airplane_mode_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_airplane_mode_off_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_alarm_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_charging.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_lock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_low_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_lock_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_open_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_outline_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_power_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_ringer_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_ringer_on_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_embed_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_ff.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_fullscreen.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_next.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_pause.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_previous.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_rew.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_dark_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_light_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_0_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_1_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_2_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_video_poster.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_account_list.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_agenda.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_allfriends.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_always_landscape_portrait.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_archive.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_attachment.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_back.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_block.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_blocked_user.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_btn_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cc_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_chat_dashboard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_clear_playlist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_close_clear_cancel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_compass.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_compose.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_crop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_day.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_directions.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_edit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_emoticons.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_end_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_friendslist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_gallery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_goto.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_help_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_home.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_info_details.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_invite.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_login.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_manage.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mapmode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_month.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_my_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mylocation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_myplaces.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_notifications.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_play_clip.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_preferences.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_recent_history.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_report_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_revert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_rotate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_save.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_selectall_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_selectall_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_send.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_set_as.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_settings_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_slideshow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_sort_alphabetically.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_sort_by_size.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_star.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_start_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_today.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_upload.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_upload_you_tube.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_view.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_week.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_zoom.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_clear_all.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_ime_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_overlay.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_partial_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_reminder.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_category_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_settings_language.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sim_card_multi_24px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sim_card_multi_48px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sysbar_quicksettings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_user_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_vibrate_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_bluetooth_ad2p.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_bluetooth_in_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_off_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/icon_highlight_rectangle.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/icon_highlight_square.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ime_qwerty.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/indicator_input_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_left_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_left_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_middle_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_right_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_right_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_left.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_left_and_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_bg.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_dimple.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_dimple_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_gray.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_accessory_bg_landscape.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_key_feedback_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_popup_panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_popup_panel_trans_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/light_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_activated_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_header_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_header_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_default_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_disabled_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_longpress.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_longpress_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_pressed_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_selected_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_multiselect_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_multiselect_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/magnified_region_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/maps_google_logo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_background_fill_parent_width.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_dropdown_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_hardkey_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_popup_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_popup_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_separator.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_submenu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_solid_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_solid_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_checkbox_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_unselected_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_selection_divider.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_focus_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_pressed_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/password_field_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/password_keyboard_background_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_accessibility_features.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_affects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/picture_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/picture_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_alias.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_alias_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_all_scroll.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_all_scroll_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_cell.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_cell_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_context_menu.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_context_menu_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_copy_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_crosshair.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_crosshair_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grab.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grab_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grabbing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grabbing_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_hand.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_hand_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_help_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_horizontal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_horizontal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_nodrop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_nodrop_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_anchor.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_hover.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_touch.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_text.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_text_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_left_diagonal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_left_diagonal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_right_diagonal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_right_diagonal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_text.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_text_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_10.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_11.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_12.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_13.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_14.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_17.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_18.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_19.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_21.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_22.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_23.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_24.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_25.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_26.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_27.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_29.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_30.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_31.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_32.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_33.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_34.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_35.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_in.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_in_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_out_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_background_mtrl_mult.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_full_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_full_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_top_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_top_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_invisible.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_offline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pressed_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_primary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_primary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_secondary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_secondary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_focused_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_normal_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_normal_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_pressed_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_pressed_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/radiobutton_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/radiobutton_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/recent_dialog_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/reticle.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_accelerated_anim2.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_horizontal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_vertical.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_disabled_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_primary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_primary_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_secondary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_plate_global.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/settings_header_raw.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_orange.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_purple.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_green.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_orange.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_purple.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_16_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_16_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_48_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_48_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_76_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_76_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_dropdown_background_down.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_dropdown_background_up.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_select.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_ecb_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_car_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_email_generic.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_gmail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_missed_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_rssi_in_range.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard_prepare.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sim_toolkit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_unknown.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_certificate_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_wimax_signal_3_fully.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_wimax_signal_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_gps_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_headset.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_general.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_throttled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_vp_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_warning.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_header_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_app_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/statusbar_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/submenu_arrow_nofocus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_incoming.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_missed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_outgoing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_contact_card.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_enter.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num0_no_plus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_ok_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_bottom_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_indicator_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_left_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_right_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_side_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_suggestions_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_middle_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_longpress_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_portrait.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_tall.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/transportcontrol_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/unknown_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/vpn_connected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/vpn_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/zoom_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/alert_window_layer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/blank_tile.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/default_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/loading_tile.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/loading_tile_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/no_tile_128.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/no_tile_256.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/platlogo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/platlogo_m.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/stat_sys_adb.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/text_cursor_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/text_cursor_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/vpn_connected.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/vpn_disconnected.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_halo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_ring.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_wave.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_halo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_ring.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_wave.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-nodpi/default_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_halo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_ring.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_wave.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-sw720dp-nodpi/default_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/dialog_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/global_action_icon_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/ic_input_extract_action_done.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/ic_input_extract_action_send.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/scrollbar_vertical_thumb.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/scrollbar_vertical_track.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/switch_thumb_watch_default_dark_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/sym_def_app_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-watch/sym_def_app_icon_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_shadow_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_shadow_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/activity_title_bar.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/arrow_down_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/arrow_up_float.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/battery_charge_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/bottom_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_buttonless_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_buttonless_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal_disable.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal_disable_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_transparent_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_global_search_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_disabled_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_disable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_disable_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_label_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_page_press.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/button_onoff_indicator_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/button_onoff_indicator_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/call_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/checkbox_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/checkbox_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_arrow_up.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_button_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_button_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_dial.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_hand_hour.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_hand_minute.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_bottom.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_top.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/combobox_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/combobox_nohighlight.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/compass_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/compass_base.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/contact_header_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/create_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dark_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/day_picker_week_view_dayline_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_full_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_full_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_middle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_middle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dim_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_textfield.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_bright_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_dark_opaque.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_background_focus_yellow.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_dropdown_background_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_angel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_cool.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_crying.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_embarrassed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_foot_in_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_happy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_kissing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_laughing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_lips_are_sealed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_money_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_sad.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_surprised.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_tongue_sticking_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_undecided.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_winking.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_wtf.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_yelling.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_ic_maximized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_ic_minimized.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_thumb_default_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_thumb_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/focused_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_unselected_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_unselected_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/grid_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/grid_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_ab_back_holo_dark_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_ab_back_holo_light_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_accessibility_magnification.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_aggregated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_audio_notification_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_audio_notification_mute_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_round_more_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_round_more_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_search_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_speak_now.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_fit_page_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_fit_page_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_page_overview_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_page_overview_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_bullet_key_permission.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_checkmark_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_coins_l.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_coins_s.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_close_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_close_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_dialer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_map.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_time.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_grayedout_printer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_get.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer_and_end.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer_and_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_decline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_sound_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_sound_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_unlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_vibrate_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_launcher_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_airplane_mode_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_airplane_mode_off_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_alarm_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_charging.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_lock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_low_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_lock_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_open_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_outline_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_power_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_ringer_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_ringer_on_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_embed_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_ff.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_fullscreen.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_next.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_pause.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_previous.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_rew.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_dark_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_light_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_video_poster.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_account_list.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_agenda.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_allfriends.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_always_landscape_portrait.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_archive.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_attachment.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_back.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_block.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_blocked_user.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_btn_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cc_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_chat_dashboard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_clear_playlist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_close_clear_cancel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_compass.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_compose.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_crop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_day.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_directions.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_edit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_emoticons.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_end_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_friendslist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_gallery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_goto.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_help_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_home.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_info_details.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_invite.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_login.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_manage.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mapmode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_month.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_my_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mylocation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_myplaces.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_notifications.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_play_clip.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_preferences.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_recent_history.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_report_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_revert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_rotate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_save.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_selectall_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_selectall_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_send.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_set_as.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_settings_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_slideshow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_sort_alphabetically.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_sort_by_size.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_star.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_start_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_today.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_upload.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_upload_you_tube.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_view.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_week.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_zoom.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_clear_all.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_ime_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_overlay.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_partial_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_reminder.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_category_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_settings_language.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_sim_card_multi_24px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_sim_card_multi_48px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_user_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_vibrate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_vibrate_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_bluetooth_ad2p.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_bluetooth_in_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_off_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_small.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/icon_highlight_rectangle.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/icon_highlight_square.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ime_qwerty.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/indicator_input_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_left_green.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_left_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_middle_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_right_red.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_right_yellow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_left.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_left_and_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_bg.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_dimple.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_dimple_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_accessory_bg_landscape.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_key_feedback_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_popup_panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_popup_panel_trans_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/light_header.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_activated_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_horizontal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_header_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_header_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_default_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_disabled_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_longpress.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_longpress_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_pressed_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_selected_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_multiselect_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_multiselect_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/magnified_region_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/maps_google_logo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_background_fill_parent_width.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_dropdown_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_hardkey_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_hardkey_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_popup_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_popup_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_separator.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_submenu_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_solid_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_solid_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_checkbox_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_unselected_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_selection_divider.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_disabled_focused.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_focus_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_pressed_blue.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/password_field_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/password_keyboard_background_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_accessibility_features.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_affects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/picture_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/picture_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_alias.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_alias_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_all_scroll.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_all_scroll_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_cell.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_cell_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_context_menu.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_context_menu_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_copy_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_crosshair.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_crosshair_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grab.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grab_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grabbing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grabbing_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_hand.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_hand_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_help_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_horizontal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_horizontal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_nodrop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_nodrop_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_anchor.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_hover.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_touch.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_text.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_text_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_left_diagonal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_left_diagonal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_right_diagonal_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_right_diagonal_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_double_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_double_arrow_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_text.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_text_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_10.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_11.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_12.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_13.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_14.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_17.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_18.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_19.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_21.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_22.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_23.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_24.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_25.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_26.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_27.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_29.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_30.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_31.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_32.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_33.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_34.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_35.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_in.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_in_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_out_large.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_background_mtrl_mult.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_full_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_full_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_top_bright.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_top_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_invisible.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_offline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pressed_application_background_static.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_primary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_primary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_secondary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_secondary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_normal_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_normal_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_pressed_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_pressed_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/radiobutton_off_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/radiobutton_on_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/recent_dialog_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/reticle.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_accelerated_anim2.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_horizontal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_vertical.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_disabled_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_primary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_primary_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_secondary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_dropdown_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_plate_global.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_selected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/settings_header_raw.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_16_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_16_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_48_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_48_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_76_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_76_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_20.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_dropdown_background_down.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_dropdown_background_up.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_select.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_16.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_48.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_76.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_big_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_big_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_ecb_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_car_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_email_generic.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_gmail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_missed_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_mmcc_indication_icn.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_rssi_in_range.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard_prepare.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sim_toolkit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_unknown.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_certificate_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_wimax_signal_3_fully.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_wimax_signal_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_gps_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_headset.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_0_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_1_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_2_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_3_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_4_cdma.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_general.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_throttled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_vp_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_vp_phone_call_on_hold.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_warning.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_background.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_header_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_app_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/statusbar_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/submenu_arrow_nofocus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_email.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_incoming.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_missed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_outgoing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_contact_card.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_delete_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_enter.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num0_no_plus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_ok.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_ok_dim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_return.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_shift.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_shift_locked.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_space.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_bottom_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_indicator_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_left.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_left_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_right.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_right_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_v4.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_side_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_suggestions_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_middle_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_default.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_selected.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_medium.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_portrait.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_tall.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/transportcontrol_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/unknown_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/vpn_connected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/vpn_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_14w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_15w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_16w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_17w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_18w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_track_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/zoom_plate.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_shadow_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_inverse_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_transparent_light_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_normal_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_normal_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_arrow_up.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_button_normal.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_button_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/combobox_disabled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/combobox_nohighlight.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/create_contact.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/day_picker_week_view_dayline_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_bottom_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_bottom_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_full_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_full_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_middle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_middle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_top_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_top_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_angel.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_cool.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_crying.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_embarrassed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_foot_in_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_happy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_kissing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_laughing.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_lips_are_sealed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_money_mouth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_sad.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_surprised.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_tongue_sticking_out.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_undecided.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_winking.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_wtf.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_yelling.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_left_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_left_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_right_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_right_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_thumb_default_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_thumb_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_ab_back_holo_dark_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_ab_back_holo_light_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_accessibility_magnification.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_audio_notification_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_audio_notification_mute_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_btn_search_go.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_btn_speak_now.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_bullet_key_permission.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_180_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_180_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_emergency.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_find_next_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_find_previous_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_input_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_launcher_android.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_airplane_mode_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_airplane_mode_off_am_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_idle_alarm_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_lock_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_open_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_outline_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_power_off_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_silent_mode_off.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_alarm.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_active.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_camera_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_camera_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_down.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_left.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_right.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_up.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_emergencycall_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_emergencycall_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_forgotpassword_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_forgotpassword_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_handle_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_player_background.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_puk.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_sim.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_focused.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_focusde.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_unlock_activated.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_unlock_normal.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreens_now_button.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_embed_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_ff.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_fullscreen.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_next.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_pause.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_play.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_previous.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_rew.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_dark_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_light_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_account_list.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_agenda.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_allfriends.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_always_landscape_portrait.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_archive.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_attachment.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_back.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_block.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_blocked_user.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_btn_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cc_am.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_chat_dashboard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_clear_playlist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_compass.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_compose.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_crop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_day.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_directions.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_edit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_emoticons.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_end_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_forward.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_friendslist.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_gallery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_goto.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_help.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_help_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_home.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_info_details.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_invite.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_login.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_manage.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mapmode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_month.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_my_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mylocation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_myplaces.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_notifications.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_play_clip.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_preferences.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_recent_history.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_report_image.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_revert.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_rotate.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_save.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_selectall_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_selectall_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_send.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_set_as.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_settings_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_slideshow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_sort_alphabetically.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_sort_by_size.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_star.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_start_conversation.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_stop.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_today.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_upload.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_upload_you_tube.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_view.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_week.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_zoom.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_ime_default.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_media_route.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_calendar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_camera.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_effects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_location.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_messages.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_microphone.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_phone_calls.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_social_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_wallpapewr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_sim_card_multi_24px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_sim_card_multi_48px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_suggestions_add.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_suggestions_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_user_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_voice_search_api_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_voice_search_api_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/indicator_input_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_activated_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_disabled.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_focus.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_longpress.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_pressed.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/lockscreen_protection_pattern.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/magnified_region_frame.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_dropdown_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_dropdown_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_hardkey_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_hardkey_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_popup_panel_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_popup_panel_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_longpressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_longpressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_selection_divider.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_focused_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_focused_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_longpressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_longpressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_normal_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_normal_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_pressed_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_pressed_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/panel_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/panel_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_accessibility_features.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_affects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/pointer_arrow.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_background_mtrl_mult.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_above_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_above_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_invisible.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_offline.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_away.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_busy.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_online.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_primary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_primary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_secondary_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_secondary_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_focused_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_focused_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_normal_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_normal_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_pressed_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_pressed_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_half_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_half_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_off_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_off_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_on_holo_dark.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_on_holo_light.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrollbar_handle_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrollbar_handle_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_disabled_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_focused_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_normal_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_on_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_on_pressed_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_pressed_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_primary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_primary_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_secondary_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_16_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_16_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_48_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_48_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_76_inner_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_76_outer_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_default_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_default_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_focused_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_focused_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_normal_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_pressed_holo_dark_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_pressed_holo_light_am.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_car_mode.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_chat.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_disk_full.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_email_generic.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_gmail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_missed_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_mmcc_indication_icn.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_more.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_rssi_in_range.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard_prepare.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sim_toolkit.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync_error.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_certificate_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_wimax_signal_3_fully.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_wimax_signal_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_gps_on.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_phone_call.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_general.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_usb.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_throttled.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim0.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_warning.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_light_v2.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_pressed_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_pressed_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_delete.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_enter.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num0_no_plus.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num1.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num2.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num3.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num4.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num5.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num6.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num7.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num8.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_return_holo.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_indicator_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_focused_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_pressed_holo.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_edit_paste_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_edit_suggestions_window.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_middle_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_activated_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_activated_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_focused_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_focused_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_activated_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_default_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_default_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_selected_holo_dark.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_selected_holo_light.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/transportcontrol_bg.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/vpn_connected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/vpn_disconnected.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_14w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_15w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_16w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_17w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_18w.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_track_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_accessibility_magnification.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_lock_open_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_lock_outline_wht_24dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_00_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_01_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_02_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_03_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_04_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_05_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_06_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_07_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_08_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_09_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_10_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_11_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_12_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_13_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_14_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_15_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_16_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_17_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_18_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_19_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_20_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_21_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_22_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_23_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_24_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_25_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_26_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_27_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_28_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_29_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_30_mtrl.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_menu_search_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_sim_card_multi_24px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_sim_card_multi_48px_clr.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_16dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_36dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_48dp.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_user_secure.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_accessibility_features.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_affects_battery.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_app_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_audio_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_bluetooth.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_bookmarks.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_device_alarms.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_display.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_personal_info.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_screenlock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_shortrange_network.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_status_bar.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_sync_settings.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_system_clock.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_system_tools.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_voicemail.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_wallpaper.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/tab_indicator_mtrl_alpha.9.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/text_select_handle_left_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/text_select_handle_right_mtrl_alpha.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ab_share_pack_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ab_solid_shadow_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_divider.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_item_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/app_icon_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/autofill_dataset_picker_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/autofilled_highlight.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/background_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/background_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/background_leanback_setup.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/box.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_borderless_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_browser_zoom_fit_page.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_browser_zoom_page_overview.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_cab_done_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_cab_done_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_material_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_checked_mtrl.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_checked_to_unchecked_mtrl_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_unchecked_mtrl.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_unchecked_to_checked_mtrl_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_circle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_clock_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_close.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_colored_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_mtrl_shape.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_small.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_transparent.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_dropdown.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_global_search.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_group_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_group_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_fulltrans.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_ics.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_trans.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_minus.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_notification_emphasized.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_plus.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_material_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_off_mtrl.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_off_to_on_mtrl_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_on_mtrl.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_on_to_off_mtrl_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_search_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_search_dialog_voice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_square_overlay.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_bg.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_down.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_page.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_up.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/button_inset.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/cab_background_bottom_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/cab_background_top_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/cling_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/control_background_32dp_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/control_background_40dp_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/dark_header_dither.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title_focused.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title_unfocused.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_close_button_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_close_button_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_maximize_button_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/decor_maximize_button_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/dialog_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/edit_query_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/editbox_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/emergency_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/emulator_circular_window_overlay.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_label_left_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_label_right_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_thumb_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_thumb_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/floating_popup_background_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/floating_popup_background_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_toarrow.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_toarrow_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_tooverflow.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_tooverflow_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/gallery_item_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/gallery_thumb.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/grid_selector_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_settings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_account_circle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_alert_window_layer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_arrow_drop_right_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_arrow_forward.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_alarm.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_alarm_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_media.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_media_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_notification.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_notification_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif_vibrate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_vol.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_vol_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_round_more.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_square_browser_zoom_fit_page.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_square_browser_zoom_page_overview.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_camera.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_check_circle_24px.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_chevron_end.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_chevron_start.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_close.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_collapse_bundle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_collapse_notification.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_commit_search_api_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_case.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_color.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_no_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_off.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_case.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_color.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_shadow.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_statusbar_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_user_badge.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_dialog_alert_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_dnd_block_notifications.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_apk.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_audio.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_certificate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_codes.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_compressed.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_contact.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_document.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_event.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_excel.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_folder.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_font.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_generic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_image.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_pdf.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_powerpoint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_presentation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_spreadsheet.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_video.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_word.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_eject_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_bundle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_more_48dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_notification.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_faster_emergency.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_feedback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_find_next_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_find_previous_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_fingerprint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_folder_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_go_search_api_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_info_outline.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_info_outline_24.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_done.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_go.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_next.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_previous.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_return.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_search.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_send.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_instant_icon_badge_bolt.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_airplane_mode.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_airplane_mode_off.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_bugreport.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_idle_alarm.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_lock.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_lockdown.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_power_off.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lockscreen_outerring.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_logout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_maps_indicator_current_position_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connected_dark_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connected_light_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_dark_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_light_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_dark_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_light_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_cc.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_copy_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_cut_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_find_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_paste_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_refresh.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_search_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_selectall_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_share_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_mic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_more_items.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_notification_alert.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_notification_block.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_perm_device_info.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_permission.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_popup_sync.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_print.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_print_error.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_qs_battery_saver.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_refresh.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_reply_notification.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_restart.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_schedule.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_screenshot.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_sd_card_48dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_search_api_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_settings_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_cellular_alt_24px.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_0_bars.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_1_bar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_2_bars.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_3_bars.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_4_bars.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_4k.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_hd.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_ld.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_sd.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_slice_send.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_spinner_caret.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_storage_48dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_text_dot.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_usb_48dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_voice_search_api_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_settings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_3.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ic_zen_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/immersive_cling_bg_circ.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/immersive_cling_light_bg_circ.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/indicator_check_mark_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/indicator_check_mark_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_normal_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_pressed_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_activated_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_answer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_generic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_unlock.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_decline.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_generic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_sound_off.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_sound_on.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_answer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_generic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_unlock.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_decline.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_generic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_sound_off.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_sound_on.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/keyboard_key_feedback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/light_header_dither.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_choice_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_divider_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight_active.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight_inactive.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_section_divider_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selected_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selected_background_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/load_average_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/lockscreen_notselected.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/lockscreen_selected.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/media_button_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menu_panel_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menu_panel_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menu_selector.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_background_solid.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_checkbox.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/messaging_user.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/minitab_lt.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/notification_material_action_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/notification_material_media_action_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/number_picker_divider_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_down_btn.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_input.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_up_btn.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/panel_picture_frame_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_calendar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_call_log.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_camera.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_contacts.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_location.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_microphone.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_phone_calls.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_sensors.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_sms.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_storage.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_alias_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_alias_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_all_scroll_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_all_scroll_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_arrow_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_arrow_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_cell_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_cell_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_context_menu_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_context_menu_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_copy_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_copy_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_crosshair_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_crosshair_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grab_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grab_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grabbing_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grabbing_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_hand_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_hand_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_help_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_help_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_horizontal_double_arrow_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_horizontal_double_arrow_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_nodrop_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_nodrop_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_anchor_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_hover_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_touch_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_text_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_text_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_left_diagonal_double_arrow_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_left_diagonal_double_arrow_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_right_diagonal_double_arrow_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_right_diagonal_double_arrow_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_double_arrow_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_double_arrow_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_text_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_text_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_wait.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_wait_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_in_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_in_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_out_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_out_large_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_anim_large_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_anim_medium_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_white.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_white.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_titlebar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_white.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/progress_static_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_focused_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_focused_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_normal_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_normal_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_pressed_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_pressed_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_half_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_indicator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/red_shield.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/resolver_icon_placeholder.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/screen_background_selector_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/screen_background_selector_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/scroll_indicator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/scrollbar_handle_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_control_selector_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_progress_horizontal_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_progress_horizontal_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/search_dropdown_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/search_dropdown_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/search_spinner.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seek_thumb.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_material_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_pressed_to_unpressed.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_pressed_to_unpressed_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_unpressed_to_pressed.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_unpressed_to_pressed_animation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_tick_mark_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_track_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/settings_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/silent_mode_indicator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/slice_remote_input_bg.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/slice_ripple_drawable.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_default_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_default_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_disabled_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_disabled_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_focused_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_focused_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_pressed_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_pressed_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_default_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_default_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_disabled_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_disabled_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_dropdown_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_focused_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_focused_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_pressed_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_pressed_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_textfield_background_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_call_mute.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_disabled_data.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_wifi_in_range.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_battery.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_battery_charge.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_download.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_download_done_static.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_speakerphone.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_tether_wifi.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_upload.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_vitals.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/status_bar_item_app_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/status_bar_item_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/submenu_arrow.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_inner_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_inner_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_thumb_material_anim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/sym_def_app_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/sym_def_app_icon_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_left.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_left_v4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_right.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_right_v4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_ab_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_v4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/text_cursor_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_left_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_middle_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_right_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search_empty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_right_holo_dark.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_right_holo_light.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/time_picker_editable_background.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/title_bar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/title_bar_shadow.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/toast_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/tooltip_frame.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_large.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_medium.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_small.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/drawable/view_accessibility_focused.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/progress_indeterminate_rotation_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_end_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_offset_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_start_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_cubic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_decelerate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quad.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quart.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/activity_close_dim.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/aggressive_ease.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/anticipate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/anticipate_overshoot.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/bounce.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_checked_mtrl_animation_interpolator_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_checked_mtrl_animation_interpolator_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_unchecked_mtrl_animation_interpolator_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_unchecked_mtrl_animation_interpolator_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_radio_to_off_mtrl_animation_interpolator_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_radio_to_on_mtrl_animation_interpolator_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/cycle.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_cubic.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quad.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quart.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_extra_slow_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_linear_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_slow_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_0.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_3.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_4.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_5.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_6.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_source_scale_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_source_scale_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_target_ydelta.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_micro_alpha.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_micro_ydelta.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/linear.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/linear_out_slow_in.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/overshoot.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect1_scalex.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect1_translatex.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect2_scalex.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect2_translatex.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/trim_end_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/interpolator/trim_start_interpolator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-land/date_picker_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-land/icon_menu_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-land/ssl_certificate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-land/time_picker_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-large/action_mode_close_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-notround-watch/alert_dialog_title_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-port/icon_menu_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-round-watch/alert_dialog_title_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/date_picker_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/keyguard.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/preference_list_content_single.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-television/autofill_save.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-television/user_switching_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/alert_dialog_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/date_picker_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/global_actions.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/global_actions_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/input_method_extract_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_list_fragment_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_widget_switch.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/progress_dialog_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-watch/time_picker_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/activity_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/breadcrumbs_in_fragment.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/breadcrumbs_in_fragment_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_item_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_multichoice_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_singlechoice_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/accessibility_button_chooser.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/accessibility_button_chooser_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_home.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_home_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_title_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_up_container.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_menu_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_menu_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_bar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_close_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_close_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/activity_chooser_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/activity_chooser_view_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/activity_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/activity_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/activity_list_item_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/adaptive_notification_wrapper.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_button_bar_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_leanback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_leanback_button_panel_side.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_title_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/always_use_checkbox.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/am_compat_mode_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_anr_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_error_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_not_authorized.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item_money.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item_old.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/app_perms_summary.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/auto_complete_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker_fullscreen.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker_header_footer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/autofill_save.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/breadcrumbs_in_fragment.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/breadcrumbs_in_fragment_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/browser_link_context_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/calendar_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/car_user_switching_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/cascading_menu_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/character_picker.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/character_picker_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/choose_account.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/choose_account_row.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/choose_account_type.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/choose_type_and_account.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/chooser_grid.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/chooser_row.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/common_tab_settings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_header_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_legacy.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_legacy_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_month_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_view_animator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/day_picker_content_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/decor_caption.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/default_navigation.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/expandable_list_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/expanded_menu_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_close_overflow_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_container.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_menu_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_open_overflow_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_overflow_button.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumb_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumb_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumbs.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/global_actions_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/global_actions_silent_mode.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/grant_credentials_permission.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/harmful_app_warning_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/heavy_weight_switcher.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/icon_menu_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/immersive_mode_cling.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/input_method.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/input_method_extract_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/input_method_switch_dialog_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/input_method_switch_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/js_prompt.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/keyboard_key_preview.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/keyboard_popup_keyboard.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/keyguard.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/language_picker_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/language_picker_section_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/launch_warning.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_content_simple.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_gestures_overlay.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_checkbox.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_radio.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/locale_picker_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/media_controller.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/media_route_chooser_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/media_route_controller_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/media_route_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/menu_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_intruder_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_emphasized.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_tombstone.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_media_action.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_reply_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_ambient_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_ambient.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_base.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_base.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_media.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_picture.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_inbox.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_media.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_messaging.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_group.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_image_message.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_text_message.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_part_chronometer.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_part_line1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_progress.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_progressbar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_right_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_smart_reply_container.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/number_picker.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/number_picker_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/number_picker_with_selector_wheel.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/overlay_display_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/permissions_account_and_authtokentype.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/permissions_package_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/popup_menu_header_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/popup_menu_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/power_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_category.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_category_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_category_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_child.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_child_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_child_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_edittext.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_edittext_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_seekbar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_seekbar_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_header_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_header_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_information.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_information_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_information_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content_single.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_fragment.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_fragment_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_checkbox.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_seekbar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_seekbar_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_switch.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/preferences.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/recent_apps_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/recent_apps_icon.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/remote_views_adapter_default_loading_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/resolve_grid_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/resolve_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/resolver_different_item_header.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/resolver_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/resolver_list_with_default.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/restrictions_pin_challenge.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/restrictions_pin_setup.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/safe_mode.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_action_bar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_custom_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_progress.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_simple.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_simple_overlay_action_mode.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_swipe_dismiss.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_title_icons.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/screen_toolbar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/search_bar.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/search_dropdown_item_icons_2line.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/search_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/shutdown_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_account_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_hint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_item_1line.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_item_2line.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_expandable_list_item_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_expandable_list_item_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_gallery_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_2_single_choice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_activated_1.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_activated_2.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_checked.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_multiple_choice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_single_choice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_selectable_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_spinner_dropdown_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/simple_spinner_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_grid.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_message.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_message_local.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_remote_input.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_secondary_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_small_template.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/slice_title.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/sms_short_code_confirmation_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/ssl_certificate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/status_bar_latest_event_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/subscription_item_layout.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/tab_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/test_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_drag_thumbnail.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_action_popup_text.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_no_paste_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_paste_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_side_no_paste_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_side_paste_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_container.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_container_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_item_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestions_window.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/textview_hint.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_header_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_legacy.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_legacy_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_text_input_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/tooltip.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/transient_notification.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/twelve_key_entry.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/two_line_list_item.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/typing_filter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/unsupported_compile_sdk_dialog_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/unsupported_display_size_dialog_content.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/user_switching_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/voice_interaction_session.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/web_runtime.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/web_text_view_dropdown.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/webview_find.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/webview_select_singlechoice.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/wifi_p2p_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/wifi_p2p_dialog_row.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/work_widget_mask_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/year_label_text_view.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/zoom_browser_accessory_buttons.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/zoom_container.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/zoom_controls.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/layout/zoom_magnify.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/menu/language_selection_list.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/menu/webview_copy.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/menu/webview_find.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_def_app_icon_foreground.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_def_app_icon_maskable.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_app_on_sd_unavailable_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_def_app_icon_foreground.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-watch-anydpi/sym_def_app_icon_foreground.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xhdpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xhdpi/sym_def_app_icon_foreground.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xxhdpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xxhdpi/sym_def_app_icon_foreground.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xxxhdpi/sym_def_app_icon.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/mipmap-xxxhdpi/sym_def_app_icon_foreground.png -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ar/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ar/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-cs/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-cs/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-da/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-da/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-de/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-de/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-en-rGB/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-en-rGB/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-es/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-es/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-fi/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-fi/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-fr/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-fr/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-hu/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-hu/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-it/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-it/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-iw/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-iw/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ja/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ja/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ko/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ko/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-nl/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-nl/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-pl/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-pl/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-pt-rBR/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-pt-rBR/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-rm/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-rm/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ru/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-ru/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-th/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-th/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-tr/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-tr/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-zh-rCN/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-zh-rCN/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-zh-rTW/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw-zh-rTW/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/color_fade_frag.frag -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/color_fade_vert.vert -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/fallback_categories.csv -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/fallbackring.ogg -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/loaderror.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/raw/nodomain.html -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/explode.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/fade.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/move.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/no_transition.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/popup_window_enter.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/popup_window_exit.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/slide_bottom.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/slide_left.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/slide_right.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/transition/slide_top.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-af-rZA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-af-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-af/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-af/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-am-rET/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-am-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-am/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-am/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar-rEG/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar-rEG/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar-rIL/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ar/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-as-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-as/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-az-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-az/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-b+sr+Latn-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-b+sr+Latn/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-be-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-be/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bg-rBG/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bg-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bg/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bg/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bn-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bn/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bs-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-bs/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ca-rES/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ca-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ca/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ca/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-cs-rCZ/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-cs-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-cs/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-cs/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-da-rDK/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-da-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-da/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-da/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de-rAT/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de-rCH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de-rDE/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de-rLI/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-de/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-el-rGR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-el-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-el/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-el/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rAU-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rCA-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rGB-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIE/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIE/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIN-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rNZ/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rNZ/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rSG/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rSG/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/donottranslate-names.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rXC-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rXC/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rZA/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-en-rZA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es-rES/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es-rUS-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es-rUS/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es-rUS/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-es/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-et-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-et/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-eu-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-eu/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fa-rIR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fa-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fa/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fa/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fi-rFI/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fi-rFI/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fi-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fi/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fi/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rBE/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rCH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-rFR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-fr/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-gl-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-gl/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-gu-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-gu/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-h320dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-h720dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hi-rIN/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hi-rIN/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hi-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hi/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hi/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hr-rHR/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hr-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hr/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hr/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hu-rHU/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hu-rHU/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hu-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hu/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hu/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hy-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-hy/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-in-rID/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-in-rID/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-in-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-in/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-in/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-is-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-is/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-it-rCH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-it-rIT/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-it-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-it/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-it/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-iw-rIL/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-iw-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-iw/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-iw/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ja-rJP/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ja-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ja/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ja/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ka-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ka/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-kk-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-kk/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-km-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-km/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-kn-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-kn/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ko-rKR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ko-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ko/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ko/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ky-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ky/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/arrays.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/donottranslate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-land/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-large/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-large/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-large/themes_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-large/themes_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-large/themes_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ldrtl-television/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lo-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lo/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lt-rLT/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lt-rLT/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lt-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lt/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lt/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lv-rLV/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lv-rLV/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lv-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lv/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-lv/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mk-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mk/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ml-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ml/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mn-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mn/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mr-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-mr/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ms-rMY/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ms-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ms/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-my-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-my/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nb-rNO/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nb-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nb/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nb/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ne-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ne/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nl-rBE/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nl-rNL/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nl-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nl/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-nl/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-notround-watch/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-notround-watch/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-or-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-or/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pa-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pa/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pl-rPL/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pl-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pl/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pl/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-port-mdpi/donottranslate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-port/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-port/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-pt/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-rm-rCH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ro-rRO/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ro-rRO/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ro-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ro/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ro/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-round-watch/config_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-round-watch/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-round-watch/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ru-rRU/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ru-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ru/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ru/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-si-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-si/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sk-rSK/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sk-rSK/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sk-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sk/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sk/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sl-rSI/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sl-rSI/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sl-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sl/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sl/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sq-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sq/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sr-rRS/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sr-rRS/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sr-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sr/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sr/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sv-rSE/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sv-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sv/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sv/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw-rTZ/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw360dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/arrays.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-port/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-w960dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/colors.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/styles.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-land/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-port/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-w1280dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/styles.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-sw900dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ta-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ta/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-te-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-te/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-television/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-television/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-television/themes.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-television/themes_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-th-rTH/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-th-rTH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-th-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-th/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-th/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tl-rPH/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tl-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tl/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tl/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tr-rTR/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tr-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tr/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-tr/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uk-rUA/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uk-rUA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uk-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uk/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uk/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ur-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-ur/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uz-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-uz/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-vi-rVN/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-vi-rVN/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-vi-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-vi/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-vi/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w170dp-notround-watch/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w180dp-notround-watch/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w192dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w195dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w205dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w210dp-round-watch/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w213dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w225dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w228dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w240dp/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w320dp-h426dp/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w320dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w426dp-h320dp/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w480dp/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-w720dp/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/colors_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/config_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/donottranslate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/donottranslate_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/styles_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/themes.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/themes_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-watch/themes_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-xlarge-land/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-xlarge/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rHK-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rHK/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zu-rZA/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zu-watch/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zu/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values-zu/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/arrays.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/attrs.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/attrs_manifest.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/bools.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_car.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_leanback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_legacy.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/colors_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/config_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/dimens_car.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/dimens_leanback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/dimens_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_device.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_profile.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_user.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-cldr.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-maps.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-names.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/donottranslate.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/donottranslate_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/ids.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/integers.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/locale_config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/public.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_device.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_profile.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_user.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/strings.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/styles.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/styles_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/styles_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/styles_leanback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/styles_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/symbols.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/themes.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/themes_device_defaults.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/themes_holo.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/themes_leanback.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/themes_material.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_device.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_profile.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_user.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_device.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_profile.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_user.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/version -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-en/autotext.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-land/password_kbd_qwerty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-land/password_kbd_qwerty_shifted.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-mdpi/password_kbd_qwerty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-mdpi/password_kbd_qwerty_shifted.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-watch/default_zen_mode_config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_numeric.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_qwerty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_qwerty_shifted.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_symbols.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_symbols_shift.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/apns.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/audio_assets.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/autofill_compat_accessibility_service.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/autotext.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/bookmarks.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/color_extraction.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/config_webview_packages.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/default_zen_mode_config.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/global_keys.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/kg_password_kbd_numeric.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_extension.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_numeric.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_popup_template.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_qwerty.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_qwerty_shifted.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_symbols.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_symbols_shift.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/power_profile.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/power_profile_test.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/sms_7bit_translation_table.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/sms_short_codes.xml -%%IDEA_HOME%%/plugins/android/lib/layoutlib/data/res/xml/storage_list.xml -%%IDEA_HOME%%/plugins/android/lib/libdeploy_java_proto.jar -%%IDEA_HOME%%/plugins/android/lib/libjava_version.jar -%%IDEA_HOME%%/plugins/android/lib/libwebp.jar -%%IDEA_HOME%%/plugins/android/lib/libwebp/linux/libwebp_jni.so -%%IDEA_HOME%%/plugins/android/lib/libwebp/linux/libwebp_jni64.so -%%IDEA_HOME%%/plugins/android/lib/libwebp/mac/libwebp_jni64.dylib -%%IDEA_HOME%%/plugins/android/lib/libwebp/win/webp_jni.dll -%%IDEA_HOME%%/plugins/android/lib/libwebp/win/webp_jni64.dll -%%IDEA_HOME%%/plugins/android/lib/lint-api-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/lint-checks-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/manifest-merger-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/moshi-1.6.0.jar -%%IDEA_HOME%%/plugins/android/lib/nosyncbuilder-jarjar.jar -%%IDEA_HOME%%/plugins/android/lib/okio-1.14.0.jar -%%IDEA_HOME%%/plugins/android/lib/org.eclipse.elk.alg.layered-0.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/org.eclipse.elk.core-0.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/org.eclipse.elk.graph-0.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/org.eclipse.emf.common-2.12.0.jar -%%IDEA_HOME%%/plugins/android/lib/org.eclipse.emf.ecore-2.12.0.jar -%%IDEA_HOME%%/plugins/android/lib/pepk.jar -%%IDEA_HOME%%/plugins/android/lib/pixelprobe.jar -%%IDEA_HOME%%/plugins/android/lib/protos-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/repository-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/resources_en.jar -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_1.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_10.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_11.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_12.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_13.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_14.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_15.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_16.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_2.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_3.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_4.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_5.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_6.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_7.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_8.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/avatars/avatar_9.xml -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/A_Photographer.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Apres_la_Pluie.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Caterpillar.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Colors_of_Autumn.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Countryside.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Death_Valley_-_Dunes.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Despair.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Eagle_Fall_Sunrise.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Green_Grass.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Hanging_Leaf.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Jelly_Fish_3.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Kauai.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Longue_Vue.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Lost_in_a_Field.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Monument_Valley_Overlook.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/One_Wheel.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Open_Sky.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Orange_Sunset.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Stream.jpg -%%IDEA_HOME%%/plugins/android/lib/sampleData/backgrounds/scenic/Yosemite_Tree.jpg -%%IDEA_HOME%%/plugins/android/lib/sdk-common-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/sdk-tools.jar -%%IDEA_HOME%%/plugins/android/lib/sdklib-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/shared-26.3.0.jar -%%IDEA_HOME%%/plugins/android/lib/spantable.jar -%%IDEA_HOME%%/plugins/android/lib/studio-profiler-grpc-1.0-jarjar.jar -%%IDEA_HOME%%/plugins/android/lib/templates/BUILD -%%IDEA_HOME%%/plugins/android/lib/templates/NOTICE -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/app_icon_your_company.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/default_background.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/movie.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/layout/activity_details.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/layout/activity_main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/values/colors.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/BrowseErrorActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/BrowseErrorActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/CardPresenter.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/CardPresenter.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsDescriptionPresenter.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsDescriptionPresenter.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/ErrorFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/ErrorFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/Movie.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/Movie.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MovieList.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MovieList.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackVideoFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackVideoFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/template-leanback-TV.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/src/app_package/SimpleActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/AccelerometerService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/AccelerometerService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/GpsService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/GpsService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/SimpleActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/TemperaturePressureService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/TemperaturePressureService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/thumbnail.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/recipe_fragment.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/activity_fragment_container.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/AndroidManifestPermissions.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/layout/blank_activity.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/layout/blank_activity_prev.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values-round/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/src/app_package/BlankActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/src/app_package/BlankActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/templates-WatchViewStub-Wear.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/build.gradle -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_dashboard_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_home_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_notifications_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/layout/activity_main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/menu/navigation.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/strings.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/src/app_package/MainActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/src/app_package/MainActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template_bottom_navigation_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/FullscreenActivity/template_fullscreen_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/layout/activity_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/src/app_package/SimpleActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity_banner.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity_interstitial.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/debugRes/values/google_maps_api.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/releaseRes/values/google_maps_api.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/res/layout/activity_map.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/src/app_package/MapActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/src/app_package/MapActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsActivity/template_map_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifestPermissions.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/debugRes/values/google_maps_api.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/releaseRes/values/google_maps_api.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/layout/activity_map.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/MapActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/MapActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template_thumb.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/LoginActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/LoginActivity/template_login_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_detail.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_list_app_bar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_detail.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list_twopane.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/item_list_content.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-w900dp/refs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/MasterDetailFlow/template_master_detail.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_camera.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_gallery.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_manage.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_send.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_share.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_slideshow.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable/side_nav_bar.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_header.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_view.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/drawer.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values-v21/no_actionbar_styles_v21.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/drawables.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/DrawerActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/DrawerActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/app_bar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/ScrollActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/ScrollActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ScrollActivity/template_scroll_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/build.gradle -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_info_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_notifications_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_sync_black_24dp.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/values/pref_strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_general.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/AppCompatPreferenceActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/AppCompatPreferenceActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/SettingsActivity/template_settings_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/app_bar_activity.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/list_item.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_fragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_dropdown.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_pager.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_tabs.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/res/layout/activity.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/res/layout/fragment.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Activity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Activity.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Fragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/ViewModel.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/ViewModel.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/ViewModelActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/common_globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/jni_code_snippet.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/jni_code_snippet.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/jni_code_usage.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/jni_code_usage.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/kotlin.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/kotlin_globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/kotlin_macros.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_app_bar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_dummy_content.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_full_screen_actionbar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_manifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_manifest_strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_no_actionbar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_simple_menu.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_theme.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/layout/app_bar.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/layout/simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/menu/simple_menu.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/app_bar_dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_attrs.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_colors.xml -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/manifest_strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/no_actionbar_styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/simple_menu_strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/theme_styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/shared_manifest_macros.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/wear_common_globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/wear-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/ImportEclipseProject/eclipse-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/ImportEclipseProject/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/ImportGradleProject/gradle-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/ImportGradleProject/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidAutoModule/car-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidAutoModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/mobile-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/CMakeLists.txt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-ApplicationManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeatureDependency-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/instantApp-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/monolithic-AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/monolithic-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/native-lib.cpp.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/drawable-v24/ic_launcher_foreground.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/drawable/ic_launcher_background.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/ic_launcher-web.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi-v26/ic_launcher.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi-v26/ic_launcher_round.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/colors.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/shared_macros.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleInstrumentedTest.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleInstrumentedTest.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleUnitTest.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleUnitTest.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/android-project.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/gradle.properties.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/local.properties.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/project_ignore -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/values/styles.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/tv-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/CMakeLists.txt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/native-lib.cpp.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/colors.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleInstrumentedTest.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleInstrumentedTest.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleUnitTest.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleUnitTest.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/things-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/dynamic-feature-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/base-AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/base-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/glass-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xxxhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/values/styles.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/test/app_package/ApplicationTest.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/instant-app-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantDynamicFeatureModule/instant-dynamic-feature-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantDynamicFeatureModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantFeatureModule/feature-module.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewInstantFeatureModule/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/template_new_project.png -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/gitignore -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/globals_android_module.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/proguard-rules.txt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/proguard_macros.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/common/proguard_recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar -%%IDEA_HOME%%/plugins/android/lib/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties -%%IDEA_HOME%%/plugins/android/lib/templates/gradle/wrapper/gradlew -%%IDEA_HOME%%/plugins/android/lib/templates/gradle/wrapper/gradlew.bat -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFolder/root/component-build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AidlFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/res/values-v21/styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/res/xml/automotive_app_desc.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/src/app_package/MusicService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/src/app_package/MusicService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMediaService/templates-mediaService-Auto.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/res/xml/automotive_app_desc.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReadReceiver.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReadReceiver.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReplyReceiver.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReplyReceiver.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessagingService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessagingService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/templates-messagingService-Auto.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidManifest/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidManifest/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AndroidManifest/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppActionsResourceFile/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppActionsResourceFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppActionsResourceFile/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppActionsResourceFile/root/res/actions.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppActionsResourceFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/layout/appwidget.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/layout/appwidget_configure.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/values-v14/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/AssetsFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AssetsFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/AssetsFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/root/res/values/strings.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/root/src/app_package/BlankFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/BlankFragment/template_blank_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/BroadcastReceiver/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/root/src/app_package/ContentProvider.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ContentProvider/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/root/res/layout/sample.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/root/res/values/attrs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/root/src/app_package/CustomView.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/root/src/app_package/CustomView.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/CustomView/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/res/layout-v17/dream.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/res/xml/dream_prefs.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/src/app_package/DreamService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Daydream/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/FontFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/FontFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/root/src/app_package/IntentService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/root/src/app_package/IntentService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/IntentService/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/JavaFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/JavaFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/JavaFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/JniFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/JniFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/JniFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/LayoutResourceFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/LayoutResourceFile/root/res/layout.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/LayoutResourceFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/res/layout/fragment_list.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/res/layout/item_list_content.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/ListFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/templates_list_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog_item.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/src/app_package/ItemListDialogFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/src/app_package/ItemListDialogFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_list.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_list_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_none.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_none_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_picture.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_picture_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_text.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/template_notification_text_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/PlusOneFragment/templates_plusone_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/RawFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/RawFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResourcesFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResourcesFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ResourcesFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/RsFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/RsFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/RsFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/root/src/app_package/Service.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/root/src/app_package/Service.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/Service/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/root/src/app_package/SliceProvider.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/root/src/app_package/SliceProvider.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/SliceProvider/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ValueResourceFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ValueResourceFile/root/res/values.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ValueResourceFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/root/res/layout/blank_fragment.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankFragment.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankViewModel.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankViewModel.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/ViewModelFragment/template_blank_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/analog_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/analog_square.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/digital_round.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/digital_square.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifestPermissions.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/bg.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_analog.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_digital.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_digital_circular.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/colors.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/res/xml/watch_face.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyAnalogWatchFaceService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyAnalogWatchFaceService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.kt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/template_thumbnail.png -%%IDEA_HOME%%/plugins/android/lib/templates/other/XmlFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/other/XmlFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/other/common/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/tracker-26.3.0.jar -%%IDEA_HOME%%/plugins/ant/lib/ant-jps-plugin.jar -%%IDEA_HOME%%/plugins/ant/lib/antIntegration.jar -%%IDEA_HOME%%/plugins/ant/lib/resources_en.jar -%%IDEA_HOME%%/plugins/configurationScript/lib/configurationScript.jar -%%IDEA_HOME%%/plugins/copyright/lib/copyright.jar -%%IDEA_HOME%%/plugins/copyright/lib/resources_en.jar -%%IDEA_HOME%%/plugins/coverage/lib/coverage-report-idea.jar -%%IDEA_HOME%%/plugins/coverage/lib/coverage-report.jar -%%IDEA_HOME%%/plugins/coverage/lib/coverage.jar -%%IDEA_HOME%%/plugins/coverage/lib/coverage_rt.jar -%%IDEA_HOME%%/plugins/coverage/lib/freemarker.jar -%%IDEA_HOME%%/plugins/coverage/lib/jacocoagent.jar -%%IDEA_HOME%%/plugins/coverage/lib/jacocoant.jar -%%IDEA_HOME%%/plugins/coverage/lib/resources_en.jar -%%IDEA_HOME%%/plugins/devkit/lib/devkit-jps-plugin.jar -%%IDEA_HOME%%/plugins/devkit/lib/devkit.jar -%%IDEA_HOME%%/plugins/devkit/lib/dtdparser113.jar -%%IDEA_HOME%%/plugins/devkit/lib/resources_en.jar -%%IDEA_HOME%%/plugins/eclipse/lib/common-eclipse-util.jar -%%IDEA_HOME%%/plugins/eclipse/lib/eclipse-jps-plugin.jar -%%IDEA_HOME%%/plugins/eclipse/lib/eclipse.jar -%%IDEA_HOME%%/plugins/eclipse/lib/resources_en.jar -%%IDEA_HOME%%/plugins/editorconfig/lib/editorconfig-core-java.jar -%%IDEA_HOME%%/plugins/editorconfig/lib/editorconfig.jar -%%IDEA_HOME%%/plugins/editorconfig/lib/resources_en.jar -%%IDEA_HOME%%/plugins/git4idea/lib/git4idea-rt.jar -%%IDEA_HOME%%/plugins/git4idea/lib/git4idea.jar -%%IDEA_HOME%%/plugins/git4idea/lib/remote-servers-git.jar -%%IDEA_HOME%%/plugins/git4idea/lib/resources_en.jar -%%IDEA_HOME%%/plugins/github/lib/github.jar -%%IDEA_HOME%%/plugins/github/lib/resources_en.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-api-4.10.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-api-impldep-4.10.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-common.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-java.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-jps-plugin.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-launcher-4.10.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-api.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-impl.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-wrapper-4.10.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle.jar -%%IDEA_HOME%%/plugins/gradle/lib/kryo-2.24.0.jar -%%IDEA_HOME%%/plugins/gradle/lib/minlog-1.2.jar -%%IDEA_HOME%%/plugins/hg4idea/lib/hg4idea.jar -%%IDEA_HOME%%/plugins/hg4idea/lib/resources_en.jar -%%IDEA_HOME%%/plugins/java-decompiler/lib/java-decompiler.jar -%%IDEA_HOME%%/plugins/java-i18n/lib/java-i18n.jar -%%IDEA_HOME%%/plugins/java-i18n/lib/resources_en.jar -%%IDEA_HOME%%/plugins/javaFX/lib/SceneBuilderKit-8.2.0.jar -%%IDEA_HOME%%/plugins/javaFX/lib/common-javaFX-plugin.jar -%%IDEA_HOME%%/plugins/javaFX/lib/javaFX-jps-plugin.jar -%%IDEA_HOME%%/plugins/javaFX/lib/javaFX.jar -%%IDEA_HOME%%/plugins/javaFX/lib/resources_en.jar -%%IDEA_HOME%%/plugins/junit/lib/idea-junit.jar -%%IDEA_HOME%%/plugins/junit/lib/junit-rt.jar -%%IDEA_HOME%%/plugins/junit/lib/junit5-rt.jar -%%IDEA_HOME%%/plugins/junit/lib/resources_en.jar -%%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m2.jar -%%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m3.jar -%%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m31.jar -%%IDEA_HOME%%/plugins/maven/lib/lucene-core-2.4.1.jar -%%IDEA_HOME%%/plugins/maven/lib/maven-errorProne-compiler.jar -%%IDEA_HOME%%/plugins/maven/lib/maven-jps-plugin.jar -%%IDEA_HOME%%/plugins/maven/lib/maven-server-api.jar -%%IDEA_HOME%%/plugins/maven/lib/maven.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-impl.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-lib/archetype-common-2.0-alpha-4-SNAPSHOT.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-lib/commons-beanutils.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-lib/maven-dependency-tree-1.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-lib/mercury-artifact-1.0-alpha-6.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2-server-lib/nexus-indexer-1.2.3.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2/LICENSE.txt -%%IDEA_HOME%%/plugins/maven/lib/maven2/NOTICE.txt -%%IDEA_HOME%%/plugins/maven/lib/maven2/README.txt -%%IDEA_HOME%%/plugins/maven/lib/maven2/bin/m2.conf -%%IDEA_HOME%%/plugins/maven/lib/maven2/bin/mvn -%%IDEA_HOME%%/plugins/maven/lib/maven2/bin/mvn.bat -%%IDEA_HOME%%/plugins/maven/lib/maven2/bin/mvnDebug -%%IDEA_HOME%%/plugins/maven/lib/maven2/bin/mvnDebug.bat -%%IDEA_HOME%%/plugins/maven/lib/maven2/boot/classworlds-1.1.jar -%%IDEA_HOME%%/plugins/maven/lib/maven2/conf/settings.xml -%%IDEA_HOME%%/plugins/maven/lib/maven2/lib/maven-2.2.1-uber.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-common.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-impl.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-lib/archetype-catalog-2.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-lib/archetype-common-2.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-lib/maven-dependency-tree-1.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-lib/nexus-indexer-3.0.4.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3-server-lib/nexus-indexer-artifact-1.0.1.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/LICENSE -%%IDEA_HOME%%/plugins/maven/lib/maven3/NOTICE -%%IDEA_HOME%%/plugins/maven/lib/maven3/README.txt -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/m2.conf -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/mvn -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/mvn.cmd -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/mvnDebug -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/mvnDebug.cmd -%%IDEA_HOME%%/plugins/maven/lib/maven3/bin/mvnyjp -%%IDEA_HOME%%/plugins/maven/lib/maven3/boot/plexus-classworlds-2.5.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/conf/logging/simplelogger.properties -%%IDEA_HOME%%/plugins/maven/lib/maven3/conf/settings.xml -%%IDEA_HOME%%/plugins/maven/lib/maven3/conf/toolchains.xml -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-api-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-connector-basic-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-connector-basic.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-impl-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-impl.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-spi-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-spi.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-transport-wagon-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-transport-wagon.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-util-1.0.2.v20150114.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aether-util.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/aopalliance-1.0.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/cdi-api-1.0.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/cdi-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/commons-cli-1.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/commons-io-2.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/commons-lang-2.6.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/commons-lang3-3.4.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/commons-lang3.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/ext/README.txt -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/guava-18.0.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/guice-4.0-no_aop.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/javax.inject-1.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/jsoup-1.7.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/jsoup.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/jsr250-api-1.0.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/jsr250-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-aether-provider-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-aether-provider.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-artifact-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-artifact.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-builder-support-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-builder-support.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-compat-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-compat.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-core-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-core.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-embedder-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-embedder.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-model-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-model-builder-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-model-builder.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-model.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-plugin-api-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-plugin-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-repository-metadata-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-repository-metadata.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-settings-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-settings-builder-3.3.9.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-settings-builder.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/maven-settings.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.inject-0.3.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.inject.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.plexus-0.3.2.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.plexus.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-cipher-1.7.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-cipher.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-component-annotations-1.6.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-interpolation-1.21.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-sec-dispatcher-1.3.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-sec-dispatcher.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/plexus-utils-3.0.22.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/slf4j-api-1.7.5.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/slf4j-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/slf4j-simple-1.7.5.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/slf4j-simple.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-file-2.10.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-file.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-http-2.10-shaded.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-http-shared-2.10.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-http-shared.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-http.license -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-provider-api-2.10.jar -%%IDEA_HOME%%/plugins/maven/lib/maven3/lib/wagon-provider-api.license -%%IDEA_HOME%%/plugins/maven/lib/maven30-server-impl.jar -%%IDEA_HOME%%/plugins/maven/lib/maven36-server-impl.jar -%%IDEA_HOME%%/plugins/maven/lib/plexus-archiver-3.0.3.jar -%%IDEA_HOME%%/plugins/maven/lib/resources_en.jar -%%IDEA_HOME%%/plugins/properties/lib/properties.jar -%%IDEA_HOME%%/plugins/properties/lib/resources_en.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/jgit.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/resources_en.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/settings-repository.jar -%%IDEA_HOME%%/plugins/smali/lib/smali.jar -%%IDEA_HOME%%/plugins/stream-debugger/lib/resources_en.jar -%%IDEA_HOME%%/plugins/stream-debugger/lib/stream-debugger.jar -%%IDEA_HOME%%/plugins/svn4idea/lib/resources_en.jar -%%IDEA_HOME%%/plugins/svn4idea/lib/sqlite-jdbc-3.20.1.jar -%%IDEA_HOME%%/plugins/svn4idea/lib/svn4idea.jar -%%IDEA_HOME%%/plugins/tasks/lib/axis-1.4.jar -%%IDEA_HOME%%/plugins/tasks/lib/axis-jaxrpc-1.4.jar -%%IDEA_HOME%%/plugins/tasks/lib/axis-saaj-1.3.jar -%%IDEA_HOME%%/plugins/tasks/lib/commons-discovery-0.4.jar -%%IDEA_HOME%%/plugins/tasks/lib/jira.jar -%%IDEA_HOME%%/plugins/tasks/lib/json-path-0.8.0.jar -%%IDEA_HOME%%/plugins/tasks/lib/json-smart-1.1.1.jar -%%IDEA_HOME%%/plugins/tasks/lib/tasks-api.jar -%%IDEA_HOME%%/plugins/tasks/lib/tasks-compatibility.jar -%%IDEA_HOME%%/plugins/tasks/lib/tasks-core.jar -%%IDEA_HOME%%/plugins/tasks/lib/tasks-java.jar -%%IDEA_HOME%%/plugins/tasks/lib/wsdl4j-1.4.jar -%%IDEA_HOME%%/plugins/terminal/.zshrc -%%IDEA_HOME%%/plugins/terminal/fish/config.fish -%%IDEA_HOME%%/plugins/terminal/jediterm-bash.in -%%IDEA_HOME%%/plugins/terminal/lib/resources_en.jar -%%IDEA_HOME%%/plugins/terminal/lib/terminal.jar -%%IDEA_HOME%%/plugins/testng/lib/jcommander-1.27.jar -%%IDEA_HOME%%/plugins/testng/lib/resources_en.jar -%%IDEA_HOME%%/plugins/testng/lib/testng-6.8.8.jar -%%IDEA_HOME%%/plugins/testng/lib/testng-plugin.jar -%%IDEA_HOME%%/plugins/uiDesigner/lib/jps/ui-designer-jps-plugin.jar -%%IDEA_HOME%%/plugins/uiDesigner/lib/resources_en.jar -%%IDEA_HOME%%/plugins/uiDesigner/lib/uiDesigner.jar -%%IDEA_HOME%%/plugins/xpath/lib/resources_en.jar -%%IDEA_HOME%%/plugins/xpath/lib/rt/xslt-rt.jar -%%IDEA_HOME%%/plugins/xpath/lib/xpath.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rmi-stubs.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rt/saxon.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rt/saxon9he.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rt/serializer-2.7.2.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rt/xalan-2.7.2.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/rt/xslt-debugger-engine-impl.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/xslt-debugger-engine.jar -%%IDEA_HOME%%/plugins/xslt-debugger/lib/xslt-debugger.jar -%%IDEA_HOME%%/plugins/yaml/lib/resources_en.jar -%%IDEA_HOME%%/plugins/yaml/lib/yaml.jar -%%IDEA_HOME%%/product-info.json -%%IDEA_HOME%%/redist/annotations-java8.jar +%%DATADIR%%/Install-Linux-tar.txt +%%DATADIR%%/LICENSE.txt +%%DATADIR%%/NOTICE.txt +%%DATADIR%%/bin/appletviewer.policy +%%DATADIR%%/bin/format.sh +%%DATADIR%%/bin/idea.png +%%DATADIR%%/bin/idea.properties +%%DATADIR%%/bin/idea.sh +%%DATADIR%%/bin/idea.svg +%%DATADIR%%/bin/idea.vmoptions +%%DATADIR%%/bin/idea64.vmoptions +%%DATADIR%%/bin/inspect.sh +%%DATADIR%%/bin/log.xml +%%DATADIR%%/bin/printenv.py +%%DATADIR%%/bin/restart.py +%%DATADIR%%/build.txt +%%DATADIR%%/lib/FastInfoset-1.2.15.jar +%%DATADIR%%/lib/aapt-proto-jarjar.jar +%%DATADIR%%/lib/annotations.jar +%%DATADIR%%/lib/ant/CONTRIBUTORS +%%DATADIR%%/lib/ant/INSTALL +%%DATADIR%%/lib/ant/KEYS +%%DATADIR%%/lib/ant/LICENSE +%%DATADIR%%/lib/ant/NOTICE +%%DATADIR%%/lib/ant/README +%%DATADIR%%/lib/ant/WHATSNEW +%%DATADIR%%/lib/ant/contributors.xml +%%DATADIR%%/lib/ant/lib/README +%%DATADIR%%/lib/ant/lib/ant-antlr.jar +%%DATADIR%%/lib/ant/lib/ant-antlr.pom +%%DATADIR%%/lib/ant/lib/ant-apache-bcel.jar +%%DATADIR%%/lib/ant/lib/ant-apache-bcel.pom +%%DATADIR%%/lib/ant/lib/ant-apache-bsf.jar +%%DATADIR%%/lib/ant/lib/ant-apache-bsf.pom +%%DATADIR%%/lib/ant/lib/ant-apache-log4j.jar +%%DATADIR%%/lib/ant/lib/ant-apache-log4j.pom +%%DATADIR%%/lib/ant/lib/ant-apache-oro.jar +%%DATADIR%%/lib/ant/lib/ant-apache-oro.pom +%%DATADIR%%/lib/ant/lib/ant-apache-regexp.jar +%%DATADIR%%/lib/ant/lib/ant-apache-regexp.pom +%%DATADIR%%/lib/ant/lib/ant-apache-resolver.jar +%%DATADIR%%/lib/ant/lib/ant-apache-resolver.pom +%%DATADIR%%/lib/ant/lib/ant-apache-xalan2.jar +%%DATADIR%%/lib/ant/lib/ant-apache-xalan2.pom +%%DATADIR%%/lib/ant/lib/ant-commons-logging.jar +%%DATADIR%%/lib/ant/lib/ant-commons-logging.pom +%%DATADIR%%/lib/ant/lib/ant-commons-net.jar +%%DATADIR%%/lib/ant/lib/ant-commons-net.pom +%%DATADIR%%/lib/ant/lib/ant-jai.jar +%%DATADIR%%/lib/ant/lib/ant-jai.pom +%%DATADIR%%/lib/ant/lib/ant-javamail.jar +%%DATADIR%%/lib/ant/lib/ant-javamail.pom +%%DATADIR%%/lib/ant/lib/ant-jdepend.jar +%%DATADIR%%/lib/ant/lib/ant-jdepend.pom +%%DATADIR%%/lib/ant/lib/ant-jmf.jar +%%DATADIR%%/lib/ant/lib/ant-jmf.pom +%%DATADIR%%/lib/ant/lib/ant-jsch.jar +%%DATADIR%%/lib/ant/lib/ant-jsch.pom +%%DATADIR%%/lib/ant/lib/ant-junit.jar +%%DATADIR%%/lib/ant/lib/ant-junit.pom +%%DATADIR%%/lib/ant/lib/ant-junit4.jar +%%DATADIR%%/lib/ant/lib/ant-junit4.pom +%%DATADIR%%/lib/ant/lib/ant-junitlauncher.jar +%%DATADIR%%/lib/ant/lib/ant-junitlauncher.pom +%%DATADIR%%/lib/ant/lib/ant-launcher.jar +%%DATADIR%%/lib/ant/lib/ant-launcher.pom +%%DATADIR%%/lib/ant/lib/ant-netrexx.jar +%%DATADIR%%/lib/ant/lib/ant-netrexx.pom +%%DATADIR%%/lib/ant/lib/ant-parent.pom +%%DATADIR%%/lib/ant/lib/ant-swing.jar +%%DATADIR%%/lib/ant/lib/ant-swing.pom +%%DATADIR%%/lib/ant/lib/ant-testutil.jar +%%DATADIR%%/lib/ant/lib/ant-testutil.pom +%%DATADIR%%/lib/ant/lib/ant-xz.jar +%%DATADIR%%/lib/ant/lib/ant-xz.pom +%%DATADIR%%/lib/ant/lib/ant.jar +%%DATADIR%%/lib/ant/lib/ant.pom +%%DATADIR%%/lib/ant/lib/libraries.properties +%%DATADIR%%/lib/ant/src.zip +%%DATADIR%%/lib/asm-5.0.3.jar +%%DATADIR%%/lib/asm-all-7.0.1.jar +%%DATADIR%%/lib/asm-analysis-5.0.3.jar +%%DATADIR%%/lib/asm-tree-5.0.3.jar +%%DATADIR%%/lib/automaton-1.12-1.jar +%%DATADIR%%/lib/baksmali-2.2.1.jar +%%DATADIR%%/lib/batik-anim-1.12.0-8.jar +%%DATADIR%%/lib/batik-awt-util-1.12.0-8.jar +%%DATADIR%%/lib/batik-bridge-1.12.0-8.jar +%%DATADIR%%/lib/batik-constants-1.12.0-8.jar +%%DATADIR%%/lib/batik-css-1.12.0-8.jar +%%DATADIR%%/lib/batik-dom-1.12.0-8.jar +%%DATADIR%%/lib/batik-ext-1.12.0-8.jar +%%DATADIR%%/lib/batik-gvt-1.12.0-8.jar +%%DATADIR%%/lib/batik-parser-1.12.0-8.jar +%%DATADIR%%/lib/batik-svg-dom-1.12.0-8.jar +%%DATADIR%%/lib/batik-svggen-1.12.0-8.jar +%%DATADIR%%/lib/batik-transcoder-1.12.0-8.jar +%%DATADIR%%/lib/batik-util-1.12.0-8.jar +%%DATADIR%%/lib/batik-xml-1.12.0-8.jar +%%DATADIR%%/lib/bcpkix-jdk15on-1.61.jar +%%DATADIR%%/lib/bcprov-jdk15on-1.61.jar +%%DATADIR%%/lib/bootstrap.jar +%%DATADIR%%/lib/built-in-server.jar +%%DATADIR%%/lib/cglib-nodep-3.2.4.jar +%%DATADIR%%/lib/cli-parser-1.1.5.jar +%%DATADIR%%/lib/common-image-3.4.1.jar +%%DATADIR%%/lib/common-io-3.4.1.jar +%%DATADIR%%/lib/common-lang-3.4.1.jar +%%DATADIR%%/lib/commons-codec-1.12.jar +%%DATADIR%%/lib/commons-collections-3.2.2.jar +%%DATADIR%%/lib/commons-compress-1.18.jar +%%DATADIR%%/lib/commons-httpclient-3.1-patched.jar +%%DATADIR%%/lib/commons-imaging-1.0-RC-1.jar +%%DATADIR%%/lib/commons-io-2.6.jar +%%DATADIR%%/lib/commons-lang-2.4.jar +%%DATADIR%%/lib/commons-logging-1.2.jar +%%DATADIR%%/lib/commons-net-3.6.jar +%%DATADIR%%/lib/completion-ranking-java-0.0.7.jar +%%DATADIR%%/lib/completion-ranking-kotlin-0.0.2.jar +%%DATADIR%%/lib/completion-ranking-python-0.0.4.jar +%%DATADIR%%/lib/configuration-store-impl.jar +%%DATADIR%%/lib/credential-store.jar +%%DATADIR%%/lib/cucumber-core-1.2.4.jar +%%DATADIR%%/lib/cucumber-java-1.2.5.jar +%%DATADIR%%/lib/delight-rhino-sandbox-0.0.10.jar +%%DATADIR%%/lib/dexlib2-2.2.1.jar +%%DATADIR%%/lib/eddsa-0.2.0.jar +%%DATADIR%%/lib/error_prone_annotations-2.3.1.jar +%%DATADIR%%/lib/exception-analyzer-api-1.0.1.jar +%%DATADIR%%/lib/extensions.jar +%%DATADIR%%/lib/external-system-rt.jar +%%DATADIR%%/lib/fluent-hc-4.5.8.jar +%%DATADIR%%/lib/forms-1.1-preview.jar +%%DATADIR%%/lib/forms_rt.jar +%%DATADIR%%/lib/gherkin-2.12.2.jar +%%DATADIR%%/lib/groovy-all-2.4.17.jar +%%DATADIR%%/lib/gson-2.8.5.jar +%%DATADIR%%/lib/guava-25.1-jre.jar +%%DATADIR%%/lib/hamcrest-core-1.3.jar +%%DATADIR%%/lib/httpclient-4.5.8.jar +%%DATADIR%%/lib/httpcore-4.4.11.jar +%%DATADIR%%/lib/httpmime-4.5.8.jar +%%DATADIR%%/lib/icons.jar +%%DATADIR%%/lib/idea.jar +%%DATADIR%%/lib/idea_rt.jar +%%DATADIR%%/lib/imageio-core-3.4.1.jar +%%DATADIR%%/lib/imageio-metadata-3.4.1.jar +%%DATADIR%%/lib/imageio-tiff-3.4.1.jar +%%DATADIR%%/lib/images.jar +%%DATADIR%%/lib/imgscalr-lib-4.2.jar +%%DATADIR%%/lib/ini4j-0.5.5-2.jar +%%DATADIR%%/lib/intellij-coverage-agent-1.0.508.jar +%%DATADIR%%/lib/intellij-dvcs.jar +%%DATADIR%%/lib/intellij-test-discovery-agent-1.0.508.jar +%%DATADIR%%/lib/intellij-xml.jar +%%DATADIR%%/lib/ion-java-1.5.0-1.jar +%%DATADIR%%/lib/isorelax-20030108.jar +%%DATADIR%%/lib/istack-commons-runtime-3.0.7.jar +%%DATADIR%%/lib/jackson-annotations-2.9.0.jar +%%DATADIR%%/lib/jackson-core-2.9.9.jar +%%DATADIR%%/lib/jackson-databind-2.9.9.jar +%%DATADIR%%/lib/java-compatibility-1.0.1.jar +%%DATADIR%%/lib/javac2.jar +%%DATADIR%%/lib/javassist-3.22.0-GA.jar +%%DATADIR%%/lib/javax.activation-1.2.0.jar +%%DATADIR%%/lib/javax.annotation-api-1.3.2.jar +%%DATADIR%%/lib/jaxb-api-2.3.1.jar +%%DATADIR%%/lib/jaxb-runtime-2.3.1.jar +%%DATADIR%%/lib/jaxen-1.2.0.jar +%%DATADIR%%/lib/jbcrypt-1.0.0.jar +%%DATADIR%%/lib/jcip-annotations-1.0.jar +%%DATADIR%%/lib/jdkAnnotations.jar +%%DATADIR%%/lib/jdom.jar +%%DATADIR%%/lib/jediterm-pty-2.19.jar +%%DATADIR%%/lib/jetCheck-0.2.1.jar +%%DATADIR%%/lib/jing-20030619.jar +%%DATADIR%%/lib/jna-platform.jar +%%DATADIR%%/lib/jna.jar +%%DATADIR%%/lib/jps-model.jar +%%DATADIR%%/lib/jsch-0.1.55.jar +%%DATADIR%%/lib/jshell-frontend.jar +%%DATADIR%%/lib/json.jar +%%DATADIR%%/lib/jsoup-1.11.3.jar +%%DATADIR%%/lib/jsr305.jar +%%DATADIR%%/lib/junit-4.12.jar +%%DATADIR%%/lib/junit.jar +%%DATADIR%%/lib/kotlin-reflect-1.3.31.jar +%%DATADIR%%/lib/kotlin-stdlib-1.3.31.jar +%%DATADIR%%/lib/kotlin-stdlib-common-1.3.31.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.3.31.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.3.31.jar +%%DATADIR%%/lib/kotlin-test-1.3.31.jar +%%DATADIR%%/lib/kotlin-test-common-1.3.31.jar +%%DATADIR%%/lib/kotlinx-coroutines-core-1.2.1.jar +%%DATADIR%%/lib/kotlinx-coroutines-jdk8-1.2.1.jar +%%DATADIR%%/lib/log4j.jar +%%DATADIR%%/lib/lz4-java-1.6.0.jar +%%DATADIR%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar +%%DATADIR%%/lib/microba.jar +%%DATADIR%%/lib/miglayout-core-5.2.jar +%%DATADIR%%/lib/miglayout-swing-5.2.jar +%%DATADIR%%/lib/nanoxml-2.2.3.jar +%%DATADIR%%/lib/nekohtml-1.9.22.jar +%%DATADIR%%/lib/netty-buffer-4.1.36.Final.jar +%%DATADIR%%/lib/netty-codec-4.1.36.Final.jar +%%DATADIR%%/lib/netty-codec-http-4.1.36.Final.jar +%%DATADIR%%/lib/netty-codec-http2-4.1.36.Final.jar +%%DATADIR%%/lib/netty-codec-socks-4.1.36.Final.jar +%%DATADIR%%/lib/netty-common-4.1.36.Final.jar +%%DATADIR%%/lib/netty-handler-4.1.36.Final.jar +%%DATADIR%%/lib/netty-handler-proxy-4.1.36.Final.jar +%%DATADIR%%/lib/netty-resolver-4.1.36.Final.jar +%%DATADIR%%/lib/netty-transport-4.1.36.Final.jar +%%DATADIR%%/lib/objenesis-3.0.1.jar +%%DATADIR%%/lib/openapi.jar +%%DATADIR%%/lib/org.eclipse.xtend.lib-2.14.0.jar +%%DATADIR%%/lib/org.eclipse.xtend.lib.macro-2.14.0.jar +%%DATADIR%%/lib/org.eclipse.xtext.xbase.lib-2.14.0.jar +%%DATADIR%%/lib/oro-2.0.8.jar +%%DATADIR%%/lib/picocontainer-1.2.jar +%%DATADIR%%/lib/platform-api.jar +%%DATADIR%%/lib/platform-concurrency.jar +%%DATADIR%%/lib/platform-core-ui.jar +%%DATADIR%%/lib/platform-ide-util-io.jar +%%DATADIR%%/lib/platform-impl.jar +%%DATADIR%%/lib/platform-objectSerializer-annotations.jar +%%DATADIR%%/lib/platform-objectSerializer.jar +%%DATADIR%%/lib/platform-util-ex.jar +%%DATADIR%%/lib/platform-util-ui.jar +%%DATADIR%%/lib/plexus-utils-3.0.22.jar +%%DATADIR%%/lib/protobuf-java-3.5.1.jar +%%DATADIR%%/lib/proxy-vole-1.0.5-jb.2.jar +%%DATADIR%%/lib/pty4j-0.9.4.jar +%%DATADIR%%/lib/purejavacomm-0.0.11.1.jar +%%DATADIR%%/lib/randomForestRegressor-0.0.11.jar +%%DATADIR%%/lib/rd-core-0.191.46.jar +%%DATADIR%%/lib/rd-swing-0.191.46.jar +%%DATADIR%%/lib/reactive-streams-1.0.2.jar +%%DATADIR%%/lib/resources.jar +%%DATADIR%%/lib/resources_en.jar +%%DATADIR%%/lib/rhino-1.7.10.jar +%%DATADIR%%/lib/rngom-20051226-patched.jar +%%DATADIR%%/lib/rxjava-2.2.8.jar +%%DATADIR%%/lib/sa-jdwp-1.12.jar +%%DATADIR%%/lib/serviceMessages.jar +%%DATADIR%%/lib/slf4j-api-1.7.25.jar +%%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar +%%DATADIR%%/lib/snakeyaml-1.24.jar +%%DATADIR%%/lib/spellchecker.jar +%%DATADIR%%/lib/sqlite-jdbc-3.21.0.1.jar +%%DATADIR%%/lib/stax-api-1.0.1.jar +%%DATADIR%%/lib/stax-ex-1.8.jar +%%DATADIR%%/lib/streamex-0.6.8.jar +%%DATADIR%%/lib/swingx-core-1.6.2-2.jar +%%DATADIR%%/lib/trang-core.jar +%%DATADIR%%/lib/trilead-ssh2-build-217-jenkins-14.jar +%%DATADIR%%/lib/trove4j.jar +%%DATADIR%%/lib/txw2-2.3.1.jar +%%DATADIR%%/lib/util-2.2.1.jar +%%DATADIR%%/lib/util.jar +%%DATADIR%%/lib/velocity-1.7.jar +%%DATADIR%%/lib/winp-1.28.jar +%%DATADIR%%/lib/xercesImpl-2.12.0.jar +%%DATADIR%%/lib/xml-apis-ext-1.3.04.jar +%%DATADIR%%/lib/xml-resolver-1.2.jar +%%DATADIR%%/lib/xmlbeans-2.6.0.jar +%%DATADIR%%/lib/xmlgraphics-commons-2.3.jar +%%DATADIR%%/lib/xmlpull-1.1.3.1.jar +%%DATADIR%%/lib/xmlrpc-2.0.1.jar +%%DATADIR%%/lib/xpp3_min-1.1.4c.jar +%%DATADIR%%/lib/xstream-1.4.11.1.jar +%%DATADIR%%/lib/xz-1.8.jar +%%DATADIR%%/license/XStream_license.txt +%%DATADIR%%/license/ant_license.txt +%%DATADIR%%/license/asm_license.txt +%%DATADIR%%/license/eclipse_license.txt +%%DATADIR%%/license/eclipse_license2.txt +%%DATADIR%%/license/growl.license +%%DATADIR%%/license/gson_license.txt +%%DATADIR%%/license/imgscalr_license.txt +%%DATADIR%%/license/javahelp_license.txt +%%DATADIR%%/license/javolution_license.txt +%%DATADIR%%/license/jaxb_license.txt +%%DATADIR%%/license/jaxen_license.txt +%%DATADIR%%/license/jdom_license.txt +%%DATADIR%%/license/jgoodies_forms_license.txt +%%DATADIR%%/license/junit_license.txt +%%DATADIR%%/license/kryo-license.txt +%%DATADIR%%/license/log4j_license.txt +%%DATADIR%%/license/microba_license.txt +%%DATADIR%%/license/miglayout_swing_license.txt +%%DATADIR%%/license/nanoxml_license.txt +%%DATADIR%%/license/oromatcher_license.txt +%%DATADIR%%/license/picoContainer_license.txt +%%DATADIR%%/license/saxon-conditions.html +%%DATADIR%%/license/swingx_license.txt +%%DATADIR%%/license/third-party-libraries.html +%%DATADIR%%/license/trove4j_license.txt +%%DATADIR%%/license/winp_license.txt +%%DATADIR%%/license/xerces_license.txt +%%DATADIR%%/license/xmlrpc_license.txt +%%DATADIR%%/license/yourkit-license-redist.txt +%%DATADIR%%/plugins/ByteCodeViewer/lib/byteCodeViewer.jar +%%DATADIR%%/plugins/ByteCodeViewer/lib/resources_en.jar +%%DATADIR%%/plugins/Groovy/lib/Groovy.jar +%%DATADIR%%/plugins/Groovy/lib/agent/gragent.jar +%%DATADIR%%/plugins/Groovy/lib/console.groovy +%%DATADIR%%/plugins/Groovy/lib/groovy-jps-plugin.jar +%%DATADIR%%/plugins/Groovy/lib/groovy-rt-constants.jar +%%DATADIR%%/plugins/Groovy/lib/groovy_rt.jar +%%DATADIR%%/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl +%%DATADIR%%/plugins/Groovy/lib/standardDsls/closuresInMethod.gdsl +%%DATADIR%%/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl +%%DATADIR%%/plugins/Groovy/lib/standardDsls/gantScript.gdsl +%%DATADIR%%/plugins/Groovy/lib/standardDsls/metaDsl.gdsl +%%DATADIR%%/plugins/IntelliLang/lib/IntelliLang.jar +%%DATADIR%%/plugins/IntelliLang/lib/intellilang-jps-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kapt +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kapt.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlin +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlin-dce-js +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlin-dce-js.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlin.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc-js +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc-js.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc-jvm +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc-jvm.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/bin/kotlinc.bat +%%DATADIR%%/plugins/Kotlin/kotlinc/build.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/allopen-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/android-extensions-runtime.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/annotations-13.0.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/jvm-abi-gen.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-cli.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-runtime.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-android.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-imports-dumper-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-main-kts.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-preloader.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-common.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-compiler-impl.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-compiler.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-scripting-jvm.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-source-sections-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk7-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk7.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk8-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk8.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit5-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit5.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-testng-sources.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test-testng.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-test.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlinx-serialization-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/mutability-annotations-compat.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/noarg-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/lib/trove4j.jar +%%DATADIR%%/plugins/Kotlin/kotlinc/license/COPYRIGHT.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/NOTICE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/README.md +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/aosp_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/args4j_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/asm_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/boost_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/closure-compiler_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/dart_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/guava_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/gwt_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/jquery_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/jshashtable_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/maven_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/pcollections_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/prototype_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/qunit_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/findbugs_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/gradle_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/lombok_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/rxjava_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/testdata/spring_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/trove_license.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/trove_readme_license.txt +%%DATADIR%%/plugins/Kotlin/lib/allopen-ide-plugin.jar +%%DATADIR%%/plugins/Kotlin/lib/android-extensions-ide.jar +%%DATADIR%%/plugins/Kotlin/lib/annotations-13.0.jar +%%DATADIR%%/plugins/Kotlin/lib/javaslang-2.0.6.jar +%%DATADIR%%/plugins/Kotlin/lib/javaslang-match-2.0.6.jar +%%DATADIR%%/plugins/Kotlin/lib/javax.inject-1.jar +%%DATADIR%%/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar +%%DATADIR%%/plugins/Kotlin/lib/kapt3-idea.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-compiler-client-embeddable.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-daemon-client.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-gradle-tooling.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-plugin.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-reflect.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-script-runtime.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-script-util.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-scripting-common.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-scripting-compiler-impl.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-scripting-intellij.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-scripting-jvm.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-stdlib-common.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-stdlib-jdk7.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-stdlib-jdk8.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-stdlib.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-core-1.1.1.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-core-common-1.1.1.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-jdk8-1.1.1.jar +%%DATADIR%%/plugins/Kotlin/lib/markdown-0.1.25.jar +%%DATADIR%%/plugins/Kotlin/lib/noarg-ide-plugin.jar +%%DATADIR%%/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar +%%DATADIR%%/plugins/android/lib/adt-ui.jar +%%DATADIR%%/plugins/android/lib/aia-manifest-proto-1.0-jarjar.jar +%%DATADIR%%/plugins/android/lib/android-common.jar +%%DATADIR%%/plugins/android/lib/android-extensions-ide.jar +%%DATADIR%%/plugins/android/lib/android-kotlin.jar +%%DATADIR%%/plugins/android/lib/android-profilers.jar +%%DATADIR%%/plugins/android/lib/android-rt.jar +%%DATADIR%%/plugins/android/lib/android.jar +%%DATADIR%%/plugins/android/lib/androidAnnotations.jar +%%DATADIR%%/plugins/android/lib/androidWidgets/theme-editor-widgets.jar +%%DATADIR%%/plugins/android/lib/annotations-26.3.0.jar +%%DATADIR%%/plugins/android/lib/apkanalyzer-26.3.0.jar +%%DATADIR%%/plugins/android/lib/artwork.jar +%%DATADIR%%/plugins/android/lib/asm-5.0.3.jar +%%DATADIR%%/plugins/android/lib/asm-analysis-5.0.3.jar +%%DATADIR%%/plugins/android/lib/asm-tree-5.0.3.jar +%%DATADIR%%/plugins/android/lib/bcpkix-jdk15on-1.56.jar +%%DATADIR%%/plugins/android/lib/bcprov-jdk15on-1.56.jar +%%DATADIR%%/plugins/android/lib/binary-resources-26.3.0.jar +%%DATADIR%%/plugins/android/lib/build-common.jar +%%DATADIR%%/plugins/android/lib/builder-model-3.3.0.jar +%%DATADIR%%/plugins/android/lib/builder-test-api-3.3.0.jar +%%DATADIR%%/plugins/android/lib/common-26.3.0.jar +%%DATADIR%%/plugins/android/lib/commons-compress-1.8.1.jar +%%DATADIR%%/plugins/android/lib/crash-26.3.0.jar +%%DATADIR%%/plugins/android/lib/d8-master.jar +%%DATADIR%%/plugins/android/lib/data-binding.jar +%%DATADIR%%/plugins/android/lib/ddmlib-26.3.0.jar +%%DATADIR%%/plugins/android/lib/deployer-26.3.0.jar +%%DATADIR%%/plugins/android/lib/device-art-resources/device-art.xml +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/galaxy_nexus/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_10/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_4/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_5x/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_6p/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_7_2013/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_9/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/button.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/power.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/power_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/volume_down.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/volume_down_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/volume_up.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_one/volume_up_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/button.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/power.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/power_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/thumb.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/volume_down.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/volume_down_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/volume_up.png +%%DATADIR%%/plugins/android/lib/device-art-resources/nexus_s/volume_up_land.png +%%DATADIR%%/plugins/android/lib/device-art-resources/phone/phone_back_simple_land.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/phone/phone_back_simple_port.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_land.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_port.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_2_xl/round_corners.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_silver/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_back_simple.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_land.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_port.9.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_1080p/back.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_1080p/fore.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_1080p/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_1080p/shadow.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_720p/back.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_720p/fore.png +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_720p/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/tv_720p/shadow.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/arrow_down.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/arrow_left.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/arrow_right.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/arrow_up.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/back.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/button.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_320px.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_380px.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/circle_mask_380px_onion.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/controls.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/fore.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/hardware.ini +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/key.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/mask.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/select.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/shadow.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/back.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/fore.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/mask.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/shadow.png +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/land_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/land_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/land_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/port_back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/port_fore.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/port_shadow.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/xoom/thumb.png +%%DATADIR%%/plugins/android/lib/draw9patch-26.3.0.jar +%%DATADIR%%/plugins/android/lib/dvlib-26.3.0.jar +%%DATADIR%%/plugins/android/lib/freemarker-2.3.20.jar +%%DATADIR%%/plugins/android/lib/instantapps-api-1.5.jar +%%DATADIR%%/plugins/android/lib/jarutils.jar +%%DATADIR%%/plugins/android/lib/java-lib-model-3.3.0.jar +%%DATADIR%%/plugins/android/lib/java-lib-model-builder-3.3.0.jar +%%DATADIR%%/plugins/android/lib/javawriter-2.2.1.jar +%%DATADIR%%/plugins/android/lib/jgraphx-3.4.1.3.jar +%%DATADIR%%/plugins/android/lib/jps/android-jps-plugin.jar +%%DATADIR%%/plugins/android/lib/kxml2-2.3.0.jar +%%DATADIR%%/plugins/android/lib/layoutInspector-26.3.0.jar +%%DATADIR%%/plugins/android/lib/layoutlib-api-26.3.0.jar +%%DATADIR%%/plugins/android/lib/layoutlib-loader.jar +%%DATADIR%%/plugins/android/lib/layoutlib.jar +%%DATADIR%%/plugins/android/lib/layoutlib/build.prop +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/AndroidClock.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/CarroisGothicSC-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/ComingSoon.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/CutiveMono.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DancingScript-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DancingScript-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DroidSans-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DroidSans.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DroidSansFallback.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/DroidSansMono.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NanumGothic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoColorEmoji.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabic-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabicUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoNaskhArabicUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansAdlam-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansArmenian-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansArmenian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansAvestan-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBalinese-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBamum-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBatak-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengali-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengali-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengaliUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBengaliUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBrahmi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBuginese-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansBuhid-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCJK-Regular.ttc +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCanadianAboriginal-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCarian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansChakma-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCham-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCham-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCherokee-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCoptic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCuneiform-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansCypriot-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDeseret-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagari-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagari-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagariUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansDevanagariUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEgyptianHieroglyphs-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEthiopic-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansEthiopic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGeorgian-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGeorgian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGlagolitic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGothic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujarati-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujarati-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujaratiUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGujaratiUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhi-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhiUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansGurmukhiUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHanunoo-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHebrew-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansHebrew-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansImperialAramaic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansInscriptionalPahlavi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansInscriptionalParthian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansJavanese-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKaithi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannada-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannada-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannadaUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKannadaUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKayahLi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKharoshthi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmer-VF.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmerUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansKhmerUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLao-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLao-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLaoUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLaoUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLepcha-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLimbu-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLinearB-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLisu-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLycian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansLydian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalam-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalam-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalamUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMalayalamUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMandaic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMeeteiMayek-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMongolian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmar-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmar-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmarUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansMyanmarUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansNKo-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansNewTaiLue-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOgham-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOlChiki-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldItalic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldPersian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldSouthArabian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOldTurkic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriya-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriya-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriyaUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOriyaUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOsage-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansOsmanya-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansPhagsPa-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansPhoenician-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansRejang-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansRunic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSamaritan-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSaurashtra-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansShavian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSinhala-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSinhala-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSundanese-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSylotiNagri-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacEastern-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacEstrangela-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansSyriacWestern-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTagalog-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTagbanwa-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiLe-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiTham-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTaiViet-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamil-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamil-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamilUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTamilUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTelugu-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTelugu-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTeluguUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTeluguUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaana-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaana-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThai-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThai-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaiUI-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansThaiUI-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTibetan-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTibetan-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansTifinagh-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansUgaritic-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansVai-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSansYi-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-BoldItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Italic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerif-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifArmenian-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifArmenian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifBengali-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifBengali-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifDevanagari-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifDevanagari-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGeorgian-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGeorgian-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGujarati-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifGujarati-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifHebrew-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifHebrew-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifKannada-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifKannada-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifLao-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifLao-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifMalayalam-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifMalayalam-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTamil-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTamil-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTelugu-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifTelugu-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifThai-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/NotoSerifThai-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Black.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-BlackItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-BoldItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Italic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Light.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-LightItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Medium.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-MediumItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-Thin.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/Roboto-ThinItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Bold.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-BoldItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Italic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Light.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-LightItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Medium.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-MediumItalic.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/RobotoCondensed-Regular.ttf +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/fonts.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/fontsInSdk.txt +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-ldrtl/task_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-watch/progress_indeterminate_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim-watch/progress_indeterminate_rotation_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/accelerate_decelerate_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/accelerate_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_translucent_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/activity_translucent_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/anticipate_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/anticipate_overshoot_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/app_starting_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/bounce_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_box_inner_merged_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_box_outer_merged_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_checked_icon_null_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_box_inner_merged_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_check_path_merged_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_checkbox_to_unchecked_icon_null_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_dot_group_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_ring_outer_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_off_mtrl_ring_outer_path_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_dot_group_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_ring_outer_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/btn_radio_to_on_mtrl_ring_outer_path_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/button_state_list_anim_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/cross_profile_apps_thumbnail_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/cycle_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/date_picker_fade_in_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/date_picker_fade_out_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/decelerate_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dialog_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dialog_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_bottom_exit_keyguard.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_left_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_left_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_right_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_right_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_top_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/dock_top_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/fade_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/fast_fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/fast_fade_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/flat_button_state_list_anim_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_pivot_0_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_2_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_pivot_0_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_3_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_4_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_5_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_6_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_1_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_2_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_3_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_4_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_5_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_toarrow_rectangle_path_6_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_1_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_1_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_2_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_2_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_3_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_3_pivot_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_1_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_2_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/ft_avd_tooverflow_rectangle_path_3_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in_center.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/grow_fade_in_from_bottom.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_extract_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_extract_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_fancy_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/input_method_fancy_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/launch_task_behind_source.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/launch_task_behind_target.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/linear_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter_fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_behind_enter_wallpaper.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/lock_screen_wallpaper_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/options_panel_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/options_panel_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/overshoot_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/popup_enter_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/popup_exit_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_horizontal_rect1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_horizontal_rect2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/progress_indeterminate_rotation_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_down_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_down_in_no_alpha.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_down_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_down_out_no_alpha.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_up_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/push_up_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/recent_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/recent_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/recents_fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/recents_fade_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_jump_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/rotation_animation_xfade_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_0_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_180_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_finish_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_minus_90_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_plus_90_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_rotate_start_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_user_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/screen_user_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/search_bar_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/search_bar_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/seekbar_thumb_pressed_to_unpressed_thumb_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/seekbar_thumb_unpressed_to_pressed_thumb_0_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out_center.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/shrink_fade_out_from_bottom.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_child_bottom.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_enter_micro.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_exit_micro.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_left.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_right.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_in_up.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_down.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_left.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_micro.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slide_out_right.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/slow_fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/submenu_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/submenu_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/swipe_window_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/swipe_window_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/task_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/task_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/task_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/task_open_enter_cross_profile_apps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/task_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/toast_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/toast_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/tooltip_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/tooltip_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/translucent_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/translucent_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_activity_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_layer_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/voice_layer_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_intra_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/wallpaper_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/anim/window_move_from_decor.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fade_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fade_out.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_fade_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_fade_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/fragment_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_close_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_close_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_open_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/animator/leanback_setup_fragment_open_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color-watch/btn_watch_default_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color-watch/switch_thumb_watch_default_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color-watch/switch_track_watch_default_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_device_default.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/background_cache_hint_selector_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_borderless_text_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/btn_colored_text_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/btn_default_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/btn_default_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/config_progress_background_tint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/control_checkable_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/control_default_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/control_highlight_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/decor_button_dark_color.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/decor_button_light_color.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/highlighted_text_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/hint_foreground_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/hint_foreground_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/list_highlight_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_disable_only.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_focused.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_dark_nodisable.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_disable_only_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_focused_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_inverse_when_activated_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_leanback_formwizard_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light_disable_only.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_light_nodisable.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_nodisable_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_nodisable_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_secondary_when_activated_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/primary_text_secondary_when_activated_material_inverse.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/ratingbar_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/ripple_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/ripple_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/search_url_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/search_url_text_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_dark_nodisable.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_inverse_when_activated_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_light_nodisable.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nodisable_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nodisable_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/secondary_text_nofocus.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/seekbar_track_progress_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/switch_thumb_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/switch_thumb_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/switch_track_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tab_highlight_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tab_indicator_text_v4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/tertiary_text_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/text_color_primary.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/text_color_secondary.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/white_disabled_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/color/widget_edittext_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-en-hdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-en-ldpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-en-ldpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-en-mdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_bottom_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_share_pack_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_shadow_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_solid_shadow_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_stacked_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ab_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/activity_title_bar.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/arrow_down_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/arrow_up_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/battery_charge_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/bottom_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_cab_done_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_buttonless_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_buttonless_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disable_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disable_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_check_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_circle_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_close_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_small_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_default_transparent_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dialog_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_dropdown_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_erase_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_global_search_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_group_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_keyboard_key_trans_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_media_player_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_minus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_plus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_radio_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_rating_star_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_disabled_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_square_overlay_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_big_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_off_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_toggle_on_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_page_press.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/btn_zoom_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/button_onoff_indicator_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/button_onoff_indicator_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_bottom_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cab_background_top_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/call_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/checkbox_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/checkbox_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_arrow_up.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_button_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/cling_button_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_dial.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_hand_hour.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/clock_hand_minute.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_bottom.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/code_lock_top.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/combobox_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/combobox_nohighlight.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/compass_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/compass_base.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/contact_header_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/create_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dark_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/day_picker_week_view_dayline_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_divider_horizontal_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_full_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_full_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_ic_close_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_middle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dialog_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_dim_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_horizontal_textfield.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_strong_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/divider_vertical_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_ic_arrow_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/dropdown_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/edit_query_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_background_focus_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/editbox_dropdown_background_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_angel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_cool.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_crying.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_embarrassed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_foot_in_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_happy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_kissing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_laughing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_lips_are_sealed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_money_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_sad.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_surprised.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_tongue_sticking_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_undecided.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_winking.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_wtf.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/emo_im_yelling.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_close_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_ic_maximized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_ic_minimized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/expander_open_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_label_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_thumb_default_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_thumb_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/fastscroll_track_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/focused_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/frame_gallery_thumb_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_selected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_unselected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/gallery_unselected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/grid_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/grid_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/highlight_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_ab_back_holo_dark_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_ab_back_holo_light_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_accessibility_magnification.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_action_assist_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_aggregated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_audio_notification_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_audio_notification_mute_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_round_more_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_round_more_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_search_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_speak_now.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_bullet_key_permission.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_cab_done_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_checkmark_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_clear_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_coins_l.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_coins_s.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_commit_search_api_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_contact_picture_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_alert_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_close_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_close_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_dialer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_map.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_time.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_dialog_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_next_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_find_previous_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_go_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_grayedout_printer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_input_get.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer_and_end.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_decline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_sound_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_sound_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_unlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_jog_dial_vibrate_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_launcher_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_airplane_mode_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_airplane_mode_off_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_alarm_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_charging.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_lock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_idle_low_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_lock_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_open_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_outline_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_power_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_ringer_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_ringer_on_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lock_silent_mode_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_embed_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_ff.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_fullscreen.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_next.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_pause.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_previous.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_rew.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connected_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_connecting_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_disabled_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_dark_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_off_light_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_0_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_1_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_2_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_route_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_media_video_poster.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_account_list.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_agenda.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_allfriends.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_always_landscape_portrait.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_archive.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_attachment.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_back.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_block.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_blocked_user.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_btn_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cc_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_chat_dashboard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_clear_playlist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_close_clear_cancel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_compass.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_compose.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_copy_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_crop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_cut_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_day.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_directions.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_edit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_emoticons.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_end_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_find_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_friendslist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_gallery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_goto.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_help_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_home.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_info_details.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_invite.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_login.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_manage.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mapmode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_month.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_my_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_mylocation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_myplaces.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_notifications.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_paste_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_play_clip.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_preferences.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_recent_history.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_report_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_revert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_rotate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_save.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_search_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_selectall_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_selectall_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_send.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_set_as.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_settings_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_share_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_slideshow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_sort_alphabetically.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_sort_by_size.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_star.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_start_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_today.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_upload.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_upload_you_tube.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_view.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_week.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_menu_zoom.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_cast_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_clear_all.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_ime_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_notification_overlay.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_partial_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_reminder.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_popup_sync_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_search_category_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_settings_language.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sim_card_multi_24px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sim_card_multi_48px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_star_half_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_sysbar_quicksettings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_user_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_vibrate_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_voice_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_bluetooth_in_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_off_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ic_volume_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/icon_highlight_rectangle.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/icon_highlight_square.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/ime_qwerty.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/indicator_input_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_left_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_right_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_left.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_arrow_short_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_bg.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_dimple.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_dial_dimple_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_key_feedback_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_popup_panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/light_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_activated_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_longpressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_divider_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_header_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_section_header_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_default_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_disabled_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_focused_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_longpress.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_longpress_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_pressed_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_background_selected_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_multiselect_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_multiselect_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/list_selector_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/magnified_region_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/maps_google_logo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_background_fill_parent_width.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_dropdown_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_hardkey_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_popup_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_popup_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_separator.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menu_submenu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_solid_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_background_solid_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/menuitem_checkbox_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/minitab_lt_unselected_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_input_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_selection_divider.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/numberpicker_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/password_field_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/password_keyboard_background_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_accessibility_features.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_affects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/perm_group_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/picture_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/picture_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_anchor.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_hover.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pointer_spot_touch.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_background_mtrl_mult.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_bottom_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_center_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_full_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_full_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_above_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_inline_error_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_top_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/popup_top_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_audio_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_invisible.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_offline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/presence_video_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/pressed_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_primary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_primary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_secondary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progress_secondary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/progressbar_indeterminate_holo8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowdown_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_left_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickactions_arrowup_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_focused_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_normal_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_normal_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_pressed_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/quickcontact_badge_overlay_pressed_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/radiobutton_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/radiobutton_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_big_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_med_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/rate_star_small_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/recent_dialog_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/reticle.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_horizontal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrollbar_handle_vertical.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_disabled_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_control_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_primary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_primary_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_secondary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/scrubber_track_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/search_plate_global.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/seek_thumb_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/settings_header_raw.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_orange.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_dark_purple.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_orange.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sim_light_purple.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_16_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_16_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_48_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_48_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_76_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_76_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_ab_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_black_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_dropdown_background_down.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_dropdown_background_up.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_select.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/spinner_white_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/star_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_ecb_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_car_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_email_generic.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_gmail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_missed_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_mmcc_indication_icn.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_rssi_in_range.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard_prepare.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sdcard_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sim_toolkit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_sync_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_notify_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_10.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_40.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_60.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_80.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_charge_anim85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_battery_unknown.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_certificate_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_wimax_signal_3_fully.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_data_wimax_signal_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_download_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_gps_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_headset.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_signal_evdo_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_general.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_tether_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_throttled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_upload_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_vp_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/stat_sys_warning.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_header_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_app_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/status_bar_item_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/statusbar_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/submenu_arrow_nofocus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_action_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_incoming.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_missed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_call_outgoing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_contact_card.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_delete_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_enter.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_feedback_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num0_no_plus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_num9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_ok_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/sym_keyboard_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_bottom_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_focus_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_indicator_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_press_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_left_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_bar_right_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_selected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/tab_unselected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_side_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_edit_suggestions_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_middle_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_longpress_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_multiline_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_empty_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_right_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_search_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/textfield_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_portrait.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/title_bar_tall.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/transportcontrol_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/unknown_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/vpn_connected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/vpn_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_14w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_15w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_16w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_17w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_thumb_mtrl_18w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/watch_switch_track_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-hdpi/zoom_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/btn_lock_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-hdpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/btn_lock_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_sound_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_sound_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/ic_jog_dial_unlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-ldpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/btn_lock_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-mdpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-land-xhdpi/btn_lock_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/activity_title_bar.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/arrow_down_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/arrow_up_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/battery_charge_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/bottom_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_buttonless_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_buttonless_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_check_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_circle_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_close_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_small_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_default_transparent_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dialog_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_dropdown_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_erase_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_global_search_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_fulltrans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_keyboard_key_trans_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_media_player_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_minus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_plus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_radio_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_rating_star_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_search_dialog_voice_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_disabled_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_square_overlay_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_big_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_star_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_toggle_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_toggle_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_page_press.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/btn_zoom_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/button_onoff_indicator_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/button_onoff_indicator_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/call_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/checkbox_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/checkbox_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_dial.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_hand_hour.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/clock_hand_minute.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_bottom.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/code_lock_top.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/compass_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/compass_base.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/contact_header_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/create_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/dark_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/dialog_divider_horizontal_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_dim_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_horizontal_textfield.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/divider_vertical_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_background_focus_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/editbox_dropdown_background_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_angel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_cool.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_crying.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_foot_in_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_happy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_kissing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_laughing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_lips_are_sealed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_money_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_sad.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_surprised.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_tongue_sticking_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_undecided.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_winking.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_wtf.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/emo_im_yelling.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/expander_ic_maximized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/expander_ic_minimized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/focused_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/frame_gallery_thumb_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_selected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_unselected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/gallery_unselected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/grid_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/grid_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/highlight_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_aggregated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_round_more_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_round_more_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_search_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_speak_now.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_fit_page_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_fit_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_page_overview_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_btn_square_browser_zoom_page_overview_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_bullet_key_permission.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_contact_picture_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_alert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_dialer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_map.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_time.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_dialog_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_input_get.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer_and_end.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_answer_and_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_decline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_sound_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_sound_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_unlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_jog_dial_vibrate_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_launcher_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_airplane_mode_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_airplane_mode_off_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_alarm_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_charging.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_lock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_idle_low_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_lock_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_power_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_ringer_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_ringer_on_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_lock_silent_mode_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_maps_indicator_current_position_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_embed_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_ff.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_fullscreen.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_next.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_pause.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_previous.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_rew.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_media_video_poster.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_account_list.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_agenda.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_allfriends.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_always_landscape_portrait.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_archive.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_attachment.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_back.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_block.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_blocked_user.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_cc_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_chat_dashboard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_clear_playlist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_close_clear_cancel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_compass.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_compose.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_crop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_day.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_directions.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_edit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_emoticons.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_end_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_friendslist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_gallery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_goto.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_home.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_info_details.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_invite.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_login.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_manage.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mapmode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_month.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_my_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_mylocation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_myplaces.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_notifications.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_play_clip.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_preferences.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_recent_history.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_report_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_revert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_rotate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_save.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_send.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_set_as.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_share.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_slideshow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_sort_alphabetically.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_sort_by_size.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_star.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_start_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_today.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_upload.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_upload_you_tube.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_view.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_week.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_menu_zoom.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_notification_clear_all.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_notification_overlay.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_partial_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_reminder.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_popup_sync_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_search_category_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_vibrate_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_bluetooth_ad2p.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_bluetooth_in_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_off_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ic_volume_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/icon_highlight_rectangle.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/icon_highlight_square.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/ime_qwerty.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/indicator_input_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_left_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_left_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_middle_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_right_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_long_right_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_left.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_left_and_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_arrow_short_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_bg.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_dimple.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_dial_dimple_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_accessory_bg_landscape.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_key_feedback_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_key_feedback_more_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_popup_panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/keyboard_popup_panel_trans_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/light_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_longpress.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/list_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/maps_google_logo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_background_fill_parent_width.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_separator.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menu_submenu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_solid_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_background_solid_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/menuitem_checkbox_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_input_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/numberpicker_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_focus_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/panel_picture_frame_bg_pressed_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/password_field_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/picture_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/picture_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_bottom_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_center_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_full_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_full_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_inline_error_above_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_inline_error_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_top_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/popup_top_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_audio_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_invisible.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_offline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/presence_video_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/pressed_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/progressbar_indeterminate3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/radiobutton_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/radiobutton_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_med_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/rate_star_small_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/recent_dialog_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/reticle.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_accelerated_anim2.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_horizontal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/scrollbar_handle_vertical.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/search_plate_global.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/seek_thumb_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/settings_header_raw.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_black_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_dropdown_background_down.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_dropdown_background_up.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_select.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/spinner_white_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/star_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_ecb_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_car_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_email_generic.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_gmail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_missed_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard_prepare.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sdcard_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sim_toolkit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_sync_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_notify_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_10.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_40.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_60.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_80.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_charge_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_battery_unknown.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_data_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_data_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_download_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_gps_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_headset.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_r_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_ra_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_signal_evdo_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_general.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_tether_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_throttled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_upload_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_vp_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_vp_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/stat_sys_warning.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_header_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_app_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/status_bar_item_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/submenu_arrow_nofocus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_action_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_incoming.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_missed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_call_outgoing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_contact_card.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_delete_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_feedback_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num0_no_plus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_num9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_ok_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/sym_keyboard_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_focus_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_press_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_left_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_bar_right_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_selected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/tab_unselected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_empty_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_search_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/textfield_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_portrait.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/title_bar_tall.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/unknown_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/vpn_connected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/vpn_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-ldpi/zoom_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_bottom_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_share_pack_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_shadow_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_solid_shadow_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_stacked_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ab_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/activity_title_bar.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/arrow_down_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/arrow_up_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/battery_charge_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/bottom_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_cab_done_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_buttonless_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_buttonless_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disable_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disable_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_check_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_circle_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_close_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_small_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_default_transparent_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dialog_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_dropdown_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_erase_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_global_search_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_group_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_keyboard_key_trans_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_media_player_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_minus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_plus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_radio_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_rating_star_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_disabled_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_square_overlay_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_big_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_off_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_toggle_on_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_page_press.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/btn_zoom_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/button_onoff_indicator_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/button_onoff_indicator_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_bottom_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cab_background_top_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/call_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/checkbox_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/checkbox_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_arrow_up.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_button_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/cling_button_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_dial.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_hand_hour.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/clock_hand_minute.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_bottom.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/code_lock_top.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/combobox_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/combobox_nohighlight.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/compass_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/compass_base.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/contact_header_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/create_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dark_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/day_picker_week_view_dayline_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_divider_horizontal_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_full_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_full_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_ic_close_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_middle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dialog_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_dim_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_horizontal_textfield.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_strong_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/divider_vertical_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_ic_arrow_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/dropdown_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/edit_query_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_background_focus_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/editbox_dropdown_background_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_angel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_cool.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_crying.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_embarrassed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_foot_in_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_happy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_kissing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_laughing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_lips_are_sealed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_money_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_sad.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_surprised.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_tongue_sticking_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_undecided.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_winking.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_wtf.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/emo_im_yelling.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_close_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_ic_maximized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_ic_minimized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/expander_open_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_label_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_thumb_default_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_thumb_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/fastscroll_track_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/focused_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/frame_gallery_thumb_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_selected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_unselected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/gallery_unselected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/grid_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/grid_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/highlight_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_ab_back_holo_dark_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_ab_back_holo_light_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_accessibility_magnification.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_action_assist_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_aggregated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_audio_notification_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_audio_notification_mute_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_round_more_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_round_more_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_search_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_speak_now.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_bullet_key_permission.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_cab_done_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_checkmark_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_clear_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_coins_l.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_coins_s.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_commit_search_api_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_contact_picture_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_alert_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_close_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_close_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_dialer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_map.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_time.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_dialog_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_next_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_find_previous_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_go_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_grayedout_printer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_input_get.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer_and_end.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_decline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_sound_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_sound_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_unlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_jog_dial_vibrate_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_launcher_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_airplane_mode_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_airplane_mode_off_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_alarm_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_charging.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_lock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_idle_low_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_lock_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_open_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_outline_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_power_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_ringer_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_ringer_on_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lock_silent_mode_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_maps_indicator_current_position_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_embed_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_ff.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_fullscreen.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_next.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_pause.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_previous.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_rew.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connected_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_connecting_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_disabled_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_dark_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_off_light_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_0_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_1_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_2_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_route_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_media_video_poster.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_account_list.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_agenda.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_allfriends.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_always_landscape_portrait.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_archive.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_attachment.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_back.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_block.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_blocked_user.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_btn_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cc_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_chat_dashboard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_clear_playlist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_close_clear_cancel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_compass.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_compose.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_copy_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_crop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_cut_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_day.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_directions.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_edit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_emoticons.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_end_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_find_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_friendslist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_gallery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_goto.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_help_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_home.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_info_details.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_invite.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_login.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_manage.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mapmode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_month.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_my_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_mylocation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_myplaces.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_notifications.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_paste_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_play_clip.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_preferences.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_recent_history.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_report_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_revert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_rotate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_save.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_search_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_selectall_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_selectall_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_send.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_set_as.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_settings_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_share_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_slideshow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_sort_alphabetically.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_sort_by_size.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_star.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_start_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_today.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_upload.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_upload_you_tube.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_view.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_week.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_menu_zoom.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_cast_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_clear_all.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_ime_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_notification_overlay.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_partial_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_reminder.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_popup_sync_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_search_category_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_settings_language.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sim_card_multi_24px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sim_card_multi_48px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_star_half_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_sysbar_quicksettings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_user_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_vibrate_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_voice_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_bluetooth_ad2p.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_bluetooth_in_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_off_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ic_volume_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/icon_highlight_rectangle.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/icon_highlight_square.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/ime_qwerty.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/indicator_input_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_left_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_left_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_middle_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_right_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_long_right_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_left.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_left_and_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_arrow_short_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_bg.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_dimple.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_dial_dimple_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_left_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_confirm_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_right_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_gray.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/jog_tab_target_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_accessory_bg_landscape.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_key_feedback_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_popup_panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/keyboard_popup_panel_trans_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/light_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_activated_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_longpressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_divider_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_header_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_section_header_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_default_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_disabled_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_focused_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_longpress.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_longpress_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_pressed_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_background_selected_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_multiselect_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_multiselect_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/list_selector_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/magnified_region_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/maps_google_logo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_background_fill_parent_width.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_dropdown_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_hardkey_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_popup_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_popup_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_separator.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menu_submenu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_solid_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_background_solid_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/menuitem_checkbox_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/minitab_lt_unselected_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_input_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_selection_divider.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/numberpicker_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_focus_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/panel_picture_frame_bg_pressed_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/password_field_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/password_keyboard_background_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_accessibility_features.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_affects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/perm_group_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/picture_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/picture_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_alias.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_alias_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_all_scroll.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_all_scroll_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_cell.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_cell_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_context_menu.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_context_menu_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_copy_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_crosshair.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_crosshair_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grab.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grab_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grabbing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_grabbing_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_hand.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_hand_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_help_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_horizontal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_horizontal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_nodrop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_nodrop_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_anchor.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_hover.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_spot_touch.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_text.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_text_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_left_diagonal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_left_diagonal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_right_diagonal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_top_right_diagonal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_text.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_vertical_text_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_10.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_11.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_12.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_13.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_14.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_17.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_18.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_19.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_21.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_22.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_23.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_24.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_25.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_26.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_27.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_29.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_30.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_31.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_32.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_33.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_34.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_35.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_wait_9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_in.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_in_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pointer_zoom_out_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_background_mtrl_mult.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_bottom_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_center_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_full_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_full_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_above_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_inline_error_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_top_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/popup_top_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_audio_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_invisible.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_offline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/presence_video_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/pressed_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_primary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_primary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_secondary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progress_secondary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/progressbar_indeterminate_holo8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowdown_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_left_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickactions_arrowup_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_focused_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_normal_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_normal_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_pressed_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/quickcontact_badge_overlay_pressed_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/radiobutton_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/radiobutton_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_big_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_med_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/rate_star_small_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/recent_dialog_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/reticle.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_accelerated_anim2.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_horizontal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrollbar_handle_vertical.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_disabled_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_control_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_primary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_primary_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_secondary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/scrubber_track_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/search_plate_global.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/seek_thumb_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/settings_header_raw.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_orange.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_dark_purple.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_green.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_orange.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sim_light_purple.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_16_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_16_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_48_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_48_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_76_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_76_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_ab_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_black_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_dropdown_background_down.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_dropdown_background_up.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_select.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/spinner_white_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/star_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_ecb_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_car_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_email_generic.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_gmail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_missed_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_rssi_in_range.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard_prepare.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sdcard_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sim_toolkit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_sync_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_notify_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_charge_anim85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_battery_unknown.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_certificate_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_wimax_signal_3_fully.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_data_wimax_signal_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_download_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_gps_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_headset.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_signal_evdo_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_general.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_tether_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_throttled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_upload_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_vp_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/stat_sys_warning.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_header_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_app_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/status_bar_item_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/statusbar_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/submenu_arrow_nofocus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_action_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_incoming.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_missed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_call_outgoing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_contact_card.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_delete_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_enter.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_feedback_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num0_no_plus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_num9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_ok_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/sym_keyboard_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_bottom_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_focus_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_indicator_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_press_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_left_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_bar_right_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_selected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/tab_unselected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_side_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_edit_suggestions_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_middle_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_longpress_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_multiline_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_empty_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_search_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/textfield_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_portrait.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/title_bar_tall.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/transportcontrol_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/unknown_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/vpn_connected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/vpn_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-mdpi/zoom_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/alert_window_layer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/blank_tile.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/default_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/loading_tile.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/loading_tile_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/no_tile_128.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/no_tile_256.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/platlogo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/platlogo_m.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/stat_sys_adb.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/text_cursor_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/text_cursor_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/vpn_connected.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-nodpi/vpn_disconnected.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_halo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_ring.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-hdpi/unlock_wave.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_halo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_ring.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-mdpi/unlock_wave.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-nodpi/default_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_halo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_ring.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw600dp-xhdpi/unlock_wave.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-sw720dp-nodpi/default_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/dialog_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/global_action_icon_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/ic_input_extract_action_done.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/ic_input_extract_action_send.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/scrollbar_vertical_thumb.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/scrollbar_vertical_track.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/switch_thumb_watch_default_dark_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/sym_def_app_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-watch/sym_def_app_icon_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_bottom_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_share_pack_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_shadow_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_solid_shadow_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ab_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/activity_title_bar.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/arrow_down_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/arrow_up_float.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/battery_charge_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/bottom_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_cab_done_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_buttonless_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_buttonless_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disable_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_check_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_circle_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_close_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal_disable.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_normal_disable_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_small_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_default_transparent_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dialog_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_dropdown_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_erase_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_global_search_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_group_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_normal_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_pressed_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_keyboard_key_trans_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_media_player_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_minus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_plus_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_radio_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_rating_star_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_search_dialog_voice_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_disabled_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_square_overlay_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_off_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_disable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_disable_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_big_on_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_label_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_off_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_toggle_on_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_page_press.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/btn_zoom_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/button_onoff_indicator_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/button_onoff_indicator_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_bottom_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cab_background_top_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/call_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/checkbox_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/checkbox_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_arrow_up.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_button_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/cling_button_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_dial.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_hand_hour.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/clock_hand_minute.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_bottom.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/code_lock_top.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/combobox_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/combobox_nohighlight.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/compass_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/compass_base.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/contact_header_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/create_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dark_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/day_picker_week_view_dayline_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_divider_horizontal_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_full_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_full_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_ic_close_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_middle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_middle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dialog_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_dim_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_horizontal_textfield.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_bright_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_dark_opaque.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/divider_vertical_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_ic_arrow_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/dropdown_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/edit_query_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_background_focus_yellow.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/editbox_dropdown_background_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_angel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_cool.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_crying.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_embarrassed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_foot_in_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_happy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_kissing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_laughing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_lips_are_sealed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_money_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_sad.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_surprised.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_tongue_sticking_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_undecided.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_winking.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_wtf.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/emo_im_yelling.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_close_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_ic_maximized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_ic_minimized.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/expander_open_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_label_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_thumb_default_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_thumb_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/fastscroll_track_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/focused_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/frame_gallery_thumb_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_selected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_unselected_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/gallery_unselected_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/grid_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/grid_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/highlight_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_ab_back_holo_dark_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_ab_back_holo_light_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_accessibility_magnification.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_aggregated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_audio_notification_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_audio_notification_mute_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_round_more_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_round_more_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_search_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_speak_now.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_fit_page_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_fit_page_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_page_overview_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_btn_square_browser_zoom_page_overview_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_bullet_key_permission.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_cab_done_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_checkmark_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_clear_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_coins_l.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_coins_s.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_commit_search_api_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_contact_picture_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_alert_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_close_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_close_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_dialer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_map.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_time.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_dialog_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_next_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_find_previous_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_go_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_grayedout_printer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_input_get.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer_and_end.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_answer_and_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_decline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_sound_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_sound_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_unlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_jog_dial_vibrate_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_launcher_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_airplane_mode_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_airplane_mode_off_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_alarm_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_charging.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_lock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_idle_low_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_lock_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_open_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_outline_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_power_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_ringer_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_ringer_on_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lock_silent_mode_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_maps_indicator_current_position_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_embed_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_ff.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_fullscreen.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_next.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_pause.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_previous.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_rew.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connected_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_connecting_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_disabled_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_dark_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_off_light_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_route_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_media_video_poster.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_account_list.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_agenda.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_allfriends.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_always_landscape_portrait.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_archive.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_attachment.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_back.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_block.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_blocked_user.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_btn_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cc_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_chat_dashboard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_clear_playlist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_close_clear_cancel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_compass.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_compose.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_copy_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_crop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_cut_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_day.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_directions.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_edit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_emoticons.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_end_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_find_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_friendslist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_gallery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_goto.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_help_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_home.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_info_details.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_invite.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_login.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_manage.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mapmode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_month.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_my_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_mylocation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_myplaces.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_notifications.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_paste_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_play_clip.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_preferences.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_recent_history.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_report_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_revert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_rotate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_save.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_search_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_selectall_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_selectall_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_send.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_set_as.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_settings_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_share_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_slideshow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_sort_alphabetically.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_sort_by_size.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_star.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_start_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_today.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_upload.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_upload_you_tube.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_view.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_week.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_menu_zoom.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_cast_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_clear_all.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_ime_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_notification_overlay.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_partial_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_reminder.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_popup_sync_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_search_category_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_settings_language.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_sim_card_multi_24px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_sim_card_multi_48px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_star_half_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_user_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_vibrate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_vibrate_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_voice_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_bluetooth_ad2p.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_bluetooth_in_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_off_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ic_volume_small.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/icon_highlight_rectangle.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/icon_highlight_square.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/ime_qwerty.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/indicator_input_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_left_green.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_left_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_middle_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_right_red.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_long_right_yellow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_left.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_left_and_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_arrow_short_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_bg.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_dimple.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/jog_dial_dimple_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_accessory_bg_landscape.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_key_feedback_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_popup_panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/keyboard_popup_panel_trans_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/light_header.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_activated_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_divider_horizontal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_longpressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_divider_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_header_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_section_header_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_default_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_disabled_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_focused_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_longpress.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_longpress_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_pressed_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_background_selected_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_multiselect_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_multiselect_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/list_selector_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/magnified_region_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/maps_google_logo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_background_fill_parent_width.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_dropdown_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_hardkey_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_hardkey_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_popup_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_popup_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_separator.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menu_submenu_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_solid_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_background_solid_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/menuitem_checkbox_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/minitab_lt_unselected_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_down_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_input_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_selection_divider.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_disabled_focused.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/numberpicker_up_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_focus_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/panel_picture_frame_bg_pressed_blue.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/password_field_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/password_keyboard_background_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_accessibility_features.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_affects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/perm_group_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/picture_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/picture_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_alias.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_alias_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_all_scroll.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_all_scroll_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_cell.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_cell_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_context_menu.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_context_menu_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_copy_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_crosshair.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_crosshair_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grab.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grab_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grabbing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_grabbing_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_hand.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_hand_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_help_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_horizontal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_horizontal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_nodrop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_nodrop_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_anchor.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_hover.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_spot_touch.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_text.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_text_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_left_diagonal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_left_diagonal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_right_diagonal_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_top_right_diagonal_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_double_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_double_arrow_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_text.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_vertical_text_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_10.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_11.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_12.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_13.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_14.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_17.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_18.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_19.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_21.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_22.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_23.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_24.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_25.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_26.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_27.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_29.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_30.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_31.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_32.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_33.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_34.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_35.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_wait_9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_in.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_in_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pointer_zoom_out_large.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_background_mtrl_mult.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_bottom_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_center_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_full_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_full_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_above_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_inline_error_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_top_bright.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/popup_top_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_audio_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_invisible.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_offline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/presence_video_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/pressed_application_background_static.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_primary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_primary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_secondary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progress_secondary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/progressbar_indeterminate_holo8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowdown_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_left_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickactions_arrowup_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_normal_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_normal_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_pressed_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/quickcontact_badge_overlay_pressed_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/radiobutton_off_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/radiobutton_on_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_big_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_med_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/rate_star_small_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/recent_dialog_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/reticle.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_accelerated_anim2.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_horizontal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrollbar_handle_vertical.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_disabled_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_control_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_primary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_primary_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_secondary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/scrubber_track_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_dropdown_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/search_plate_global.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/seek_thumb_selected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/settings_header_raw.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_16_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_16_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_48_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_48_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_76_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_76_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_ab_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_20.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_black_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_dropdown_background_down.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_dropdown_background_up.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_select.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_16.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_48.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/spinner_white_76.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_big_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_big_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/star_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_ecb_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_car_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_email_generic.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_gmail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_missed_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_mmcc_indication_icn.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_rssi_in_range.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard_prepare.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sdcard_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sim_toolkit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_sync_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_notify_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_battery_unknown.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_certificate_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_wimax_signal_3_fully.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_data_wimax_signal_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_download_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_gps_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_headset.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_r_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_ra_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_0_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_1_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_2_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_3_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_4_cdma.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_signal_evdo_4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_general.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_tether_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_throttled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_upload_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_vp_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_vp_phone_call_on_hold.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/stat_sys_warning.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_background.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_header_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_app_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/status_bar_item_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/statusbar_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/submenu_arrow_nofocus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_action_email.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_incoming.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_missed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_call_outgoing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_contact_card.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_delete_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_enter.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_feedback_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num0_no_plus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_num9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_ok.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_ok_dim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_return.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_shift.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_shift_locked.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/sym_keyboard_space.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_bottom_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_focus_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_indicator_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_press_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_left.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_left_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_right.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_bar_right_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_selected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/tab_unselected_v4.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_side_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_edit_suggestions_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_middle_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_disabled_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_multiline_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_default.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_empty_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_right_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_search_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/textfield_selected.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_medium.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_portrait.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/title_bar_tall.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/transportcontrol_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/unknown_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/vpn_connected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/vpn_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_14w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_15w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_16w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_17w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_thumb_mtrl_18w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/watch_switch_track_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xhdpi/zoom_plate.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_bottom_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_share_pack_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_solid_shadow_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_inverse_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_solid_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_stacked_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ab_transparent_light_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_cab_done_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_check_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_default_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_group_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_radio_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_rating_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_off_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_star_on_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_off_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_normal_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_normal_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/btn_toggle_on_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_bottom_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cab_background_top_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_arrow_up.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_button_normal.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/cling_button_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/combobox_disabled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/combobox_nohighlight.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/create_contact.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/day_picker_week_view_dayline_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_bottom_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_bottom_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_full_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_full_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_ic_close_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_middle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_middle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_top_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/dialog_top_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_angel.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_cool.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_crying.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_embarrassed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_foot_in_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_happy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_kissing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_laughing.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_lips_are_sealed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_money_mouth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_sad.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_surprised.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_tongue_sticking_out.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_undecided.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_winking.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_wtf.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/emo_im_yelling.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_close_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/expander_open_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_left_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_left_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_right_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_label_right_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_thumb_default_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_thumb_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/fastscroll_track_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_ab_back_holo_dark_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_ab_back_holo_light_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_accessibility_magnification.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_audio_notification_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_audio_notification_mute_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_btn_search_go.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_btn_speak_now.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_bullet_key_permission.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_cab_done_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_commit_search_api_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_180_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_180_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_contact_picture_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_emergency.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_find_next_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_find_previous_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_input_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_launcher_android.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_airplane_mode_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_airplane_mode_off_am_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_idle_alarm_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_lock_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_open_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_outline_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_power_off_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lock_silent_mode_off.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_alarm.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_active.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_camera_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_camera_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_down.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_left.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_right.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_chevron_up.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_emergencycall_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_emergencycall_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_forgotpassword_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_forgotpassword_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_google_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_handle_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_player_background.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_puk.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_silent_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_sim.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_focused.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_soundon_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_focusde.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_text_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_unlock_activated.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreen_unlock_normal.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_lockscreens_now_button.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_embed_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_ff.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_fullscreen.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_next.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_pause.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_play.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_previous.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_rew.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connected_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_connecting_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_disabled_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_dark_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_off_light_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_route_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_media_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_account_list.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_agenda.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_allfriends.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_always_landscape_portrait.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_archive.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_attachment.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_back.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_block.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_blocked_user.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_btn_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cc_am.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_chat_dashboard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_clear_playlist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_compass.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_compose.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_copy_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_crop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_cut_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_day.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_directions.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_edit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_emoticons.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_end_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_find_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_forward.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_friendslist.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_gallery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_goto.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_help.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_help_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_home.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_info_details.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_invite.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_login.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_manage.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mapmode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_month.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_moreoverflow_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_my_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_mylocation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_myplaces.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_notifications.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_paste_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_play_clip.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_preferences.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_recent_history.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_report_image.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_revert.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_rotate.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_save.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_search_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_selectall_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_selectall_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_send.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_set_as.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_settings_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_share_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_slideshow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_sort_alphabetically.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_sort_by_size.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_star.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_start_conversation.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_stop.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_today.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_upload.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_upload_you_tube.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_view.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_week.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_menu_zoom.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_cast_2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_ime_default.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_notification_media_route.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_calendar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_camera.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_effects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_location.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_messages.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_microphone.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_phone_calls.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_social_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_perm_group_wallpapewr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_sim_card_multi_24px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_sim_card_multi_48px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_star_half_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_suggestions_add.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_suggestions_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_user_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_voice_search_api_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/ic_voice_search_api_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/indicator_input_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_activated_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_longpressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_section_divider_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_disabled.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_focus.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_longpress.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/list_selector_background_pressed.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/lockscreen_protection_pattern.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/magnified_region_frame.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_dropdown_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_dropdown_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_hardkey_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_hardkey_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_popup_panel_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/menu_popup_panel_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_longpressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_longpressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_down_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_selection_divider.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_disabled_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_focused_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_focused_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_longpressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_longpressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_normal_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_normal_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_pressed_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/numberpicker_up_pressed_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/panel_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/panel_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_accessibility_features.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_affects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/perm_group_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/pointer_arrow.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_background_mtrl_mult.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_above_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_above_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/popup_inline_error_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_audio_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_invisible.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_offline.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_away.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_busy.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/presence_video_online.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_primary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_primary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_secondary_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progress_secondary_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/progressbar_indeterminate_holo8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_focused_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_focused_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_normal_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_normal_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_pressed_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/quickcontact_badge_overlay_pressed_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_big_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_med_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_half_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_half_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_off_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_off_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_on_holo_dark.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/rate_star_small_on_holo_light.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrollbar_handle_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrollbar_handle_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_disabled_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_focused_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_normal_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_on_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_on_pressed_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_control_pressed_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_primary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_primary_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_secondary_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/scrubber_track_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_16_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_16_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_48_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_48_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_76_inner_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_76_outer_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_ab_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_default_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_default_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_disabled_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_focused_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_focused_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_normal_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_pressed_holo_dark_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/spinner_pressed_holo_light_am.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_car_mode.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_chat.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_disk_full.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_email_generic.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_gmail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_missed_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_mmcc_indication_icn.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_more.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_rssi_in_range.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard_prepare.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sdcard_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sim_toolkit.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_sync_error.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_notify_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_certificate_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_wimax_signal_3_fully.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_data_wimax_signal_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_download_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_gps_on.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_phone_call.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_general.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_tether_usb.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_throttled.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim0.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_upload_anim5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/stat_sys_warning.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_bg_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_holo_light_v2.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_pressed_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/switch_thumb_pressed_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_delete.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_enter.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num0_no_plus.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num1.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num2.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num3.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num4.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num5.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num6.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num7.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num8.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_num9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/sym_keyboard_return_holo.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_indicator_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_selected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_focused_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/tab_unselected_pressed_holo.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_edit_paste_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_edit_suggestions_window.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_middle_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_activated_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_activated_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_disabled_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_focused_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_multiline_focused_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_activated_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_default_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_default_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_default_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_right_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_selected_holo_dark.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/textfield_search_selected_holo_light.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/transportcontrol_bg.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/vpn_connected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/vpn_disconnected.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_14w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_15w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_16w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_17w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_thumb_mtrl_18w.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxhdpi/watch_switch_track_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_accessibility_magnification.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_lock_open_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_lock_outline_wht_24dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connected_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_dark_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_00_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_01_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_02_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_03_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_04_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_05_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_06_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_07_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_08_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_09_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_10_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_11_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_12_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_13_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_14_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_15_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_16_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_17_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_18_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_19_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_20_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_21_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_22_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_23_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_24_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_25_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_26_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_27_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_28_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_29_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_media_route_connecting_light_30_mtrl.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_menu_search_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_sim_card_multi_24px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_sim_card_multi_48px_clr.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_16dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_36dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_star_half_black_48dp.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/ic_user_secure.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_accessibility_features.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_affects_battery.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_app_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_audio_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_bluetooth.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_bookmarks.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_device_alarms.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_display.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_personal_info.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_screenlock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_shortrange_network.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_status_bar.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_sync_settings.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_system_clock.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_system_tools.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_voicemail.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/perm_group_wallpaper.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/tab_indicator_mtrl_alpha.9.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/text_select_handle_left_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable-xxxhdpi/text_select_handle_right_mtrl_alpha.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ab_share_pack_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ab_solid_shadow_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_divider.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/action_bar_item_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/activated_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/app_icon_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/autofill_dataset_picker_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/autofilled_highlight.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/background_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/background_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/background_leanback_setup.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/box.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_borderless_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_browser_zoom_fit_page.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_browser_zoom_page_overview.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_cab_done_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_cab_done_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_check_material_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_checked_mtrl.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_checked_to_unchecked_mtrl_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_unchecked_mtrl.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_checkbox_unchecked_to_checked_mtrl_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_circle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_clock_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_close.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_colored_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_mtrl_shape.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_small.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_default_transparent.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_dropdown.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_global_search.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_group_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_group_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_fulltrans.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_ics.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_keyboard_key_trans.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_minus.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_notification_emphasized.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_plus.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_material_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_off_mtrl.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_off_to_on_mtrl_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_on_mtrl.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_radio_on_to_off_mtrl_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_search_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_search_dialog_voice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_square_overlay.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_star_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_bg.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_toggle_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_down.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_page.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/btn_zoom_up.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/button_inset.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/cab_background_bottom_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/cab_background_top_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/cling_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/control_background_32dp_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/control_background_40dp_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/dark_header_dither.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title_focused.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_caption_title_unfocused.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_close_button_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_close_button_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_maximize_button_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/decor_maximize_button_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/dialog_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/edit_query_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/edit_text_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/editbox_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/emergency_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/emulator_circular_window_overlay.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/expander_group_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_label_left_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_label_right_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_thumb_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_thumb_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/fastscroll_track_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/floating_popup_background_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/floating_popup_background_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_toarrow.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_toarrow_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_tooverflow.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ft_avd_tooverflow_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/gallery_item_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/gallery_thumb.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/grid_selector_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_ab_back_material_settings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_account_circle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_alert_window_layer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_arrow_drop_right_black_24dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_arrow_forward.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_alarm.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_alarm_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_media.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_media_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_notification.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_notification_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_ring_notif_vibrate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_vol.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_audio_vol_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_round_more.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_square_browser_zoom_fit_page.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_btn_square_browser_zoom_page_overview.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_camera.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_check_circle_24px.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_chevron_end.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_chevron_start.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_clear_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_close.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_collapse_bundle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_collapse_notification.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_commit_search_api_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_case.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_color.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_no_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_badge_off.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_case.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_color.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_icon_badge_shadow.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_statusbar_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_corp_user_badge.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_dialog_alert_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_dnd_block_notifications.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_apk.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_audio.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_certificate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_codes.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_compressed.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_contact.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_document.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_event.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_excel.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_folder.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_font.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_generic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_image.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_pdf.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_powerpoint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_presentation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_spreadsheet.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_video.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_doc_word.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_eject_24dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_bundle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_more_48dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_expand_notification.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_faster_emergency.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_feedback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_find_next_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_find_previous_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_fingerprint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_folder_24dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_go_search_api_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_info_outline.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_info_outline_24.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_done.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_go.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_next.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_previous.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_return.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_search.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_input_extract_action_send.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_instant_icon_badge_bolt.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_airplane_mode.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_airplane_mode_off.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_bugreport.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_idle_alarm.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_lock.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_lockdown.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lock_power_off.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_lockscreen_outerring.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_logout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_maps_indicator_current_position_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connected_dark_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connected_light_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_dark_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_connecting_light_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_dark_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_media_route_light_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_cc.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_copy_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_cut_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_find_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_moreoverflow_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_paste_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_refresh.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_search_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_selectall_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_menu_share_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_mic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_more_items.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_notification_alert.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_notification_block.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_perm_device_info.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_permission.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_popup_sync.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_print.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_print_error.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_qs_battery_saver.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_refresh.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_reply_notification.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_restart.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_schedule.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_screenshot.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_sd_card_48dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_search_api_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_settings_24dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_cellular_alt_24px.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_0_bars.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_1_bar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_2_bars.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_3_bars.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_4_bars.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_4k.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_hd.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_ld.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_signal_wifi_badged_sd.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_slice_send.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_spinner_caret.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_storage_48dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_text_dot.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_usb_48dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_voice_search_api_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_settings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_3.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_wifi_signal_4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ic_zen_24dp.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/immersive_cling_bg_circ.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/immersive_cling_light_bg_circ.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/indicator_check_mark_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/indicator_check_mark_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_normal_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/input_extract_action_bg_pressed_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_activated_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_borderless_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/item_background_material_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_answer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_generic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_left_unlock.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_decline.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_generic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_sound_off.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_bar_right_sound_on.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_answer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_generic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_left_unlock.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_decline.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_generic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_sound_off.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/jog_tab_right_sound_on.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/keyboard_key_feedback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/light_header_dither.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_choice_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_divider_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight_active.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_highlight_inactive.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_section_divider_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selected_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selected_background_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_background_transition_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/list_selector_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/load_average_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/lockscreen_notselected.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/lockscreen_selected.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/media_button_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menu_panel_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menu_panel_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menu_selector.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_background_solid.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/menuitem_checkbox.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/messaging_user.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/minitab_lt.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/notification_material_action_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/notification_material_media_action_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/number_picker_divider_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_down_btn.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_input.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/numberpicker_up_btn.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/panel_picture_frame_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_calendar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_call_log.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_camera.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_contacts.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_location.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_microphone.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_phone_calls.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_sensors.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_sms.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/perm_group_storage.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_alias_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_alias_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_all_scroll_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_all_scroll_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_arrow_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_arrow_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_cell_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_cell_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_context_menu_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_context_menu_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_copy_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_copy_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_crosshair_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_crosshair_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grab_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grab_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grabbing_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_grabbing_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_hand_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_hand_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_help_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_help_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_horizontal_double_arrow_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_horizontal_double_arrow_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_nodrop_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_nodrop_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_anchor_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_hover_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_spot_touch_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_text_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_text_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_left_diagonal_double_arrow_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_left_diagonal_double_arrow_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_right_diagonal_double_arrow_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_top_right_diagonal_double_arrow_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_double_arrow_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_double_arrow_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_text_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_vertical_text_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_wait.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_wait_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_in_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_in_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_out_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/pointer_zoom_out_large_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_above_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/popup_inline_error_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_horizontal_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_anim_large_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_anim_medium_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_indeterminate_horizontal_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_large_white.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_medium_white.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_titlebar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_small_white.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/progress_static_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_focused_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_focused_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_normal_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_normal_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_pressed_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/quickcontact_badge_overlay_pressed_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_empty_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_filled_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_half_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_full_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_indicator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/ratingbar_small_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/red_shield.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/resolver_icon_placeholder.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/screen_background_selector_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/screen_background_selector_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/scroll_indicator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/scrollbar_handle_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_control_selector_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_progress_horizontal_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/scrubber_progress_horizontal_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/search_dropdown_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/search_dropdown_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/search_spinner.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seek_thumb.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_material_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_pressed_to_unpressed.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_pressed_to_unpressed_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_unpressed_to_pressed.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_thumb_unpressed_to_pressed_animation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_tick_mark_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/seekbar_track_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/settings_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/silent_mode_indicator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/slice_remote_input_bg.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/slice_ripple_drawable.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_default_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_default_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_disabled_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_disabled_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_focused_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_focused_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_pressed_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_ab_pressed_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_default_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_default_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_disabled_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_disabled_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_dropdown_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_focused_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_focused_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_pressed_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_pressed_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/spinner_textfield_background_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_call_mute.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_disabled_data.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_notify_wifi_in_range.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_battery.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_battery_charge.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_download.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_download_done_static.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_speakerphone.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_tether_wifi.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_upload.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/stat_sys_vitals.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/status_bar_item_app_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/status_bar_item_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/submenu_arrow.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_inner_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_inner_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_thumb_material_anim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/switch_track_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/sym_def_app_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/sym_def_app_icon_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_left.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_left_v4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_right.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_bottom_right_v4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_ab_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tab_indicator_v4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/text_cursor_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_left_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_middle_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/text_select_handle_right_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search_empty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_search_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_right_holo_dark.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/textfield_searchview_right_holo_light.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/time_picker_editable_background.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/title_bar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/title_bar_shadow.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/toast_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/tooltip_frame.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_large.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_medium.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_bar_small.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/drawable/view_accessibility_focused.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/progress_indeterminate_rotation_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_end_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_offset_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator-watch/trim_start_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_cubic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_decelerate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quad.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quart.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/accelerate_quint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/activity_close_dim.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/aggressive_ease.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/anticipate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/anticipate_overshoot.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/bounce.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_checked_mtrl_animation_interpolator_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_checked_mtrl_animation_interpolator_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_unchecked_mtrl_animation_interpolator_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_checkbox_unchecked_mtrl_animation_interpolator_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_radio_to_off_mtrl_animation_interpolator_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/btn_radio_to_on_mtrl_animation_interpolator_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/cycle.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_cubic.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quad.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quart.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/decelerate_quint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_extra_slow_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_linear_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/fast_out_slow_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_0.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_3.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_4.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_5.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/ft_avd_toarrow_animation_interpolator_6.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_source_scale_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_source_scale_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_behind_target_ydelta.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_micro_alpha.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/launch_task_micro_ydelta.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/linear.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/linear_out_slow_in.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/overshoot.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect1_scalex.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect1_translatex.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect2_scalex.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/progress_indeterminate_horizontal_rect2_translatex.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/trim_end_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/interpolator/trim_start_interpolator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-land/date_picker_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-land/icon_menu_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-land/ssl_certificate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-land/time_picker_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-large/action_mode_close_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-notround-watch/alert_dialog_title_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-port/icon_menu_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-round-watch/alert_dialog_title_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/date_picker_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/keyguard.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-sw600dp/preference_list_content_single.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-television/autofill_save.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-television/user_switching_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/alert_dialog_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/date_picker_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/global_actions.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/global_actions_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/input_method_extract_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_list_fragment_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/preference_widget_switch.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/progress_dialog_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-watch/time_picker_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/activity_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/breadcrumbs_in_fragment.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/breadcrumbs_in_fragment_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_item_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_multichoice_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout-xlarge/select_dialog_singlechoice_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/accessibility_button_chooser.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/accessibility_button_chooser_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_home.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_home_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_title_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_bar_up_container.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_menu_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_menu_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_bar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_close_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/action_mode_close_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/activity_chooser_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/activity_chooser_view_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/activity_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/activity_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/activity_list_item_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/adaptive_notification_wrapper.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_button_bar_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_leanback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_leanback_button_panel_side.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_progress_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/alert_dialog_title_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/always_use_checkbox.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/am_compat_mode_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_anr_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_error_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_not_authorized.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item_money.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_permission_item_old.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/app_perms_summary.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/auto_complete_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker_fullscreen.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/autofill_dataset_picker_header_footer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/autofill_save.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/breadcrumbs_in_fragment.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/breadcrumbs_in_fragment_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/browser_link_context_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/calendar_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/car_user_switching_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/cascading_menu_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/character_picker.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/character_picker_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/choose_account.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/choose_account_row.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/choose_account_type.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/choose_type_and_account.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/chooser_grid.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/chooser_row.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/common_tab_settings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_header_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_legacy.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_legacy_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_month_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/date_picker_view_animator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/day_picker_content_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/decor_caption.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/default_navigation.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_custom_title_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_icons_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/dialog_title_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/expandable_list_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/expanded_menu_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_close_overflow_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_container.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_menu_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_open_overflow_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/floating_popup_overflow_button.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumb_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumb_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/fragment_bread_crumbs.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/global_actions_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/global_actions_silent_mode.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/grant_credentials_permission.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/harmful_app_warning_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/heavy_weight_switcher.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/icon_menu_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/immersive_mode_cling.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/input_method.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/input_method_extract_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/input_method_switch_dialog_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/input_method_switch_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/js_prompt.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/keyboard_key_preview.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/keyboard_popup_keyboard.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/keyguard.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/language_picker_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/language_picker_section_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/launch_warning.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_content_simple.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_gestures_overlay.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_checkbox.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/list_menu_item_radio.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/locale_picker_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/media_controller.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/media_route_chooser_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/media_route_controller_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/media_route_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/menu_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_intruder_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_emphasized.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_action_tombstone.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_media_action.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_material_reply_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_ambient_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_ambient.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_base.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_base.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_media.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_picture.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_big_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_inbox.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_media.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_material_messaging.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_group.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_image_message.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_messaging_text_message.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_part_chronometer.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_part_line1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_progress.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_progressbar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_right_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_smart_reply_container.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/notification_template_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/number_picker.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/number_picker_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/number_picker_with_selector_wheel.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/overlay_display_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/permissions_account_and_authtokentype.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/permissions_package_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/popup_menu_header_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/popup_menu_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/power_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_category.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_category_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_category_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_child.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_child_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_child_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_edittext.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_edittext_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_seekbar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_dialog_seekbar_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_header_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_header_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_information.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_information_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_information_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_content_single.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_fragment.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_list_fragment_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_checkbox.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_seekbar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_seekbar_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preference_widget_switch.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/preferences.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/progress_dialog_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/recent_apps_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/recent_apps_icon.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/remote_views_adapter_default_loading_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/resolve_grid_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/resolve_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/resolver_different_item_header.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/resolver_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/resolver_list_with_default.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/restrictions_pin_challenge.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/restrictions_pin_setup.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/safe_mode.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_action_bar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_custom_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_progress.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_simple.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_simple_overlay_action_mode.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_swipe_dismiss.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_title_icons.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/screen_toolbar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/search_bar.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/search_dropdown_item_icons_2line.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/search_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_multichoice_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/select_dialog_singlechoice_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/shutdown_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_account_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_hint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_item_1line.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_dropdown_item_2line.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_expandable_list_item_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_expandable_list_item_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_gallery_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_2_single_choice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_activated_1.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_activated_2.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_checked.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_multiple_choice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_list_item_single_choice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_selectable_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_spinner_dropdown_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/simple_spinner_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_grid.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_message.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_message_local.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_remote_input.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_secondary_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_small_template.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/slice_title.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/sms_short_code_confirmation_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/ssl_certificate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/status_bar_latest_event_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/subscription_item_layout.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/tab_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/tab_indicator_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/test_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_drag_thumbnail.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_action_popup_text.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_no_paste_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_paste_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_side_no_paste_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_side_paste_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_container.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_container_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestion_item_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/text_edit_suggestions_window.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/textview_hint.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_header_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_legacy.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_legacy_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/time_picker_text_input_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/tooltip.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/transient_notification.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/twelve_key_entry.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/two_line_list_item.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/typing_filter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/unsupported_compile_sdk_dialog_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/unsupported_display_size_dialog_content.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/user_switching_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/voice_interaction_session.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/web_runtime.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/web_text_view_dropdown.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/webview_find.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/webview_select_singlechoice.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/wifi_p2p_dialog.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/wifi_p2p_dialog_row.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/work_widget_mask_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/year_label_text_view.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/zoom_browser_accessory_buttons.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/zoom_container.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/zoom_controls.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/layout/zoom_magnify.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/menu/language_selection_list.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/menu/webview_copy.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/menu/webview_find.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-hdpi/sym_def_app_icon_foreground.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-ldpi/sym_def_app_icon_maskable.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_app_on_sd_unavailable_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-mdpi/sym_def_app_icon_foreground.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-watch-anydpi/sym_def_app_icon_foreground.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xhdpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xhdpi/sym_def_app_icon_foreground.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xxhdpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xxhdpi/sym_def_app_icon_foreground.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xxxhdpi/sym_def_app_icon.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/mipmap-xxxhdpi/sym_def_app_icon_foreground.png +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ar/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ar/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-cs/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-cs/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-da/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-da/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-de/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-de/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-en-rGB/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-en-rGB/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-es/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-es/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-fi/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-fi/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-fr/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-fr/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-hu/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-hu/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-it/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-it/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-iw/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-iw/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ja/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ja/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ko/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ko/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-nl/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-nl/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-pl/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-pl/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-pt-rBR/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-pt-rBR/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-rm/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-rm/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ru/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-ru/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-th/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-th/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-tr/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-tr/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-zh-rCN/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-zh-rCN/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-zh-rTW/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw-zh-rTW/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/color_fade_frag.frag +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/color_fade_vert.vert +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/fallback_categories.csv +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/fallbackring.ogg +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/loaderror.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/raw/nodomain.html +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/explode.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/fade.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/move.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/no_transition.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/popup_window_enter.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/popup_window_exit.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/slide_bottom.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/slide_left.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/slide_right.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/transition/slide_top.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-af-rZA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-af-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-af/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-af/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-am-rET/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-am-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-am/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-am/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar-rEG/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar-rEG/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar-rIL/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ar/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-as-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-as/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-az-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-az/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-b+sr+Latn-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-b+sr+Latn/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-be-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-be/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bg-rBG/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bg-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bg/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bg/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bn-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bn/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bs-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-bs/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ca-rES/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ca-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ca/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ca/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-cs-rCZ/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-cs-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-cs/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-cs/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-da-rDK/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-da-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-da/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-da/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de-rAT/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de-rCH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de-rDE/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de-rLI/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-de/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-el-rGR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-el-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-el/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-el/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rAU-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rAU/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rCA-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rCA/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rGB-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rGB/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIE/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIE/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIN-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rIN/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rNZ/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rNZ/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rSG/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rSG/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/donottranslate-names.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rUS/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rXC-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rXC/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rZA/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-en-rZA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es-rES/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es-rUS-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es-rUS/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es-rUS/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-es/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-et-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-et/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-eu-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-eu/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fa-rIR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fa-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fa/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fa/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fi-rFI/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fi-rFI/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fi-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fi/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fi/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rBE/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rCA/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rCH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-rFR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-fr/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-gl-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-gl/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-gu-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-gu/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-h320dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-h720dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hi-rIN/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hi-rIN/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hi-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hi/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hi/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hr-rHR/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hr-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hr/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hr/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hu-rHU/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hu-rHU/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hu-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hu/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hu/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hy-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-hy/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-in-rID/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-in-rID/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-in-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-in/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-in/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-is-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-is/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-it-rCH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-it-rIT/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-it-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-it/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-it/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-iw-rIL/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-iw-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-iw/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-iw/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ja-rJP/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ja-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ja/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ja/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ka-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ka/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-kk-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-kk/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-km-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-km/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-kn-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-kn/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ko-rKR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ko-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ko/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ko/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ky-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ky/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/arrays.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/donottranslate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-land/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-large/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-large/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-large/themes_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-large/themes_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-large/themes_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ldrtl-television/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lo-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lo/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lt-rLT/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lt-rLT/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lt-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lt/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lt/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lv-rLV/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lv-rLV/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lv-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lv/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-lv/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mk-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mk/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ml-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ml/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mn-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mn/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mr-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-mr/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ms-rMY/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ms-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ms/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-my-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-my/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nb-rNO/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nb-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nb/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nb/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ne-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ne/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nl-rBE/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nl-rNL/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nl-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nl/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-nl/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-notround-watch/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-notround-watch/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-or-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-or/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pa-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pa/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pl-rPL/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pl-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pl/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pl/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-port-mdpi/donottranslate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-port/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-port/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rBR/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-rPT/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-pt/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-rm-rCH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ro-rRO/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ro-rRO/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ro-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ro/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ro/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-round-watch/config_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-round-watch/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-round-watch/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ru-rRU/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ru-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ru/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ru/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-si-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-si/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sk-rSK/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sk-rSK/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sk-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sk/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sk/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sl-rSI/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sl-rSI/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sl-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sl/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sl/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sq-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sq/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sr-rRS/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sr-rRS/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sr-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sr/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sr/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sv-rSE/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sv-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sv/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sv/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw-rTZ/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw360dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/arrays.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-land/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-port/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp-w960dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/colors.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw600dp/styles.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-land/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-port/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp-w1280dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw720dp/styles.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-sw900dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ta-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ta/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-te-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-te/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-television/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-television/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-television/themes.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-television/themes_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-th-rTH/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-th-rTH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-th-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-th/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-th/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tl-rPH/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tl-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tl/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tl/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tr-rTR/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tr-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tr/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-tr/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uk-rUA/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uk-rUA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uk-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uk/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uk/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ur-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-ur/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uz-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-uz/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-vi-rVN/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-vi-rVN/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-vi-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-vi/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-vi/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w170dp-notround-watch/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w180dp-notround-watch/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w192dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w195dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w205dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w210dp-round-watch/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w213dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w225dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w228dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w240dp/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w320dp-h426dp/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w320dp/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w426dp-h320dp/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w480dp/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-w720dp/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/colors_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/config_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/donottranslate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/donottranslate_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/styles_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/themes.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/themes_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-watch/themes_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-xlarge-land/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-xlarge/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rCN/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rHK-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rHK/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zh-rTW/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zu-rZA/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zu-watch/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zu/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values-zu/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/arrays.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/attrs.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/attrs_manifest.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/bools.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_car.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_leanback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_legacy.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/colors_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/config_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/dimens_car.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/dimens_leanback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/dimens_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_device.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_profile.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/disallowed_apps_managed_user.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-cldr.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-maps.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/donottranslate-names.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/donottranslate.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/donottranslate_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/ids.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/integers.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/locale_config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/public.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_device.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_profile.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/required_apps_managed_user.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/strings.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/styles.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/styles_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/styles_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/styles_leanback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/styles_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/symbols.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/themes.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/themes_device_defaults.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/themes_holo.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/themes_leanback.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/themes_material.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_device.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_profile.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_disallowed_apps_managed_user.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_device.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_profile.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/values/vendor_required_apps_managed_user.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/version +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-en/autotext.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-land/password_kbd_qwerty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-land/password_kbd_qwerty_shifted.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-mdpi/password_kbd_qwerty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-mdpi/password_kbd_qwerty_shifted.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-watch/default_zen_mode_config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_numeric.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_qwerty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_qwerty_shifted.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_symbols.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml-xlarge/password_kbd_symbols_shift.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/apns.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/audio_assets.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/autofill_compat_accessibility_service.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/autotext.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/bookmarks.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/color_extraction.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/config_webview_packages.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/default_zen_mode_config.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/global_keys.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/kg_password_kbd_numeric.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_extension.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_numeric.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_popup_template.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_qwerty.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_qwerty_shifted.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_symbols.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/password_kbd_symbols_shift.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/power_profile.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/power_profile_test.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/sms_7bit_translation_table.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/sms_short_codes.xml +%%DATADIR%%/plugins/android/lib/layoutlib/data/res/xml/storage_list.xml +%%DATADIR%%/plugins/android/lib/libdeploy_java_proto.jar +%%DATADIR%%/plugins/android/lib/libjava_version.jar +%%DATADIR%%/plugins/android/lib/libwebp.jar +%%DATADIR%%/plugins/android/lib/lint-api-26.3.0.jar +%%DATADIR%%/plugins/android/lib/lint-checks-26.3.0.jar +%%DATADIR%%/plugins/android/lib/manifest-merger-26.3.0.jar +%%DATADIR%%/plugins/android/lib/moshi-1.6.0.jar +%%DATADIR%%/plugins/android/lib/ninepatch-26.3.0.jar +%%DATADIR%%/plugins/android/lib/nosyncbuilder-jarjar.jar +%%DATADIR%%/plugins/android/lib/okio-1.14.0.jar +%%DATADIR%%/plugins/android/lib/org.eclipse.elk.alg.layered-0.3.0.jar +%%DATADIR%%/plugins/android/lib/org.eclipse.elk.core-0.3.0.jar +%%DATADIR%%/plugins/android/lib/org.eclipse.elk.graph-0.3.0.jar +%%DATADIR%%/plugins/android/lib/org.eclipse.emf.common-2.12.0.jar +%%DATADIR%%/plugins/android/lib/org.eclipse.emf.ecore-2.12.0.jar +%%DATADIR%%/plugins/android/lib/pepk.jar +%%DATADIR%%/plugins/android/lib/perflib-26.3.0.jar +%%DATADIR%%/plugins/android/lib/pixelprobe-26.3.0.jar +%%DATADIR%%/plugins/android/lib/protos-26.3.0.jar +%%DATADIR%%/plugins/android/lib/repository-26.3.0.jar +%%DATADIR%%/plugins/android/lib/resources_en.jar +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_1.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_10.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_11.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_12.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_13.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_14.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_15.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_16.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_2.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_3.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_4.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_5.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_6.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_7.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_8.xml +%%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_9.xml +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/A_Photographer.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Apres_la_Pluie.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Caterpillar.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Colors_of_Autumn.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Countryside.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Death_Valley_-_Dunes.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Despair.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Eagle_Fall_Sunrise.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Green_Grass.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Hanging_Leaf.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Jelly_Fish_3.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Kauai.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Longue_Vue.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Lost_in_a_Field.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Monument_Valley_Overlook.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/One_Wheel.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Open_Sky.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Orange_Sunset.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Stream.jpg +%%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Yosemite_Tree.jpg +%%DATADIR%%/plugins/android/lib/sdk-common-26.3.0-sp1.jar +%%DATADIR%%/plugins/android/lib/sdk-tools.jar +%%DATADIR%%/plugins/android/lib/sdklib-26.3.0.jar +%%DATADIR%%/plugins/android/lib/shared-26.3.0.jar +%%DATADIR%%/plugins/android/lib/spantable.jar +%%DATADIR%%/plugins/android/lib/studio-profiler-grpc-1.0-jarjar.jar +%%DATADIR%%/plugins/android/lib/templates/BUILD +%%DATADIR%%/plugins/android/lib/templates/NOTICE +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/app_icon_your_company.png +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/default_background.xml +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/drawable/movie.png +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/layout/activity_details.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/layout/activity_main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/values/colors.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/BrowseErrorActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/BrowseErrorActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/CardPresenter.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/CardPresenter.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsDescriptionPresenter.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/DetailsDescriptionPresenter.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/ErrorFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/ErrorFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MainFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/Movie.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/Movie.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MovieList.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/MovieList.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackVideoFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/PlaybackVideoFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/template-leanback-TV.png +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidTVActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/src/app_package/SimpleActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/root/src/app_package/SimpleActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsActivity/template_blank_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/AccelerometerService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/AccelerometerService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/GpsService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/GpsService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/SimpleActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/SimpleActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/TemperaturePressureService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/root/src/app_package/TemperaturePressureService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/AndroidThingsPeripheralActivity/thumbnail.png +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/recipe_fragment.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/activity_fragment_container.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/fragment_simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity_fragment.png +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/AndroidManifestPermissions.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/layout/blank_activity.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/layout/blank_activity_prev.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values-round/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/src/app_package/BlankActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/root/src/app_package/BlankActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BlankWearActivity/templates-WatchViewStub-Wear.png +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/build.gradle +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_dashboard_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_home_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_notifications_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/layout/activity_main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/menu/navigation.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/strings.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/src/app_package/MainActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/src/app_package/MainActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template_bottom_navigation_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/EmptyActivity/template_blank_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/FullscreenActivity/template_fullscreen_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/layout/activity_simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/menu/main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values-w820dp/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/src/app_package/SimpleActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/root/src/app_package/SimpleActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity_banner.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_admob_activity_interstitial.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/template_blank_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/debugRes/values/google_maps_api.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/releaseRes/values/google_maps_api.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/res/layout/activity_map.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/src/app_package/MapActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/root/src/app_package/MapActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsActivity/template_map_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifestPermissions.xml +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/debugRes/values/google_maps_api.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/releaseRes/values/google_maps_api.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/layout/activity_map.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/MapActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/MapActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template_thumb.png +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/LoginActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/LoginActivity/template_login_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_detail.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_list_app_bar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_detail.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list_twopane.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/item_list_content.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-w900dp/refs.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/MasterDetailFlow/template_master_detail.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_camera.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_gallery.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_manage.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_send.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_share.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_slideshow.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable/side_nav_bar.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_header.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_view.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/drawer.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values-v21/no_actionbar_styles_v21.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/drawables.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/DrawerActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/DrawerActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/app_bar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/ScrollActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/ScrollActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/ScrollActivity/template_scroll_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/build.gradle +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_info_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_notifications_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable/ic_sync_black_24dp.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/values/pref_strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_general.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/AppCompatPreferenceActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/AppCompatPreferenceActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/SettingsActivity/template_settings_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/app_bar_activity.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/list_item.xml +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_fragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_dropdown.png +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_pager.png +%%DATADIR%%/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_tabs.png +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/res/layout/activity.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/res/layout/fragment.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Activity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Activity.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Fragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/Fragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/ViewModel.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/root/src/app_package/ViewModel.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/template.xml +%%DATADIR%%/plugins/android/lib/templates/activities/ViewModelActivity/template_blank_activity.png +%%DATADIR%%/plugins/android/lib/templates/activities/common/common_globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/jni_code_snippet.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/jni_code_snippet.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/jni_code_usage.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/jni_code_usage.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/kotlin.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/kotlin_globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/kotlin_macros.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_app_bar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_dummy_content.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_full_screen_actionbar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_manifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_manifest_strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_no_actionbar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_simple_menu.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/recipe_theme.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/layout/app_bar.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/layout/simple.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/menu/simple_menu.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/app_bar_dimens.xml +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_attrs.xml +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_colors.xml +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/full_screen_styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/manifest_strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/no_actionbar_styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/simple_menu_strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/res/values/theme_styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.java.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/shared_manifest_macros.ftl +%%DATADIR%%/plugins/android/lib/templates/activities/common/wear_common_globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-hdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-mdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/wear-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/ImportEclipseProject/eclipse-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/ImportEclipseProject/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/ImportGradleProject/gradle-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/ImportGradleProject/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidAutoModule/car-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidAutoModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/mobile-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/CMakeLists.txt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-ApplicationManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeature-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/baseFeatureDependency-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/instantApp-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/monolithic-AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/monolithic-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/native-lib.cpp.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/drawable-v24/ic_launcher_foreground.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/drawable/ic_launcher_background.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/ic_launcher-web.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi-v26/ic_launcher.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher_round.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher_round.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher_round.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher_round.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher_round.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/colors.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/shared_macros.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleInstrumentedTest.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleInstrumentedTest.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleUnitTest.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/test/app_package/ExampleUnitTest.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/android-project.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/gradle.properties.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/local.properties.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/project_ignore +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidProject/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-hdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-mdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/res/values/styles.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidTVModule/tv-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/CMakeLists.txt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/native-lib.cpp.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/colors.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/res/values/styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleInstrumentedTest.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleInstrumentedTest.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleUnitTest.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/root/test/app_package/ExampleUnitTest.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewAndroidThingsModule/things-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/dynamic-feature-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/base-AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/base-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewDynamicFeatureModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/glass-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-hdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-mdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/mipmap-xxxhdpi/ic_launcher.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/res/values/styles.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/root/test/app_package/ApplicationTest.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewGlassModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/instant-app-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantAppModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantDynamicFeatureModule/instant-dynamic-feature-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantDynamicFeatureModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantFeatureModule/feature-module.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewInstantFeatureModule/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/settings.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/template.xml +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/NewJavaLibrary/template_new_project.png +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/gitignore +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/globals_android_module.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/proguard-rules.txt.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/proguard_macros.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle-projects/common/proguard_recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar +%%DATADIR%%/plugins/android/lib/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties +%%DATADIR%%/plugins/android/lib/templates/gradle/wrapper/gradlew +%%DATADIR%%/plugins/android/lib/templates/gradle/wrapper/gradlew.bat +%%DATADIR%%/plugins/android/lib/templates/other/AidlFile/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AidlFile/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AidlFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AidlFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AidlFolder/root/component-build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AidlFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/res/values-v21/styles.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/res/xml/automotive_app_desc.xml +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/src/app_package/MusicService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/root/src/app_package/MusicService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMediaService/templates-mediaService-Auto.png +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/res/xml/automotive_app_desc.xml +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReadReceiver.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReadReceiver.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReplyReceiver.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessageReplyReceiver.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessagingService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/root/src/app_package/MessagingService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AndroidAutoMessagingService/templates-messagingService-Auto.png +%%DATADIR%%/plugins/android/lib/templates/other/AndroidManifest/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidManifest/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AndroidManifest/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppActionsResourceFile/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppActionsResourceFile/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppActionsResourceFile/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppActionsResourceFile/root/res/actions.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppActionsResourceFile/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/layout/appwidget.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/layout/appwidget_configure.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/values-v14/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_h.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_v.png +%%DATADIR%%/plugins/android/lib/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png +%%DATADIR%%/plugins/android/lib/templates/other/AssetsFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AssetsFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/AssetsFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/root/res/values/strings.xml +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/root/src/app_package/BlankFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/BlankFragment/template_blank_fragment.png +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/BroadcastReceiver/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/root/src/app_package/ContentProvider.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ContentProvider/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/root/res/layout/sample.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/root/res/values/attrs.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/root/src/app_package/CustomView.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/root/src/app_package/CustomView.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/CustomView/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/res/layout-v17/dream.xml +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/res/xml/dream_prefs.xml +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/src/app_package/DreamService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Daydream/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/FontFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/FontFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/root/src/app_package/IntentService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/root/src/app_package/IntentService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/IntentService/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/JavaFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/JavaFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/JavaFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/JniFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/JniFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/JniFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/LayoutResourceFile/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/LayoutResourceFile/root/res/layout.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/LayoutResourceFile/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/res/layout/fragment_list.xml +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/res/layout/item_list_content.xml +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/ListFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ListFragment/templates_list_fragment.png +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog.xml +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog_item.xml +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/values/dimens.xml +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/root/src/app_package/ItemListDialogFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/root/src/app_package/ItemListDialogFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ModalBottomSheet/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/Notification/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Notification/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_list.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_list_actions.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_none.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_none_actions.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_picture.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_picture_actions.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_text.png +%%DATADIR%%/plugins/android/lib/templates/other/Notification/template_notification_text_actions.png +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/PlusOneFragment/templates_plusone_fragment.png +%%DATADIR%%/plugins/android/lib/templates/other/RawFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/RawFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ResFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ResFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ResFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ResourcesFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ResourcesFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ResourcesFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/RsFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/RsFolder/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/RsFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/Service/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Service/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Service/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Service/root/src/app_package/Service.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Service/root/src/app_package/Service.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/Service/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/root/src/app_package/SliceProvider.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/root/src/app_package/SliceProvider.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/SliceProvider/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ValueResourceFile/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ValueResourceFile/root/res/values.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ValueResourceFile/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/root/res/layout/blank_fragment.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankFragment.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankFragment.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankViewModel.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/root/src/app_package/BlankViewModel.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/ViewModelFragment/template_blank_fragment.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/analog_round.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/analog_square.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/digital_round.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/digital_square.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifest.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifestPermissions.xml +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/build.gradle.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/bg.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_analog.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_digital.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/preview_digital_circular.png +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/colors.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/dimens.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/values/strings.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/res/xml/watch_face.xml +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyAnalogWatchFaceService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyAnalogWatchFaceService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.java.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.kt.ftl +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/WatchFaceService/template_thumbnail.png +%%DATADIR%%/plugins/android/lib/templates/other/XmlFolder/recipe.xml.ftl +%%DATADIR%%/plugins/android/lib/templates/other/XmlFolder/template.xml +%%DATADIR%%/plugins/android/lib/templates/other/common/globals.xml.ftl +%%DATADIR%%/plugins/android/lib/tracker-26.3.0.jar +%%DATADIR%%/plugins/ant/lib/ant-jps-plugin.jar +%%DATADIR%%/plugins/ant/lib/antIntegration.jar +%%DATADIR%%/plugins/ant/lib/resources_en.jar +%%DATADIR%%/plugins/configurationScript/lib/configurationScript.jar +%%DATADIR%%/plugins/copyright/lib/copyright.jar +%%DATADIR%%/plugins/copyright/lib/resources_en.jar +%%DATADIR%%/plugins/coverage/lib/coverage-report-idea.jar +%%DATADIR%%/plugins/coverage/lib/coverage-report.jar +%%DATADIR%%/plugins/coverage/lib/coverage.jar +%%DATADIR%%/plugins/coverage/lib/coverage_rt.jar +%%DATADIR%%/plugins/coverage/lib/freemarker.jar +%%DATADIR%%/plugins/coverage/lib/jacocoagent.jar +%%DATADIR%%/plugins/coverage/lib/jacocoant.jar +%%DATADIR%%/plugins/coverage/lib/resources_en.jar +%%DATADIR%%/plugins/devkit/lib/devkit-jps-plugin.jar +%%DATADIR%%/plugins/devkit/lib/devkit.jar +%%DATADIR%%/plugins/devkit/lib/dtdparser113.jar +%%DATADIR%%/plugins/devkit/lib/resources_en.jar +%%DATADIR%%/plugins/eclipse/lib/common-eclipse-util.jar +%%DATADIR%%/plugins/eclipse/lib/eclipse-jps-plugin.jar +%%DATADIR%%/plugins/eclipse/lib/eclipse.jar +%%DATADIR%%/plugins/eclipse/lib/resources_en.jar +%%DATADIR%%/plugins/editorconfig/lib/editorconfig-core-java.jar +%%DATADIR%%/plugins/editorconfig/lib/editorconfig.jar +%%DATADIR%%/plugins/editorconfig/lib/resources_en.jar +%%DATADIR%%/plugins/git4idea/lib/git4idea-rt.jar +%%DATADIR%%/plugins/git4idea/lib/git4idea.jar +%%DATADIR%%/plugins/git4idea/lib/remote-servers-git.jar +%%DATADIR%%/plugins/git4idea/lib/resources_en.jar +%%DATADIR%%/plugins/github/lib/github.jar +%%DATADIR%%/plugins/github/lib/resources_en.jar +%%DATADIR%%/plugins/gradle-java-maven/lib/gradle-java-maven.jar +%%DATADIR%%/plugins/gradle-java-maven/lib/resources_en.jar +%%DATADIR%%/plugins/gradle/lib/gradle-api-5.2.1-sp1.jar +%%DATADIR%%/plugins/gradle/lib/gradle-api-impldep-5.2.1-sp1.jar +%%DATADIR%%/plugins/gradle/lib/gradle-common.jar +%%DATADIR%%/plugins/gradle/lib/gradle-java.jar +%%DATADIR%%/plugins/gradle/lib/gradle-jps-plugin.jar +%%DATADIR%%/plugins/gradle/lib/gradle-launcher-5.2.1-sp1.jar +%%DATADIR%%/plugins/gradle/lib/gradle-tooling-extension-api.jar +%%DATADIR%%/plugins/gradle/lib/gradle-tooling-extension-impl.jar +%%DATADIR%%/plugins/gradle/lib/gradle-toolingLoaderRt.jar +%%DATADIR%%/plugins/gradle/lib/gradle-wrapper-5.2.1-sp1.jar +%%DATADIR%%/plugins/gradle/lib/gradle.jar +%%DATADIR%%/plugins/gradle/lib/kryo-2.24.0.jar +%%DATADIR%%/plugins/gradle/lib/minlog-1.2.jar +%%DATADIR%%/plugins/hg4idea/lib/hg4idea.jar +%%DATADIR%%/plugins/hg4idea/lib/resources_en.jar +%%DATADIR%%/plugins/java-decompiler/lib/java-decompiler.jar +%%DATADIR%%/plugins/java-i18n/lib/java-i18n.jar +%%DATADIR%%/plugins/java-i18n/lib/resources_en.jar +%%DATADIR%%/plugins/java-ide-customization/lib/java-ide-customization.jar +%%DATADIR%%/plugins/java/lib/aether-api-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-connector-basic-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-dependency-resolver.jar +%%DATADIR%%/plugins/java/lib/aether-impl-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-spi-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-transport-file-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-transport-http-1.1.0.jar +%%DATADIR%%/plugins/java/lib/aether-util-1.1.0.jar +%%DATADIR%%/plugins/java/lib/commons-lang3-3.4.jar +%%DATADIR%%/plugins/java/lib/debugger-memory-agent-0.0.11.jar +%%DATADIR%%/plugins/java/lib/ecj-4.10.jar +%%DATADIR%%/plugins/java/lib/java-api.jar +%%DATADIR%%/plugins/java/lib/java-impl.jar +%%DATADIR%%/plugins/java/lib/java_resources_en.jar +%%DATADIR%%/plugins/java/lib/javac2.jar +%%DATADIR%%/plugins/java/lib/jdkAnnotations.jar +%%DATADIR%%/plugins/java/lib/jgoodies-common-1.4.0.jar +%%DATADIR%%/plugins/java/lib/jps-builders-6.jar +%%DATADIR%%/plugins/java/lib/jps-builders.jar +%%DATADIR%%/plugins/java/lib/jps-launcher.jar +%%DATADIR%%/plugins/java/lib/jshell-protocol.jar +%%DATADIR%%/plugins/java/lib/maven-aether-provider-3.3.9.jar +%%DATADIR%%/plugins/java/lib/maven-artifact-3.3.9.jar +%%DATADIR%%/plugins/java/lib/maven-builder-support-3.3.9.jar +%%DATADIR%%/plugins/java/lib/maven-model-3.3.9.jar +%%DATADIR%%/plugins/java/lib/maven-model-builder-3.3.9.jar +%%DATADIR%%/plugins/java/lib/maven-repository-metadata-3.3.9.jar +%%DATADIR%%/plugins/java/lib/plexus-component-annotations-1.6.jar +%%DATADIR%%/plugins/java/lib/plexus-interpolation-1.21.jar +%%DATADIR%%/plugins/java/lib/plexus-utils-3.0.22.jar +%%DATADIR%%/plugins/java/lib/resources.jar +%%DATADIR%%/plugins/java/lib/resources_en.jar +%%DATADIR%%/plugins/java/lib/rt/debugger-agent-storage.jar +%%DATADIR%%/plugins/java/lib/rt/debugger-agent.jar +%%DATADIR%%/plugins/java/lib/wadl-core.jar +%%DATADIR%%/plugins/javaFX/lib/SceneBuilderKit-8.2.0.jar +%%DATADIR%%/plugins/javaFX/lib/common-javaFX-plugin.jar +%%DATADIR%%/plugins/javaFX/lib/javaFX-jps-plugin.jar +%%DATADIR%%/plugins/javaFX/lib/javaFX.jar +%%DATADIR%%/plugins/javaFX/lib/resources_en.jar +%%DATADIR%%/plugins/junit/lib/idea-junit.jar +%%DATADIR%%/plugins/junit/lib/junit-rt.jar +%%DATADIR%%/plugins/junit/lib/junit5-rt.jar +%%DATADIR%%/plugins/junit/lib/resources_en.jar +%%DATADIR%%/plugins/markdown/lib/markdown-0.1.31.jar +%%DATADIR%%/plugins/markdown/lib/markdown.jar +%%DATADIR%%/plugins/markdown/lib/owasp-java-html-sanitizer.jar +%%DATADIR%%/plugins/markdown/lib/resources_en.jar +%%DATADIR%%/plugins/maven/lib/artifact-resolver-m2.jar +%%DATADIR%%/plugins/maven/lib/artifact-resolver-m3.jar +%%DATADIR%%/plugins/maven/lib/artifact-resolver-m31.jar +%%DATADIR%%/plugins/maven/lib/lucene-core-2.4.1.jar +%%DATADIR%%/plugins/maven/lib/maven-errorProne-compiler.jar +%%DATADIR%%/plugins/maven/lib/maven-event-listener.jar +%%DATADIR%%/plugins/maven/lib/maven-jps-plugin.jar +%%DATADIR%%/plugins/maven/lib/maven-server-api.jar +%%DATADIR%%/plugins/maven/lib/maven.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-impl.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-lib/archetype-common-2.0-alpha-4-SNAPSHOT.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-lib/commons-beanutils.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-lib/maven-dependency-tree-1.2.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-lib/mercury-artifact-1.0-alpha-6.jar +%%DATADIR%%/plugins/maven/lib/maven2-server-lib/nexus-indexer-1.2.3.jar +%%DATADIR%%/plugins/maven/lib/maven2/LICENSE.txt +%%DATADIR%%/plugins/maven/lib/maven2/NOTICE.txt +%%DATADIR%%/plugins/maven/lib/maven2/README.txt +%%DATADIR%%/plugins/maven/lib/maven2/bin/m2.conf +%%DATADIR%%/plugins/maven/lib/maven2/bin/mvn +%%DATADIR%%/plugins/maven/lib/maven2/bin/mvn.bat +%%DATADIR%%/plugins/maven/lib/maven2/bin/mvnDebug +%%DATADIR%%/plugins/maven/lib/maven2/bin/mvnDebug.bat +%%DATADIR%%/plugins/maven/lib/maven2/boot/classworlds-1.1.jar +%%DATADIR%%/plugins/maven/lib/maven2/conf/settings.xml +%%DATADIR%%/plugins/maven/lib/maven2/lib/maven-2.2.1-uber.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-common.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-impl.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-lib/archetype-catalog-2.2.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-lib/archetype-common-2.2.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-lib/maven-dependency-tree-1.2.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-lib/nexus-indexer-3.0.4.jar +%%DATADIR%%/plugins/maven/lib/maven3-server-lib/nexus-indexer-artifact-1.0.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/LICENSE +%%DATADIR%%/plugins/maven/lib/maven3/NOTICE +%%DATADIR%%/plugins/maven/lib/maven3/README.txt +%%DATADIR%%/plugins/maven/lib/maven3/bin/m2.conf +%%DATADIR%%/plugins/maven/lib/maven3/bin/mvn +%%DATADIR%%/plugins/maven/lib/maven3/bin/mvn.cmd +%%DATADIR%%/plugins/maven/lib/maven3/bin/mvnDebug +%%DATADIR%%/plugins/maven/lib/maven3/bin/mvnDebug.cmd +%%DATADIR%%/plugins/maven/lib/maven3/bin/mvnyjp +%%DATADIR%%/plugins/maven/lib/maven3/boot/plexus-classworlds-2.6.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/conf/logging/simplelogger.properties +%%DATADIR%%/plugins/maven/lib/maven3/conf/settings.xml +%%DATADIR%%/plugins/maven/lib/maven3/conf/toolchains.xml +%%DATADIR%%/plugins/maven/lib/maven3/lib/animal-sniffer-annotations-1.14.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/animal-sniffer-annotations.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/aopalliance-1.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/cdi-api-1.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/checker-compat-qual-2.0.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/checker-compat-qual.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/commons-cli-1.4.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/commons-io-2.5.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/commons-lang3-3.8.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/error_prone_annotations-2.1.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/ext/README.txt +%%DATADIR%%/plugins/maven/lib/maven3/lib/guava-25.1-android.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/guice-4.2.1-no_aop.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/j2objc-annotations-1.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-1.17.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/javax.inject-1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j-1.7.25.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/jsr250-api-1.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jsr250-api.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/jsr305-3.0.2.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-artifact-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-builder-support-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-compat-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-core-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-embedder-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-model-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-model-builder-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-plugin-api-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-repository-metadata-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-api-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-connector-basic-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-impl-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-provider-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-spi-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-transport-wagon-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-resolver-util-1.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-settings-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-settings-builder-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-shared-utils-3.2.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/maven-slf4j-provider-3.6.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.inject-0.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.inject.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.plexus-0.3.3.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/org.eclipse.sisu.plexus.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/plexus-cipher-1.7.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/plexus-component-annotations-1.7.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/plexus-interpolation-1.25.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/plexus-sec-dispatcher-1.4.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/plexus-utils-3.2.0.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/slf4j-api-1.7.25.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/slf4j-api.license +%%DATADIR%%/plugins/maven/lib/maven3/lib/wagon-file-3.3.2.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/wagon-http-3.3.2-shaded.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/wagon-provider-api-3.3.2.jar +%%DATADIR%%/plugins/maven/lib/maven30-server-impl.jar +%%DATADIR%%/plugins/maven/lib/maven36-server-impl.jar +%%DATADIR%%/plugins/maven/lib/plexus-archiver-3.0.3.jar +%%DATADIR%%/plugins/maven/lib/resources_en.jar +%%DATADIR%%/plugins/properties/lib/properties.jar +%%DATADIR%%/plugins/properties/lib/resources_en.jar +%%DATADIR%%/plugins/settings-repository/lib/jgit.jar +%%DATADIR%%/plugins/settings-repository/lib/resources_en.jar +%%DATADIR%%/plugins/settings-repository/lib/settings-repository.jar +%%DATADIR%%/plugins/sh/lib/resources_en.jar +%%DATADIR%%/plugins/sh/lib/sh.jar +%%DATADIR%%/plugins/smali/lib/smali.jar +%%DATADIR%%/plugins/stream-debugger/lib/resources_en.jar +%%DATADIR%%/plugins/stream-debugger/lib/stream-debugger.jar +%%DATADIR%%/plugins/svn4idea/lib/resources_en.jar +%%DATADIR%%/plugins/svn4idea/lib/sqlite-jdbc-3.20.1.jar +%%DATADIR%%/plugins/svn4idea/lib/svn4idea.jar +%%DATADIR%%/plugins/tasks/lib/axis-1.4.jar +%%DATADIR%%/plugins/tasks/lib/axis-jaxrpc-1.4.jar +%%DATADIR%%/plugins/tasks/lib/axis-saaj-1.3.jar +%%DATADIR%%/plugins/tasks/lib/commons-discovery-0.4.jar +%%DATADIR%%/plugins/tasks/lib/jira.jar +%%DATADIR%%/plugins/tasks/lib/json-path-0.8.0.jar +%%DATADIR%%/plugins/tasks/lib/json-smart-1.1.1.jar +%%DATADIR%%/plugins/tasks/lib/tasks-api.jar +%%DATADIR%%/plugins/tasks/lib/tasks-compatibility.jar +%%DATADIR%%/plugins/tasks/lib/tasks-core.jar +%%DATADIR%%/plugins/tasks/lib/tasks-java.jar +%%DATADIR%%/plugins/tasks/lib/wsdl4j-1.4.jar +%%DATADIR%%/plugins/terminal/.zshrc +%%DATADIR%%/plugins/terminal/fish/config.fish +%%DATADIR%%/plugins/terminal/jediterm-bash.in +%%DATADIR%%/plugins/terminal/lib/resources_en.jar +%%DATADIR%%/plugins/terminal/lib/terminal.jar +%%DATADIR%%/plugins/testng/lib/jcommander-1.27.jar +%%DATADIR%%/plugins/testng/lib/resources_en.jar +%%DATADIR%%/plugins/testng/lib/testng-6.8.21.jar +%%DATADIR%%/plugins/testng/lib/testng-plugin.jar +%%DATADIR%%/plugins/textmate/lib/bundles/bat/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/bat/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/bat/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/bat/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/bat/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/bat/snippets/batchfile.snippets.json +%%DATADIR%%/plugins/textmate/lib/bundles/bat/syntaxes/batchfile.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/clojure/syntaxes/clojure.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/snippets/coffeescript.snippets.json +%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/syntaxes/coffeescript.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/snippets/c.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/snippets/cpp.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/c.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/cpp.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/platform.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/snippets/csharp.json +%%DATADIR%%/plugins/textmate/lib/bundles/csharp/syntaxes/csharp.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/.vscode/launch.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/css/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/css/syntaxes/css.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/docker/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/docker/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/docker/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/docker/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/docker/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/docker/syntaxes/docker.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/snippets/fsharp.json +%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/syntaxes/fsharp.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/git/README.md +%%DATADIR%%/plugins/textmate/lib/bundles/git/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/extension.webpack.config.js +%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/diff.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/git-commit.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/git-rebase.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/ignore.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/api1.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/extension.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/git.d.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass-empty.sh +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass-main.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass.sh +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/autofetch.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/commands.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/contentProvider.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/decorationProvider.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/decorators.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/encoding.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/git.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/main.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/model.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/protocolHandler.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/repository.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/staging.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/statusbar.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/test/git.test.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/typings/jschardet.d.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/typings/refs.d.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/uri.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/src/util.ts +%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/diff.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/git-commit.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/git-rebase.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/ignore.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/tsconfig.json +%%DATADIR%%/plugins/textmate/lib/bundles/git/yarn.lock +%%DATADIR%%/plugins/textmate/lib/bundles/go/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/go/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/go/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/go/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/go/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/go/syntaxes/go.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/snippets/groovy.json +%%DATADIR%%/plugins/textmate/lib/bundles/groovy/syntaxes/groovy.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/syntaxes/Handlebars.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/syntaxes/hlsl.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/html/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html-derivative.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/ini/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/ini.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/properties.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/ini/syntaxes/ini.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/java/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/snippets/java.snippets.json +%%DATADIR%%/plugins/textmate/lib/bundles/java/syntaxes/java.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/javascript-language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/schemas/jsconfig.schema.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/snippets/javascript.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/JavaScript.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/Readme.md +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage +%%DATADIR%%/plugins/textmate/lib/bundles/javascript/tags-language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/json/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/syntaxes/JSON.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/json/syntaxes/JSONC.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/less/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/less/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/less/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/less/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/less/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/less/syntaxes/less.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/log/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/log/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/log/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/log/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/log/syntaxes/log.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/lua/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/lua/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/lua/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/lua/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/lua/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/lua/syntaxes/lua.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/make/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/make/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/make/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/make/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/make/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/make/syntaxes/make.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/snippets/markdown.json +%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/syntaxes/markdown.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/syntaxes/cpp.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/syntaxes/objective-c++.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/syntaxes/objective-c.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/perl/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/perl.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/perl6.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/syntaxes/perl.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/perl/syntaxes/perl6.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscode/launch.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscode/tasks.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/php/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/snippets/php.snippets.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/syntaxes/html.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/php/syntaxes/php.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/snippets/powershell.json +%%DATADIR%%/plugins/textmate/lib/bundles/powershell/syntaxes/powershell.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/pug/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/pug/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/pug/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/pug/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/pug/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/pug/syntaxes/pug.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscode/launch.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscode/tasks.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/python/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/src/pythonMain.ts +%%DATADIR%%/plugins/textmate/lib/bundles/python/src/typings/ref.d.ts +%%DATADIR%%/plugins/textmate/lib/bundles/python/syntaxes/MagicPython.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/syntaxes/MagicRegExp.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/python/tsconfig.json +%%DATADIR%%/plugins/textmate/lib/bundles/r/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/r/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/r/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/r/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/r/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/r/syntaxes/r.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/razor/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/razor/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/razor/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/razor/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/razor/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/razor/syntaxes/cshtml.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/ruby/syntaxes/ruby.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/rust/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/rust/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/rust/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/rust/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/rust/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/rust/syntaxes/rust.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/scss/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/syntaxes/sassdoc.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/scss/syntaxes/scss.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/syntaxes/shaderlab.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/syntaxes/shell-unix-bash.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/sql/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/sql/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/sql/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/sql/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/sql/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/sql/syntaxes/sql.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/swift/LICENSE.md +%%DATADIR%%/plugins/textmate/lib/bundles/swift/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/snippets/swift.json +%%DATADIR%%/plugins/textmate/lib/bundles/swift/syntaxes/swift.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/schemas/tsconfig.schema.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/snippets/typescript.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/Readme.md +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/TypeScript.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/jsdoc.injection.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/vb/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/snippets/vb.json +%%DATADIR%%/plugins/textmate/lib/bundles/vb/syntaxes/asp-vb-net.tmlanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/xml/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/syntaxes/xml.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/syntaxes/xsl.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/xml.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/xml/xsl.language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/.vscodeignore +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/cgmanifest.json +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/language-configuration.json +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/package.json +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/yaml/syntaxes/yaml.tmLanguage.json +%%DATADIR%%/plugins/textmate/lib/jcodings-1.0.44.jar +%%DATADIR%%/plugins/textmate/lib/joni-2.1.29.jar +%%DATADIR%%/plugins/textmate/lib/resources_en.jar +%%DATADIR%%/plugins/textmate/lib/textmate.jar +%%DATADIR%%/plugins/textmate/lib/themes/All Hallow's Eve.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Blackboard.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Cobalt.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Darcula.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Github.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/IR_Black.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Monokai.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/RailsCasts.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/Twilight.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/VibrantInk.tmTheme +%%DATADIR%%/plugins/textmate/lib/themes/default.tmTheme +%%DATADIR%%/plugins/uiDesigner/lib/jps/ui-designer-jps-plugin.jar +%%DATADIR%%/plugins/uiDesigner/lib/resources_en.jar +%%DATADIR%%/plugins/uiDesigner/lib/uiDesigner.jar +%%DATADIR%%/plugins/vcs-changeReminder/lib/resources_en.jar +%%DATADIR%%/plugins/vcs-changeReminder/lib/vcs-changeReminder.jar +%%DATADIR%%/plugins/xpath/lib/resources_en.jar +%%DATADIR%%/plugins/xpath/lib/rt/xslt-rt.jar +%%DATADIR%%/plugins/xpath/lib/xpath.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rmi-stubs.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rt/saxon.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rt/saxon9he.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rt/serializer-2.7.2.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rt/xalan-2.7.2.jar +%%DATADIR%%/plugins/xslt-debugger/lib/rt/xslt-debugger-engine-impl.jar +%%DATADIR%%/plugins/xslt-debugger/lib/xslt-debugger-engine.jar +%%DATADIR%%/plugins/xslt-debugger/lib/xslt-debugger.jar +%%DATADIR%%/plugins/yaml/lib/resources_en.jar +%%DATADIR%%/plugins/yaml/lib/yaml.jar +%%DATADIR%%/product-info.json +%%DATADIR%%/redist/annotations-java8.jar -- cgit From a981e1a9388e4fdb132f731326a29f8fb63215b3 Mon Sep 17 00:00:00 2001 From: tota Date: Mon, 12 Aug 2019 22:14:08 +0000 Subject: - Update to 0.8 --- textproc/R-cran-DT/Makefile | 4 ++-- textproc/R-cran-DT/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/textproc/R-cran-DT/Makefile b/textproc/R-cran-DT/Makefile index 76b64db7ec45..9925bacbae24 100644 --- a/textproc/R-cran-DT/Makefile +++ b/textproc/R-cran-DT/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= DT -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.8 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -14,6 +13,7 @@ LICENSE= GPLv3 CRAN_DEPENDS= R-cran-htmltools>=0.3.6:textproc/R-cran-htmltools \ R-cran-htmlwidgets>=1.3:www/R-cran-htmlwidgets \ + R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \ R-cran-magrittr>0:devel/R-cran-magrittr \ R-cran-crosstalk>0:www/R-cran-crosstalk \ R-cran-promises>0:devel/R-cran-promises diff --git a/textproc/R-cran-DT/distinfo b/textproc/R-cran-DT/distinfo index f6ad07ef22a4..d4850eb0ed1b 100644 --- a/textproc/R-cran-DT/distinfo +++ b/textproc/R-cran-DT/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563059792 -SHA256 (DT_0.7.tar.gz) = 1de3f170deccd9e3aaefc057dd87c498e3b3f7f88eff645cf165ac34ffe3de2c -SIZE (DT_0.7.tar.gz) = 822634 +TIMESTAMP = 1565624507 +SHA256 (DT_0.8.tar.gz) = 90195054148806cf31c7db5c41f72d5389c75adc0b1183606a9babd2c6ae8e21 +SIZE (DT_0.8.tar.gz) = 821419 -- cgit From 06fdf298d3f3c5b54b9af8c9237cc905bfaf3638 Mon Sep 17 00:00:00 2001 From: jgh Date: Mon, 12 Aug 2019 23:07:37 +0000 Subject: - remove valid endpoints from code - patches submitted upstream - bump revision --- net/htpdate/Makefile | 2 +- net/htpdate/files/patch-README | 11 +++++++++++ net/htpdate/files/patch-htpdate.8 | 35 +++++++++++++++++++++++++++++++++++ net/htpdate/files/patch-htpdate.c | 16 ++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 net/htpdate/files/patch-README create mode 100644 net/htpdate/files/patch-htpdate.8 create mode 100644 net/htpdate/files/patch-htpdate.c diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index 53e6a46cc934..c118e40be093 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -3,7 +3,7 @@ PORTNAME= htpdate PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.vervest.org/htp/archive/c/ \ http://twekkel.home.xs4all.nl/htp/ diff --git a/net/htpdate/files/patch-README b/net/htpdate/files/patch-README new file mode 100644 index 000000000000..dbf1923d8277 --- /dev/null +++ b/net/htpdate/files/patch-README @@ -0,0 +1,11 @@ +--- README.orig 2019-08-12 22:50:17 UTC ++++ README +@@ -42,7 +42,7 @@ Usage: htpdate [-046abdhlqstxD] [-i pid file] [-m minp + [-p precision] [-P [:port]] [-u user[:group]] + ... + +- E.g. htpdate -q www.linux.org www.freebsd.org ++ E.g. htpdate -q www.example.com + + + In general, if more web servers are specified, the accuracy will increase. diff --git a/net/htpdate/files/patch-htpdate.8 b/net/htpdate/files/patch-htpdate.8 new file mode 100644 index 000000000000..4fff86dbca48 --- /dev/null +++ b/net/htpdate/files/patch-htpdate.8 @@ -0,0 +1,35 @@ +--- htpdate.8.orig 2019-08-12 22:48:12 UTC ++++ htpdate.8 +@@ -80,15 +80,15 @@ Portnumber (default 80 and 8080 for proxy server) + .SH "EXAMPLES" + Request time from web server (don't update local clock): + .br +-\& htpdate \-q www.linux.org www.freebsd.org ++\& htpdate \-q www.example.com + .P + Verbose output (don't update local clock): + .br +-\& htpdate \-d \-q www.linux.org www.freebsd.org ++\& htpdate \-d \-q www.example.com + .P + Adjust time smoothly and log output to syslog (eg. cron): + .br +-\& htpdate \-a \-l www.linux.org www.freebsd.org ++\& htpdate \-a \-l www.example.com + .P + HTTP/1.0 request in IPv6 literal format (RFC 2732): + .br +@@ -96,11 +96,11 @@ HTTP/1.0 request in IPv6 literal format (RFC 2732): + .P + Run htpdate as daemon: + .br +-\& htpdate \-D www.linux.org www.freebsd.org ++\& htpdate \-D www.example.com + .P + Daemon mode for the security minded: + .br +-\& htpdate \-D \-u nobody:nogroup www.linux.org www.freebsd.org ++\& htpdate \-D \-u nobody:nogroup www.example.com + .SH "AUTHOR" + Eddy Vervest , http://www.vervest.org/htp + .SH "SEE ALSO" diff --git a/net/htpdate/files/patch-htpdate.c b/net/htpdate/files/patch-htpdate.c new file mode 100644 index 000000000000..aa00ce17ec67 --- /dev/null +++ b/net/htpdate/files/patch-htpdate.c @@ -0,0 +1,16 @@ +--- htpdate.c.orig 2019-08-12 22:48:19 UTC ++++ htpdate.c +@@ -14,11 +14,11 @@ + Debug mode (shows raw timestamps, round trip time (RTT) and + time difference): + +- ~# htpdate -d www.linux.org www.freebsd.org ++ ~# htpdate -d www.example.com + + Adjust time smoothly: + +- ~# htpdate -a www.linux.org www.freebsd.org ++ ~# htpdate -a www.example.com + + ...see man page for more details + -- cgit From 81b4360eb412b226ee836f9045986b9d16ceeaa0 Mon Sep 17 00:00:00 2001 From: makc Date: Mon, 12 Aug 2019 23:28:41 +0000 Subject: graphics/jogamp-jogl: - Switch to x11-toolkits/swt which is newer than swt-devel port PR: 219186 --- graphics/jogamp-jogl/Makefile | 6 +++--- graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile index dcfc5c0ee17b..951453cf4fe6 100644 --- a/graphics/jogamp-jogl/Makefile +++ b/graphics/jogamp-jogl/Makefile @@ -3,7 +3,7 @@ PORTNAME= jogamp-jogl PORTVERSION= 2.2.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics devel java MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \ http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/ @@ -14,8 +14,8 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Java bindings for OpenGL EXTRACT_DEPENDS= ${7Z_CMD}:archivers/p7zip -BUILD_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel -RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel +BUILD_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt +RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt ONLY_FOR_ARCHS= i386 amd64 diff --git a/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml b/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml index c5eb241f6fda..e043d7eb36e8 100644 --- a/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml +++ b/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml @@ -6,7 +6,7 @@ - - -+ ++ + -- cgit From 8e6378ba315d0323863e677428423b0973299ed2 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 13 Aug 2019 00:00:42 +0000 Subject: science/py-tensorflow-estimator: Add NO_ARCH=yes; Fix build for the port name having hyphen (vs. underscore) in PORTNAME. --- science/py-tensorflow-estimator/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/science/py-tensorflow-estimator/Makefile b/science/py-tensorflow-estimator/Makefile index c275399c9870..dbf16d0bf262 100644 --- a/science/py-tensorflow-estimator/Makefile +++ b/science/py-tensorflow-estimator/Makefile @@ -3,6 +3,7 @@ PORTNAME= tensorflow-estimator DISTVERSIONPREFIX= v DISTVERSION= 1.14.0 +PORTREVISION= 1 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,6 +22,8 @@ USE_GITHUB= yes GH_ACCOUNT= tensorflow GH_PROJECT= estimator +NO_ARCH= yes + BAZEL_BOOT= --output_user_root=${WRKDIR}/bazel_out post-patch: @@ -38,10 +41,10 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR} @${MKDIR} ${WRKDIR}/tmp - @${UNZIP_NATIVE_CMD} -d ${WRKDIR}/tmp ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl - cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME} \ + @${UNZIP_NATIVE_CMD} -d ${WRKDIR}/tmp ${WRKDIR}/whl/${PORTNAME:S/-/_/}-${PORTVERSION}-*.whl + cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME:S/-/_/} \ ${STAGEDIR}${PYTHON_SITELIBDIR} - cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME}-${PORTVERSION}.dist-info \ + cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME:S/-/_/}-${PORTVERSION}.dist-info \ ${STAGEDIR}${PYTHON_SITELIBDIR} .include -- cgit From d1422b029b24e60c46e08d0c0bd1230d4ad8b88e Mon Sep 17 00:00:00 2001 From: jbeich Date: Tue, 13 Aug 2019 00:39:00 +0000 Subject: emulators/rpcs3: update to 0.0.6.8465 Changes: https://github.com/RPCS3/rpcs3/compare/94d33003a...d48d424b1 --- emulators/rpcs3/Makefile | 4 ++-- emulators/rpcs3/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 2088bc5bd460..dac6d806e451 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.6-8457 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g94d33003a +DISTVERSION= 0.0.6-8465 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -gd48d424b1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 489477849048..12e17bb1a1d2 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1565455657 -SHA256 (RPCS3-rpcs3-v0.0.6-8457-g94d33003a_GH0.tar.gz) = f1dfa44327b2e6515cc524d66c091d8dd7aadffe71d5183beb3fa8f764e6f4e2 -SIZE (RPCS3-rpcs3-v0.0.6-8457-g94d33003a_GH0.tar.gz) = 5532923 +TIMESTAMP = 1565609843 +SHA256 (RPCS3-rpcs3-v0.0.6-8465-gd48d424b1_GH0.tar.gz) = 9ad90b431adc2517b4e65cb4ca04cda80f5f8bfb577fd7bac12afe3a6d12eb47 +SIZE (RPCS3-rpcs3-v0.0.6-8465-gd48d424b1_GH0.tar.gz) = 5533842 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e -- cgit From 3a8ec8100b7926f833796681923d22cf6633041e Mon Sep 17 00:00:00 2001 From: jbeich Date: Tue, 13 Aug 2019 00:39:08 +0000 Subject: multimedia/aom: update to 1.0.0.2235 Changes: https://aomedia.googlesource.com/aom/+log/9666276ac..fc1404d58 --- multimedia/aom/Makefile | 4 ++-- multimedia/aom/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index dcfd5b5bddd1..42d21e8b8720 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-2231 -DISTVERSIONSUFFIX= -g9666276ac +DISTVERSION= 1.0.0-2235 +DISTVERSIONSUFFIX= -gfc1404d58 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 5b0b35e116ac..3ab43111e65f 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565394276 -SHA256 (jbeich-aom-v1.0.0-2231-g9666276ac_GH0.tar.gz) = 8ba8f84c1dc61a1da1570e7da6b2fd8c38cc27ed8116433758bb1a1d52830833 -SIZE (jbeich-aom-v1.0.0-2231-g9666276ac_GH0.tar.gz) = 3397458 +TIMESTAMP = 1565655840 +SHA256 (jbeich-aom-v1.0.0-2235-gfc1404d58_GH0.tar.gz) = a9e13cef818cfee40dc35f674a94a1d10f41da2c2f169de376d336a2b3f6bcaa +SIZE (jbeich-aom-v1.0.0-2235-gfc1404d58_GH0.tar.gz) = 3397892 -- cgit From 405ab8584cacf3f8ae62882ee4924972ef041b14 Mon Sep 17 00:00:00 2001 From: jbeich Date: Tue, 13 Aug 2019 00:39:16 +0000 Subject: lang/rust-nightly: update to 1.38.0.20190813 Changes: https://github.com/rust-lang/rust/compare/9703ef666123...60960a260f7b --- lang/rust-nightly/Makefile | 2 +- lang/rust-nightly/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 3dcfa0b42cb8..9b22301dbbbb 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2019-08-11 +NIGHTLY_DATE= 2019-08-13 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index ab76658d0e86..728bbe43e307 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1565463949 -SHA256 (rust/2019-08-11/rustc-nightly-src.tar.xz) = 02cae8bdef758eb92a37bd445cb7f6b59a347bc0620edba8eab6c9bb15ceb94d -SIZE (rust/2019-08-11/rustc-nightly-src.tar.xz) = 93985272 +TIMESTAMP = 1565620939 +SHA256 (rust/2019-08-13/rustc-nightly-src.tar.xz) = 1c42c5dae86873361dbe098692d83a6d5565a3fbf541de39bcd12c4ddf9fe01d +SIZE (rust/2019-08-13/rustc-nightly-src.tar.xz) = 94011812 SHA256 (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2e3f9fd2ba916facd3239df2bab16420161c6aa62d03317caa3b038ce56e5738 SIZE (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70343111 SHA256 (rust/2019-07-04/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 735c8a380bd369ca4b1c05cb3f93d3fad41e073a94146230f4e851be66f23b0f -- cgit From 643e59e3611854bc12d4ef8e6c18f63ffc811251 Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 13 Aug 2019 01:32:48 +0000 Subject: - Fix build on non-x86 - Fix build on powerpc64 PR: 239437 Submitted by: pkubaj --- audio/mixxx/Makefile | 5 ++--- .../mixxx/files/patch-plugins_soundsourcem4a_soundsourcem4a.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 audio/mixxx/files/patch-plugins_soundsourcem4a_soundsourcem4a.h diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 0f0df2c52e70..377932b414ce 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -4,7 +4,7 @@ PORTNAME= mixxx DISTVERSIONPREFIX= release- DISTVERSION= 2.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= acm@FreeBSD.org @@ -14,7 +14,6 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to compile: Exception("invalid machine type") -BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack BUILD_DEPENDS= lv2>=1.14.0:audio/lv2 LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ @@ -48,7 +47,7 @@ USE_QT= buildtools concurrent core dbus gui network opengl script scripttools \ CONFLICTS= mixxx20* mixxx21* MAKE_ARGS= qtdir="${PREFIX}" install_root="${PREFIX}" \ - build=release optimize=native ${GUI} battery=0 vamp=1 modplug=1 + build=release optimize=off ${GUI} battery=0 vamp=1 modplug=1 LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR} GUI= qt5=1 diff --git a/audio/mixxx/files/patch-plugins_soundsourcem4a_soundsourcem4a.h b/audio/mixxx/files/patch-plugins_soundsourcem4a_soundsourcem4a.h new file mode 100644 index 000000000000..d45a2ae4a508 --- /dev/null +++ b/audio/mixxx/files/patch-plugins_soundsourcem4a_soundsourcem4a.h @@ -0,0 +1,11 @@ +--- plugins/soundsourcem4a/soundsourcem4a.h.orig 2019-07-19 22:36:09 UTC ++++ plugins/soundsourcem4a/soundsourcem4a.h +@@ -5,6 +5,8 @@ + + #include "util/readaheadsamplebuffer.h" + ++#include ++ + #ifdef __MP4V2__ + #include + #else -- cgit From 102a14eb11fda5f8ee8ee02c75ceff4505b8cdc4 Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 13 Aug 2019 02:09:55 +0000 Subject: - Update to 4.0.8 --- devel/sope4/Makefile | 3 +-- devel/sope4/distinfo | 6 +++--- devel/sope4/pkg-plist | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/sope4/Makefile b/devel/sope4/Makefile index 9fd1347f8c58..8291f36b8f6b 100644 --- a/devel/sope4/Makefile +++ b/devel/sope4/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sope4 -PORTVERSION= 4.0.7 -PORTREVISION= 1 +PORTVERSION= 4.0.8 CATEGORIES= devel gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOPE-${PORTVERSION} diff --git a/devel/sope4/distinfo b/devel/sope4/distinfo index 2b6e0fea1775..825b7d5e6023 100644 --- a/devel/sope4/distinfo +++ b/devel/sope4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551409303 -SHA256 (SOPE-4.0.7.tar.gz) = 6fa177591c08e921bf1823299f7bf587f4a12d277e56e504268102d433cbdafb -SIZE (SOPE-4.0.7.tar.gz) = 2279894 +TIMESTAMP = 1565660415 +SHA256 (SOPE-4.0.8.tar.gz) = e615434641667b741df2bf75ee2608f74fb23399242dcdaa48729e4e6a7ab535 +SIZE (SOPE-4.0.8.tar.gz) = 2280503 diff --git a/devel/sope4/pkg-plist b/devel/sope4/pkg-plist index fe651a5eed61..afe64df5562f 100644 --- a/devel/sope4/pkg-plist +++ b/devel/sope4/pkg-plist @@ -470,3 +470,4 @@ GNUstep/Local/Tools/wod GNUstep/System/Library/Makefiles/Additional/ngobjweb.make GNUstep/System/Library/Makefiles/woapp.make GNUstep/System/Library/Makefiles/wobundle.make +libdata/ldconfig/sope4 -- cgit From 4dab2ef76cf7425212db6689b43b57a84d16baee Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 13 Aug 2019 02:12:11 +0000 Subject: - Update to 4.0.8 - Fix path to SOGo in Apache configuraton file [1] PR: 235175 [1] Submitted by: Robert Schulze [1] --- www/sogo4/Makefile | 5 ++--- www/sogo4/distinfo | 6 +++--- www/sogo4/pkg-plist | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/www/sogo4/Makefile b/www/sogo4/Makefile index 7fe61973c682..a723746b07e1 100644 --- a/www/sogo4/Makefile +++ b/www/sogo4/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sogo4 -PORTVERSION= 4.0.7 -PORTREVISION= 1 +PORTVERSION= 4.0.8 CATEGORIES= www gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOGo-${PORTVERSION} @@ -43,7 +42,7 @@ CONFIGURE_ARGS= --disable-debug --enable-strip post-patch: @${GREP} -rlF '/etc/sogo' ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g' - @${REINPLACE_CMD} -e 's|/usr/|/usr/local/|g' ${WRKSRC}/Apache/SOGo.conf + @${REINPLACE_CMD} -e 's|/usr/lib/GNUstep/|${LOCALBASE}/GNUstep/Local/Library|g' ${WRKSRC}/Apache/SOGo.conf post-patch-ACTIVESYNC-on: @${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile diff --git a/www/sogo4/distinfo b/www/sogo4/distinfo index 920147046c7f..f4800c81f2f4 100644 --- a/www/sogo4/distinfo +++ b/www/sogo4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551409336 -SHA256 (SOGo-4.0.7.tar.gz) = da75a51c38d8e34c4df7af0d643f1780a0ef8cacfa81b50028a8af9510cc0efd -SIZE (SOGo-4.0.7.tar.gz) = 34561851 +TIMESTAMP = 1565660503 +SHA256 (SOGo-4.0.8.tar.gz) = 761c24a6328c2811bcf7af5d0efcb86f249e58e8d31339359ed43d308ab0f8f1 +SIZE (SOGo-4.0.8.tar.gz) = 34552490 diff --git a/www/sogo4/pkg-plist b/www/sogo4/pkg-plist index beba84107786..6735ff76a0b2 100644 --- a/www/sogo4/pkg-plist +++ b/www/sogo4/pkg-plist @@ -606,6 +606,7 @@ GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localiza GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -648,6 +649,7 @@ GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/German.lproj/Localizable. GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -692,6 +694,7 @@ GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/German.lproj/Localizable.stri GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -734,6 +737,7 @@ GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/German.lproj/Localizable.stri GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -775,6 +779,7 @@ GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/German.lproj/Localizable.st GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -818,6 +823,7 @@ GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/German.lproj/Localizab GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -859,6 +865,7 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/German.lproj/Localizable.string GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -935,6 +942,10 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicForward.wo/SOG GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.wod +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIndonesianForward.wo/SOGoMailIndonesianForward.html +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIndonesianForward.wo/SOGoMailIndonesianForward.wod +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIndonesianReply.wo/SOGoMailIndonesianReply.html +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailIndonesianReply.wo/SOGoMailIndonesianReply.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoMailItalianForward.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.html @@ -1044,6 +1055,7 @@ GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/German.lproj/Localizable.stri GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -1106,6 +1118,8 @@ GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Hungarian.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Icelandic.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Indonesian.lproj/Locale +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Italian.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Italian.lproj/Localizable.strings @@ -1180,6 +1194,7 @@ GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/German.lproj/Localizable GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -1221,6 +1236,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/German.lproj/Localizable.s GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Indonesian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Italian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Japanese.lproj/Localizable.strings @@ -1361,6 +1377,9 @@ GNUstep/Local/Library/SOGo/Templates/SOGoACLHungarianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLIcelandicAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLIcelandicModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLIcelandicRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLIndonesianAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLIndonesianModificationAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLIndonesianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianRemovalAdvisory.wox @@ -1452,6 +1471,8 @@ GNUstep/Local/Library/SOGo/Templates/SOGoFolderHungarianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderHungarianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderIcelandicAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderIcelandicRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderIndonesianAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderIndonesianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderItalianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderItalianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderJapaneseAdditionAdvisory.wox -- cgit From e89b26f43faacb65ad02be48e9cec030d1f4c659 Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 13 Aug 2019 02:18:11 +0000 Subject: - Fix build on powerpc64 PR: 239414 Submitted by: pkubaj --- games/naev/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/games/naev/Makefile b/games/naev/Makefile index c1a83fdf03f7..32261a5d16ed 100644 --- a/games/naev/Makefile +++ b/games/naev/Makefile @@ -3,7 +3,7 @@ PORTNAME= naev PORTVERSION= 0.7.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ @@ -39,6 +39,8 @@ PLIST_FILES= bin/${PORTNAME} man/man6/${PORTNAME}.6.gz \ OPTIONS_DEFINE= DOCS OPENAL SDL2 SDL_MIXER OPTIONS_DEFAULT= LUA_JIT OPENAL SDL2 SDL_MIXER +OPTIONS_DEFAULT_powerpc64= LUA_SHARED +OPTIONS_EXCLUDE_powerpc64= LUA_JIT OPTIONS_SINGLE= LUA OPTIONS_SINGLE_LUA= LUA_INTERNAL LUA_SHARED LUA_JIT -- cgit From 47b6f07f0d9f22f66bb28ec9e7a02b26df4ba314 Mon Sep 17 00:00:00 2001 From: jrm Date: Tue, 13 Aug 2019 02:18:18 +0000 Subject: editors/emacs-devel: Update to 2019-08-12 commit, 2b329ed This fixes Emacs bug #37006, which could prevent the garbage collector from running. --- editors/emacs-devel/Makefile | 5 ++--- editors/emacs-devel/distinfo | 6 +++--- editors/emacs-devel/pkg-plist | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index ac8409dedc89..85b0d2fbcda2 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -3,7 +3,6 @@ PORTNAME= emacs DISTVERSION= ${EMACS_VER}.${EMACS_REV} -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 PKGNAMESUFFIX= -devel @@ -33,7 +32,7 @@ USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= b22b59c +GH_TAGNAME= 2b329ed CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var @@ -199,7 +198,7 @@ XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ XWIDGETS_IMPLIES= GTK3 EMACS_VER= 27.0.50 -EMACS_REV= 20190801 +EMACS_REV= 20190812 .include diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index f36e92da091a..99c8626c6a81 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564651102 -SHA256 (emacs-mirror-emacs-27.0.50.20190801-b22b59c_GH0.tar.gz) = 44017d2dae56460b62b771e21e6c20a7318d043c8c1baf22fd18fa6003c2fc16 -SIZE (emacs-mirror-emacs-27.0.50.20190801-b22b59c_GH0.tar.gz) = 40782238 +TIMESTAMP = 1565649031 +SHA256 (emacs-mirror-emacs-27.0.50.20190812-2b329ed_GH0.tar.gz) = 1dd6089a43663edefeda77b4c69dee48f7c215ddd939ec2d5f7111a6adc5a7d0 +SIZE (emacs-mirror-emacs-27.0.50.20190812-2b329ed_GH0.tar.gz) = 40800340 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 0cc77dd15895..1dc7ebefb0cd 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -1525,8 +1525,6 @@ share/metainfo/emacs.appdata.xml %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-print.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/crm.el.gz @@ -2862,6 +2860,8 @@ share/metainfo/emacs.appdata.xml %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz -- cgit From 44f7a9fdc31c9bf8864990faac1022d3cf9b2e6d Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 13 Aug 2019 03:22:44 +0000 Subject: - Update to 8.7.6 ChangeLog at: https://www.drupal.org/project/drupal/releases/8.7.6 --- www/drupal8/Makefile | 2 +- www/drupal8/distinfo | 6 +++--- www/drupal8/pkg-plist | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile index 87f2383c7918..fc37e1f1aecc 100644 --- a/www/drupal8/Makefile +++ b/www/drupal8/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drupal8 -PORTVERSION= 8.7.5 +PORTVERSION= 8.7.6 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} diff --git a/www/drupal8/distinfo b/www/drupal8/distinfo index c1b9d39a8fde..25df57eea9c4 100644 --- a/www/drupal8/distinfo +++ b/www/drupal8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563513602 -SHA256 (drupal/drupal-8.7.5.tar.gz) = 05a5d787bf8499fada699ea5375521321a9fd4c07ee50ec43ecdd1b11c501d82 -SIZE (drupal/drupal-8.7.5.tar.gz) = 17843250 +TIMESTAMP = 1565662764 +SHA256 (drupal/drupal-8.7.6.tar.gz) = fdcf29dad0c042527cbcaa5468fc928698412b9c4b1826f908458e3e04f3d51d +SIZE (drupal/drupal-8.7.6.tar.gz) = 17866782 diff --git a/www/drupal8/pkg-plist b/www/drupal8/pkg-plist index 489749873572..59559ada10c5 100644 --- a/www/drupal8/pkg-plist +++ b/www/drupal8/pkg-plist @@ -2457,6 +2457,7 @@ %%WWWDIR%%/core/lib/Drupal/Core/TypedData/Validation/RecursiveValidator.php %%WWWDIR%%/core/lib/Drupal/Core/TypedData/Validation/TypedDataAwareValidatorTrait.php %%WWWDIR%%/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php +%%WWWDIR%%/core/lib/Drupal/Core/Update/UpdateCompilerPass.php %%WWWDIR%%/core/lib/Drupal/Core/Update/UpdateKernel.php %%WWWDIR%%/core/lib/Drupal/Core/Update/UpdateRegistry.php %%WWWDIR%%/core/lib/Drupal/Core/Update/UpdateRegistryFactory.php @@ -4700,6 +4701,7 @@ %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldDataCountTest.php %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldDisplayTest.php +%%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldFormatterTest.php %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php %%WWWDIR%%/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php @@ -8682,6 +8684,7 @@ %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.site-branding-into-block-2005546.php %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.stable-base-theme-2575421.php +%%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.taxonomy-parent-multilingual-3066439.php %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.test-config-init.php %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php %%WWWDIR%%/core/modules/system/tests/fixtures/update/drupal-8.update-test-postupdate-enabled.php @@ -8976,6 +8979,7 @@ %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/entity_test_update.install %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/entity_test_update.module %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php +%%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/src/EntityTestUpdateStorage.php %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/src/EntityTestUpdateStorageSchema.php %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/src/Plugin/Field/FieldType/MultiValueTestItem.php %%WWWDIR%%/core/modules/system/tests/modules/entity_test_update/update/entity_rev_pub_updates_8400.inc @@ -9201,6 +9205,15 @@ %%WWWDIR%%/core/modules/system/tests/modules/module_test/module_test.post_update.php %%WWWDIR%%/core/modules/system/tests/modules/module_test/module_test.routing.yml %%WWWDIR%%/core/modules/system/tests/modules/module_test/src/Controller/ModuleTestController.php +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/new_dependency_test.info.yml +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/new_dependency_test.install +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/new_dependency_test.services.yml +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/src/InjectedService.php +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/src/Service.php +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test/src/ServiceWithDependency.php +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test_with_service/new_dependency_test_with_service.info.yml +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test_with_service/new_dependency_test_with_service.services.yml +%%WWWDIR%%/core/modules/system/tests/modules/new_dependency_test_with_service/src/NewService.php %%WWWDIR%%/core/modules/system/tests/modules/off_canvas_test/off_canvas_test.info.yml %%WWWDIR%%/core/modules/system/tests/modules/off_canvas_test/off_canvas_test.routing.yml %%WWWDIR%%/core/modules/system/tests/modules/off_canvas_test/src/Controller/TestController.php @@ -9641,6 +9654,7 @@ %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/StableBaseThemeUpdateTest.php %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdateActionsWithEntityPluginsTest.php %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdateEntityDisplayTest.php +%%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdatePathNewDependencyTest.php %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseFilledTest.php %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseTest.php %%WWWDIR%%/core/modules/system/tests/src/Functional/Update/UpdatePathTestBaseFilledTest.php @@ -9964,6 +9978,7 @@ %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/ThemeTest.php %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/Update/TaxonomyParentUpdateTest.php +%%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/Update/TaxonomyTermParentMultilingualTest.php %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/Update/TaxonomyTermUpdatePathTest.php %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/Update/TaxonomyVocabularyHierarchyUpdateTest.php %%WWWDIR%%/core/modules/taxonomy/tests/src/Functional/Views/RelationshipNodeTermDataTest.php -- cgit From 0f77a8867ea6b734a8bc2fbe3be2fbd49883a380 Mon Sep 17 00:00:00 2001 From: glewis Date: Tue, 13 Aug 2019 04:41:40 +0000 Subject: Update to 11.0.4+11.2 --- java/openjdk11/Makefile | 3 +-- java/openjdk11/distinfo | 6 +++--- java/openjdk11/files/patch-make_autoconf_libraries.m4 | 16 ++++++++-------- .../patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 11 ----------- .../patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp | 12 ++++++++++++ 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp create mode 100644 java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 20861a1bf56d..428903696e76 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -57,7 +56,7 @@ JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 4 JDK_BUILD_NUMBER= 11 -BSD_JDK_VERSION= 1 +BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index d793f4467556..64fe3b2cc8b0 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563553365 -SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = eed0b1dc30d16e14ef470186c9fe21c36e02da95f2657754b8402e84b803965c -SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = 116997649 +TIMESTAMP = 1565662004 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 15fdeeea8d716620ab78a44e66edf88eeb7707a9b7b389304f2ba6fd39d5fa36 +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 117004198 diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4 index 11f8769f67c6..0911464a6522 100644 --- a/java/openjdk11/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4 @@ -1,15 +1,15 @@ ---- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700 -+++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700 -@@ -186,9 +186,9 @@ +--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 ++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 +@@ -188,9 +188,9 @@ ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv - else -- ICONV_CFLAGS= + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG - ICONV_LDFLAGS= - ICONV_LIBS= + ICONV_CFLAGS=%%ICONV_CFLAGS%% + ICONV_LDFLAGS=%%ICONV_LDFLAGS%% + ICONV_LIBS=%%ICONV_LIBS%% - fi - else - ICONV_CFLAGS= + else + ICONV_CFLAGS= + ICONV_LDFLAGS= diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index 0eeb4da71971..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -133,7 +133,7 @@ - } - - static unsigned long ucontext_get_trap(const ucontext_t * uc) { -- return uc->uc_mcontext.regs->trap; -+ return uc->uc_mcontext.mc_exc; - } - - ExtendedPC os::fetch_frame_from_context(const void* ucVoid, diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp new file mode 100644 index 000000000000..701059058259 --- /dev/null +++ b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp @@ -0,0 +1,12 @@ +--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp ++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp +@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig, + // Handle ALL stack overflow variations here + if (sig == SIGSEGV || sig == SIGBUS) { + address addr = (address) info->si_addr; ++#ifdef __FreeBSD__ ++ addr = align_down(addr, os::vm_page_size()); ++#endif + + // check if fault address is within thread stack + if (thread->on_local_stack(addr)) { -- cgit From 64c984ae6c52c74dd1db456e8a573595d2892a5e Mon Sep 17 00:00:00 2001 From: mfechner Date: Tue, 13 Aug 2019 05:02:02 +0000 Subject: Document www/gitlab-ce vulnerabilities. --- security/vuxml/vuln.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index e4a9a8730364..be501c75b39e 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -58,6 +58,38 @@ Notes: * Do not forget port variants (linux-f10-libxml2, libxml2, etc.) --> + + Gitlab -- Multiple Vulnerabilities + + + gitlab-ce + 12.1.012.1.6 + 12.0.012.0.6 + 10.0.011.11.8 + + + + +

    Gitlab reports:

    +
    +

    Insecure Authentication Methods Disabled for Grafana By Default

    +

    Multiple Command-Line Flag Injection Vulnerabilities

    +

    Insecure Cookie Handling on GitLab Pages

    +
    + +
    + + https://about.gitlab.com/2019/08/12/critical-security-release-gitlab-12-dot-1-dot-6-released/ + CVE-2019-14943 + CVE-2019-14944 + CVE-2019-14942 + + + 2019-08-12 + 2019-08-13 + +
    + KDE Frameworks -- malicious .desktop files execute code -- cgit From 0ea1de1b64c37403d8dea7d50d2488c65e8d8969 Mon Sep 17 00:00:00 2001 From: gerald Date: Tue, 13 Aug 2019 07:54:03 +0000 Subject: Update to the 20190808 snapshot of GCC 7.4.1, skipping the 20190801 snapshot which did not bring actual changes. This brings backports for two issues on the Fortran side. --- lang/gcc7-devel/Makefile | 2 +- lang/gcc7-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index 630a9b9fd86a..22b62fc23334 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 7.4.1.s20190725 +PORTVERSION= 7.4.1.s20190808 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo index 1bd893110e28..ff5cd688d871 100644 --- a/lang/gcc7-devel/distinfo +++ b/lang/gcc7-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564100238 -SHA256 (gcc-7-20190725.tar.xz) = 981a23325ba14b32e767b02b4d9357b9f64441ce2be9f963cf6308c88e6db53f -SIZE (gcc-7-20190725.tar.xz) = 59368032 +TIMESTAMP = 1565459850 +SHA256 (gcc-7-20190808.tar.xz) = c9f13f2ec51ef8419a6a70fceb090602b8c39ab951a6b43f1a63984398b47024 +SIZE (gcc-7-20190808.tar.xz) = 59368532 -- cgit From 06fee64289bee21ed41e7b8535ddb08c41dbb78b Mon Sep 17 00:00:00 2001 From: pkubaj Date: Tue, 13 Aug 2019 08:50:23 +0000 Subject: science/py-onnx: fix build with GCC-based architectures Use C11 compiler because of: /wrkdirs/usr/ports/science/py-onnx/work-py36/onnx-1.5.0/onnx/onnxifi_loader.c:121: error: 'struct onnxifi_library' has no member named 'functions' Approved by: mentors (implicit approval) --- science/py-onnx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/py-onnx/Makefile b/science/py-onnx/Makefile index acb7d1b82715..e96ce99e28dc 100644 --- a/science/py-onnx/Makefile +++ b/science/py-onnx/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python +USES= compiler:c11 python USE_PYTHON= distutils concurrent autoplist BINARY_ALIAS= python=${PYTHON_CMD} -- cgit From d9e7cf3f43c3c77e9e000653450adee02a3bba01 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Tue, 13 Aug 2019 09:02:33 +0000 Subject: - Update WWW Approved by: portmgr blanket --- devel/c2mdoc/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/c2mdoc/pkg-descr b/devel/c2mdoc/pkg-descr index a3435ca49c1d..9c41020cbdf0 100644 --- a/devel/c2mdoc/pkg-descr +++ b/devel/c2mdoc/pkg-descr @@ -4,4 +4,4 @@ developer documentation. c2man already claims to do such a thing, but seems crippled in the face of our kernel source. The toolchain used by this port winces, but still generates markup. -WWW: http://bsdforge.com/projects/devel/c2mdoc/ +WWW: https://bsdforge.com/projects/devel/c2mdoc/ -- cgit From 80a133243aa6086c800d63ec4739fbe2db1d9b53 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Tue, 13 Aug 2019 09:18:19 +0000 Subject: mail/astroid: fix build with GCC-based architectures Use C11 compiler: /usr/local/include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h:49: error: redefinition of typedef 'WebKitUserContentFilter' /usr/local/include/webkitgtk-4.0/webkit2/WebKitUserContent.h:141: error: previous declaration of 'WebKitUserContentFilter' was here Approved by: mentors (implicit approval) --- mail/astroid/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile index 2fe66a68e23f..a34640f83d49 100644 --- a/mail/astroid/Makefile +++ b/mail/astroid/Makefile @@ -26,7 +26,8 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= notmuch:mail/notmuch -USES= cmake desktop-file-utils gettext-runtime gnome pkgconfig +USES= cmake compiler:c11 desktop-file-utils gettext-runtime gnome \ + pkgconfig USE_GITHUB= yes GH_ACCOUNT= astroidmail GH_PROJECT= astroid -- cgit From f4c235bc5cf615a2ea3395d28849e8328cd39db0 Mon Sep 17 00:00:00 2001 From: tijl Date: Tue, 13 Aug 2019 09:25:26 +0000 Subject: Make fetchable again. The distfile was rerolled a week after initial release. The only changes are in CHANGES, README.md, and src/gtk-3.20/scss/apps/_gnome-applications.scss where a style change was added for Gnome app Geary. --- x11-themes/numix-theme/Makefile | 3 +-- x11-themes/numix-theme/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x11-themes/numix-theme/Makefile b/x11-themes/numix-theme/Makefile index 4ba8cbd07f53..cfc11fa1343e 100644 --- a/x11-themes/numix-theme/Makefile +++ b/x11-themes/numix-theme/Makefile @@ -3,6 +3,7 @@ PORTNAME= numix PORTVERSION= 2.6.7 +PORTREVISION= 1 CATEGORIES= x11-themes xfce PKGNAMESUFFIX= -theme @@ -11,8 +12,6 @@ COMMENT= Gtk flat themes LICENSE= GPLv3 -BROKEN= unfetchable - BUILD_DEPENDS= rubygem-sass>=3.4:textproc/rubygem-sass RUN_DEPENDS= gtk-murrine-engine>=0.98.2:x11-themes/gtk-murrine-engine diff --git a/x11-themes/numix-theme/distinfo b/x11-themes/numix-theme/distinfo index ad1098956e9c..58fd0f13dc36 100644 --- a/x11-themes/numix-theme/distinfo +++ b/x11-themes/numix-theme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507275113 -SHA256 (numixproject-numix-gtk-theme-2.6.7_GH0.tar.gz) = 4590c6077828d73aecbc2521acf5b8d4669aacff1e9d09575888be67f2dc0d1b -SIZE (numixproject-numix-gtk-theme-2.6.7_GH0.tar.gz) = 156407 +TIMESTAMP = 1565685171 +SHA256 (numixproject-numix-gtk-theme-2.6.7_GH0.tar.gz) = 2b997ad3eee0b802d0dd49dd772127fd3c337cca32d8863efd4897928e38879a +SIZE (numixproject-numix-gtk-theme-2.6.7_GH0.tar.gz) = 156607 -- cgit From a831d2894945274ba7bff86f85b919d8998bebde Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 13 Aug 2019 10:31:18 +0000 Subject: Force ports depending on a fetch target to actually run checksum. This prevents an improbable MITM attack on dependencies where the target is "fetch" and the port is built manuallt. (Which means a port depends on a dependency being fetched, but not built or anything else.) In this case, as the target is only "fetch", the distribution files of the dependency are not checked against the dependency's distinfo file. One could, in theory, impersonate the dependency's master site and provide a malicious distribution file. The ports that could in theory be affected are russian/gd, ukrainian/gd, and ukrainian/webalizer. They are only affected when building manually, as when building with poudriere, the *-depends target do not have network access, and the build would fail if the distribution files are not already present. (From the dependencies being built normally, where checksum would have ran.) The detail is described here: https://www.reddit.com/r/BSD/comments/br62hm/freebsd_cryptographic_bypass_and_mitmbased/ Reported by: emaste (on IRC) Reviewed by: swills emaste antoine MFH: 2019Q3 Differential Revision: https://reviews.freebsd.org/D21230 --- Mk/Scripts/do-depends.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index 5469bff33337..163570052a54 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -138,7 +138,13 @@ for _line in ${dp_RAWDEPENDS} ; do depends_args="${dp_DEPENDS_ARGS}" target=${dp_DEPENDS_TARGET} if [ -n "${last}" ]; then - target=${last} + # In case we depend on the fetch stage, actually run checksum, + # this prevent a MITM attack. + if [ "${last}" = "fetch" ]; then + target=checksum + else + target=${last} + fi if [ -n "${dp_DEPENDS_PRECLEAN}" ]; then target="clean ${target}" depends_args="${depends_args:+${depends_args} }NOCLEANDEPENDS=yes" -- cgit From 01e2c9a74ccd2cb71e8ff91f208fe6b704f3a294 Mon Sep 17 00:00:00 2001 From: pizzamig Date: Tue, 13 Aug 2019 11:33:56 +0000 Subject: sysuilts/pot: Update to 0.9.0 Many changes, from 0.6.1 to 0.9.0 A lot of work to make pot more friendly and to be used with nomad. Changes: https://github.com/pizzamig/pot/releases Sponsored by: trivago N.V. --- sysutils/pot/Makefile | 4 +++- sysutils/pot/distinfo | 6 +++--- sysutils/pot/files/pkg-message.in | 1 + sysutils/pot/pkg-plist | 11 +++++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sysutils/pot/Makefile b/sysutils/pot/Makefile index e4aeb6bbdb30..926781ac4a04 100644 --- a/sysutils/pot/Makefile +++ b/sysutils/pot/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pot -PORTVERSION= 0.6.1 +PORTVERSION= 0.9.0 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org @@ -41,6 +41,8 @@ do-install: ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/etc/pot/flavours/dns.sh \ ${STAGEDIR}${ETCDIR}/flavours + ${INSTALL_DATA} ${WRKSRC}/etc/pot/flavours/slim.sh \ + ${STAGEDIR}${ETCDIR}/flavours do-install-ZSH-on: ( cd ${WRKSRC}/share/zsh && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/zsh) diff --git a/sysutils/pot/distinfo b/sysutils/pot/distinfo index fddf7569b8fe..f5a0890e1bbb 100644 --- a/sysutils/pot/distinfo +++ b/sysutils/pot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561467715 -SHA256 (pizzamig-pot-0.6.1_GH0.tar.gz) = 92c342012e2fc52e7762234ced1b6baf7a7a7144f2dbc5b2a2852c217cec4da6 -SIZE (pizzamig-pot-0.6.1_GH0.tar.gz) = 122747 +TIMESTAMP = 1565694596 +SHA256 (pizzamig-pot-0.9.0_GH0.tar.gz) = b54e7b2adab04e4bcada6fbcd6d3a5adc6ea2012ddf11c7a8f59354ec9f4e15c +SIZE (pizzamig-pot-0.9.0_GH0.tar.gz) = 130964 diff --git a/sysutils/pot/files/pkg-message.in b/sysutils/pot/files/pkg-message.in index 49081e58490e..91c26ae2f09f 100644 --- a/sysutils/pot/files/pkg-message.in +++ b/sysutils/pot/files/pkg-message.in @@ -7,6 +7,7 @@ To upgrade from prevoius versions of pot (<0.6.0) to 0.6.0+ the following steps * stop all your pots * re-run `pot init` * if needed, restart pf +* if needed, use `pot update-config` on your pots The variable `pot_list` in the rc.conf file is deprecated. Use `pot set-attr` to enable the attribute start-at-boot to your pot diff --git a/sysutils/pot/pkg-plist b/sysutils/pot/pkg-plist index 90b4058c1dae..065cdda3c314 100644 --- a/sysutils/pot/pkg-plist +++ b/sysutils/pot/pkg-plist @@ -1,30 +1,32 @@ bin/pot %%ETCDIR%%/flavours/dns.sh +%%ETCDIR%%/flavours/slim.sh @sample %%ETCDIR%%/pot.conf.sample %%ETCDIR%%/pot.default.conf %%DATADIR%%/add-dep.sh -%%DATADIR%%/add-file.sh -%%DATADIR%%/add-fscomp.sh %%DATADIR%%/clone-fscomp.sh %%DATADIR%%/clone.sh %%DATADIR%%/common.sh %%DATADIR%%/config.sh +%%DATADIR%%/copy-in.sh %%DATADIR%%/create-base.sh %%DATADIR%%/create-dns.sh %%DATADIR%%/create-fscomp.sh %%DATADIR%%/create.sh %%DATADIR%%/de-init.sh %%DATADIR%%/destroy.sh -%%DATADIR%%/execute.sh %%DATADIR%%/export.sh %%DATADIR%%/export-ports.sh %%DATADIR%%/get-attribute.sh +%%DATADIR%%/get-rss.sh %%DATADIR%%/help.sh %%DATADIR%%/import.sh %%DATADIR%%/info.sh %%DATADIR%%/init.sh %%DATADIR%%/list.sh -%%DATADIR%%/promote.sh +%%DATADIR%%/mount-in.sh +%%DATADIR%%/prepare.sh +%%DATADIR%%/prune.sh %%DATADIR%%/ps.sh %%DATADIR%%/purge-snapshots.sh %%DATADIR%%/rename.sh @@ -38,6 +40,7 @@ bin/pot %%DATADIR%%/stop.sh %%DATADIR%%/term.sh %%DATADIR%%/top.sh +%%DATADIR%%/update-config.sh %%DATADIR%%/version.sh %%DATADIR%%/vnet-start.sh %%ZSH%%share/zsh/site-functions/_pot -- cgit From 9354d9d9600ca0fb122d99c003324f37765b939d Mon Sep 17 00:00:00 2001 From: glewis Date: Tue, 13 Aug 2019 13:32:12 +0000 Subject: Update to 12.0.2+10.2 --- java/openjdk12/Makefile | 3 +-- java/openjdk12/distinfo | 6 +++--- java/openjdk12/files/patch-make_autoconf_libraries.m4 | 16 ++++++++-------- .../patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp | 12 ++++++++++++ 4 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index a8884e6afbd4..8df32825c4ec 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -57,7 +56,7 @@ JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 2 JDK_BUILD_NUMBER= 10 -BSD_JDK_VERSION= 1 +BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ diff --git a/java/openjdk12/distinfo b/java/openjdk12/distinfo index c6add0d20381..e81aac7cc37d 100644 --- a/java/openjdk12/distinfo +++ b/java/openjdk12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563554636 -SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 3fb583b455007a84ef790d72a73232aef2c18c9fba07e84f71e32a63503241fc -SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 110435414 +TIMESTAMP = 1565671800 +SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 7038f9264880a343334e5a80c59ac6265e32ed6e9cff0d122b0a7f70826fde67 +SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 110452445 diff --git a/java/openjdk12/files/patch-make_autoconf_libraries.m4 b/java/openjdk12/files/patch-make_autoconf_libraries.m4 index 11f8769f67c6..0911464a6522 100644 --- a/java/openjdk12/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk12/files/patch-make_autoconf_libraries.m4 @@ -1,15 +1,15 @@ ---- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700 -+++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700 -@@ -186,9 +186,9 @@ +--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 ++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 +@@ -188,9 +188,9 @@ ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv - else -- ICONV_CFLAGS= + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG - ICONV_LDFLAGS= - ICONV_LIBS= + ICONV_CFLAGS=%%ICONV_CFLAGS%% + ICONV_LDFLAGS=%%ICONV_LDFLAGS%% + ICONV_LIBS=%%ICONV_LIBS%% - fi - else - ICONV_CFLAGS= + else + ICONV_CFLAGS= + ICONV_LDFLAGS= diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp new file mode 100644 index 000000000000..701059058259 --- /dev/null +++ b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp @@ -0,0 +1,12 @@ +--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp ++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp +@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig, + // Handle ALL stack overflow variations here + if (sig == SIGSEGV || sig == SIGBUS) { + address addr = (address) info->si_addr; ++#ifdef __FreeBSD__ ++ addr = align_down(addr, os::vm_page_size()); ++#endif + + // check if fault address is within thread stack + if (thread->on_local_stack(addr)) { -- cgit From fe7e0a7f3c509adf349d44ae2cab4c8098665f0c Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 13 Aug 2019 13:38:25 +0000 Subject: mojolicious: Update to 8.23 --- www/p5-Mojolicious/Makefile | 6 +++--- www/p5-Mojolicious/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile index 9a3a47a672f5..9b8d36af8252 100644 --- a/www/p5-Mojolicious/Makefile +++ b/www/p5-Mojolicious/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mojolicious -PORTVERSION= 8.22 +PORTVERSION= 8.23 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -29,8 +29,8 @@ EV_BUILD_DEPENDS= p5-EV>=4:devel/p5-EV EV_RUN_DEPENDS= p5-EV>=4:devel/p5-EV JSONXS_DESC= High-performance JSON parsing via p5-Cpanel-JSON-XS -JSONXS_BUILD_DEPENDS= p5-Cpanel-JSON-XS>=4.04:converters/p5-Cpanel-JSON-XS -JSONXS_RUN_DEPENDS= p5-Cpanel-JSON-XS>=4.04:converters/p5-Cpanel-JSON-XS +JSONXS_BUILD_DEPENDS= p5-Cpanel-JSON-XS>=4.09:converters/p5-Cpanel-JSON-XS +JSONXS_RUN_DEPENDS= p5-Cpanel-JSON-XS>=4.09:converters/p5-Cpanel-JSON-XS TLS_BUILD_DEPENDS= p5-IO-Socket-SSL>=2.009:security/p5-IO-Socket-SSL TLS_RUN_DEPENDS= p5-IO-Socket-SSL>=2.009:security/p5-IO-Socket-SSL diff --git a/www/p5-Mojolicious/distinfo b/www/p5-Mojolicious/distinfo index aa8c8f46e856..caf0e868d660 100644 --- a/www/p5-Mojolicious/distinfo +++ b/www/p5-Mojolicious/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563453208 -SHA256 (Mojolicious-8.22.tar.gz) = 86e34a50f7daeb7af43655d7b3bfe43bb09124216bfaf3016e6fd975c3f24854 -SIZE (Mojolicious-8.22.tar.gz) = 764431 +TIMESTAMP = 1565703409 +SHA256 (Mojolicious-8.23.tar.gz) = 6d40c51ee338fc0a3f081d3dffa266f026762357e57ce7d4f55169f0213091dc +SIZE (Mojolicious-8.23.tar.gz) = 765863 -- cgit From c4238c19f1168d2e12093ad373ad9b6ce08d064e Mon Sep 17 00:00:00 2001 From: royger Date: Tue, 13 Aug 2019 13:39:58 +0000 Subject: xen-{tools/kernel}: update to 4.12.1 Sponsored by: Citrix Systems R&D Approved by: mat Differential revision: https://reviews.freebsd.org/D21227 --- emulators/xen-kernel/Makefile | 18 +- emulators/xen-kernel/distinfo | 6 +- ...-msr-Shorten-ARCH_CAPABILITIES_-constants.patch | 71 ----- ...plement-controls-for-RTM-force-abort-mode.patch | 185 ------------ ...rl-Extend-repoline-safey-calcuations-for-.patch | 68 ----- emulators/xen-kernel/files/xsa297-4.12-1.patch | 163 ----------- emulators/xen-kernel/files/xsa297-4.12-2.patch | 54 ---- emulators/xen-kernel/files/xsa297-4.12-3.patch | 109 ------- emulators/xen-kernel/files/xsa297-4.12-4.patch | 55 ---- emulators/xen-kernel/files/xsa297-4.12-5.patch | 147 ---------- emulators/xen-kernel/files/xsa297-4.12-6.patch | 134 --------- emulators/xen-kernel/files/xsa297-4.12-7.patch | 316 --------------------- sysutils/xen-tools/Makefile | 18 +- sysutils/xen-tools/distinfo | 6 +- ...-msr-Shorten-ARCH_CAPABILITIES_-constants.patch | 71 ----- ...plement-controls-for-RTM-force-abort-mode.patch | 185 ------------ ...-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch | 56 ---- ...rl-Extend-repoline-safey-calcuations-for-.patch | 68 ----- sysutils/xen-tools/files/xsa297-4.12-1.patch | 163 ----------- sysutils/xen-tools/files/xsa297-4.12-2.patch | 54 ---- sysutils/xen-tools/files/xsa297-4.12-3.patch | 109 ------- sysutils/xen-tools/files/xsa297-4.12-4.patch | 55 ---- sysutils/xen-tools/files/xsa297-4.12-5.patch | 147 ---------- sysutils/xen-tools/files/xsa297-4.12-6.patch | 134 --------- sysutils/xen-tools/files/xsa297-4.12-7.patch | 316 --------------------- 25 files changed, 10 insertions(+), 2698 deletions(-) delete mode 100644 emulators/xen-kernel/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch delete mode 100644 emulators/xen-kernel/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch delete mode 100644 emulators/xen-kernel/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-1.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-2.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-3.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-4.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-5.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-6.patch delete mode 100644 emulators/xen-kernel/files/xsa297-4.12-7.patch delete mode 100644 sysutils/xen-tools/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch delete mode 100644 sysutils/xen-tools/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch delete mode 100644 sysutils/xen-tools/files/0001-xen-mapcache-use-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch delete mode 100644 sysutils/xen-tools/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-1.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-2.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-3.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-4.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-5.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-6.patch delete mode 100644 sysutils/xen-tools/files/xsa297-4.12-7.patch diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile index a3a6004d297c..452761d17e9b 100644 --- a/emulators/xen-kernel/Makefile +++ b/emulators/xen-kernel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xen -PORTVERSION= 4.12.0 -PORTREVISION= 4 +PORTVERSION= 4.12.1 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ PKGNAMESUFFIX= -kernel @@ -25,20 +25,6 @@ STRIP= # PLIST_FILES= /boot/xen \ lib/debug/boot/xen.debug -# Pre-patches for XSA-297 to apply cleanly -EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch:-p1 \ - ${PATCHDIR}/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch:-p1 \ - ${PATCHDIR}/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch:-p1 - -# Fixes for XSA-297 (MDS) -EXTRA_PATCHES+= ${PATCHDIR}/xsa297-4.12-1.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-2.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-3.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-4.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-5.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-6.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-7.patch:-p1 - # LLD 8 changed the behaviour re the placement of orphaned sections, which # produces a non-bootable Xen kernel: # diff --git a/emulators/xen-kernel/distinfo b/emulators/xen-kernel/distinfo index 85ee9e3c004f..37564fd9fd45 100644 --- a/emulators/xen-kernel/distinfo +++ b/emulators/xen-kernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555345627 -SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64 -SIZE (xen-4.12.0.tar.gz) = 26949697 +TIMESTAMP = 1565595632 +SHA256 (xen-4.12.1.tar.gz) = 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159 +SIZE (xen-4.12.1.tar.gz) = 26970584 diff --git a/emulators/xen-kernel/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch b/emulators/xen-kernel/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch deleted file mode 100644 index 91c17af9d2ed..000000000000 --- a/emulators/xen-kernel/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch +++ /dev/null @@ -1,71 +0,0 @@ -From e25d1338e1d8a32e46c808321323c4ad8fc5ba01 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:44:58 +0200 -Subject: [PATCH 1/2] x86/msr: Shorten ARCH_CAPABILITIES_* constants - -They are unnecesserily verbose, and ARCH_CAPS_* is already the more common -version. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich -master commit: ba27aaa88548c824a47dcf5609288ee1c05d2946 -master date: 2019-03-18 16:26:40 +0000 ---- - xen/arch/x86/spec_ctrl.c | 10 +++++----- - xen/include/asm-x86/msr-index.h | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index ad72ecd3a5..22bfc5a5e8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -230,8 +230,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", -- (caps & ARCH_CAPABILITIES_IBRS_ALL) ? " IBRS_ALL" : "", -- (caps & ARCH_CAPABILITIES_RDCL_NO) ? " RDCL_NO" : "", -+ (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", -+ (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : ""); -@@ -549,7 +549,7 @@ static __init void l1tf_calculations(uint64_t caps) - } - - /* Any processor advertising RDCL_NO should be not vulnerable to L1TF. */ -- if ( caps & ARCH_CAPABILITIES_RDCL_NO ) -+ if ( caps & ARCH_CAPS_RDCL_NO ) - cpu_has_bug_l1tf = false; - - if ( cpu_has_bug_l1tf && hit_default ) -@@ -613,9 +613,9 @@ int8_t __read_mostly opt_xpti_domu = -1; - static __init void xpti_init_default(uint64_t caps) - { - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -- caps = ARCH_CAPABILITIES_RDCL_NO; -+ caps = ARCH_CAPS_RDCL_NO; - -- if ( caps & ARCH_CAPABILITIES_RDCL_NO ) -+ if ( caps & ARCH_CAPS_RDCL_NO ) - { - if ( opt_xpti_hwdom < 0 ) - opt_xpti_hwdom = 0; -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index c6e1d8768f..11512d4250 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -42,8 +42,8 @@ - #define PRED_CMD_IBPB (_AC(1, ULL) << 0) - - #define MSR_ARCH_CAPABILITIES 0x0000010a --#define ARCH_CAPABILITIES_RDCL_NO (_AC(1, ULL) << 0) --#define ARCH_CAPABILITIES_IBRS_ALL (_AC(1, ULL) << 1) -+#define ARCH_CAPS_RDCL_NO (_AC(1, ULL) << 0) -+#define ARCH_CAPS_IBRS_ALL (_AC(1, ULL) << 1) - #define ARCH_CAPS_RSBA (_AC(1, ULL) << 2) - #define ARCH_CAPS_SKIP_L1DFL (_AC(1, ULL) << 3) - #define ARCH_CAPS_SSB_NO (_AC(1, ULL) << 4) --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch b/emulators/xen-kernel/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch deleted file mode 100644 index 30352f9eeec3..000000000000 --- a/emulators/xen-kernel/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch +++ /dev/null @@ -1,185 +0,0 @@ -From e3a1ebee98e61dfe3b8b1eb71043ad5220b3cfd3 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:39:29 +0200 -Subject: [PATCH] x86/tsx: Implement controls for RTM force-abort mode - -The CPUID bit and MSR are deliberately not exposed to guests, because they -won't exist on newer processors. As vPMU isn't security supported, the -misbehaviour of PCR3 isn't expected to impact production deployments. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich -master commit: 6be613f29b4205349275d24367bd4c82fb2960dd -master date: 2019-03-12 17:05:21 +0000 ---- - docs/misc/xen-command-line.pandoc | 17 ++++++++++++++++- - tools/misc/xen-cpuid.c | 2 ++ - xen/arch/x86/cpu/intel.c | 3 +++ - xen/arch/x86/cpu/vpmu.c | 3 +++ - xen/arch/x86/msr.c | 4 ++++ - xen/include/asm-x86/cpufeature.h | 3 +++ - xen/include/asm-x86/msr-index.h | 3 +++ - xen/include/asm-x86/vpmu.h | 1 + - xen/include/public/arch-x86/cpufeatureset.h | 1 + - 9 files changed, 36 insertions(+), 1 deletion(-) - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index 742555616d..6db82f302e 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -2109,7 +2109,7 @@ Use Virtual Processor ID support if available. This prevents the need for TLB - flushes on VM entry and exit, increasing performance. - - ### vpmu (x86) -- = List of [ , bts, ipc, arch ] -+ = List of [ , bts, ipc, arch, rtm-abort= ] - - Applicability: x86. Default: false - -@@ -2142,6 +2142,21 @@ provide access to a wealth of low level processor information. - - * The `arch` option allows access to the pre-defined architectural events. - -+* The `rtm-abort` boolean controls a trade-off between working Restricted -+ Transactional Memory, and working performance counters. -+ -+ All processors released to date (Q1 2019) supporting Transactional Memory -+ Extensions suffer an erratum which has been addressed in microcode. -+ -+ Processors based on the Skylake microarchitecture with up-to-date -+ microcode internally use performance counter 3 to work around the erratum. -+ A consequence is that the counter gets reprogrammed whenever an `XBEGIN` -+ instruction is executed. -+ -+ An alternative mode exists where PCR3 behaves as before, at the cost of -+ `XBEGIN` unconditionally aborting. Enabling `rtm-abort` mode will -+ activate this alternative mode. -+ - *Warning:* - As the virtualisation is not 100% safe, don't use the vpmu flag on - production systems (see http://xenbits.xen.org/xsa/advisory-163.html)! -diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c -index 6e7ca8b9a4..d87a72e3e6 100644 ---- a/tools/misc/xen-cpuid.c -+++ b/tools/misc/xen-cpuid.c -@@ -146,6 +146,8 @@ static const char *str_7d0[32] = - { - [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps", - -+ /* 12 */ [13] = "tsx-force-abort", -+ - [26] = "ibrsb", [27] = "stibp", - [28] = "l1d_flush", [29] = "arch_caps", - /* 30 */ [31] = "ssbd", -diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c -index 65fa3d611f..29c6b87512 100644 ---- a/xen/arch/x86/cpu/intel.c -+++ b/xen/arch/x86/cpu/intel.c -@@ -286,6 +286,9 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) - if (c->x86 == 6 && cpu_has_clflush && - (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) - __set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); -+ -+ if (cpu_has_tsx_force_abort && opt_rtm_abort) -+ wrmsrl(MSR_TSX_FORCE_ABORT, TSX_FORCE_ABORT_RTM); - } - - -diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c -index 8324d62f11..8f6daf13fd 100644 ---- a/xen/arch/x86/cpu/vpmu.c -+++ b/xen/arch/x86/cpu/vpmu.c -@@ -45,6 +45,7 @@ CHECK_pmu_params; - static unsigned int __read_mostly opt_vpmu_enabled; - unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; - unsigned int __read_mostly vpmu_features = 0; -+bool __read_mostly opt_rtm_abort; - - static DEFINE_SPINLOCK(vpmu_lock); - static unsigned vpmu_count; -@@ -73,6 +74,8 @@ static int __init parse_vpmu_params(const char *s) - vpmu_features |= XENPMU_FEATURE_IPC_ONLY; - else if ( !cmdline_strcmp(s, "arch") ) - vpmu_features |= XENPMU_FEATURE_ARCH_ONLY; -+ else if ( (val = parse_boolean("rtm-abort", s, ss)) >= 0 ) -+ opt_rtm_abort = val; - else - rc = -EINVAL; - -diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c -index 9bb38b6d66..4df4a59f4d 100644 ---- a/xen/arch/x86/msr.c -+++ b/xen/arch/x86/msr.c -@@ -131,6 +131,8 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) - case MSR_PRED_CMD: - case MSR_FLUSH_CMD: - /* Write-only */ -+ case MSR_TSX_FORCE_ABORT: -+ /* Not offered to guests. */ - goto gp_fault; - - case MSR_SPEC_CTRL: -@@ -230,6 +232,8 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) - case MSR_INTEL_PLATFORM_INFO: - case MSR_ARCH_CAPABILITIES: - /* Read-only */ -+ case MSR_TSX_FORCE_ABORT: -+ /* Not offered to guests. */ - goto gp_fault; - - case MSR_AMD_PATCHLOADER: -diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h -index 1fb9af4b19..745801f3c0 100644 ---- a/xen/include/asm-x86/cpufeature.h -+++ b/xen/include/asm-x86/cpufeature.h -@@ -112,6 +112,9 @@ - /* CPUID level 0x80000007.edx */ - #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) - -+/* CPUID level 0x00000007:0.edx */ -+#define cpu_has_tsx_force_abort boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT) -+ - /* Synthesized. */ - #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) - #define cpu_has_cpuid_faulting boot_cpu_has(X86_FEATURE_CPUID_FAULTING) -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 24d783a72d..c6e1d8768f 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -51,6 +51,9 @@ - #define MSR_FLUSH_CMD 0x0000010b - #define FLUSH_CMD_L1D (_AC(1, ULL) << 0) - -+#define MSR_TSX_FORCE_ABORT 0x0000010f -+#define TSX_FORCE_ABORT_RTM (_AC(1, ULL) << 0) -+ - /* Intel MSRs. Some also available on other CPUs */ - #define MSR_IA32_PERFCTR0 0x000000c1 - #define MSR_IA32_A_PERFCTR0 0x000004c1 -diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h -index 5e778ab7ba..1287b9fb6e 100644 ---- a/xen/include/asm-x86/vpmu.h -+++ b/xen/include/asm-x86/vpmu.h -@@ -125,6 +125,7 @@ static inline int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content) - - extern unsigned int vpmu_mode; - extern unsigned int vpmu_features; -+extern bool opt_rtm_abort; - - /* Context switch */ - static inline void vpmu_switch_from(struct vcpu *prev) -diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h -index fbc68fa29f..2bcc5487ac 100644 ---- a/xen/include/public/arch-x86/cpufeatureset.h -+++ b/xen/include/public/arch-x86/cpufeatureset.h -@@ -242,6 +242,7 @@ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by - /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ - XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ - XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ -+XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ - XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ - XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ - XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch b/emulators/xen-kernel/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch deleted file mode 100644 index b4b8a7d05aa5..000000000000 --- a/emulators/xen-kernel/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fd2a34c9655acecaaa1541dd84fc670936303175 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:45:45 +0200 -Subject: [PATCH 2/2] x86/spec-ctrl: Extend repoline safey calcuations for - eIBRS and Atom parts - -All currently-released Atom processors are in practice retpoline-safe, because -they don't fall back to a BTB prediction on RSB underflow. - -However, an additional meaning of Enhanced IRBS is that the processor may not -be retpoline-safe. The Gemini Lake platform, based on the Goldmont Plus -microarchitecture is the first Atom processor to support eIBRS. - -Until Xen gets full eIBRS support, Gemini Lake will still be safe using -regular IBRS. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich -master commit: 17f74242ccf0ce6e51c03a5860947865c0ef0dc2 -master date: 2019-03-18 16:26:40 +0000 ---- - xen/arch/x86/spec_ctrl.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 22bfc5a5e8..1171c02ab1 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -316,8 +316,11 @@ static bool __init retpoline_safe(uint64_t caps) - /* - * RSBA may be set by a hypervisor to indicate that we may move to a - * processor which isn't retpoline-safe. -+ * -+ * Processors offering Enhanced IBRS are not guarenteed to be -+ * repoline-safe. - */ -- if ( caps & ARCH_CAPS_RSBA ) -+ if ( caps & (ARCH_CAPS_RSBA | ARCH_CAPS_IBRS_ALL) ) - return false; - - switch ( boot_cpu_data.x86_model ) -@@ -377,6 +380,23 @@ static bool __init retpoline_safe(uint64_t caps) - case 0x9e: - return false; - -+ /* -+ * Atom processors before Goldmont Plus/Gemini Lake are retpoline-safe. -+ */ -+ case 0x1c: /* Pineview */ -+ case 0x26: /* Lincroft */ -+ case 0x27: /* Penwell */ -+ case 0x35: /* Cloverview */ -+ case 0x36: /* Cedarview */ -+ case 0x37: /* Baytrail / Valleyview (Silvermont) */ -+ case 0x4d: /* Avaton / Rangely (Silvermont) */ -+ case 0x4c: /* Cherrytrail / Brasswell */ -+ case 0x4a: /* Merrifield */ -+ case 0x5a: /* Moorefield */ -+ case 0x5c: /* Goldmont */ -+ case 0x5f: /* Denverton */ -+ return true; -+ - default: - printk("Unrecognised CPU model %#x - assuming not reptpoline safe\n", - boot_cpu_data.x86_model); --- -2.17.2 (Apple Git-113) - diff --git a/emulators/xen-kernel/files/xsa297-4.12-1.patch b/emulators/xen-kernel/files/xsa297-4.12-1.patch deleted file mode 100644 index 51da965f7b18..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-1.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Reposition the XPTI command line parsing logic - -It has ended up in the middle of the mitigation calculation logic. Move it to -be beside the other command line parsing. - -No functional change. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 1171c02..99310c8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -167,6 +167,73 @@ static int __init parse_spec_ctrl(const char *s) - } - custom_param("spec-ctrl", parse_spec_ctrl); - -+int8_t __read_mostly opt_xpti_hwdom = -1; -+int8_t __read_mostly opt_xpti_domu = -1; -+ -+static __init void xpti_init_default(uint64_t caps) -+{ -+ if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -+ caps = ARCH_CAPS_RDCL_NO; -+ -+ if ( caps & ARCH_CAPS_RDCL_NO ) -+ { -+ if ( opt_xpti_hwdom < 0 ) -+ opt_xpti_hwdom = 0; -+ if ( opt_xpti_domu < 0 ) -+ opt_xpti_domu = 0; -+ } -+ else -+ { -+ if ( opt_xpti_hwdom < 0 ) -+ opt_xpti_hwdom = 1; -+ if ( opt_xpti_domu < 0 ) -+ opt_xpti_domu = 1; -+ } -+} -+ -+static __init int parse_xpti(const char *s) -+{ -+ const char *ss; -+ int val, rc = 0; -+ -+ /* Interpret 'xpti' alone in its positive boolean form. */ -+ if ( *s == '\0' ) -+ opt_xpti_hwdom = opt_xpti_domu = 1; -+ -+ do { -+ ss = strchr(s, ','); -+ if ( !ss ) -+ ss = strchr(s, '\0'); -+ -+ switch ( parse_bool(s, ss) ) -+ { -+ case 0: -+ opt_xpti_hwdom = opt_xpti_domu = 0; -+ break; -+ -+ case 1: -+ opt_xpti_hwdom = opt_xpti_domu = 1; -+ break; -+ -+ default: -+ if ( !strcmp(s, "default") ) -+ opt_xpti_hwdom = opt_xpti_domu = -1; -+ else if ( (val = parse_boolean("dom0", s, ss)) >= 0 ) -+ opt_xpti_hwdom = val; -+ else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) -+ opt_xpti_domu = val; -+ else if ( *s ) -+ rc = -EINVAL; -+ break; -+ } -+ -+ s = ss + 1; -+ } while ( *ss ); -+ -+ return rc; -+} -+custom_param("xpti", parse_xpti); -+ - int8_t __read_mostly opt_pv_l1tf_hwdom = -1; - int8_t __read_mostly opt_pv_l1tf_domu = -1; - -@@ -627,73 +694,6 @@ static __init void l1tf_calculations(uint64_t caps) - : (3ul << (paddr_bits - 2)))); - } - --int8_t __read_mostly opt_xpti_hwdom = -1; --int8_t __read_mostly opt_xpti_domu = -1; -- --static __init void xpti_init_default(uint64_t caps) --{ -- if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -- caps = ARCH_CAPS_RDCL_NO; -- -- if ( caps & ARCH_CAPS_RDCL_NO ) -- { -- if ( opt_xpti_hwdom < 0 ) -- opt_xpti_hwdom = 0; -- if ( opt_xpti_domu < 0 ) -- opt_xpti_domu = 0; -- } -- else -- { -- if ( opt_xpti_hwdom < 0 ) -- opt_xpti_hwdom = 1; -- if ( opt_xpti_domu < 0 ) -- opt_xpti_domu = 1; -- } --} -- --static __init int parse_xpti(const char *s) --{ -- const char *ss; -- int val, rc = 0; -- -- /* Interpret 'xpti' alone in its positive boolean form. */ -- if ( *s == '\0' ) -- opt_xpti_hwdom = opt_xpti_domu = 1; -- -- do { -- ss = strchr(s, ','); -- if ( !ss ) -- ss = strchr(s, '\0'); -- -- switch ( parse_bool(s, ss) ) -- { -- case 0: -- opt_xpti_hwdom = opt_xpti_domu = 0; -- break; -- -- case 1: -- opt_xpti_hwdom = opt_xpti_domu = 1; -- break; -- -- default: -- if ( !strcmp(s, "default") ) -- opt_xpti_hwdom = opt_xpti_domu = -1; -- else if ( (val = parse_boolean("dom0", s, ss)) >= 0 ) -- opt_xpti_hwdom = val; -- else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) -- opt_xpti_domu = val; -- else if ( *s ) -- rc = -EINVAL; -- break; -- } -- -- s = ss + 1; -- } while ( *ss ); -- -- return rc; --} --custom_param("xpti", parse_xpti); -- - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; diff --git a/emulators/xen-kernel/files/xsa297-4.12-2.patch b/emulators/xen-kernel/files/xsa297-4.12-2.patch deleted file mode 100644 index d03279a14e61..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Andrew Cooper -Subject: x86/msr: Definitions for MSR_INTEL_CORE_THREAD_COUNT - -This is a model specific register which details the current configuration -cores and threads in the package. Because of how Hyperthread and Core -configuration works works in firmware, the MSR it is de-facto constant and -will remain unchanged until the next system reset. - -It is a read only MSR (so unilaterally reject writes), but for now retain its -leaky-on-read properties. Further CPUID/MSR work is required before we can -start virtualising a consistent topology to the guest, and retaining the old -behaviour is the safest course of action. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c -index 4df4a59..a7f67d9 100644 ---- a/xen/arch/x86/msr.c -+++ b/xen/arch/x86/msr.c -@@ -200,6 +200,10 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) - ARRAY_SIZE(msrs->dr_mask))]; - break; - -+ /* -+ * TODO: Implement when we have better topology representation. -+ case MSR_INTEL_CORE_THREAD_COUNT: -+ */ - default: - return X86EMUL_UNHANDLEABLE; - } -@@ -229,6 +233,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) - { - uint64_t rsvd; - -+ case MSR_INTEL_CORE_THREAD_COUNT: - case MSR_INTEL_PLATFORM_INFO: - case MSR_ARCH_CAPABILITIES: - /* Read-only */ -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 11512d4..389f95f 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -32,6 +32,10 @@ - #define EFER_KNOWN_MASK (EFER_SCE | EFER_LME | EFER_LMA | EFER_NX | \ - EFER_SVME | EFER_FFXSE) - -+#define MSR_INTEL_CORE_THREAD_COUNT 0x00000035 -+#define MSR_CTC_THREAD_MASK 0x0000ffff -+#define MSR_CTC_CORE_MASK 0xffff0000 -+ - /* Speculation Controls. */ - #define MSR_SPEC_CTRL 0x00000048 - #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) diff --git a/emulators/xen-kernel/files/xsa297-4.12-3.patch b/emulators/xen-kernel/files/xsa297-4.12-3.patch deleted file mode 100644 index 7b4326691fae..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-3.patch +++ /dev/null @@ -1,109 +0,0 @@ -From: Andrew Cooper -Subject: x86/boot: Detect the firmware SMT setting correctly on Intel hardware - -While boot_cpu_data.x86_num_siblings is an accurate value to use on AMD -hardware, it isn't on Intel when the user has disabled Hyperthreading in the -firmware. As a result, a user which has chosen to disable HT still gets -nagged on L1TF-vulnerable hardware when they haven't chosen an explicit -smt= setting. - -Make use of the largely-undocumented MSR_INTEL_CORE_THREAD_COUNT which in -practice exists since Nehalem, when booting on real hardware. Fall back to -using the ACPI table APIC IDs. - -While adjusting this logic, fix a latent bug in amd_get_topology(). The -thread count field in CPUID.0x8000001e.ebx is documented as 8 bits wide, -rather than 2 bits wide. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c -index c790416..b1debac 100644 ---- a/xen/arch/x86/cpu/amd.c -+++ b/xen/arch/x86/cpu/amd.c -@@ -507,7 +507,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c) - u32 eax, ebx, ecx, edx; - - cpuid(0x8000001e, &eax, &ebx, &ecx, &edx); -- c->x86_num_siblings = ((ebx >> 8) & 0x3) + 1; -+ c->x86_num_siblings = ((ebx >> 8) & 0xff) + 1; - - if (c->x86 < 0x17) - c->compute_unit_id = ebx & 0xFF; -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 99310c8..e49ab3f 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -368,6 +368,45 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - #endif - } - -+static bool __init check_smt_enabled(void) -+{ -+ uint64_t val; -+ unsigned int cpu; -+ -+ /* -+ * x86_num_siblings defaults to 1 in the absence of other information, and -+ * is adjusted based on other topology information found in CPUID leaves. -+ * -+ * On AMD hardware, it will be the current SMT configuration. On Intel -+ * hardware, it will represent the maximum capability, rather than the -+ * current configuration. -+ */ -+ if ( boot_cpu_data.x86_num_siblings < 2 ) -+ return false; -+ -+ /* -+ * Intel Nehalem and later hardware does have an MSR which reports the -+ * current count of cores/threads in the package. -+ * -+ * At the time of writing, it is almost completely undocumented, so isn't -+ * virtualised reliably. -+ */ -+ if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && !cpu_has_hypervisor && -+ !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) -+ return (MASK_EXTR(val, MSR_CTC_CORE_MASK) != -+ MASK_EXTR(val, MSR_CTC_THREAD_MASK)); -+ -+ /* -+ * Search over the CPUs reported in the ACPI tables. Any whose APIC ID -+ * has a non-zero thread id component indicates that SMT is active. -+ */ -+ for_each_present_cpu ( cpu ) -+ if ( x86_cpu_to_apicid[cpu] & (boot_cpu_data.x86_num_siblings - 1) ) -+ return true; -+ -+ return false; -+} -+ - /* Calculate whether Retpoline is known-safe on this CPU. */ - static bool __init retpoline_safe(uint64_t caps) - { -@@ -697,12 +736,14 @@ static __init void l1tf_calculations(uint64_t caps) - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; -- bool use_spec_ctrl = false, ibrs = false; -+ bool use_spec_ctrl = false, ibrs = false, hw_smt_enabled; - uint64_t caps = 0; - - if ( boot_cpu_has(X86_FEATURE_ARCH_CAPS) ) - rdmsrl(MSR_ARCH_CAPABILITIES, caps); - -+ hw_smt_enabled = check_smt_enabled(); -+ - /* - * Has the user specified any custom BTI mitigations? If so, follow their - * instructions exactly and disable all heuristics. -@@ -873,8 +914,7 @@ void __init init_speculation_mitigations(void) - * However, if we are on affected hardware, with HT enabled, and the user - * hasn't explicitly chosen whether to use HT or not, nag them to do so. - */ -- if ( opt_smt == -1 && cpu_has_bug_l1tf && !pv_shim && -- boot_cpu_data.x86_num_siblings > 1 ) -+ if ( opt_smt == -1 && cpu_has_bug_l1tf && !pv_shim && hw_smt_enabled ) - warning_add( - "Booted on L1TF-vulnerable hardware with SMT/Hyperthreading\n" - "enabled. Please assess your configuration and choose an\n" diff --git a/emulators/xen-kernel/files/xsa297-4.12-4.patch b/emulators/xen-kernel/files/xsa297-4.12-4.patch deleted file mode 100644 index a7e2fe2a3f29..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-4.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Misc non-functional cleanup - - * Identify BTI in the spec_ctrl_{enter,exit}_idle() comments, as other - mitigations will shortly appear. - * Use alternative_input() and cover the lack of memory cobber with a further - barrier. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h -index 779da2b..20ee112 100644 ---- a/xen/include/asm-x86/spec_ctrl.h -+++ b/xen/include/asm-x86/spec_ctrl.h -@@ -68,6 +68,8 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - uint32_t val = 0; - - /* -+ * Branch Target Injection: -+ * - * Latch the new shadow value, then enable shadowing, then update the MSR. - * There are no SMP issues here; only local processor ordering concerns. - */ -@@ -75,8 +77,9 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - barrier(); - info->spec_ctrl_flags |= SCF_use_shadow; - barrier(); -- asm volatile ( ALTERNATIVE("", "wrmsr", X86_FEATURE_SC_MSR_IDLE) -- :: "a" (val), "c" (MSR_SPEC_CTRL), "d" (0) : "memory" ); -+ alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, -+ "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); -+ barrier(); - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe before this call. */ -@@ -85,13 +88,16 @@ static always_inline void spec_ctrl_exit_idle(struct cpu_info *info) - uint32_t val = info->xen_spec_ctrl; - - /* -+ * Branch Target Injection: -+ * - * Disable shadowing before updating the MSR. There are no SMP issues - * here; only local processor ordering concerns. - */ - info->spec_ctrl_flags &= ~SCF_use_shadow; - barrier(); -- asm volatile ( ALTERNATIVE("", "wrmsr", X86_FEATURE_SC_MSR_IDLE) -- :: "a" (val), "c" (MSR_SPEC_CTRL), "d" (0) : "memory" ); -+ alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, -+ "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); -+ barrier(); - } - - #endif /* __ASSEMBLY__ */ diff --git a/emulators/xen-kernel/files/xsa297-4.12-5.patch b/emulators/xen-kernel/files/xsa297-4.12-5.patch deleted file mode 100644 index 172a9925e58e..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-5.patch +++ /dev/null @@ -1,147 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: CPUID/MSR definitions for Microarchitectural Data - Sampling - -The MD_CLEAR feature can be automatically offered to guests. No -infrastructure is needed in Xen to support the guest making use of it. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index 6db82f3..f80d8d8 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -483,7 +483,7 @@ accounting for hardware capabilities as enumerated via CPUID. - - Currently accepted: - --The Speculation Control hardware features `ibrsb`, `stibp`, `ibpb`, -+The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`, - `l1d-flush` and `ssbd` are used by default if available and applicable. They can - be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and - won't offer them to guests. -diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c -index 52e16c2..5a1702d 100644 ---- a/tools/libxl/libxl_cpuid.c -+++ b/tools/libxl/libxl_cpuid.c -@@ -202,6 +202,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) - - {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, - {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, -+ {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, - {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, - {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, - {"l1d-flush", 0x00000007, 0, CPUID_REG_EDX, 28, 1}, -diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c -index d87a72e..f67ecd3 100644 ---- a/tools/misc/xen-cpuid.c -+++ b/tools/misc/xen-cpuid.c -@@ -146,6 +146,7 @@ static const char *str_7d0[32] = - { - [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps", - -+ [10] = "md-clear", - /* 12 */ [13] = "tsx-force-abort", - - [26] = "ibrsb", [27] = "stibp", -diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c -index ab0aab6..3efad9c 100644 ---- a/xen/arch/x86/cpuid.c -+++ b/xen/arch/x86/cpuid.c -@@ -29,7 +29,12 @@ static int __init parse_xen_cpuid(const char *s) - if ( !ss ) - ss = strchr(s, '\0'); - -- if ( (val = parse_boolean("ibpb", s, ss)) >= 0 ) -+ if ( (val = parse_boolean("md-clear", s, ss)) >= 0 ) -+ { -+ if ( !val ) -+ setup_clear_cpu_cap(X86_FEATURE_MD_CLEAR); -+ } -+ else if ( (val = parse_boolean("ibpb", s, ss)) >= 0 ) - { - if ( !val ) - setup_clear_cpu_cap(X86_FEATURE_IBPB); -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index e49ab3f..a573b02 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -291,17 +291,19 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - printk("Speculative mitigation facilities:\n"); - - /* Hardware features which pertain to speculative mitigations. */ -- printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", -+ printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", -+ (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", -- (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : ""); -+ (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", -+ (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : ""); - - /* Compiled-in support which pertains to mitigations. */ - if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -@@ -339,23 +341,25 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - * mitigation support for guests. - */ - #ifdef CONFIG_HVM -- printk(" Support for HVM VMs:%s%s%s%s\n", -+ printk(" Support for HVM VMs:%s%s%s%s%s\n", - (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) || - boot_cpu_has(X86_FEATURE_SC_RSB_HVM) || - opt_eager_fpu) ? "" : " None", - boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ? " MSR_SPEC_CTRL" : "", - boot_cpu_has(X86_FEATURE_SC_RSB_HVM) ? " RSB" : "", -- opt_eager_fpu ? " EAGER_FPU" : ""); -+ opt_eager_fpu ? " EAGER_FPU" : "", -+ boot_cpu_has(X86_FEATURE_MD_CLEAR) ? " MD_CLEAR" : ""); - - #endif - #ifdef CONFIG_PV -- printk(" Support for PV VMs:%s%s%s%s\n", -+ printk(" Support for PV VMs:%s%s%s%s%s\n", - (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || - boot_cpu_has(X86_FEATURE_SC_RSB_PV) || - opt_eager_fpu) ? "" : " None", - boot_cpu_has(X86_FEATURE_SC_MSR_PV) ? " MSR_SPEC_CTRL" : "", - boot_cpu_has(X86_FEATURE_SC_RSB_PV) ? " RSB" : "", -- opt_eager_fpu ? " EAGER_FPU" : ""); -+ opt_eager_fpu ? " EAGER_FPU" : "", -+ boot_cpu_has(X86_FEATURE_MD_CLEAR) ? " MD_CLEAR" : ""); - - printk(" XPTI (64-bit PV only): Dom0 %s, DomU %s (with%s PCID)\n", - opt_xpti_hwdom ? "enabled" : "disabled", -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 389f95f..637259b 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -51,6 +51,7 @@ - #define ARCH_CAPS_RSBA (_AC(1, ULL) << 2) - #define ARCH_CAPS_SKIP_L1DFL (_AC(1, ULL) << 3) - #define ARCH_CAPS_SSB_NO (_AC(1, ULL) << 4) -+#define ARCH_CAPS_MDS_NO (_AC(1, ULL) << 5) - - #define MSR_FLUSH_CMD 0x0000010b - #define FLUSH_CMD_L1D (_AC(1, ULL) << 0) -diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h -index 2bcc548..55231d4 100644 ---- a/xen/include/public/arch-x86/cpufeatureset.h -+++ b/xen/include/public/arch-x86/cpufeatureset.h -@@ -242,6 +242,7 @@ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by - /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ - XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ - XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ -+XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ - XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ - XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ - XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ diff --git a/emulators/xen-kernel/files/xsa297-4.12-6.patch b/emulators/xen-kernel/files/xsa297-4.12-6.patch deleted file mode 100644 index 48023a88b646..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-6.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Infrastructure to use VERW to flush pipeline buffers - -Three synthetic features are introduced, as we need individual control of -each, depending on circumstances. A later change will enable them at -appropriate points. - -The verw_sel field doesn't strictly need to live in struct cpu_info. It lives -there because there is a convenient hole it can fill, and it reduces the -complexity of the SPEC_CTRL_EXIT_TO_{PV,HVM} assembly by avoiding the need for -any temporary stack maintenance. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c -index 052228c..33930ce 100644 ---- a/xen/arch/x86/x86_64/asm-offsets.c -+++ b/xen/arch/x86/x86_64/asm-offsets.c -@@ -110,6 +110,7 @@ void __dummy__(void) - BLANK(); - - OFFSET(CPUINFO_guest_cpu_user_regs, struct cpu_info, guest_cpu_user_regs); -+ OFFSET(CPUINFO_verw_sel, struct cpu_info, verw_sel); - OFFSET(CPUINFO_current_vcpu, struct cpu_info, current_vcpu); - OFFSET(CPUINFO_cr4, struct cpu_info, cr4); - OFFSET(CPUINFO_xen_cr3, struct cpu_info, xen_cr3); -diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h -index 0c06274..ba55245 100644 ---- a/xen/include/asm-x86/cpufeatures.h -+++ b/xen/include/asm-x86/cpufeatures.h -@@ -31,3 +31,6 @@ XEN_CPUFEATURE(SC_RSB_PV, (FSCAPINTS+0)*32+18) /* RSB overwrite needed for - XEN_CPUFEATURE(SC_RSB_HVM, (FSCAPINTS+0)*32+19) /* RSB overwrite needed for HVM */ - XEN_CPUFEATURE(SC_MSR_IDLE, (FSCAPINTS+0)*32+21) /* (SC_MSR_PV || SC_MSR_HVM) && default_xen_spec_ctrl */ - XEN_CPUFEATURE(XEN_LBR, (FSCAPINTS+0)*32+22) /* Xen uses MSR_DEBUGCTL.LBR */ -+XEN_CPUFEATURE(SC_VERW_PV, (FSCAPINTS+0)*32+23) /* VERW used by Xen for PV */ -+XEN_CPUFEATURE(SC_VERW_HVM, (FSCAPINTS+0)*32+24) /* VERW used by Xen for HVM */ -+XEN_CPUFEATURE(SC_VERW_IDLE, (FSCAPINTS+0)*32+25) /* VERW used by Xen for idle */ -diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h -index 5bd64b2..f3508c3 100644 ---- a/xen/include/asm-x86/current.h -+++ b/xen/include/asm-x86/current.h -@@ -38,6 +38,7 @@ struct vcpu; - struct cpu_info { - struct cpu_user_regs guest_cpu_user_regs; - unsigned int processor_id; -+ unsigned int verw_sel; - struct vcpu *current_vcpu; - unsigned long per_cpu_offset; - unsigned long cr4; -diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h -index 20ee112..ba03bb4 100644 ---- a/xen/include/asm-x86/spec_ctrl.h -+++ b/xen/include/asm-x86/spec_ctrl.h -@@ -60,6 +60,13 @@ static inline void init_shadow_spec_ctrl_state(void) - info->shadow_spec_ctrl = 0; - info->xen_spec_ctrl = default_xen_spec_ctrl; - info->spec_ctrl_flags = default_spec_ctrl_flags; -+ -+ /* -+ * For least latency, the VERW selector should be a writeable data -+ * descriptor resident in the cache. __HYPERVISOR_DS32 shares a cache -+ * line with __HYPERVISOR_CS, so is expected to be very cache-hot. -+ */ -+ info->verw_sel = __HYPERVISOR_DS32; - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe after this call. */ -@@ -80,6 +87,22 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, - "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); - barrier(); -+ -+ /* -+ * Microarchitectural Store Buffer Data Sampling: -+ * -+ * On vulnerable systems, store buffer entries are statically partitioned -+ * between active threads. When entering idle, our store buffer entries -+ * are re-partitioned to allow the other threads to use them. -+ * -+ * Flush the buffers to ensure that no sensitive data of ours can be -+ * leaked by a sibling after it gets our store buffer entries. -+ * -+ * Note: VERW must be encoded with a memory operand, as it is only that -+ * form which causes a flush. -+ */ -+ alternative_input("", "verw %[sel]", X86_FEATURE_SC_VERW_IDLE, -+ [sel] "m" (info->verw_sel)); - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe before this call. */ -@@ -98,6 +121,17 @@ static always_inline void spec_ctrl_exit_idle(struct cpu_info *info) - alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, - "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); - barrier(); -+ -+ /* -+ * Microarchitectural Store Buffer Data Sampling: -+ * -+ * On vulnerable systems, store buffer entries are statically partitioned -+ * between active threads. When exiting idle, the other threads store -+ * buffer entries are re-partitioned to give us some. -+ * -+ * We now have store buffer entries with stale data from sibling threads. -+ * A flush if necessary will be performed on the return to guest path. -+ */ - } - - #endif /* __ASSEMBLY__ */ -diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h -index 803f7ce..c60093b 100644 ---- a/xen/include/asm-x86/spec_ctrl_asm.h -+++ b/xen/include/asm-x86/spec_ctrl_asm.h -@@ -241,12 +241,16 @@ - /* Use when exiting to PV guest context. */ - #define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ -- DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV -+ DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ -+ ALTERNATIVE "", __stringify(verw CPUINFO_verw_sel(%rsp)), \ -+ X86_FEATURE_SC_VERW_PV - - /* Use when exiting to HVM guest context. */ - #define SPEC_CTRL_EXIT_TO_HVM \ - ALTERNATIVE "", \ -- DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_HVM -+ DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_HVM; \ -+ ALTERNATIVE "", __stringify(verw CPUINFO_verw_sel(%rsp)), \ -+ X86_FEATURE_SC_VERW_HVM - - /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. diff --git a/emulators/xen-kernel/files/xsa297-4.12-7.patch b/emulators/xen-kernel/files/xsa297-4.12-7.patch deleted file mode 100644 index 8a706876e215..000000000000 --- a/emulators/xen-kernel/files/xsa297-4.12-7.patch +++ /dev/null @@ -1,316 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Introduce options to control VERW flushing - -The Microarchitectural Data Sampling vulnerability is split into categories -with subtly different properties: - - MLPDS - Microarchitectural Load Port Data Sampling - MSBDS - Microarchitectural Store Buffer Data Sampling - MFBDS - Microarchitectural Fill Buffer Data Sampling - MDSUM - Microarchitectural Data Sampling Uncacheable Memory - -MDSUM is a special case of the other three, and isn't distinguished further. - -These issues pertain to three microarchitectural buffers. The Load Ports, the -Store Buffers and the Fill Buffers. Each of these structures are flushed by -the new enhanced VERW functionality, but the conditions under which flushing -is necessary vary. - -For this concise overview of the issues and default logic, the abbreviations -SP (Store Port), FB (Fill Buffer), LP (Load Port) and HT (Hyperthreading) are -used for brevity: - - * Vulnerable hardware is divided into two categories - parts which suffer - from SP only, and parts with any other combination of vulnerabilities. - - * SP only has an HT interaction when the thread goes idle, due to the static - partitioning of resources. LP and FB have HT interactions at all points, - due to the competitive sharing of resources. All issues potentially leak - data across the return-to-guest transition. - - * The microcode which implements VERW flushing also extends MSR_FLUSH_CMD, so - we don't need to do both on the HVM return-to-guest path. However, some - parts are not vulnerable to L1TF (therefore have no MSR_FLUSH_CMD), but are - vulnerable to MDS, so do require VERW on the HVM path. - -Note that we deliberately support mds=1 even without MD_CLEAR in case the -microcode has been updated but the feature bit not exposed. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index f80d8d8..85081fd 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -1895,7 +1895,7 @@ not be able to control the state of the mitigation. - By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). - - ### spec-ctrl (x86) --> `= List of [ , xen=, {pv,hvm,msr-sc,rsb}=, -+> `= List of [ , xen=, {pv,hvm,msr-sc,rsb,md-clear}=, - > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,eager-fpu, - > l1d-flush}= ]` - -@@ -1919,9 +1919,10 @@ in place for guests to use. - - Use of a positive boolean value for either of these options is invalid. - --The booleans `pv=`, `hvm=`, `msr-sc=` and `rsb=` offer fine grained control --over the alternative blocks used by Xen. These impact Xen's ability to --protect itself, and Xen's ability to virtualise support for guests to use. -+The booleans `pv=`, `hvm=`, `msr-sc=`, `rsb=` and `md-clear=` offer fine -+grained control over the alternative blocks used by Xen. These impact Xen's -+ability to protect itself, and Xen's ability to virtualise support for guests -+to use. - - * `pv=` and `hvm=` offer control over all suboptions for PV and HVM guests - respectively. -@@ -1930,6 +1931,11 @@ protect itself, and Xen's ability to virtualise support for guests to use. - guests and if disabled, guests will be unable to use IBRS/STIBP/SSBD/etc. - * `rsb=` offers control over whether to overwrite the Return Stack Buffer / - Return Address Stack on entry to Xen. -+* `md-clear=` offers control over whether to use VERW to flush -+ microarchitectural buffers on idle and exit from Xen. *Note: For -+ compatibility with development versions of this fix, `mds=` is also accepted -+ on Xen 4.12 and earlier as an alias. Consult vendor documentation in -+ preference to here.* - - If Xen was compiled with INDIRECT_THUNK support, `bti-thunk=` can be used to - select which of the thunks gets patched into the `__x86_indirect_thunk_%reg` -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index a573b02..0509ac8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -35,6 +35,8 @@ static bool __initdata opt_msr_sc_pv = true; - static bool __initdata opt_msr_sc_hvm = true; - static bool __initdata opt_rsb_pv = true; - static bool __initdata opt_rsb_hvm = true; -+static int8_t __initdata opt_md_clear_pv = -1; -+static int8_t __initdata opt_md_clear_hvm = -1; - - /* Cmdline controls for Xen's speculative settings. */ - static enum ind_thunk { -@@ -59,6 +61,9 @@ paddr_t __read_mostly l1tf_addr_mask, __read_mostly l1tf_safe_maddr; - static bool __initdata cpu_has_bug_l1tf; - static unsigned int __initdata l1d_maxphysaddr; - -+static bool __initdata cpu_has_bug_msbds_only; /* => minimal HT impact. */ -+static bool __initdata cpu_has_bug_mds; /* Any other M{LP,SB,FB}DS combination. */ -+ - static int __init parse_spec_ctrl(const char *s) - { - const char *ss; -@@ -94,6 +99,8 @@ static int __init parse_spec_ctrl(const char *s) - disable_common: - opt_rsb_pv = false; - opt_rsb_hvm = false; -+ opt_md_clear_pv = 0; -+ opt_md_clear_hvm = 0; - - opt_thunk = THUNK_JMP; - opt_ibrs = 0; -@@ -116,11 +123,13 @@ static int __init parse_spec_ctrl(const char *s) - { - opt_msr_sc_pv = val; - opt_rsb_pv = val; -+ opt_md_clear_pv = val; - } - else if ( (val = parse_boolean("hvm", s, ss)) >= 0 ) - { - opt_msr_sc_hvm = val; - opt_rsb_hvm = val; -+ opt_md_clear_hvm = val; - } - else if ( (val = parse_boolean("msr-sc", s, ss)) >= 0 ) - { -@@ -132,6 +141,12 @@ static int __init parse_spec_ctrl(const char *s) - opt_rsb_pv = val; - opt_rsb_hvm = val; - } -+ else if ( (val = parse_boolean("md-clear", s, ss)) >= 0 || -+ (val = parse_boolean("mds", s, ss)) >= 0 ) -+ { -+ opt_md_clear_pv = val; -+ opt_md_clear_hvm = val; -+ } - - /* Xen's speculative sidechannel mitigation settings. */ - else if ( !strncmp(s, "bti-thunk=", 10) ) -@@ -317,7 +332,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - "\n"); - - /* Settings for Xen's protection, irrespective of guests. */ -- printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s, Other:%s%s\n", -+ printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s, Other:%s%s%s\n", - thunk == THUNK_NONE ? "N/A" : - thunk == THUNK_RETPOLINE ? "RETPOLINE" : - thunk == THUNK_LFENCE ? "LFENCE" : -@@ -327,7 +342,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - !boot_cpu_has(X86_FEATURE_SSBD) ? "" : - (default_xen_spec_ctrl & SPEC_CTRL_SSBD) ? " SSBD+" : " SSBD-", - opt_ibpb ? " IBPB" : "", -- opt_l1d_flush ? " L1D_FLUSH" : ""); -+ opt_l1d_flush ? " L1D_FLUSH" : "", -+ opt_md_clear_pv || opt_md_clear_hvm ? " VERW" : ""); - - /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ - if ( cpu_has_bug_l1tf || opt_pv_l1tf_hwdom || opt_pv_l1tf_domu ) -@@ -737,6 +753,107 @@ static __init void l1tf_calculations(uint64_t caps) - : (3ul << (paddr_bits - 2)))); - } - -+/* Calculate whether this CPU is vulnerable to MDS. */ -+static __init void mds_calculations(uint64_t caps) -+{ -+ /* MDS is only known to affect Intel Family 6 processors at this time. */ -+ if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || -+ boot_cpu_data.x86 != 6 ) -+ return; -+ -+ /* Any processor advertising MDS_NO should be not vulnerable to MDS. */ -+ if ( caps & ARCH_CAPS_MDS_NO ) -+ return; -+ -+ switch ( boot_cpu_data.x86_model ) -+ { -+ /* -+ * Core processors since at least Nehalem are vulnerable. -+ */ -+ case 0x1f: /* Auburndale / Havendale */ -+ case 0x1e: /* Nehalem */ -+ case 0x1a: /* Nehalem EP */ -+ case 0x2e: /* Nehalem EX */ -+ case 0x25: /* Westmere */ -+ case 0x2c: /* Westmere EP */ -+ case 0x2f: /* Westmere EX */ -+ case 0x2a: /* SandyBridge */ -+ case 0x2d: /* SandyBridge EP/EX */ -+ case 0x3a: /* IvyBridge */ -+ case 0x3e: /* IvyBridge EP/EX */ -+ case 0x3c: /* Haswell */ -+ case 0x3f: /* Haswell EX/EP */ -+ case 0x45: /* Haswell D */ -+ case 0x46: /* Haswell H */ -+ case 0x3d: /* Broadwell */ -+ case 0x47: /* Broadwell H */ -+ case 0x4f: /* Broadwell EP/EX */ -+ case 0x56: /* Broadwell D */ -+ case 0x4e: /* Skylake M */ -+ case 0x5e: /* Skylake D */ -+ cpu_has_bug_mds = true; -+ break; -+ -+ /* -+ * Some Core processors have per-stepping vulnerability. -+ */ -+ case 0x55: /* Skylake-X / Cascade Lake */ -+ if ( boot_cpu_data.x86_mask <= 5 ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ case 0x8e: /* Kaby / Coffee / Whiskey Lake M */ -+ if ( boot_cpu_data.x86_mask <= 0xb ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ case 0x9e: /* Kaby / Coffee / Whiskey Lake D */ -+ if ( boot_cpu_data.x86_mask <= 0xc ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ /* -+ * Very old and very new Atom processors are not vulnerable. -+ */ -+ case 0x1c: /* Pineview */ -+ case 0x26: /* Lincroft */ -+ case 0x27: /* Penwell */ -+ case 0x35: /* Cloverview */ -+ case 0x36: /* Cedarview */ -+ case 0x7a: /* Goldmont */ -+ break; -+ -+ /* -+ * Middling Atom processors are vulnerable to just the Store Buffer -+ * aspect. -+ */ -+ case 0x37: /* Baytrail / Valleyview (Silvermont) */ -+ case 0x4a: /* Merrifield */ -+ case 0x4c: /* Cherrytrail / Brasswell */ -+ case 0x4d: /* Avaton / Rangely (Silvermont) */ -+ case 0x5a: /* Moorefield */ -+ case 0x5d: -+ case 0x65: -+ case 0x6e: -+ case 0x75: -+ /* -+ * Knights processors (which are based on the Silvermont/Airmont -+ * microarchitecture) are similarly only affected by the Store Buffer -+ * aspect. -+ */ -+ case 0x57: /* Knights Landing */ -+ case 0x85: /* Knights Mill */ -+ cpu_has_bug_msbds_only = true; -+ break; -+ -+ default: -+ printk("Unrecognised CPU model %#x - assuming vulnerable to MDS\n", -+ boot_cpu_data.x86_model); -+ cpu_has_bug_mds = true; -+ break; -+ } -+} -+ - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; -@@ -924,6 +1041,47 @@ void __init init_speculation_mitigations(void) - "enabled. Please assess your configuration and choose an\n" - "explicit 'smt=' setting. See XSA-273.\n"); - -+ mds_calculations(caps); -+ -+ /* -+ * By default, enable PV and HVM mitigations on MDS-vulnerable hardware. -+ * This will only be a token effort for MLPDS/MFBDS when HT is enabled, -+ * but it is somewhat better than nothing. -+ */ -+ if ( opt_md_clear_pv == -1 ) -+ opt_md_clear_pv = ((cpu_has_bug_mds || cpu_has_bug_msbds_only) && -+ boot_cpu_has(X86_FEATURE_MD_CLEAR)); -+ if ( opt_md_clear_hvm == -1 ) -+ opt_md_clear_hvm = ((cpu_has_bug_mds || cpu_has_bug_msbds_only) && -+ boot_cpu_has(X86_FEATURE_MD_CLEAR)); -+ -+ /* -+ * Enable MDS defences as applicable. The PV blocks need using all the -+ * time, and the Idle blocks need using if either PV or HVM defences are -+ * used. -+ * -+ * HVM is more complicated. The MD_CLEAR microcode extends L1D_FLUSH with -+ * equivelent semantics to avoid needing to perform both flushes on the -+ * HVM path. The HVM blocks don't need activating if our hypervisor told -+ * us it was handling L1D_FLUSH, or we are using L1D_FLUSH ourselves. -+ */ -+ if ( opt_md_clear_pv ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_PV); -+ if ( opt_md_clear_pv || opt_md_clear_hvm ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_IDLE); -+ if ( opt_md_clear_hvm && !(caps & ARCH_CAPS_SKIP_L1DFL) && !opt_l1d_flush ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_HVM); -+ -+ /* -+ * Warn the user if they are on MLPDS/MFBDS-vulnerable hardware with HT -+ * active and no explicit SMT choice. -+ */ -+ if ( opt_smt == -1 && cpu_has_bug_mds && hw_smt_enabled ) -+ warning_add( -+ "Booted on MLPDS/MFBDS-vulnerable hardware with SMT/Hyperthreading\n" -+ "enabled. Mitigations will not be fully effective. Please\n" -+ "choose an explicit smt= setting. See XSA-297.\n"); -+ - print_details(thunk, caps); - - /* diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 79820a29e8c6..bf54c48eec6f 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -2,8 +2,8 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -PORTVERSION= 4.12.0 -PORTREVISION= 2 +PORTVERSION= 4.12.1 +PORTREVISION= 0 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -56,20 +56,6 @@ DOCS_INSTALL_TARGET= install-docs EXTRA_PATCHES+= ${PATCHDIR}/0001-tools-include-propagate-python-interpreter-path.patch:-p1 -# Pre-patches for XSA-297 to apply cleanly -EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch:-p1 \ - ${PATCHDIR}/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch:-p1 \ - ${PATCHDIR}/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch:-p1 - -# Fixes for XSA-297 (MDS) -EXTRA_PATCHES+= ${PATCHDIR}/xsa297-4.12-1.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-2.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-3.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-4.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-5.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-6.patch:-p1 \ - ${PATCHDIR}/xsa297-4.12-7.patch:-p1 - # LLD 8 changed the behaviour re the placement of orphaned sections, which # produces a non-bootable Xen kernel: # diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo index 85ee9e3c004f..8103dac766e3 100644 --- a/sysutils/xen-tools/distinfo +++ b/sysutils/xen-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555345627 -SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64 -SIZE (xen-4.12.0.tar.gz) = 26949697 +TIMESTAMP = 1565599755 +SHA256 (xen-4.12.1.tar.gz) = 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159 +SIZE (xen-4.12.1.tar.gz) = 26970584 diff --git a/sysutils/xen-tools/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch b/sysutils/xen-tools/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch deleted file mode 100644 index 91c17af9d2ed..000000000000 --- a/sysutils/xen-tools/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch +++ /dev/null @@ -1,71 +0,0 @@ -From e25d1338e1d8a32e46c808321323c4ad8fc5ba01 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:44:58 +0200 -Subject: [PATCH 1/2] x86/msr: Shorten ARCH_CAPABILITIES_* constants - -They are unnecesserily verbose, and ARCH_CAPS_* is already the more common -version. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich -master commit: ba27aaa88548c824a47dcf5609288ee1c05d2946 -master date: 2019-03-18 16:26:40 +0000 ---- - xen/arch/x86/spec_ctrl.c | 10 +++++----- - xen/include/asm-x86/msr-index.h | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index ad72ecd3a5..22bfc5a5e8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -230,8 +230,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", -- (caps & ARCH_CAPABILITIES_IBRS_ALL) ? " IBRS_ALL" : "", -- (caps & ARCH_CAPABILITIES_RDCL_NO) ? " RDCL_NO" : "", -+ (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", -+ (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : ""); -@@ -549,7 +549,7 @@ static __init void l1tf_calculations(uint64_t caps) - } - - /* Any processor advertising RDCL_NO should be not vulnerable to L1TF. */ -- if ( caps & ARCH_CAPABILITIES_RDCL_NO ) -+ if ( caps & ARCH_CAPS_RDCL_NO ) - cpu_has_bug_l1tf = false; - - if ( cpu_has_bug_l1tf && hit_default ) -@@ -613,9 +613,9 @@ int8_t __read_mostly opt_xpti_domu = -1; - static __init void xpti_init_default(uint64_t caps) - { - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -- caps = ARCH_CAPABILITIES_RDCL_NO; -+ caps = ARCH_CAPS_RDCL_NO; - -- if ( caps & ARCH_CAPABILITIES_RDCL_NO ) -+ if ( caps & ARCH_CAPS_RDCL_NO ) - { - if ( opt_xpti_hwdom < 0 ) - opt_xpti_hwdom = 0; -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index c6e1d8768f..11512d4250 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -42,8 +42,8 @@ - #define PRED_CMD_IBPB (_AC(1, ULL) << 0) - - #define MSR_ARCH_CAPABILITIES 0x0000010a --#define ARCH_CAPABILITIES_RDCL_NO (_AC(1, ULL) << 0) --#define ARCH_CAPABILITIES_IBRS_ALL (_AC(1, ULL) << 1) -+#define ARCH_CAPS_RDCL_NO (_AC(1, ULL) << 0) -+#define ARCH_CAPS_IBRS_ALL (_AC(1, ULL) << 1) - #define ARCH_CAPS_RSBA (_AC(1, ULL) << 2) - #define ARCH_CAPS_SKIP_L1DFL (_AC(1, ULL) << 3) - #define ARCH_CAPS_SSB_NO (_AC(1, ULL) << 4) --- -2.17.2 (Apple Git-113) - diff --git a/sysutils/xen-tools/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch b/sysutils/xen-tools/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch deleted file mode 100644 index 30352f9eeec3..000000000000 --- a/sysutils/xen-tools/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch +++ /dev/null @@ -1,185 +0,0 @@ -From e3a1ebee98e61dfe3b8b1eb71043ad5220b3cfd3 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:39:29 +0200 -Subject: [PATCH] x86/tsx: Implement controls for RTM force-abort mode - -The CPUID bit and MSR are deliberately not exposed to guests, because they -won't exist on newer processors. As vPMU isn't security supported, the -misbehaviour of PCR3 isn't expected to impact production deployments. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich -master commit: 6be613f29b4205349275d24367bd4c82fb2960dd -master date: 2019-03-12 17:05:21 +0000 ---- - docs/misc/xen-command-line.pandoc | 17 ++++++++++++++++- - tools/misc/xen-cpuid.c | 2 ++ - xen/arch/x86/cpu/intel.c | 3 +++ - xen/arch/x86/cpu/vpmu.c | 3 +++ - xen/arch/x86/msr.c | 4 ++++ - xen/include/asm-x86/cpufeature.h | 3 +++ - xen/include/asm-x86/msr-index.h | 3 +++ - xen/include/asm-x86/vpmu.h | 1 + - xen/include/public/arch-x86/cpufeatureset.h | 1 + - 9 files changed, 36 insertions(+), 1 deletion(-) - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index 742555616d..6db82f302e 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -2109,7 +2109,7 @@ Use Virtual Processor ID support if available. This prevents the need for TLB - flushes on VM entry and exit, increasing performance. - - ### vpmu (x86) -- = List of [ , bts, ipc, arch ] -+ = List of [ , bts, ipc, arch, rtm-abort= ] - - Applicability: x86. Default: false - -@@ -2142,6 +2142,21 @@ provide access to a wealth of low level processor information. - - * The `arch` option allows access to the pre-defined architectural events. - -+* The `rtm-abort` boolean controls a trade-off between working Restricted -+ Transactional Memory, and working performance counters. -+ -+ All processors released to date (Q1 2019) supporting Transactional Memory -+ Extensions suffer an erratum which has been addressed in microcode. -+ -+ Processors based on the Skylake microarchitecture with up-to-date -+ microcode internally use performance counter 3 to work around the erratum. -+ A consequence is that the counter gets reprogrammed whenever an `XBEGIN` -+ instruction is executed. -+ -+ An alternative mode exists where PCR3 behaves as before, at the cost of -+ `XBEGIN` unconditionally aborting. Enabling `rtm-abort` mode will -+ activate this alternative mode. -+ - *Warning:* - As the virtualisation is not 100% safe, don't use the vpmu flag on - production systems (see http://xenbits.xen.org/xsa/advisory-163.html)! -diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c -index 6e7ca8b9a4..d87a72e3e6 100644 ---- a/tools/misc/xen-cpuid.c -+++ b/tools/misc/xen-cpuid.c -@@ -146,6 +146,8 @@ static const char *str_7d0[32] = - { - [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps", - -+ /* 12 */ [13] = "tsx-force-abort", -+ - [26] = "ibrsb", [27] = "stibp", - [28] = "l1d_flush", [29] = "arch_caps", - /* 30 */ [31] = "ssbd", -diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c -index 65fa3d611f..29c6b87512 100644 ---- a/xen/arch/x86/cpu/intel.c -+++ b/xen/arch/x86/cpu/intel.c -@@ -286,6 +286,9 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) - if (c->x86 == 6 && cpu_has_clflush && - (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) - __set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); -+ -+ if (cpu_has_tsx_force_abort && opt_rtm_abort) -+ wrmsrl(MSR_TSX_FORCE_ABORT, TSX_FORCE_ABORT_RTM); - } - - -diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c -index 8324d62f11..8f6daf13fd 100644 ---- a/xen/arch/x86/cpu/vpmu.c -+++ b/xen/arch/x86/cpu/vpmu.c -@@ -45,6 +45,7 @@ CHECK_pmu_params; - static unsigned int __read_mostly opt_vpmu_enabled; - unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; - unsigned int __read_mostly vpmu_features = 0; -+bool __read_mostly opt_rtm_abort; - - static DEFINE_SPINLOCK(vpmu_lock); - static unsigned vpmu_count; -@@ -73,6 +74,8 @@ static int __init parse_vpmu_params(const char *s) - vpmu_features |= XENPMU_FEATURE_IPC_ONLY; - else if ( !cmdline_strcmp(s, "arch") ) - vpmu_features |= XENPMU_FEATURE_ARCH_ONLY; -+ else if ( (val = parse_boolean("rtm-abort", s, ss)) >= 0 ) -+ opt_rtm_abort = val; - else - rc = -EINVAL; - -diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c -index 9bb38b6d66..4df4a59f4d 100644 ---- a/xen/arch/x86/msr.c -+++ b/xen/arch/x86/msr.c -@@ -131,6 +131,8 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) - case MSR_PRED_CMD: - case MSR_FLUSH_CMD: - /* Write-only */ -+ case MSR_TSX_FORCE_ABORT: -+ /* Not offered to guests. */ - goto gp_fault; - - case MSR_SPEC_CTRL: -@@ -230,6 +232,8 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) - case MSR_INTEL_PLATFORM_INFO: - case MSR_ARCH_CAPABILITIES: - /* Read-only */ -+ case MSR_TSX_FORCE_ABORT: -+ /* Not offered to guests. */ - goto gp_fault; - - case MSR_AMD_PATCHLOADER: -diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h -index 1fb9af4b19..745801f3c0 100644 ---- a/xen/include/asm-x86/cpufeature.h -+++ b/xen/include/asm-x86/cpufeature.h -@@ -112,6 +112,9 @@ - /* CPUID level 0x80000007.edx */ - #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) - -+/* CPUID level 0x00000007:0.edx */ -+#define cpu_has_tsx_force_abort boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT) -+ - /* Synthesized. */ - #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) - #define cpu_has_cpuid_faulting boot_cpu_has(X86_FEATURE_CPUID_FAULTING) -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 24d783a72d..c6e1d8768f 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -51,6 +51,9 @@ - #define MSR_FLUSH_CMD 0x0000010b - #define FLUSH_CMD_L1D (_AC(1, ULL) << 0) - -+#define MSR_TSX_FORCE_ABORT 0x0000010f -+#define TSX_FORCE_ABORT_RTM (_AC(1, ULL) << 0) -+ - /* Intel MSRs. Some also available on other CPUs */ - #define MSR_IA32_PERFCTR0 0x000000c1 - #define MSR_IA32_A_PERFCTR0 0x000004c1 -diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h -index 5e778ab7ba..1287b9fb6e 100644 ---- a/xen/include/asm-x86/vpmu.h -+++ b/xen/include/asm-x86/vpmu.h -@@ -125,6 +125,7 @@ static inline int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content) - - extern unsigned int vpmu_mode; - extern unsigned int vpmu_features; -+extern bool opt_rtm_abort; - - /* Context switch */ - static inline void vpmu_switch_from(struct vcpu *prev) -diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h -index fbc68fa29f..2bcc5487ac 100644 ---- a/xen/include/public/arch-x86/cpufeatureset.h -+++ b/xen/include/public/arch-x86/cpufeatureset.h -@@ -242,6 +242,7 @@ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by - /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ - XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ - XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ -+XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ - XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ - XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ - XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ --- -2.17.2 (Apple Git-113) - diff --git a/sysutils/xen-tools/files/0001-xen-mapcache-use-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch b/sysutils/xen-tools/files/0001-xen-mapcache-use-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch deleted file mode 100644 index e73814ead8f7..000000000000 --- a/sysutils/xen-tools/files/0001-xen-mapcache-use-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f3069a581c0f96b62c59b06a43b57561f7418813 Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Fri, 15 Mar 2019 09:27:19 +0100 -Subject: [PATCH] xen-mapcache: use MAP_FIXED flag so the mmap address hint is - always honored -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Or if it's not possible to honor the hinted address an error is returned -instead. This makes it easier to spot the actual failure, instead of -failing later on when the caller of xen_remap_bucket realizes the -mapping has not been created at the requested address. - -Also note that at least on FreeBSD using MAP_FIXED will cause mmap to -try harder to honor the passed address. - -Signed-off-by: Roger Pau Monné ---- -Cc: Stefano Stabellini -Cc: Anthony Perard -Cc: Paul Durrant -Cc: Igor Druzhinin -Cc: Paolo Bonzini -Cc: Richard Henderson -Cc: Eduardo Habkost -Cc: "Michael S. Tsirkin" -Cc: Marcel Apfelbaum -Cc: xen-devel@lists.xenproject.org ---- - hw/i386/xen/xen-mapcache.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c -index 349f72d00c..0e2870b320 100644 ---- a/hw/i386/xen/xen-mapcache.c -+++ b/hw/i386/xen/xen-mapcache.c -@@ -185,8 +185,14 @@ static void xen_remap_bucket(MapCacheEntry *entry, - } - - if (!dummy) { -+ /* -+ * If the caller has requested the mapping at a specific address use -+ * MAP_FIXED to make sure it's honored. Note that with MAP_FIXED at -+ * least FreeBSD will try harder to honor the passed address. -+ */ - vaddr_base = xenforeignmemory_map2(xen_fmem, xen_domid, vaddr, -- PROT_READ | PROT_WRITE, 0, -+ PROT_READ | PROT_WRITE, -+ vaddr ? MAP_FIXED : 0, - nb_pfn, pfns, err); - if (vaddr_base == NULL) { - perror("xenforeignmemory_map2"); --- -2.17.2 (Apple Git-113) - diff --git a/sysutils/xen-tools/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch b/sysutils/xen-tools/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch deleted file mode 100644 index b4b8a7d05aa5..000000000000 --- a/sysutils/xen-tools/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fd2a34c9655acecaaa1541dd84fc670936303175 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper -Date: Fri, 3 May 2019 10:45:45 +0200 -Subject: [PATCH 2/2] x86/spec-ctrl: Extend repoline safey calcuations for - eIBRS and Atom parts - -All currently-released Atom processors are in practice retpoline-safe, because -they don't fall back to a BTB prediction on RSB underflow. - -However, an additional meaning of Enhanced IRBS is that the processor may not -be retpoline-safe. The Gemini Lake platform, based on the Goldmont Plus -microarchitecture is the first Atom processor to support eIBRS. - -Until Xen gets full eIBRS support, Gemini Lake will still be safe using -regular IBRS. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich -master commit: 17f74242ccf0ce6e51c03a5860947865c0ef0dc2 -master date: 2019-03-18 16:26:40 +0000 ---- - xen/arch/x86/spec_ctrl.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 22bfc5a5e8..1171c02ab1 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -316,8 +316,11 @@ static bool __init retpoline_safe(uint64_t caps) - /* - * RSBA may be set by a hypervisor to indicate that we may move to a - * processor which isn't retpoline-safe. -+ * -+ * Processors offering Enhanced IBRS are not guarenteed to be -+ * repoline-safe. - */ -- if ( caps & ARCH_CAPS_RSBA ) -+ if ( caps & (ARCH_CAPS_RSBA | ARCH_CAPS_IBRS_ALL) ) - return false; - - switch ( boot_cpu_data.x86_model ) -@@ -377,6 +380,23 @@ static bool __init retpoline_safe(uint64_t caps) - case 0x9e: - return false; - -+ /* -+ * Atom processors before Goldmont Plus/Gemini Lake are retpoline-safe. -+ */ -+ case 0x1c: /* Pineview */ -+ case 0x26: /* Lincroft */ -+ case 0x27: /* Penwell */ -+ case 0x35: /* Cloverview */ -+ case 0x36: /* Cedarview */ -+ case 0x37: /* Baytrail / Valleyview (Silvermont) */ -+ case 0x4d: /* Avaton / Rangely (Silvermont) */ -+ case 0x4c: /* Cherrytrail / Brasswell */ -+ case 0x4a: /* Merrifield */ -+ case 0x5a: /* Moorefield */ -+ case 0x5c: /* Goldmont */ -+ case 0x5f: /* Denverton */ -+ return true; -+ - default: - printk("Unrecognised CPU model %#x - assuming not reptpoline safe\n", - boot_cpu_data.x86_model); --- -2.17.2 (Apple Git-113) - diff --git a/sysutils/xen-tools/files/xsa297-4.12-1.patch b/sysutils/xen-tools/files/xsa297-4.12-1.patch deleted file mode 100644 index 51da965f7b18..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-1.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Reposition the XPTI command line parsing logic - -It has ended up in the middle of the mitigation calculation logic. Move it to -be beside the other command line parsing. - -No functional change. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 1171c02..99310c8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -167,6 +167,73 @@ static int __init parse_spec_ctrl(const char *s) - } - custom_param("spec-ctrl", parse_spec_ctrl); - -+int8_t __read_mostly opt_xpti_hwdom = -1; -+int8_t __read_mostly opt_xpti_domu = -1; -+ -+static __init void xpti_init_default(uint64_t caps) -+{ -+ if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -+ caps = ARCH_CAPS_RDCL_NO; -+ -+ if ( caps & ARCH_CAPS_RDCL_NO ) -+ { -+ if ( opt_xpti_hwdom < 0 ) -+ opt_xpti_hwdom = 0; -+ if ( opt_xpti_domu < 0 ) -+ opt_xpti_domu = 0; -+ } -+ else -+ { -+ if ( opt_xpti_hwdom < 0 ) -+ opt_xpti_hwdom = 1; -+ if ( opt_xpti_domu < 0 ) -+ opt_xpti_domu = 1; -+ } -+} -+ -+static __init int parse_xpti(const char *s) -+{ -+ const char *ss; -+ int val, rc = 0; -+ -+ /* Interpret 'xpti' alone in its positive boolean form. */ -+ if ( *s == '\0' ) -+ opt_xpti_hwdom = opt_xpti_domu = 1; -+ -+ do { -+ ss = strchr(s, ','); -+ if ( !ss ) -+ ss = strchr(s, '\0'); -+ -+ switch ( parse_bool(s, ss) ) -+ { -+ case 0: -+ opt_xpti_hwdom = opt_xpti_domu = 0; -+ break; -+ -+ case 1: -+ opt_xpti_hwdom = opt_xpti_domu = 1; -+ break; -+ -+ default: -+ if ( !strcmp(s, "default") ) -+ opt_xpti_hwdom = opt_xpti_domu = -1; -+ else if ( (val = parse_boolean("dom0", s, ss)) >= 0 ) -+ opt_xpti_hwdom = val; -+ else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) -+ opt_xpti_domu = val; -+ else if ( *s ) -+ rc = -EINVAL; -+ break; -+ } -+ -+ s = ss + 1; -+ } while ( *ss ); -+ -+ return rc; -+} -+custom_param("xpti", parse_xpti); -+ - int8_t __read_mostly opt_pv_l1tf_hwdom = -1; - int8_t __read_mostly opt_pv_l1tf_domu = -1; - -@@ -627,73 +694,6 @@ static __init void l1tf_calculations(uint64_t caps) - : (3ul << (paddr_bits - 2)))); - } - --int8_t __read_mostly opt_xpti_hwdom = -1; --int8_t __read_mostly opt_xpti_domu = -1; -- --static __init void xpti_init_default(uint64_t caps) --{ -- if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) -- caps = ARCH_CAPS_RDCL_NO; -- -- if ( caps & ARCH_CAPS_RDCL_NO ) -- { -- if ( opt_xpti_hwdom < 0 ) -- opt_xpti_hwdom = 0; -- if ( opt_xpti_domu < 0 ) -- opt_xpti_domu = 0; -- } -- else -- { -- if ( opt_xpti_hwdom < 0 ) -- opt_xpti_hwdom = 1; -- if ( opt_xpti_domu < 0 ) -- opt_xpti_domu = 1; -- } --} -- --static __init int parse_xpti(const char *s) --{ -- const char *ss; -- int val, rc = 0; -- -- /* Interpret 'xpti' alone in its positive boolean form. */ -- if ( *s == '\0' ) -- opt_xpti_hwdom = opt_xpti_domu = 1; -- -- do { -- ss = strchr(s, ','); -- if ( !ss ) -- ss = strchr(s, '\0'); -- -- switch ( parse_bool(s, ss) ) -- { -- case 0: -- opt_xpti_hwdom = opt_xpti_domu = 0; -- break; -- -- case 1: -- opt_xpti_hwdom = opt_xpti_domu = 1; -- break; -- -- default: -- if ( !strcmp(s, "default") ) -- opt_xpti_hwdom = opt_xpti_domu = -1; -- else if ( (val = parse_boolean("dom0", s, ss)) >= 0 ) -- opt_xpti_hwdom = val; -- else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) -- opt_xpti_domu = val; -- else if ( *s ) -- rc = -EINVAL; -- break; -- } -- -- s = ss + 1; -- } while ( *ss ); -- -- return rc; --} --custom_param("xpti", parse_xpti); -- - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; diff --git a/sysutils/xen-tools/files/xsa297-4.12-2.patch b/sysutils/xen-tools/files/xsa297-4.12-2.patch deleted file mode 100644 index d03279a14e61..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Andrew Cooper -Subject: x86/msr: Definitions for MSR_INTEL_CORE_THREAD_COUNT - -This is a model specific register which details the current configuration -cores and threads in the package. Because of how Hyperthread and Core -configuration works works in firmware, the MSR it is de-facto constant and -will remain unchanged until the next system reset. - -It is a read only MSR (so unilaterally reject writes), but for now retain its -leaky-on-read properties. Further CPUID/MSR work is required before we can -start virtualising a consistent topology to the guest, and retaining the old -behaviour is the safest course of action. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c -index 4df4a59..a7f67d9 100644 ---- a/xen/arch/x86/msr.c -+++ b/xen/arch/x86/msr.c -@@ -200,6 +200,10 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) - ARRAY_SIZE(msrs->dr_mask))]; - break; - -+ /* -+ * TODO: Implement when we have better topology representation. -+ case MSR_INTEL_CORE_THREAD_COUNT: -+ */ - default: - return X86EMUL_UNHANDLEABLE; - } -@@ -229,6 +233,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) - { - uint64_t rsvd; - -+ case MSR_INTEL_CORE_THREAD_COUNT: - case MSR_INTEL_PLATFORM_INFO: - case MSR_ARCH_CAPABILITIES: - /* Read-only */ -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 11512d4..389f95f 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -32,6 +32,10 @@ - #define EFER_KNOWN_MASK (EFER_SCE | EFER_LME | EFER_LMA | EFER_NX | \ - EFER_SVME | EFER_FFXSE) - -+#define MSR_INTEL_CORE_THREAD_COUNT 0x00000035 -+#define MSR_CTC_THREAD_MASK 0x0000ffff -+#define MSR_CTC_CORE_MASK 0xffff0000 -+ - /* Speculation Controls. */ - #define MSR_SPEC_CTRL 0x00000048 - #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) diff --git a/sysutils/xen-tools/files/xsa297-4.12-3.patch b/sysutils/xen-tools/files/xsa297-4.12-3.patch deleted file mode 100644 index 7b4326691fae..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-3.patch +++ /dev/null @@ -1,109 +0,0 @@ -From: Andrew Cooper -Subject: x86/boot: Detect the firmware SMT setting correctly on Intel hardware - -While boot_cpu_data.x86_num_siblings is an accurate value to use on AMD -hardware, it isn't on Intel when the user has disabled Hyperthreading in the -firmware. As a result, a user which has chosen to disable HT still gets -nagged on L1TF-vulnerable hardware when they haven't chosen an explicit -smt= setting. - -Make use of the largely-undocumented MSR_INTEL_CORE_THREAD_COUNT which in -practice exists since Nehalem, when booting on real hardware. Fall back to -using the ACPI table APIC IDs. - -While adjusting this logic, fix a latent bug in amd_get_topology(). The -thread count field in CPUID.0x8000001e.ebx is documented as 8 bits wide, -rather than 2 bits wide. - -Signed-off-by: Andrew Cooper -Acked-by: Jan Beulich - -diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c -index c790416..b1debac 100644 ---- a/xen/arch/x86/cpu/amd.c -+++ b/xen/arch/x86/cpu/amd.c -@@ -507,7 +507,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c) - u32 eax, ebx, ecx, edx; - - cpuid(0x8000001e, &eax, &ebx, &ecx, &edx); -- c->x86_num_siblings = ((ebx >> 8) & 0x3) + 1; -+ c->x86_num_siblings = ((ebx >> 8) & 0xff) + 1; - - if (c->x86 < 0x17) - c->compute_unit_id = ebx & 0xFF; -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index 99310c8..e49ab3f 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -368,6 +368,45 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - #endif - } - -+static bool __init check_smt_enabled(void) -+{ -+ uint64_t val; -+ unsigned int cpu; -+ -+ /* -+ * x86_num_siblings defaults to 1 in the absence of other information, and -+ * is adjusted based on other topology information found in CPUID leaves. -+ * -+ * On AMD hardware, it will be the current SMT configuration. On Intel -+ * hardware, it will represent the maximum capability, rather than the -+ * current configuration. -+ */ -+ if ( boot_cpu_data.x86_num_siblings < 2 ) -+ return false; -+ -+ /* -+ * Intel Nehalem and later hardware does have an MSR which reports the -+ * current count of cores/threads in the package. -+ * -+ * At the time of writing, it is almost completely undocumented, so isn't -+ * virtualised reliably. -+ */ -+ if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && !cpu_has_hypervisor && -+ !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) -+ return (MASK_EXTR(val, MSR_CTC_CORE_MASK) != -+ MASK_EXTR(val, MSR_CTC_THREAD_MASK)); -+ -+ /* -+ * Search over the CPUs reported in the ACPI tables. Any whose APIC ID -+ * has a non-zero thread id component indicates that SMT is active. -+ */ -+ for_each_present_cpu ( cpu ) -+ if ( x86_cpu_to_apicid[cpu] & (boot_cpu_data.x86_num_siblings - 1) ) -+ return true; -+ -+ return false; -+} -+ - /* Calculate whether Retpoline is known-safe on this CPU. */ - static bool __init retpoline_safe(uint64_t caps) - { -@@ -697,12 +736,14 @@ static __init void l1tf_calculations(uint64_t caps) - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; -- bool use_spec_ctrl = false, ibrs = false; -+ bool use_spec_ctrl = false, ibrs = false, hw_smt_enabled; - uint64_t caps = 0; - - if ( boot_cpu_has(X86_FEATURE_ARCH_CAPS) ) - rdmsrl(MSR_ARCH_CAPABILITIES, caps); - -+ hw_smt_enabled = check_smt_enabled(); -+ - /* - * Has the user specified any custom BTI mitigations? If so, follow their - * instructions exactly and disable all heuristics. -@@ -873,8 +914,7 @@ void __init init_speculation_mitigations(void) - * However, if we are on affected hardware, with HT enabled, and the user - * hasn't explicitly chosen whether to use HT or not, nag them to do so. - */ -- if ( opt_smt == -1 && cpu_has_bug_l1tf && !pv_shim && -- boot_cpu_data.x86_num_siblings > 1 ) -+ if ( opt_smt == -1 && cpu_has_bug_l1tf && !pv_shim && hw_smt_enabled ) - warning_add( - "Booted on L1TF-vulnerable hardware with SMT/Hyperthreading\n" - "enabled. Please assess your configuration and choose an\n" diff --git a/sysutils/xen-tools/files/xsa297-4.12-4.patch b/sysutils/xen-tools/files/xsa297-4.12-4.patch deleted file mode 100644 index a7e2fe2a3f29..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-4.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Misc non-functional cleanup - - * Identify BTI in the spec_ctrl_{enter,exit}_idle() comments, as other - mitigations will shortly appear. - * Use alternative_input() and cover the lack of memory cobber with a further - barrier. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h -index 779da2b..20ee112 100644 ---- a/xen/include/asm-x86/spec_ctrl.h -+++ b/xen/include/asm-x86/spec_ctrl.h -@@ -68,6 +68,8 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - uint32_t val = 0; - - /* -+ * Branch Target Injection: -+ * - * Latch the new shadow value, then enable shadowing, then update the MSR. - * There are no SMP issues here; only local processor ordering concerns. - */ -@@ -75,8 +77,9 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - barrier(); - info->spec_ctrl_flags |= SCF_use_shadow; - barrier(); -- asm volatile ( ALTERNATIVE("", "wrmsr", X86_FEATURE_SC_MSR_IDLE) -- :: "a" (val), "c" (MSR_SPEC_CTRL), "d" (0) : "memory" ); -+ alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, -+ "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); -+ barrier(); - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe before this call. */ -@@ -85,13 +88,16 @@ static always_inline void spec_ctrl_exit_idle(struct cpu_info *info) - uint32_t val = info->xen_spec_ctrl; - - /* -+ * Branch Target Injection: -+ * - * Disable shadowing before updating the MSR. There are no SMP issues - * here; only local processor ordering concerns. - */ - info->spec_ctrl_flags &= ~SCF_use_shadow; - barrier(); -- asm volatile ( ALTERNATIVE("", "wrmsr", X86_FEATURE_SC_MSR_IDLE) -- :: "a" (val), "c" (MSR_SPEC_CTRL), "d" (0) : "memory" ); -+ alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, -+ "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); -+ barrier(); - } - - #endif /* __ASSEMBLY__ */ diff --git a/sysutils/xen-tools/files/xsa297-4.12-5.patch b/sysutils/xen-tools/files/xsa297-4.12-5.patch deleted file mode 100644 index 172a9925e58e..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-5.patch +++ /dev/null @@ -1,147 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: CPUID/MSR definitions for Microarchitectural Data - Sampling - -The MD_CLEAR feature can be automatically offered to guests. No -infrastructure is needed in Xen to support the guest making use of it. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index 6db82f3..f80d8d8 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -483,7 +483,7 @@ accounting for hardware capabilities as enumerated via CPUID. - - Currently accepted: - --The Speculation Control hardware features `ibrsb`, `stibp`, `ibpb`, -+The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`, - `l1d-flush` and `ssbd` are used by default if available and applicable. They can - be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and - won't offer them to guests. -diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c -index 52e16c2..5a1702d 100644 ---- a/tools/libxl/libxl_cpuid.c -+++ b/tools/libxl/libxl_cpuid.c -@@ -202,6 +202,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) - - {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, - {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, -+ {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, - {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, - {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, - {"l1d-flush", 0x00000007, 0, CPUID_REG_EDX, 28, 1}, -diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c -index d87a72e..f67ecd3 100644 ---- a/tools/misc/xen-cpuid.c -+++ b/tools/misc/xen-cpuid.c -@@ -146,6 +146,7 @@ static const char *str_7d0[32] = - { - [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps", - -+ [10] = "md-clear", - /* 12 */ [13] = "tsx-force-abort", - - [26] = "ibrsb", [27] = "stibp", -diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c -index ab0aab6..3efad9c 100644 ---- a/xen/arch/x86/cpuid.c -+++ b/xen/arch/x86/cpuid.c -@@ -29,7 +29,12 @@ static int __init parse_xen_cpuid(const char *s) - if ( !ss ) - ss = strchr(s, '\0'); - -- if ( (val = parse_boolean("ibpb", s, ss)) >= 0 ) -+ if ( (val = parse_boolean("md-clear", s, ss)) >= 0 ) -+ { -+ if ( !val ) -+ setup_clear_cpu_cap(X86_FEATURE_MD_CLEAR); -+ } -+ else if ( (val = parse_boolean("ibpb", s, ss)) >= 0 ) - { - if ( !val ) - setup_clear_cpu_cap(X86_FEATURE_IBPB); -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index e49ab3f..a573b02 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -291,17 +291,19 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - printk("Speculative mitigation facilities:\n"); - - /* Hardware features which pertain to speculative mitigations. */ -- printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", -+ printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", -+ (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", -- (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : ""); -+ (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", -+ (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : ""); - - /* Compiled-in support which pertains to mitigations. */ - if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -@@ -339,23 +341,25 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - * mitigation support for guests. - */ - #ifdef CONFIG_HVM -- printk(" Support for HVM VMs:%s%s%s%s\n", -+ printk(" Support for HVM VMs:%s%s%s%s%s\n", - (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) || - boot_cpu_has(X86_FEATURE_SC_RSB_HVM) || - opt_eager_fpu) ? "" : " None", - boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ? " MSR_SPEC_CTRL" : "", - boot_cpu_has(X86_FEATURE_SC_RSB_HVM) ? " RSB" : "", -- opt_eager_fpu ? " EAGER_FPU" : ""); -+ opt_eager_fpu ? " EAGER_FPU" : "", -+ boot_cpu_has(X86_FEATURE_MD_CLEAR) ? " MD_CLEAR" : ""); - - #endif - #ifdef CONFIG_PV -- printk(" Support for PV VMs:%s%s%s%s\n", -+ printk(" Support for PV VMs:%s%s%s%s%s\n", - (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || - boot_cpu_has(X86_FEATURE_SC_RSB_PV) || - opt_eager_fpu) ? "" : " None", - boot_cpu_has(X86_FEATURE_SC_MSR_PV) ? " MSR_SPEC_CTRL" : "", - boot_cpu_has(X86_FEATURE_SC_RSB_PV) ? " RSB" : "", -- opt_eager_fpu ? " EAGER_FPU" : ""); -+ opt_eager_fpu ? " EAGER_FPU" : "", -+ boot_cpu_has(X86_FEATURE_MD_CLEAR) ? " MD_CLEAR" : ""); - - printk(" XPTI (64-bit PV only): Dom0 %s, DomU %s (with%s PCID)\n", - opt_xpti_hwdom ? "enabled" : "disabled", -diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h -index 389f95f..637259b 100644 ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -51,6 +51,7 @@ - #define ARCH_CAPS_RSBA (_AC(1, ULL) << 2) - #define ARCH_CAPS_SKIP_L1DFL (_AC(1, ULL) << 3) - #define ARCH_CAPS_SSB_NO (_AC(1, ULL) << 4) -+#define ARCH_CAPS_MDS_NO (_AC(1, ULL) << 5) - - #define MSR_FLUSH_CMD 0x0000010b - #define FLUSH_CMD_L1D (_AC(1, ULL) << 0) -diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h -index 2bcc548..55231d4 100644 ---- a/xen/include/public/arch-x86/cpufeatureset.h -+++ b/xen/include/public/arch-x86/cpufeatureset.h -@@ -242,6 +242,7 @@ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by - /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ - XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ - XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ -+XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ - XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ - XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ - XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ diff --git a/sysutils/xen-tools/files/xsa297-4.12-6.patch b/sysutils/xen-tools/files/xsa297-4.12-6.patch deleted file mode 100644 index 48023a88b646..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-6.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Infrastructure to use VERW to flush pipeline buffers - -Three synthetic features are introduced, as we need individual control of -each, depending on circumstances. A later change will enable them at -appropriate points. - -The verw_sel field doesn't strictly need to live in struct cpu_info. It lives -there because there is a convenient hole it can fill, and it reduces the -complexity of the SPEC_CTRL_EXIT_TO_{PV,HVM} assembly by avoiding the need for -any temporary stack maintenance. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c -index 052228c..33930ce 100644 ---- a/xen/arch/x86/x86_64/asm-offsets.c -+++ b/xen/arch/x86/x86_64/asm-offsets.c -@@ -110,6 +110,7 @@ void __dummy__(void) - BLANK(); - - OFFSET(CPUINFO_guest_cpu_user_regs, struct cpu_info, guest_cpu_user_regs); -+ OFFSET(CPUINFO_verw_sel, struct cpu_info, verw_sel); - OFFSET(CPUINFO_current_vcpu, struct cpu_info, current_vcpu); - OFFSET(CPUINFO_cr4, struct cpu_info, cr4); - OFFSET(CPUINFO_xen_cr3, struct cpu_info, xen_cr3); -diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h -index 0c06274..ba55245 100644 ---- a/xen/include/asm-x86/cpufeatures.h -+++ b/xen/include/asm-x86/cpufeatures.h -@@ -31,3 +31,6 @@ XEN_CPUFEATURE(SC_RSB_PV, (FSCAPINTS+0)*32+18) /* RSB overwrite needed for - XEN_CPUFEATURE(SC_RSB_HVM, (FSCAPINTS+0)*32+19) /* RSB overwrite needed for HVM */ - XEN_CPUFEATURE(SC_MSR_IDLE, (FSCAPINTS+0)*32+21) /* (SC_MSR_PV || SC_MSR_HVM) && default_xen_spec_ctrl */ - XEN_CPUFEATURE(XEN_LBR, (FSCAPINTS+0)*32+22) /* Xen uses MSR_DEBUGCTL.LBR */ -+XEN_CPUFEATURE(SC_VERW_PV, (FSCAPINTS+0)*32+23) /* VERW used by Xen for PV */ -+XEN_CPUFEATURE(SC_VERW_HVM, (FSCAPINTS+0)*32+24) /* VERW used by Xen for HVM */ -+XEN_CPUFEATURE(SC_VERW_IDLE, (FSCAPINTS+0)*32+25) /* VERW used by Xen for idle */ -diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h -index 5bd64b2..f3508c3 100644 ---- a/xen/include/asm-x86/current.h -+++ b/xen/include/asm-x86/current.h -@@ -38,6 +38,7 @@ struct vcpu; - struct cpu_info { - struct cpu_user_regs guest_cpu_user_regs; - unsigned int processor_id; -+ unsigned int verw_sel; - struct vcpu *current_vcpu; - unsigned long per_cpu_offset; - unsigned long cr4; -diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h -index 20ee112..ba03bb4 100644 ---- a/xen/include/asm-x86/spec_ctrl.h -+++ b/xen/include/asm-x86/spec_ctrl.h -@@ -60,6 +60,13 @@ static inline void init_shadow_spec_ctrl_state(void) - info->shadow_spec_ctrl = 0; - info->xen_spec_ctrl = default_xen_spec_ctrl; - info->spec_ctrl_flags = default_spec_ctrl_flags; -+ -+ /* -+ * For least latency, the VERW selector should be a writeable data -+ * descriptor resident in the cache. __HYPERVISOR_DS32 shares a cache -+ * line with __HYPERVISOR_CS, so is expected to be very cache-hot. -+ */ -+ info->verw_sel = __HYPERVISOR_DS32; - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe after this call. */ -@@ -80,6 +87,22 @@ static always_inline void spec_ctrl_enter_idle(struct cpu_info *info) - alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, - "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); - barrier(); -+ -+ /* -+ * Microarchitectural Store Buffer Data Sampling: -+ * -+ * On vulnerable systems, store buffer entries are statically partitioned -+ * between active threads. When entering idle, our store buffer entries -+ * are re-partitioned to allow the other threads to use them. -+ * -+ * Flush the buffers to ensure that no sensitive data of ours can be -+ * leaked by a sibling after it gets our store buffer entries. -+ * -+ * Note: VERW must be encoded with a memory operand, as it is only that -+ * form which causes a flush. -+ */ -+ alternative_input("", "verw %[sel]", X86_FEATURE_SC_VERW_IDLE, -+ [sel] "m" (info->verw_sel)); - } - - /* WARNING! `ret`, `call *`, `jmp *` not safe before this call. */ -@@ -98,6 +121,17 @@ static always_inline void spec_ctrl_exit_idle(struct cpu_info *info) - alternative_input("", "wrmsr", X86_FEATURE_SC_MSR_IDLE, - "a" (val), "c" (MSR_SPEC_CTRL), "d" (0)); - barrier(); -+ -+ /* -+ * Microarchitectural Store Buffer Data Sampling: -+ * -+ * On vulnerable systems, store buffer entries are statically partitioned -+ * between active threads. When exiting idle, the other threads store -+ * buffer entries are re-partitioned to give us some. -+ * -+ * We now have store buffer entries with stale data from sibling threads. -+ * A flush if necessary will be performed on the return to guest path. -+ */ - } - - #endif /* __ASSEMBLY__ */ -diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h -index 803f7ce..c60093b 100644 ---- a/xen/include/asm-x86/spec_ctrl_asm.h -+++ b/xen/include/asm-x86/spec_ctrl_asm.h -@@ -241,12 +241,16 @@ - /* Use when exiting to PV guest context. */ - #define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ -- DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV -+ DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ -+ ALTERNATIVE "", __stringify(verw CPUINFO_verw_sel(%rsp)), \ -+ X86_FEATURE_SC_VERW_PV - - /* Use when exiting to HVM guest context. */ - #define SPEC_CTRL_EXIT_TO_HVM \ - ALTERNATIVE "", \ -- DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_HVM -+ DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_HVM; \ -+ ALTERNATIVE "", __stringify(verw CPUINFO_verw_sel(%rsp)), \ -+ X86_FEATURE_SC_VERW_HVM - - /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. diff --git a/sysutils/xen-tools/files/xsa297-4.12-7.patch b/sysutils/xen-tools/files/xsa297-4.12-7.patch deleted file mode 100644 index 8a706876e215..000000000000 --- a/sysutils/xen-tools/files/xsa297-4.12-7.patch +++ /dev/null @@ -1,316 +0,0 @@ -From: Andrew Cooper -Subject: x86/spec-ctrl: Introduce options to control VERW flushing - -The Microarchitectural Data Sampling vulnerability is split into categories -with subtly different properties: - - MLPDS - Microarchitectural Load Port Data Sampling - MSBDS - Microarchitectural Store Buffer Data Sampling - MFBDS - Microarchitectural Fill Buffer Data Sampling - MDSUM - Microarchitectural Data Sampling Uncacheable Memory - -MDSUM is a special case of the other three, and isn't distinguished further. - -These issues pertain to three microarchitectural buffers. The Load Ports, the -Store Buffers and the Fill Buffers. Each of these structures are flushed by -the new enhanced VERW functionality, but the conditions under which flushing -is necessary vary. - -For this concise overview of the issues and default logic, the abbreviations -SP (Store Port), FB (Fill Buffer), LP (Load Port) and HT (Hyperthreading) are -used for brevity: - - * Vulnerable hardware is divided into two categories - parts which suffer - from SP only, and parts with any other combination of vulnerabilities. - - * SP only has an HT interaction when the thread goes idle, due to the static - partitioning of resources. LP and FB have HT interactions at all points, - due to the competitive sharing of resources. All issues potentially leak - data across the return-to-guest transition. - - * The microcode which implements VERW flushing also extends MSR_FLUSH_CMD, so - we don't need to do both on the HVM return-to-guest path. However, some - parts are not vulnerable to L1TF (therefore have no MSR_FLUSH_CMD), but are - vulnerable to MDS, so do require VERW on the HVM path. - -Note that we deliberately support mds=1 even without MD_CLEAR in case the -microcode has been updated but the feature bit not exposed. - -This is part of XSA-297, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091. - -Signed-off-by: Andrew Cooper -Reviewed-by: Jan Beulich - -diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc -index f80d8d8..85081fd 100644 ---- a/docs/misc/xen-command-line.pandoc -+++ b/docs/misc/xen-command-line.pandoc -@@ -1895,7 +1895,7 @@ not be able to control the state of the mitigation. - By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). - - ### spec-ctrl (x86) --> `= List of [ , xen=, {pv,hvm,msr-sc,rsb}=, -+> `= List of [ , xen=, {pv,hvm,msr-sc,rsb,md-clear}=, - > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,eager-fpu, - > l1d-flush}= ]` - -@@ -1919,9 +1919,10 @@ in place for guests to use. - - Use of a positive boolean value for either of these options is invalid. - --The booleans `pv=`, `hvm=`, `msr-sc=` and `rsb=` offer fine grained control --over the alternative blocks used by Xen. These impact Xen's ability to --protect itself, and Xen's ability to virtualise support for guests to use. -+The booleans `pv=`, `hvm=`, `msr-sc=`, `rsb=` and `md-clear=` offer fine -+grained control over the alternative blocks used by Xen. These impact Xen's -+ability to protect itself, and Xen's ability to virtualise support for guests -+to use. - - * `pv=` and `hvm=` offer control over all suboptions for PV and HVM guests - respectively. -@@ -1930,6 +1931,11 @@ protect itself, and Xen's ability to virtualise support for guests to use. - guests and if disabled, guests will be unable to use IBRS/STIBP/SSBD/etc. - * `rsb=` offers control over whether to overwrite the Return Stack Buffer / - Return Address Stack on entry to Xen. -+* `md-clear=` offers control over whether to use VERW to flush -+ microarchitectural buffers on idle and exit from Xen. *Note: For -+ compatibility with development versions of this fix, `mds=` is also accepted -+ on Xen 4.12 and earlier as an alias. Consult vendor documentation in -+ preference to here.* - - If Xen was compiled with INDIRECT_THUNK support, `bti-thunk=` can be used to - select which of the thunks gets patched into the `__x86_indirect_thunk_%reg` -diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c -index a573b02..0509ac8 100644 ---- a/xen/arch/x86/spec_ctrl.c -+++ b/xen/arch/x86/spec_ctrl.c -@@ -35,6 +35,8 @@ static bool __initdata opt_msr_sc_pv = true; - static bool __initdata opt_msr_sc_hvm = true; - static bool __initdata opt_rsb_pv = true; - static bool __initdata opt_rsb_hvm = true; -+static int8_t __initdata opt_md_clear_pv = -1; -+static int8_t __initdata opt_md_clear_hvm = -1; - - /* Cmdline controls for Xen's speculative settings. */ - static enum ind_thunk { -@@ -59,6 +61,9 @@ paddr_t __read_mostly l1tf_addr_mask, __read_mostly l1tf_safe_maddr; - static bool __initdata cpu_has_bug_l1tf; - static unsigned int __initdata l1d_maxphysaddr; - -+static bool __initdata cpu_has_bug_msbds_only; /* => minimal HT impact. */ -+static bool __initdata cpu_has_bug_mds; /* Any other M{LP,SB,FB}DS combination. */ -+ - static int __init parse_spec_ctrl(const char *s) - { - const char *ss; -@@ -94,6 +99,8 @@ static int __init parse_spec_ctrl(const char *s) - disable_common: - opt_rsb_pv = false; - opt_rsb_hvm = false; -+ opt_md_clear_pv = 0; -+ opt_md_clear_hvm = 0; - - opt_thunk = THUNK_JMP; - opt_ibrs = 0; -@@ -116,11 +123,13 @@ static int __init parse_spec_ctrl(const char *s) - { - opt_msr_sc_pv = val; - opt_rsb_pv = val; -+ opt_md_clear_pv = val; - } - else if ( (val = parse_boolean("hvm", s, ss)) >= 0 ) - { - opt_msr_sc_hvm = val; - opt_rsb_hvm = val; -+ opt_md_clear_hvm = val; - } - else if ( (val = parse_boolean("msr-sc", s, ss)) >= 0 ) - { -@@ -132,6 +141,12 @@ static int __init parse_spec_ctrl(const char *s) - opt_rsb_pv = val; - opt_rsb_hvm = val; - } -+ else if ( (val = parse_boolean("md-clear", s, ss)) >= 0 || -+ (val = parse_boolean("mds", s, ss)) >= 0 ) -+ { -+ opt_md_clear_pv = val; -+ opt_md_clear_hvm = val; -+ } - - /* Xen's speculative sidechannel mitigation settings. */ - else if ( !strncmp(s, "bti-thunk=", 10) ) -@@ -317,7 +332,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - "\n"); - - /* Settings for Xen's protection, irrespective of guests. */ -- printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s, Other:%s%s\n", -+ printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s, Other:%s%s%s\n", - thunk == THUNK_NONE ? "N/A" : - thunk == THUNK_RETPOLINE ? "RETPOLINE" : - thunk == THUNK_LFENCE ? "LFENCE" : -@@ -327,7 +342,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) - !boot_cpu_has(X86_FEATURE_SSBD) ? "" : - (default_xen_spec_ctrl & SPEC_CTRL_SSBD) ? " SSBD+" : " SSBD-", - opt_ibpb ? " IBPB" : "", -- opt_l1d_flush ? " L1D_FLUSH" : ""); -+ opt_l1d_flush ? " L1D_FLUSH" : "", -+ opt_md_clear_pv || opt_md_clear_hvm ? " VERW" : ""); - - /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ - if ( cpu_has_bug_l1tf || opt_pv_l1tf_hwdom || opt_pv_l1tf_domu ) -@@ -737,6 +753,107 @@ static __init void l1tf_calculations(uint64_t caps) - : (3ul << (paddr_bits - 2)))); - } - -+/* Calculate whether this CPU is vulnerable to MDS. */ -+static __init void mds_calculations(uint64_t caps) -+{ -+ /* MDS is only known to affect Intel Family 6 processors at this time. */ -+ if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || -+ boot_cpu_data.x86 != 6 ) -+ return; -+ -+ /* Any processor advertising MDS_NO should be not vulnerable to MDS. */ -+ if ( caps & ARCH_CAPS_MDS_NO ) -+ return; -+ -+ switch ( boot_cpu_data.x86_model ) -+ { -+ /* -+ * Core processors since at least Nehalem are vulnerable. -+ */ -+ case 0x1f: /* Auburndale / Havendale */ -+ case 0x1e: /* Nehalem */ -+ case 0x1a: /* Nehalem EP */ -+ case 0x2e: /* Nehalem EX */ -+ case 0x25: /* Westmere */ -+ case 0x2c: /* Westmere EP */ -+ case 0x2f: /* Westmere EX */ -+ case 0x2a: /* SandyBridge */ -+ case 0x2d: /* SandyBridge EP/EX */ -+ case 0x3a: /* IvyBridge */ -+ case 0x3e: /* IvyBridge EP/EX */ -+ case 0x3c: /* Haswell */ -+ case 0x3f: /* Haswell EX/EP */ -+ case 0x45: /* Haswell D */ -+ case 0x46: /* Haswell H */ -+ case 0x3d: /* Broadwell */ -+ case 0x47: /* Broadwell H */ -+ case 0x4f: /* Broadwell EP/EX */ -+ case 0x56: /* Broadwell D */ -+ case 0x4e: /* Skylake M */ -+ case 0x5e: /* Skylake D */ -+ cpu_has_bug_mds = true; -+ break; -+ -+ /* -+ * Some Core processors have per-stepping vulnerability. -+ */ -+ case 0x55: /* Skylake-X / Cascade Lake */ -+ if ( boot_cpu_data.x86_mask <= 5 ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ case 0x8e: /* Kaby / Coffee / Whiskey Lake M */ -+ if ( boot_cpu_data.x86_mask <= 0xb ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ case 0x9e: /* Kaby / Coffee / Whiskey Lake D */ -+ if ( boot_cpu_data.x86_mask <= 0xc ) -+ cpu_has_bug_mds = true; -+ break; -+ -+ /* -+ * Very old and very new Atom processors are not vulnerable. -+ */ -+ case 0x1c: /* Pineview */ -+ case 0x26: /* Lincroft */ -+ case 0x27: /* Penwell */ -+ case 0x35: /* Cloverview */ -+ case 0x36: /* Cedarview */ -+ case 0x7a: /* Goldmont */ -+ break; -+ -+ /* -+ * Middling Atom processors are vulnerable to just the Store Buffer -+ * aspect. -+ */ -+ case 0x37: /* Baytrail / Valleyview (Silvermont) */ -+ case 0x4a: /* Merrifield */ -+ case 0x4c: /* Cherrytrail / Brasswell */ -+ case 0x4d: /* Avaton / Rangely (Silvermont) */ -+ case 0x5a: /* Moorefield */ -+ case 0x5d: -+ case 0x65: -+ case 0x6e: -+ case 0x75: -+ /* -+ * Knights processors (which are based on the Silvermont/Airmont -+ * microarchitecture) are similarly only affected by the Store Buffer -+ * aspect. -+ */ -+ case 0x57: /* Knights Landing */ -+ case 0x85: /* Knights Mill */ -+ cpu_has_bug_msbds_only = true; -+ break; -+ -+ default: -+ printk("Unrecognised CPU model %#x - assuming vulnerable to MDS\n", -+ boot_cpu_data.x86_model); -+ cpu_has_bug_mds = true; -+ break; -+ } -+} -+ - void __init init_speculation_mitigations(void) - { - enum ind_thunk thunk = THUNK_DEFAULT; -@@ -924,6 +1041,47 @@ void __init init_speculation_mitigations(void) - "enabled. Please assess your configuration and choose an\n" - "explicit 'smt=' setting. See XSA-273.\n"); - -+ mds_calculations(caps); -+ -+ /* -+ * By default, enable PV and HVM mitigations on MDS-vulnerable hardware. -+ * This will only be a token effort for MLPDS/MFBDS when HT is enabled, -+ * but it is somewhat better than nothing. -+ */ -+ if ( opt_md_clear_pv == -1 ) -+ opt_md_clear_pv = ((cpu_has_bug_mds || cpu_has_bug_msbds_only) && -+ boot_cpu_has(X86_FEATURE_MD_CLEAR)); -+ if ( opt_md_clear_hvm == -1 ) -+ opt_md_clear_hvm = ((cpu_has_bug_mds || cpu_has_bug_msbds_only) && -+ boot_cpu_has(X86_FEATURE_MD_CLEAR)); -+ -+ /* -+ * Enable MDS defences as applicable. The PV blocks need using all the -+ * time, and the Idle blocks need using if either PV or HVM defences are -+ * used. -+ * -+ * HVM is more complicated. The MD_CLEAR microcode extends L1D_FLUSH with -+ * equivelent semantics to avoid needing to perform both flushes on the -+ * HVM path. The HVM blocks don't need activating if our hypervisor told -+ * us it was handling L1D_FLUSH, or we are using L1D_FLUSH ourselves. -+ */ -+ if ( opt_md_clear_pv ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_PV); -+ if ( opt_md_clear_pv || opt_md_clear_hvm ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_IDLE); -+ if ( opt_md_clear_hvm && !(caps & ARCH_CAPS_SKIP_L1DFL) && !opt_l1d_flush ) -+ setup_force_cpu_cap(X86_FEATURE_SC_VERW_HVM); -+ -+ /* -+ * Warn the user if they are on MLPDS/MFBDS-vulnerable hardware with HT -+ * active and no explicit SMT choice. -+ */ -+ if ( opt_smt == -1 && cpu_has_bug_mds && hw_smt_enabled ) -+ warning_add( -+ "Booted on MLPDS/MFBDS-vulnerable hardware with SMT/Hyperthreading\n" -+ "enabled. Mitigations will not be fully effective. Please\n" -+ "choose an explicit smt= setting. See XSA-297.\n"); -+ - print_details(thunk, caps); - - /* -- cgit From d9c339610606bae884168f8bf359eb01337f5e92 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 13 Aug 2019 13:45:01 +0000 Subject: Thinking about r508819 a bit more, make sure nothing depends on fetch directly in ports. --- databases/sqlite3/Makefile | 2 +- emulators/i386-wine-devel/Makefile.inc | 2 +- emulators/i386-wine/Makefile.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index f23f15761188..948789bc8acc 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -252,7 +252,7 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/include/msvc.h # for compares with checksum from of the site -sha1: fetch +sha1: checksum .if defined(SHA1) && !empty(SHA1) @sha1 -c ${SHA1} ${DISTDIR}/${ALLFILES} .else diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 91b434c1a1e6..d23a29b1ab15 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -78,7 +78,7 @@ do-extract: do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} -${PLIST}: fetch +${PLIST}: checksum ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} > /dev/null ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index cd78f01ea174..8c48617ad616 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -71,7 +71,7 @@ do-extract: do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} -${PLIST}: fetch +${PLIST}: checksum ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} port-update: -- cgit From c9e2b283f9158aab4814c27c9d48e6e5c6147b21 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 13 Aug 2019 13:51:10 +0000 Subject: Update to 1.3.3. No significant user-visible changes. --- audio/flac/Makefile | 8 ++------ audio/flac/distinfo | 6 +++--- audio/flac/files/patch-configure | 13 ------------- audio/flac/pkg-plist | 40 ++++++++++++++++++++-------------------- 4 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 audio/flac/files/patch-configure diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 5ef704436d97..db524ea83391 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -2,12 +2,9 @@ # $FreeBSD$ PORTNAME= flac -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.3 CATEGORIES= audio -MASTER_SITES= https://downloads.xiph.org/releases/flac/ \ - https://download.videolan.org/contrib/flac/ \ - SF/flac/flac-src +MASTER_SITES= https://downloads.xiph.org/releases/flac/ MAINTAINER= naddy@FreeBSD.org COMMENT= Free lossless audio codec @@ -41,7 +38,6 @@ BUILD_DEPENDS+= nasm:devel/nasm .endif post-install: - cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} flac ${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' \ ${STAGEDIR}${PREFIX}/man/man1/flac.1 ${RM} ${STAGEDIR}${PREFIX}/man/man1/flac.1.bak diff --git a/audio/flac/distinfo b/audio/flac/distinfo index dd1b35fcbe4c..21e84ab78d75 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484327981 -SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f -SIZE (flac-1.3.2.tar.xz) = 776192 +TIMESTAMP = 1565699962 +SHA256 (flac-1.3.3.tar.xz) = 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 +SIZE (flac-1.3.3.tar.xz) = 1044472 diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure deleted file mode 100644 index e1ba89b793f4..000000000000 --- a/audio/flac/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig 2017-01-01 03:46:48 UTC -+++ configure -@@ -20547,8 +20547,8 @@ if test "x$debug" = xtrue; then - CFLAGS="-g $CFLAGS" - else - CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') -- CFLAGS="-O3 -funroll-loops $CFLAGS" -+ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') -+ #CFLAGS="-O3 -funroll-loops $CFLAGS" - fi - - diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist index 4b7f0e4a55b1..97a74b8e0966 100644 --- a/audio/flac/pkg-plist +++ b/audio/flac/pkg-plist @@ -29,23 +29,23 @@ man/man1/metaflac.1.gz share/aclocal/libFLAC++.m4 share/aclocal/libFLAC.m4 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag -%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html -%%PORTDOCS%%%%DOCSDIR%%/html/developers.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_bugs.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_example_code.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_format_overview.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_flac.html -%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_metaflac.html -%%PORTDOCS%%%%DOCSDIR%%/html/faq.html -%%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico -%%PORTDOCS%%%%DOCSDIR%%/html/features.html -%%PORTDOCS%%%%DOCSDIR%%/html/flac.css -%%PORTDOCS%%%%DOCSDIR%%/html/format.html -%%PORTDOCS%%%%DOCSDIR%%/html/id.html -%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.svg -%%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/license.html -%%PORTDOCS%%%%DOCSDIR%%/html/ogg_mapping.html +%%PORTDOCS%%%%DOCSDIR%%/changelog.html +%%PORTDOCS%%%%DOCSDIR%%/developers.html +%%PORTDOCS%%%%DOCSDIR%%/documentation.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_bugs.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_example_code.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_format_overview.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_tools.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_tools_flac.html +%%PORTDOCS%%%%DOCSDIR%%/documentation_tools_metaflac.html +%%PORTDOCS%%%%DOCSDIR%%/faq.html +%%PORTDOCS%%%%DOCSDIR%%/favicon.ico +%%PORTDOCS%%%%DOCSDIR%%/features.html +%%PORTDOCS%%%%DOCSDIR%%/flac.css +%%PORTDOCS%%%%DOCSDIR%%/format.html +%%PORTDOCS%%%%DOCSDIR%%/id.html +%%PORTDOCS%%%%DOCSDIR%%/images/logo.svg +%%PORTDOCS%%%%DOCSDIR%%/images/logo130.gif +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/license.html +%%PORTDOCS%%%%DOCSDIR%%/ogg_mapping.html -- cgit From 631c1d77fcae7b3a04605c3c1be816e660f238e9 Mon Sep 17 00:00:00 2001 From: vsevolod Date: Tue, 13 Aug 2019 14:05:01 +0000 Subject: - Update to 1.0.18 - Remove random hack as it's meaningful merely on Linux - Skip bump of revision as public API has not changed PR: 236602 Reported by: Oleh Hushchenkov --- security/libsodium/Makefile | 3 +-- security/libsodium/distinfo | 6 +++--- security/libsodium/pkg-plist | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/security/libsodium/Makefile b/security/libsodium/Makefile index 09fe2907ea64..f814933eb7cb 100644 --- a/security/libsodium/Makefile +++ b/security/libsodium/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libsodium -PORTVERSION= 1.0.16 +PORTVERSION= 1.0.18 CATEGORIES= security MASTER_SITES= https://download.libsodium.org/libsodium/releases/ @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig USE_LDCONFIG= yes -CONFIGURE_ARGS+= --enable-blocking-random INSTALL_TARGET?= install-strip TEST_TARGET= check diff --git a/security/libsodium/distinfo b/security/libsodium/distinfo index 52889a3e009f..65ad4d2fbfee 100644 --- a/security/libsodium/distinfo +++ b/security/libsodium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513157053 -SHA256 (libsodium-1.0.16.tar.gz) = eeadc7e1e1bcef09680fb4837d448fbdf57224978f865ac1c16745868fbd0533 -SIZE (libsodium-1.0.16.tar.gz) = 1910835 +TIMESTAMP = 1565704155 +SHA256 (libsodium-1.0.18.tar.gz) = 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 +SIZE (libsodium-1.0.18.tar.gz) = 1919817 diff --git a/security/libsodium/pkg-plist b/security/libsodium/pkg-plist index 7a69f3f517fb..e546f883aeeb 100644 --- a/security/libsodium/pkg-plist +++ b/security/libsodium/pkg-plist @@ -13,6 +13,7 @@ include/sodium/crypto_box_curve25519xsalsa20poly1305.h include/sodium/crypto_core_ed25519.h include/sodium/crypto_core_hchacha20.h include/sodium/crypto_core_hsalsa20.h +include/sodium/crypto_core_ristretto255.h include/sodium/crypto_core_salsa20.h include/sodium/crypto_core_salsa2012.h include/sodium/crypto_core_salsa208.h @@ -33,6 +34,7 @@ include/sodium/crypto_pwhash_scryptsalsa208sha256.h include/sodium/crypto_scalarmult.h include/sodium/crypto_scalarmult_curve25519.h include/sodium/crypto_scalarmult_ed25519.h +include/sodium/crypto_scalarmult_ristretto255.h include/sodium/crypto_secretbox.h include/sodium/crypto_secretbox_xchacha20poly1305.h include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -54,7 +56,7 @@ include/sodium/crypto_verify_32.h include/sodium/crypto_verify_64.h include/sodium/export.h include/sodium/randombytes.h -include/sodium/randombytes_salsa20_random.h +include/sodium/randombytes_internal_random.h include/sodium/randombytes_sysrandom.h include/sodium/runtime.h include/sodium/utils.h @@ -62,7 +64,7 @@ include/sodium/version.h lib/libsodium.a lib/libsodium.so lib/libsodium.so.23 -lib/libsodium.so.23.1.0 +lib/libsodium.so.23.3.0 libdata/pkgconfig/libsodium.pc %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README.markdown -- cgit From 10184adb78db6058c27724a83b1852a981fef801 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Tue, 13 Aug 2019 14:19:04 +0000 Subject: Style: move GH_* variables closer to each other Fixes invalid change I introduced in r482963. Reported by: mat Differential Revision: https://reviews.freebsd.org/D17699 --- misc/exercism/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile index b24a32347f81..32522bf94d59 100644 --- a/misc/exercism/Makefile +++ b/misc/exercism/Makefile @@ -12,9 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go - USE_GITHUB= yes - GH_TUPLE= \ exercism:cli:v${PORTVERSION}:DEFAULT/src/github.com/exercism/cli \ armon:consul-api:eb2c6b5:consulapi/src/github.com/armon/consul-api \ @@ -62,7 +60,6 @@ GH_TUPLE= \ go4org:go4:417644f:go4/src/go4.org \ go-check:check:788fd78:gocheck/src/gopkg.in/check.v1 \ go-yaml:yaml:25c4ec8:yaml/src/gopkg.in/yaml.v2 - GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/exercism -- cgit From e41f1b8ce33ff74179907c366b89a6aa767c09ae Mon Sep 17 00:00:00 2001 From: tobik Date: Tue, 13 Aug 2019 14:46:28 +0000 Subject: Mk/bsd.sanity.mk: Flag non-integer PORTREVISION/PORTEPOCH Currently they are not checked and something like PORTREVISION=foo or just PORTREVISION= is accepted. Some ports use indirection via custom variables for them so it is worthwhile to check that they are set to sane values. While here fix ports that currently have non-integer PORTREVISION or PORTEPOCH. Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D21225 --- Mk/bsd.sanity.mk | 8 ++++++++ devel/elfio/Makefile | 2 +- devel/subversion/Makefile.addons | 4 ++-- games/xboard-devel/Makefile | 4 ++-- games/xboard/Makefile | 2 +- misc/dnetc/Makefile | 2 +- www/mod_dav_svn/Makefile | 3 --- www/nuvolaplayer-all-services/Makefile | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 2aa0f21fe4c8..04542537d798 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -168,6 +168,14 @@ DEV_ERROR+= "PORT${_type} does not do anything unless the ${_type} option is pre . endif .endfor +.if empty(PORTEPOCH) || !empty(PORTEPOCH:C/[0-9]+//) +DEV_ERROR+= "PORTEPOCH needs to be an integer \>= 0" +.endif + +.if empty(PORTREVISION) || !empty(PORTREVISION:C/[0-9]+//) +DEV_ERROR+= "PORTREVISION needs to be an integer \>= 0" +.endif + # Whitelist of options helper lookalikes that should not be reported on: _OPTIONS_HELPERS_SEEN+= OPENSSL_LDFLAGS _BROKEN_OPTIONS_HELPERS= diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile index 9cc1dd37645d..db941c476a6d 100644 --- a/devel/elfio/Makefile +++ b/devel/elfio/Makefile @@ -3,7 +3,7 @@ PORTNAME= elfio PORTVERSION= 3.4 -PORTREVISION= +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION} diff --git a/devel/subversion/Makefile.addons b/devel/subversion/Makefile.addons index 950e7a03f299..5fb5196316b9 100644 --- a/devel/subversion/Makefile.addons +++ b/devel/subversion/Makefile.addons @@ -12,7 +12,7 @@ CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[^1][0-9].[0-9]* \ ${PORTNAME}-1.1[0-1].[0-9]* \ ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_112} +PORTREVISION= ${PORTREVISION_112:U0} PLIST_SUB+= SVN112="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion @@ -22,7 +22,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_LTS} +PORTREVISION= ${PORTREVISION_LTS:U0} PLIST_SUB+= SVN112="@comment " SVNLTS="" LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts OPTIONS_NAME= devel_subversion-lts diff --git a/games/xboard-devel/Makefile b/games/xboard-devel/Makefile index 683cfd3326dd..65fb35afecf9 100644 --- a/games/xboard-devel/Makefile +++ b/games/xboard-devel/Makefile @@ -2,8 +2,8 @@ PORTNAME= xboard-devel PORTVERSION= 4.8.0.20151020.3 -PORTREVISION= -PORTEPOCH= +PORTREVISION= 0 +PORTEPOCH= 0 MASTER_SITES= http://freeheimdall.spdns.org/files/ # http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=xboard.git;a=snapshot;h=${COMMIT_HASH};sf=tgz # http://hgm.nubati.net/cgi-bin/gitweb.cgi/xboard.git/snapshot/${COMMIT_HASH} diff --git a/games/xboard/Makefile b/games/xboard/Makefile index a1e455006637..cf1ae06f764a 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xboard PORTVERSION?= 4.9.1 PORTREVISION?= 1 -PORTEPOCH?= +PORTEPOCH?= 0 CATEGORIES?= games MASTER_SITES?= GNU diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile index 7b04595e42a5..1e48721426b2 100644 --- a/misc/dnetc/Makefile +++ b/misc/dnetc/Makefile @@ -3,7 +3,7 @@ PORTNAME= dnetc PORTVERSION= ${VERSION} -PORTREVISION= ${REVISION} +PORTREVISION= ${REVISION:U0} PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \ diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile index 7cbbab64d617..0eb8ae7a9aeb 100644 --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -11,9 +11,6 @@ COMMENT= Apache module for subversion serving USES= apache:2.2+ -PORTREVISION_111= 1 -PORTREVISION_19= 0 - .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --with-apxs=${APXS} \ diff --git a/www/nuvolaplayer-all-services/Makefile b/www/nuvolaplayer-all-services/Makefile index 62242443c927..82ceba47eacc 100644 --- a/www/nuvolaplayer-all-services/Makefile +++ b/www/nuvolaplayer-all-services/Makefile @@ -30,7 +30,7 @@ ${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAM NV_ID= ${${.CURDIR:T:S/${PORTNAME}-//}_ID} PORTVERSION= ${NV_${NV_ID}_VERSION} -PORTREVISION?= ${NV_${NV_ID}_REVISION} +PORTREVISION?= ${NV_${NV_ID}_REVISION:U0} PKGNAMESUFFIX?= -${NV_${NV_ID}_NAME} COMMENT?= ${NV_${NV_ID}_DESC} integration for Nuvola Player -- cgit From 53266515bc809dcc3f114bcb70197ef335102641 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Tue, 13 Aug 2019 14:54:59 +0000 Subject: games/freeminer: enable building on powerpc64 Luajit is not available on powerpc64. This itself doesn't fix build with GCC on powerpc64 currently, but it does fix build when experimental patches for Clang in base are used. Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D21241 --- games/freeminer/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile index e8f7c3af96c4..94ce89d6e4df 100644 --- a/games/freeminer/Makefile +++ b/games/freeminer/Makefile @@ -28,6 +28,7 @@ PORTDOCS= * OPTIONS_DEFINE= CLIENT SERVER CURL SOUND FREETYPE LEVELDB LUAJIT NLS DOCS EXAMPLES OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LEVELDB LUAJIT +OPTIONS_EXCLUDE_powerpc64= LUAJIT OPTIONS_SUB= yes CLIENT_DESC= Build client -- cgit From 0ae9de24fbac25ac5235817417183ba8e3cb63d6 Mon Sep 17 00:00:00 2001 From: tobik Date: Tue, 13 Aug 2019 14:57:22 +0000 Subject: Drop nop PORTREVISION_19 from devel/subversion addon ports devel/subversion19 has been removed. --- devel/p5-subversion/Makefile | 1 - devel/py-subversion/Makefile | 1 - devel/ruby-subversion/Makefile | 1 - java/java-subversion/Makefile | 1 - 4 files changed, 4 deletions(-) diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index b875cd4ee745..f73699b77989 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -10,7 +10,6 @@ USES= perl5 USE_PERL5= build run PORTREVISION_112= 0 -PORTREVISION_19= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 1832e7f2731d..1431f1ddf8ae 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -11,7 +11,6 @@ USES+= python:2.7 USE_PYTHON= flavors py3kplist PORTREVISION_112= 0 -PORTREVISION_19= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index bf597d418053..0c43fd7b25ae 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -9,7 +9,6 @@ COMMENT= Ruby bindings for version control system USE_RUBY= yes PORTREVISION_112= 0 -PORTREVISION_19= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index 7126e822980d..2bdbb3d502bb 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -17,7 +17,6 @@ JAVA_RUN= yes PORTREVISION_112= 0 -PORTREVISION_19= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes -- cgit From 8ca8b239bb121eb332ccea6ddee6df68335f1374 Mon Sep 17 00:00:00 2001 From: jwb Date: Tue, 13 Aug 2019 15:30:21 +0000 Subject: biology/bolt-lmm: Upgrade to 2.3.4 Remove previously upstreamed patches New Makefile patch that preserves default behavior and should be palatable to upstream --- biology/bolt-lmm/Makefile | 19 +++-- biology/bolt-lmm/distinfo | 6 +- biology/bolt-lmm/files/patch-src_Jackknife.cpp | 13 ---- .../files/patch-src_LDscoreCalibration.cpp | 24 ------ biology/bolt-lmm/files/patch-src_Makefile | 88 ++++++++++++---------- biology/bolt-lmm/files/patch-src_SnpData.cpp | 20 ----- biology/bolt-lmm/files/patch-src_StatsUtils.cpp | 13 ---- 7 files changed, 63 insertions(+), 120 deletions(-) delete mode 100644 biology/bolt-lmm/files/patch-src_Jackknife.cpp delete mode 100644 biology/bolt-lmm/files/patch-src_LDscoreCalibration.cpp delete mode 100644 biology/bolt-lmm/files/patch-src_SnpData.cpp delete mode 100644 biology/bolt-lmm/files/patch-src_StatsUtils.cpp diff --git a/biology/bolt-lmm/Makefile b/biology/bolt-lmm/Makefile index 1d9a822d9d11..616d24986b07 100644 --- a/biology/bolt-lmm/Makefile +++ b/biology/bolt-lmm/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bolt-lmm -DISTVERSION= 2.3.2 -PORTREVISION= 2 +DISTVERSION= 2.3.4 CATEGORIES= biology MASTER_SITES= https://data.broadinstitute.org/alkesgroup/BOLT-LMM/downloads/ DISTNAME= BOLT-LMM_v${PORTVERSION} @@ -21,11 +20,19 @@ LIB_DEPENDS= libnlopt.so:math/nlopt \ # both merely add a GCC requirement. USES= compiler:gcc-c++11-lib gmake -BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src -INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/src -CXXFLAGS_i386= -DUSE_SSE -msse -msse2 -CXXFLAGS_amd64= -DUSE_SSE +BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src +INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/src +CXXFLAGS_i386= -DUSE_SSE -msse -msse2 +CXXFLAGS_amd64= -DUSE_SSE CXXFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -mvsx +MAKE_ARGS= BOOST_INSTALL_DIR=${LOCALBASE} \ + NLOPT_INSTALL_DIR=${LOCALBASE} \ + ZLIB_STATIC_DIR=/usr/lib \ + LIBSTDCXX_STATIC_DIR=/usr/lib \ + GLIBC_STATIC_DIR=/usr/lib \ + SSEFLAGS="" \ + MEMCPY="" \ + LLAPACK="-lopenblas -lgfortran" PORTEXAMPLES= * diff --git a/biology/bolt-lmm/distinfo b/biology/bolt-lmm/distinfo index 18551a76e51a..618a36d60050 100644 --- a/biology/bolt-lmm/distinfo +++ b/biology/bolt-lmm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558717810 -SHA256 (BOLT-LMM_v2.3.2.tar.gz) = ee505a04138f6c80bfefad4df4b81a2d07e72114dd8329d187c97543f5a0521f -SIZE (BOLT-LMM_v2.3.2.tar.gz) = 335057533 +TIMESTAMP = 1565528176 +SHA256 (BOLT-LMM_v2.3.4.tar.gz) = 2477faff5028ff8fee5d8f4e6b0cab6d0752b268fd508fe64530a66807d9b0c0 +SIZE (BOLT-LMM_v2.3.4.tar.gz) = 335128004 diff --git a/biology/bolt-lmm/files/patch-src_Jackknife.cpp b/biology/bolt-lmm/files/patch-src_Jackknife.cpp deleted file mode 100644 index 6d6a970889c3..000000000000 --- a/biology/bolt-lmm/files/patch-src_Jackknife.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Jackknife.cpp.orig 2019-08-03 00:15:27 UTC -+++ src/Jackknife.cpp -@@ -28,8 +28,8 @@ namespace Jackknife { - using std::make_pair; - - double stddev(const vector &x, int n) { -- for (int i = 0; i < n; i++) if (isnan(x[i])) return NAN; -- for (int i = 0; i < n; i++) if (isinf(x[i])) return INFINITY; -+ for (int i = 0; i < n; i++) if (std::isnan(x[i])) return NAN; -+ for (int i = 0; i < n; i++) if (std::isinf(x[i])) return INFINITY; - double s = 0.0, s2 = 0.0; - for (int i = 0; i < n; i++) { - s += x[i]; diff --git a/biology/bolt-lmm/files/patch-src_LDscoreCalibration.cpp b/biology/bolt-lmm/files/patch-src_LDscoreCalibration.cpp deleted file mode 100644 index 51a1ef896340..000000000000 --- a/biology/bolt-lmm/files/patch-src_LDscoreCalibration.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- src/LDscoreCalibration.cpp.orig 2019-08-03 00:18:05 UTC -+++ src/LDscoreCalibration.cpp -@@ -201,8 +201,8 @@ namespace LDscoreCalibration { - snps[m].MAF >= minMAF && // MAF threshold - statsRef[m] > 0 && // ref stat available - statsCur[m] > 0 && // cur stat available -- !isnan(LDscores[m]) && // LD Score available -- !isnan(LDscoresChip[m]); // LD Score weight available -+ !std::isnan(LDscores[m]) && // LD Score available -+ !std::isnan(LDscoresChip[m]); // LD Score weight available - - // perform outlier removal - double outlierChisqThresh = std::max(MIN_OUTLIER_CHISQ_THRESH, N * outlierVarFracThresh); -@@ -256,8 +256,8 @@ namespace LDscoreCalibration { - maskSnps[m] = - snps[m].MAF >= minMAF && // MAF threshold - stats[m] > 0 && // stat available -- !isnan(LDscores[m]) && // LD Score available -- !isnan(LDscoresChip[m]); // LD Score weight available -+ !std::isnan(LDscores[m]) && // LD Score available -+ !std::isnan(LDscoresChip[m]); // LD Score weight available - - // perform outlier removal - double outlierChisqThresh = std::max(MIN_OUTLIER_CHISQ_THRESH, N * outlierVarFracThresh); diff --git a/biology/bolt-lmm/files/patch-src_Makefile b/biology/bolt-lmm/files/patch-src_Makefile index 7cd1f25f5420..cf667e25edd4 100644 --- a/biology/bolt-lmm/files/patch-src_Makefile +++ b/biology/bolt-lmm/files/patch-src_Makefile @@ -1,21 +1,27 @@ ---- src/Makefile.orig 2018-03-13 02:44:52 UTC +--- src/Makefile.orig 2019-08-11 03:05:04 UTC +++ src/Makefile -@@ -1,29 +1,28 @@ +@@ -1,31 +1,35 @@ ++ ### modify these paths to local Boost and NLopt install directories -BOOST_INSTALL_DIR = /home/pl88/boost_1_58_0/install -NLOPT_INSTALL_DIR = /n/groups/price/poru/HSPH_SVN/src/BOLT-LMM/nlopt-2.4.2 -+BOOST_INSTALL_DIR ?= ${LOCALBASE} -+# Redundant on FreeBSD NLOPT_INSTALL_DIR = /n/groups/price/poru/HSPH_SVN/src/BOLT-LMM/nlopt-2.4.2 ++### by setting them in the environment or make command line args ++### which will override variables set with ?= - INTELROOT = /n/groups/price/poru/external_software/intel_mkl_2018 - MKLROOT = ${INTELROOT}/mkl +-INTELROOT = /n/groups/price/poru/external_software/intel_mkl_2019u4 +-MKLROOT = ${INTELROOT}/mkl -ZLIB_STATIC_DIR = /n/groups/price/poru/external_software/zlib/zlib-1.2.11 # probably unnecessary on most systems -LIBSTDCXX_STATIC_DIR = /n/groups/price/poru/external_software/libstdc++/usr/lib/gcc/x86_64-redhat-linux/4.8.5/ -GLIBC_STATIC_DIR = /home/pl88/glibc-static/usr/lib64 -+ZLIB_STATIC_DIR ?= /usr/lib -+LIBSTDCXX_STATIC_DIR ?= /usr/lib -+GLIBC_STATIC_DIR ?= /usr/lib - ++BOOST_INSTALL_DIR ?= /home/pl88/boost_1_58_0/install ++NLOPT_INSTALL_DIR ?= /n/groups/price/poru/HSPH_SVN/src/BOLT-LMM/nlopt-2.4.2 + ++INTELROOT ?= /n/groups/price/poru/external_software/intel_mkl_2019u4 ++MKLROOT ?= ${INTELROOT}/mkl ++ZLIB_STATIC_DIR ?= /n/groups/price/poru/external_software/zlib/zlib-1.2.11 # probably unnecessary on most systems ++LIBSTDCXX_STATIC_DIR ?= /n/groups/price/poru/external_software/libstdc++/usr/lib/gcc/x86_64-redhat-linux/4.8.5/ ++GLIBC_STATIC_DIR ?= /home/pl88/glibc-static/usr/lib64 ++ ifeq ($(strip ${linking}),) linking = dynamic endif @@ -36,33 +42,25 @@ -CFLAGS += -msse -msse2 -CFLAGS += -DUSE_SSE -DMEASURE_DGEMM -DVERBOSE -CFLAGS += -Wall -+CXXFLAGS += -DMEASURE_DGEMM -DVERBOSE -+CXXFLAGS += -Wall - ++# Set SSEFLAGS to empty string in the env or make command line if building on ++# systems with no SSE such as PowerPC ++SSEFLAGS ?= -msse -msse2 -DUSE_SSE ++CXXFLAGS += ${SSEFLAGS} -DMEASURE_DGEMM -DVERBOSE -Wall +- # add Boost include and lib paths -@@ -38,9 +37,9 @@ endif - # add NLopt include and lib paths - ifneq ($(strip ${NLOPT_INSTALL_DIR}),) - CPATHS += -I${NLOPT_INSTALL_DIR}/api -- LPATHS += -L${NLOPT_INSTALL_DIR}/.libs -+ LPATHS += -L${NLOPT_INSTALL_DIR}/libs - ifeq (${linking},dynamic) -- LPATHS += -Wl,-rpath,${NLOPT_INSTALL_DIR}/.libs -+ LPATHS += -Wl,-rpath,${NLOPT_INSTALL_DIR}/libs - endif - endif - -@@ -52,7 +51,7 @@ ifneq ($(strip ${ZLIB_STATIC_DIR}),) + ifneq ($(strip ${BOOST_INSTALL_DIR}),) + CPATHS += -I${BOOST_INSTALL_DIR}/include +@@ -52,7 +56,7 @@ ifneq ($(strip ${ZLIB_STATIC_DIR}),) endif # add MKL paths (if not compiling with g++, i.e., compiling with icpc) -ifneq (${CC},g++) -+ifneq (${CXX},${CXX}) ++ifeq (${CXX},icpc) CPATHS += -I${MKLROOT}/include - ifeq (${linking},dynamic) - LPATHS += -L${MKLROOT}/lib/intel64 -Wl,-rpath,${MKLROOT}/lib/intel64 # for libmkl* -@@ -61,28 +60,28 @@ ifneq (${CC},g++) + ifeq (${linking},static) + LPATHS += -L${INTELROOT}/lib/intel64 '-Wl,-rpath,$$ORIGIN/lib' # for libiomp5.so (now packaged with binary) +@@ -65,34 +69,34 @@ ifneq (${CC},g++) endif # add flags for static linking; build LAPACK/MKL component of link line @@ -70,10 +68,10 @@ - CFLAGS += -fopenmp - LFLAGS += -fopenmp - LLAPACK = -llapack -lgfortran -+ifeq (${CXX},${CXX}) ++ifneq (${CXX},icpc) + CXXFLAGS += -fopenmp + LDFLAGS += -fopenmp -+ LLAPACK = -lopenblas -lgfortran ++ LLAPACK ?= -llapack -lgfortran ifeq (${linking},static) - LFLAGS += -static + LDFLAGS += -static @@ -92,39 +90,47 @@ + CXXFLAGS += -qopenmp + LDFLAGS += -qopenmp + CXXFLAGS += -Wunused-variable -Wpointer-arith -Wuninitialized -Wreturn-type -Wcheck -Wshadow + LIOMP5 = -liomp5 + LDL = -ldl ifeq (${linking},static) - LFLAGS += -static + LDFLAGS += -static LPATHS += -L${GLIBC_STATIC_DIR} -L${ZLIB_STATIC_DIR} - LLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a -Wl,--end-group + LLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a ${MKLROOT}/lib/intel64/libmkl_core.a -Wl,--end-group else ifeq (${linking},static-except-glibc) - LFLAGS += -static-intel -static-libstdc++ -static-libgcc + LDFLAGS += -static-intel -static-libstdc++ -static-libgcc LPATHS += -L${ZLIB_STATIC_DIR} - LLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a -Wl,--end-group + LLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a ${MKLROOT}/lib/intel64/libmkl_core.a -Wl,--end-group + else ifeq (${linking},static-except-glibc-intel) +- LFLAGS += -static-libstdc++ -static-libgcc ++ LDFLAGS += -static-libstdc++ -static-libgcc + LPATHS += -L${ZLIB_STATIC_DIR} + LLAPACK = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core else -@@ -95,7 +94,8 @@ else +@@ -105,7 +109,7 @@ else endif # build link line (minus flags) -LLIBS = -lboost_program_options -lboost_iostreams -lz -lnlopt +LLIBS = -lnlopt -lboost_program_options -lboost_iostreams -lz -+# LLIBS = /usr/local/lib/libboost_program_options.a -lnlopt -lboost_iostreams -lz ifeq (${linking},static-except-glibc) - L = -L${LIBSTDCXX_STATIC_DIR} ${LPATHS} -Wl,--wrap=memcpy -Wl,-Bstatic ${LLIBS} ${LLAPACK} -Wl,-Bdynamic -lpthread -lm - else -@@ -105,16 +105,18 @@ endif + L = -L${LIBSTDCXX_STATIC_DIR} ${LPATHS} -Wl,--wrap=memcpy -Wl,-Bstatic ${LLIBS} ${LLAPACK} -Wl,-Bdynamic ${LIOMP5} -lpthread -lm ${LDL} + else ifeq (${linking},static-except-glibc-intel) +@@ -117,16 +121,20 @@ endif T = bolt -O = Bolt.o BoltParams.o BoltParEstCV.o BoltReml.o CovariateBasis.o DataMatrix.o FileUtils.o Jackknife.o LDscoreCalibration.o MapInterpolater.o MatrixUtils.o MemoryUtils.o NonlinearOptMulti.o NumericUtils.o PhenoBuilder.o RestrictSnpSet.o SnpData.o SnpInfo.o SpectrumTools.o StatsUtils.o StringUtils.o Timer.o memcpy.o -+O = Bolt.o BoltParams.o BoltParEstCV.o BoltReml.o CovariateBasis.o DataMatrix.o FileUtils.o Jackknife.o LDscoreCalibration.o MapInterpolater.o MatrixUtils.o MemoryUtils.o NonlinearOptMulti.o NumericUtils.o PhenoBuilder.o RestrictSnpSet.o SnpData.o SnpInfo.o SpectrumTools.o StatsUtils.o StringUtils.o Timer.o ++# Set to empty string in env or make command line to use system memcpy ++MEMCPY ?= memcpy.o ++O = Bolt.o BoltParams.o BoltParEstCV.o BoltReml.o CovariateBasis.o DataMatrix.o FileUtils.o Jackknife.o LDscoreCalibration.o MapInterpolater.o MatrixUtils.o MemoryUtils.o NonlinearOptMulti.o NumericUtils.o PhenoBuilder.o RestrictSnpSet.o SnpData.o SnpInfo.o SpectrumTools.o StatsUtils.o StringUtils.o Timer.o ${MEMCPY} OMAIN = BoltMain.o $O -.PHONY: clean +.PHONY: clean all -+all: $T ++all: ${T} + %.o: %.cpp - ${CC} ${CFLAGS} ${CPATHS} -o $@ -c $< diff --git a/biology/bolt-lmm/files/patch-src_SnpData.cpp b/biology/bolt-lmm/files/patch-src_SnpData.cpp deleted file mode 100644 index 5763ee62879c..000000000000 --- a/biology/bolt-lmm/files/patch-src_SnpData.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/SnpData.cpp.orig 2019-08-03 00:23:17 UTC -+++ src/SnpData.cpp -@@ -996,7 +996,7 @@ namespace LMM { - for (int w = 0; w < W; w++) - if (isProximal(m, mp, windows[w].first, windows[w].second)) { - foundProximal = true; -- if (!isnan(r2)) { -+ if (!std::isnan(r2)) { - for (int a = 0; a < A; a++) { - double weight = pow((snps[mp].MAF * (1-snps[mp].MAF)), alphaMAFdeps[a]); - LDscores[w*A+a] += weight * r2; -@@ -1048,7 +1048,7 @@ namespace LMM { - if (snps[mp].chrom != snps[m].chrom) { - fillSnpRow(&mpRow[0], mp); - double r2 = compute_r2(&mRow[0], &mpRow[0], Nstride); -- if (!isnan(r2)) { -+ if (!std::isnan(r2)) { - totOffChrom_r2s += r2; - numOffChrom_r2s++; - } diff --git a/biology/bolt-lmm/files/patch-src_StatsUtils.cpp b/biology/bolt-lmm/files/patch-src_StatsUtils.cpp deleted file mode 100644 index 7e4e35d33963..000000000000 --- a/biology/bolt-lmm/files/patch-src_StatsUtils.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/StatsUtils.cpp.orig 2019-08-03 00:24:37 UTC -+++ src/StatsUtils.cpp -@@ -33,8 +33,8 @@ namespace StatsUtils { - if (n <= 1) return NAN; - double s = 0.0, s2 = 0.0; - for (uint64 i = 0; i < n; i++) { -- if (isnan(x[i])) return NAN; -- if (isinf(x[i])) return INFINITY; -+ if (std::isnan(x[i])) return NAN; -+ if (std::isinf(x[i])) return INFINITY; - s += x[i]; - s2 += x[i]*x[i]; - } -- cgit From 8dc52147f5ad42a0ab899cb4964c62101d6f1108 Mon Sep 17 00:00:00 2001 From: adridg Date: Tue, 13 Aug 2019 15:40:06 +0000 Subject: Update devel/kdevelop and attendant ports to latest upstream 5.4.1 Release announcement: https://www.kdevelop.org/news/kdevelop-541-released Various small bugfixes over 5.4.0, which was announced at https://www.kdevelop.org/news/kdevelop-540-released and *that* introduced Meson build support, Scratchpads, and clang-tidy. The port chases upstream, with one exception: the QDebug categories are specifically dropped back to "old" style, so they live in ${LOCALBASE}/etc/xdg with the rest, instead of the new-fangled and we-need-to-think-about-this ${LOCALBASE}/share/qdebug-categories5/ --- devel/kdev-php/Makefile | 8 +- devel/kdev-php/distinfo | 6 +- devel/kdev-php/files/patch-CMakeLists.txt | 11 ++ devel/kdev-php/pkg-plist | 26 ++-- devel/kdev-python/Makefile | 7 +- devel/kdev-python/distinfo | 6 +- devel/kdev-python/files/patch-CMakeLists.txt | 11 ++ devel/kdev-python/pkg-plist | 4 +- devel/kdevelop/Makefile | 8 +- devel/kdevelop/distinfo | 6 +- devel/kdevelop/pkg-plist | 224 +++++++++++++++++---------- 11 files changed, 205 insertions(+), 112 deletions(-) create mode 100644 devel/kdev-php/files/patch-CMakeLists.txt create mode 100644 devel/kdev-python/files/patch-CMakeLists.txt diff --git a/devel/kdev-php/Makefile b/devel/kdev-php/Makefile index f4feae8952a4..4988956adbeb 100644 --- a/devel/kdev-php/Makefile +++ b/devel/kdev-php/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kdev-php -DISTVERSION= 5.3.2 -PORTREVISION= 1 +DISTVERSION= 5.4.1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop @@ -20,7 +19,12 @@ USE_KDE= auth codecs completion config configwidgets coreaddons ecm \ USE_QT= concurrent core dbus gui network webkit widgets xml \ buildtools_build qmake_build +# Versioning values, to reduce plist churn (match with devel/kdevelop) +PLATFORM_VER= 32 +PLIST_SUB+= PLATFORM_VER=${PLATFORM_VER} PRIVATE_VER=${DISTVERSION:R} + # Does not build with jobs. MAKE_JOBS_UNSAFE= yes + .include diff --git a/devel/kdev-php/distinfo b/devel/kdev-php/distinfo index ed6e5828efb3..35c34557b990 100644 --- a/devel/kdev-php/distinfo +++ b/devel/kdev-php/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552086994 -SHA256 (KDE/kdevelop/kdev-php-5.3.2.tar.xz) = 9ac87343185a6f48411334744e942f5e9fde7cb33fcca40d000980ef2075dd4a -SIZE (KDE/kdevelop/kdev-php-5.3.2.tar.xz) = 1008036 +TIMESTAMP = 1565704739 +SHA256 (KDE/kdevelop/kdev-php-5.4.1.tar.xz) = 7dc4a1f4e8521dfa85fce1ad736405e0dc1d25ad7b152587aaa50eb92c8cb992 +SIZE (KDE/kdevelop/kdev-php-5.4.1.tar.xz) = 1042236 diff --git a/devel/kdev-php/files/patch-CMakeLists.txt b/devel/kdev-php/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..df1f05683958 --- /dev/null +++ b/devel/kdev-php/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-08-13 15:15:26 UTC ++++ CMakeLists.txt +@@ -100,7 +100,7 @@ install(FILES org.kde.kdev-php.metainfo.xml DESTINATIO + # kdebugsettings >= 18.12 supports/pushes for some newer, not backward-compatible format. + # For ECM >= 5.59 we install categories files to new location, which is only supported by + # newer kdebugsettings also supporting the new content format, so we use that as base. +-if (ECM_VERSION VERSION_GREATER "5.58.0") ++if (0) + install(FILES kdevphpsupport-newformat.categories RENAME kdevphpsupport.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} + ) diff --git a/devel/kdev-php/pkg-plist b/devel/kdev-php/pkg-plist index 001a12a6cf2a..e5cdf8b9d5c9 100644 --- a/devel/kdev-php/pkg-plist +++ b/devel/kdev-php/pkg-plist @@ -3,15 +3,15 @@ include/kdev-php/kdevphpversion.h include/kdev-php/parser/parsesession.h include/kdev-php/parser/phplexer.h include/kdev-php/parser/tokenstream.h -include/kdev-php/private/5.3/parser/parserexport.h -include/kdev-php/private/5.3/parser/phpast-fwd.h -include/kdev-php/private/5.3/parser/phpast.h -include/kdev-php/private/5.3/parser/phpdebugvisitor.h -include/kdev-php/private/5.3/parser/phpdefaultvisitor.h -include/kdev-php/private/5.3/parser/phpparser.h -include/kdev-php/private/5.3/parser/phptokentext.h -include/kdev-php/private/5.3/parser/phptokentype.h -include/kdev-php/private/5.3/parser/phpvisitor.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/parserexport.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpast-fwd.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpast.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpdebugvisitor.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpdefaultvisitor.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpparser.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phptokentext.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phptokentype.h +include/kdev-php/private/%%PRIVATE_VER%%/parser/phpvisitor.h lib/cmake/KDevPHP/KDevPHPConfig.cmake lib/cmake/KDevPHP/KDevPHPConfigVersion.cmake lib/cmake/KDevPHP/KDevPHPTargets-release.cmake @@ -19,10 +19,10 @@ lib/cmake/KDevPHP/KDevPHPTargets.cmake lib/libkdevphpcompletion.so lib/libkdevphpduchain.so lib/libkdevphpparser.so -%%QT_PLUGINDIR%%/kdevplatform/31/kcm/kcm_kdevphpdocs.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevphpdocs.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevphplanguagesupport.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevphpunitprovider.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kcm/kcm_kdevphpdocs.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevphpdocs.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevphplanguagesupport.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevphpunitprovider.so share/kdevappwizard/templates/simple_phpapp.tar.bz2 share/kdevphpsupport/phpfunctions.php share/kdevphpsupport/phpunitdeclarations.php diff --git a/devel/kdev-python/Makefile b/devel/kdev-python/Makefile index 67ca323280b6..5922e9c6b3c8 100644 --- a/devel/kdev-python/Makefile +++ b/devel/kdev-python/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kdev-python -DISTVERSION= 5.3.2 -PORTREVISION= 1 +DISTVERSION= 5.4.1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop @@ -20,6 +19,10 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \ USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build +# Versioning values, to reduce plist churn (match with devel/kdevelop) +PLATFORM_VER= 32 +PLIST_SUB+= PLATFORM_VER=${PLATFORM_VER} + # Does not build with jobs. MAKE_JOBS_UNSAFE= yes diff --git a/devel/kdev-python/distinfo b/devel/kdev-python/distinfo index 5f2cece0b46a..adb62ed816c8 100644 --- a/devel/kdev-python/distinfo +++ b/devel/kdev-python/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552087023 -SHA256 (KDE/kdevelop/kdev-python-5.3.2.tar.xz) = 06dde524183516889bf50172c595276a9b199e19752dc961bd17f31406b9ced1 -SIZE (KDE/kdevelop/kdev-python-5.3.2.tar.xz) = 1074980 +TIMESTAMP = 1565704830 +SHA256 (KDE/kdevelop/kdev-python-5.4.1.tar.xz) = b7dfe4d477eac8ef59f988ff471d3ea6169faac0c841bd93b0f981036ed47bd7 +SIZE (KDE/kdevelop/kdev-python-5.4.1.tar.xz) = 1074132 diff --git a/devel/kdev-python/files/patch-CMakeLists.txt b/devel/kdev-python/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..abe2ef1fc0de --- /dev/null +++ b/devel/kdev-python/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-08-13 15:18:32 UTC ++++ CMakeLists.txt +@@ -148,7 +148,7 @@ install(FILES org.kde.kdev-python.metainfo.xml DESTINA + # kdebugsettings >= 18.12 supports/pushes for some newer, not backward-compatible format. + # For ECM >= 5.59 we install categories files to new location, which is only supported by + # newer kdebugsettings also supporting the new content format, so we use that as base. +-if (ECM_VERSION VERSION_GREATER "5.58.0") ++if (0) + install(FILES kdevpythonsupport-newformat.categories RENAME kdevpythonsupport.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} + ) diff --git a/devel/kdev-python/pkg-plist b/devel/kdev-python/pkg-plist index 42d0702d356a..24324cbcb189 100644 --- a/devel/kdev-python/pkg-plist +++ b/devel/kdev-python/pkg-plist @@ -2,8 +2,8 @@ etc/xdg/kdevpythonsupport.categories lib/libkdevpythoncompletion.so lib/libkdevpythonduchain.so lib/libkdevpythonparser.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevpdb.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevpythonlanguagesupport.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevpdb.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevpythonlanguagesupport.so share/kdevappwizard/templates/django_project.tar.bz2 share/kdevappwizard/templates/qtdesigner_app.tar.bz2 share/kdevappwizard/templates/simple_pythonapp.tar.bz2 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 654fc8fa1d23..e31d562d463e 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kdevelop -DISTVERSION= 5.3.3 -PORTREVISION= 1 +DISTVERSION= 5.4.1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop @@ -40,6 +39,11 @@ SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \ CMAKE_ARGS= -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DLLVM_ROOT=${LOCALBASE}/llvm${LLVM_DEFAULT} +# Versioning values, to reduce plist churn +PLATFORM_VER= 32 +SO_VER= 54 +PLIST_SUB+= PLATFORM_VER=${PLATFORM_VER} SO_VER=${SO_VER} SO_VER_LONG=${DISTVERSION} + OPTIONS_DEFINE= WEBENGINE WEBENGINE_DESC= Use WebEngine as help reader WEBENGINE_USES= qt:5 diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index bf3e50f17666..ad9496b4a432 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563699370 -SHA256 (KDE/kdevelop/kdevelop-5.3.3.tar.xz) = cedd1c7ba8e352a76ec021218cf2e35a6c060875ef3d27964246c48d0f2ae81c -SIZE (KDE/kdevelop/kdevelop-5.3.3.tar.xz) = 6977420 +TIMESTAMP = 1565704440 +SHA256 (KDE/kdevelop/kdevelop-5.4.1.tar.xz) = 6849c289ab9f4ad227cc4f4a52bf14e0eacab89ebf81020b0238d5ae607d388a +SIZE (KDE/kdevelop/kdevelop-5.4.1.tar.xz) = 7006564 diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist index 9ea39fef9eea..a274a1e9e08c 100644 --- a/devel/kdevelop/pkg-plist +++ b/devel/kdevelop/pkg-plist @@ -374,101 +374,104 @@ lib/cmake/KDevPlatform/KDevPlatformTargets.cmake lib/cmake/KDevelop/KDevelopConfig.cmake lib/cmake/KDevelop/KDevelopConfigVersion.cmake lib/cmake/KDevelop/KDevelopTargets.cmake -lib/libKDevClangPrivate.so.31 +lib/libKDevClangPrivate.so.%%PLATFORM_VER%% lib/libKDevPlatformDebugger.so -lib/libKDevPlatformDebugger.so.5.3.3 -lib/libKDevPlatformDebugger.so.53 +lib/libKDevPlatformDebugger.so.%%SO_VER_LONG%% +lib/libKDevPlatformDebugger.so.%%SO_VER%% lib/libKDevPlatformDocumentation.so -lib/libKDevPlatformDocumentation.so.5.3.3 -lib/libKDevPlatformDocumentation.so.53 +lib/libKDevPlatformDocumentation.so.%%SO_VER_LONG%% +lib/libKDevPlatformDocumentation.so.%%SO_VER%% lib/libKDevPlatformInterfaces.so -lib/libKDevPlatformInterfaces.so.5.3.3 -lib/libKDevPlatformInterfaces.so.53 +lib/libKDevPlatformInterfaces.so.%%SO_VER_LONG%% +lib/libKDevPlatformInterfaces.so.%%SO_VER%% lib/libKDevPlatformLanguage.so -lib/libKDevPlatformLanguage.so.5.3.3 -lib/libKDevPlatformLanguage.so.53 +lib/libKDevPlatformLanguage.so.%%SO_VER_LONG%% +lib/libKDevPlatformLanguage.so.%%SO_VER%% lib/libKDevPlatformOutputView.so -lib/libKDevPlatformOutputView.so.5.3.3 -lib/libKDevPlatformOutputView.so.53 +lib/libKDevPlatformOutputView.so.%%SO_VER_LONG%% +lib/libKDevPlatformOutputView.so.%%SO_VER%% lib/libKDevPlatformProject.so -lib/libKDevPlatformProject.so.5.3.3 -lib/libKDevPlatformProject.so.53 +lib/libKDevPlatformProject.so.%%SO_VER_LONG%% +lib/libKDevPlatformProject.so.%%SO_VER%% lib/libKDevPlatformSerialization.so -lib/libKDevPlatformSerialization.so.5.3.3 -lib/libKDevPlatformSerialization.so.53 +lib/libKDevPlatformSerialization.so.%%SO_VER_LONG%% +lib/libKDevPlatformSerialization.so.%%SO_VER%% lib/libKDevPlatformShell.so -lib/libKDevPlatformShell.so.5.3.3 -lib/libKDevPlatformShell.so.53 +lib/libKDevPlatformShell.so.%%SO_VER_LONG%% +lib/libKDevPlatformShell.so.%%SO_VER%% lib/libKDevPlatformSublime.so -lib/libKDevPlatformSublime.so.5.3.3 -lib/libKDevPlatformSublime.so.53 +lib/libKDevPlatformSublime.so.%%SO_VER_LONG%% +lib/libKDevPlatformSublime.so.%%SO_VER%% lib/libKDevPlatformUtil.so -lib/libKDevPlatformUtil.so.5.3.3 -lib/libKDevPlatformUtil.so.53 +lib/libKDevPlatformUtil.so.%%SO_VER_LONG%% +lib/libKDevPlatformUtil.so.%%SO_VER%% lib/libKDevPlatformVcs.so -lib/libKDevPlatformVcs.so.5.3.3 -lib/libKDevPlatformVcs.so.53 +lib/libKDevPlatformVcs.so.%%SO_VER_LONG%% +lib/libKDevPlatformVcs.so.%%SO_VER%% lib/libkdevcmakecommon.so %%QT_PLUGINDIR%%/grantlee/%%GRANTLEE_VERSION_SHORT%%/kdev_filters.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevandroid.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevappwizard.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevastyle.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevbazaar.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevclangsupport.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevclassbrowser.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevclazy.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcmakebuilder.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcmakedocumentation.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcmakemanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcodeutils.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcontextbrowser.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcppcheck.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcustombuildsystem.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcustommakemanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevcustomscript.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevdefinesandincludesmanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevdocker.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevdocumentswitcher.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevdocumentview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevexecute.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevexecuteplasmoid.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevexecutescript.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevexternalscript.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevfilemanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevfiletemplates.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevflatpak.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevgdb.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevgenericmanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevghprovider.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevgit.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevgrepview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevheaptrack.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevkdeprovider.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevkonsoleview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevlldb.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevmakebuilder.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevmanpage.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevninja.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevokteta.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevopenwith.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevoutlineview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevpatchreview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevperforce.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevproblemreporter.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevprojectfilter.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevprojectmanagerview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevqmakebuilder.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevqmakemanager.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevqmljslanguagesupport.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevqthelp.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevquickopen.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevsourceformatter.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevstandardoutputview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevsubversion.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevswitchtobuddy.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevtestview.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevvcschangesviewplugin.so -%%QT_PLUGINDIR%%/kdevplatform/31/kdevwelcomepage.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevandroid.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevappwizard.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevastyle.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevbazaar.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevclangsupport.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevclangtidy.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevclassbrowser.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevclazy.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcmakebuilder.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcmakedocumentation.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcmakemanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcodeutils.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcontextbrowser.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcppcheck.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcustombuildsystem.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcustommakemanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevcustomscript.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevdefinesandincludesmanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevdocker.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevdocumentswitcher.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevdocumentview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevexecute.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevexecuteplasmoid.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevexecutescript.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevexternalscript.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevfilemanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevfiletemplates.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevflatpak.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevgdb.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevgenericmanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevghprovider.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevgit.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevgrepview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevheaptrack.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevkdeprovider.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevkonsoleview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevlldb.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevmakebuilder.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevmanpage.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevmesonmanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevninja.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevokteta.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevopenwith.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevoutlineview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevpatchreview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevperforce.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevproblemreporter.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevprojectfilter.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevprojectmanagerview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevqmakebuilder.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevqmakemanager.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevqmljslanguagesupport.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevqthelp.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevquickopen.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevscratchpad.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevsourceformatter.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevstandardoutputview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevsubversion.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevswitchtobuddy.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevtestview.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevvcschangesviewplugin.so +%%QT_PLUGINDIR%%/kdevplatform/%%PLATFORM_VER%%/kdevwelcomepage.so %%QT_PLUGINDIR%%/krunner_kdevelopsessions.so %%QT_PLUGINDIR%%/plasma/dataengine/plasma_engine_kdevelopsessions.so %%QT_QMLDIR%%/org/kde/kdevplatform/libkdevelopdashboarddeclarativeplugin.so @@ -875,6 +878,7 @@ share/locale/ca/LC_MESSAGES/kdevappwizard.mo share/locale/ca/LC_MESSAGES/kdevastyle.mo share/locale/ca/LC_MESSAGES/kdevbazaar.mo share/locale/ca/LC_MESSAGES/kdevclang.mo +share/locale/ca/LC_MESSAGES/kdevclangtidy.mo share/locale/ca/LC_MESSAGES/kdevclassbrowser.mo share/locale/ca/LC_MESSAGES/kdevclazy.mo share/locale/ca/LC_MESSAGES/kdevcmake.mo @@ -908,6 +912,7 @@ share/locale/ca/LC_MESSAGES/kdevkonsole.mo share/locale/ca/LC_MESSAGES/kdevlldb.mo share/locale/ca/LC_MESSAGES/kdevmakebuilder.mo share/locale/ca/LC_MESSAGES/kdevmanpage.mo +share/locale/ca/LC_MESSAGES/kdevmesonmanager.mo share/locale/ca/LC_MESSAGES/kdevninja.mo share/locale/ca/LC_MESSAGES/kdevokteta.mo share/locale/ca/LC_MESSAGES/kdevopenwith.mo @@ -923,6 +928,7 @@ share/locale/ca/LC_MESSAGES/kdevqmakemanager.mo share/locale/ca/LC_MESSAGES/kdevqmljs.mo share/locale/ca/LC_MESSAGES/kdevqthelp.mo share/locale/ca/LC_MESSAGES/kdevquickopen.mo +share/locale/ca/LC_MESSAGES/kdevscratchpad.mo share/locale/ca/LC_MESSAGES/kdevsourceformatter.mo share/locale/ca/LC_MESSAGES/kdevstandardoutputview.mo share/locale/ca/LC_MESSAGES/kdevsubversion.mo @@ -937,6 +943,7 @@ share/locale/ca@valencia/LC_MESSAGES/kdevappwizard.mo share/locale/ca@valencia/LC_MESSAGES/kdevastyle.mo share/locale/ca@valencia/LC_MESSAGES/kdevbazaar.mo share/locale/ca@valencia/LC_MESSAGES/kdevclang.mo +share/locale/ca@valencia/LC_MESSAGES/kdevclangtidy.mo share/locale/ca@valencia/LC_MESSAGES/kdevclassbrowser.mo share/locale/ca@valencia/LC_MESSAGES/kdevclazy.mo share/locale/ca@valencia/LC_MESSAGES/kdevcmake.mo @@ -970,6 +977,7 @@ share/locale/ca@valencia/LC_MESSAGES/kdevkonsole.mo share/locale/ca@valencia/LC_MESSAGES/kdevlldb.mo share/locale/ca@valencia/LC_MESSAGES/kdevmakebuilder.mo share/locale/ca@valencia/LC_MESSAGES/kdevmanpage.mo +share/locale/ca@valencia/LC_MESSAGES/kdevmesonmanager.mo share/locale/ca@valencia/LC_MESSAGES/kdevninja.mo share/locale/ca@valencia/LC_MESSAGES/kdevokteta.mo share/locale/ca@valencia/LC_MESSAGES/kdevopenwith.mo @@ -999,6 +1007,7 @@ share/locale/cs/LC_MESSAGES/kdevappwizard.mo share/locale/cs/LC_MESSAGES/kdevastyle.mo share/locale/cs/LC_MESSAGES/kdevbazaar.mo share/locale/cs/LC_MESSAGES/kdevclang.mo +share/locale/cs/LC_MESSAGES/kdevclangtidy.mo share/locale/cs/LC_MESSAGES/kdevclassbrowser.mo share/locale/cs/LC_MESSAGES/kdevclazy.mo share/locale/cs/LC_MESSAGES/kdevcmake.mo @@ -1032,6 +1041,7 @@ share/locale/cs/LC_MESSAGES/kdevkonsole.mo share/locale/cs/LC_MESSAGES/kdevlldb.mo share/locale/cs/LC_MESSAGES/kdevmakebuilder.mo share/locale/cs/LC_MESSAGES/kdevmanpage.mo +share/locale/cs/LC_MESSAGES/kdevmesonmanager.mo share/locale/cs/LC_MESSAGES/kdevninja.mo share/locale/cs/LC_MESSAGES/kdevokteta.mo share/locale/cs/LC_MESSAGES/kdevopenwith.mo @@ -1047,6 +1057,7 @@ share/locale/cs/LC_MESSAGES/kdevqmakemanager.mo share/locale/cs/LC_MESSAGES/kdevqmljs.mo share/locale/cs/LC_MESSAGES/kdevqthelp.mo share/locale/cs/LC_MESSAGES/kdevquickopen.mo +share/locale/cs/LC_MESSAGES/kdevscratchpad.mo share/locale/cs/LC_MESSAGES/kdevsourceformatter.mo share/locale/cs/LC_MESSAGES/kdevstandardoutputview.mo share/locale/cs/LC_MESSAGES/kdevsubversion.mo @@ -1108,6 +1119,7 @@ share/locale/de/LC_MESSAGES/kdevappwizard.mo share/locale/de/LC_MESSAGES/kdevastyle.mo share/locale/de/LC_MESSAGES/kdevbazaar.mo share/locale/de/LC_MESSAGES/kdevclang.mo +share/locale/de/LC_MESSAGES/kdevclangtidy.mo share/locale/de/LC_MESSAGES/kdevclassbrowser.mo share/locale/de/LC_MESSAGES/kdevclazy.mo share/locale/de/LC_MESSAGES/kdevcmake.mo @@ -1140,6 +1152,7 @@ share/locale/de/LC_MESSAGES/kdevkonsole.mo share/locale/de/LC_MESSAGES/kdevlldb.mo share/locale/de/LC_MESSAGES/kdevmakebuilder.mo share/locale/de/LC_MESSAGES/kdevmanpage.mo +share/locale/de/LC_MESSAGES/kdevmesonmanager.mo share/locale/de/LC_MESSAGES/kdevninja.mo share/locale/de/LC_MESSAGES/kdevokteta.mo share/locale/de/LC_MESSAGES/kdevopenwith.mo @@ -1212,6 +1225,7 @@ share/locale/en_GB/LC_MESSAGES/kdevappwizard.mo share/locale/en_GB/LC_MESSAGES/kdevastyle.mo share/locale/en_GB/LC_MESSAGES/kdevbazaar.mo share/locale/en_GB/LC_MESSAGES/kdevclang.mo +share/locale/en_GB/LC_MESSAGES/kdevclangtidy.mo share/locale/en_GB/LC_MESSAGES/kdevclassbrowser.mo share/locale/en_GB/LC_MESSAGES/kdevclazy.mo share/locale/en_GB/LC_MESSAGES/kdevcmake.mo @@ -1245,6 +1259,7 @@ share/locale/en_GB/LC_MESSAGES/kdevkonsole.mo share/locale/en_GB/LC_MESSAGES/kdevlldb.mo share/locale/en_GB/LC_MESSAGES/kdevmakebuilder.mo share/locale/en_GB/LC_MESSAGES/kdevmanpage.mo +share/locale/en_GB/LC_MESSAGES/kdevmesonmanager.mo share/locale/en_GB/LC_MESSAGES/kdevninja.mo share/locale/en_GB/LC_MESSAGES/kdevokteta.mo share/locale/en_GB/LC_MESSAGES/kdevopenwith.mo @@ -1260,6 +1275,7 @@ share/locale/en_GB/LC_MESSAGES/kdevqmakemanager.mo share/locale/en_GB/LC_MESSAGES/kdevqmljs.mo share/locale/en_GB/LC_MESSAGES/kdevqthelp.mo share/locale/en_GB/LC_MESSAGES/kdevquickopen.mo +share/locale/en_GB/LC_MESSAGES/kdevscratchpad.mo share/locale/en_GB/LC_MESSAGES/kdevsourceformatter.mo share/locale/en_GB/LC_MESSAGES/kdevstandardoutputview.mo share/locale/en_GB/LC_MESSAGES/kdevsubversion.mo @@ -1305,6 +1321,7 @@ share/locale/es/LC_MESSAGES/kdevappwizard.mo share/locale/es/LC_MESSAGES/kdevastyle.mo share/locale/es/LC_MESSAGES/kdevbazaar.mo share/locale/es/LC_MESSAGES/kdevclang.mo +share/locale/es/LC_MESSAGES/kdevclangtidy.mo share/locale/es/LC_MESSAGES/kdevclassbrowser.mo share/locale/es/LC_MESSAGES/kdevclazy.mo share/locale/es/LC_MESSAGES/kdevcmake.mo @@ -1338,6 +1355,7 @@ share/locale/es/LC_MESSAGES/kdevkonsole.mo share/locale/es/LC_MESSAGES/kdevlldb.mo share/locale/es/LC_MESSAGES/kdevmakebuilder.mo share/locale/es/LC_MESSAGES/kdevmanpage.mo +share/locale/es/LC_MESSAGES/kdevmesonmanager.mo share/locale/es/LC_MESSAGES/kdevninja.mo share/locale/es/LC_MESSAGES/kdevokteta.mo share/locale/es/LC_MESSAGES/kdevopenwith.mo @@ -1353,6 +1371,7 @@ share/locale/es/LC_MESSAGES/kdevqmakemanager.mo share/locale/es/LC_MESSAGES/kdevqmljs.mo share/locale/es/LC_MESSAGES/kdevqthelp.mo share/locale/es/LC_MESSAGES/kdevquickopen.mo +share/locale/es/LC_MESSAGES/kdevscratchpad.mo share/locale/es/LC_MESSAGES/kdevsourceformatter.mo share/locale/es/LC_MESSAGES/kdevstandardoutputview.mo share/locale/es/LC_MESSAGES/kdevsubversion.mo @@ -1420,6 +1439,7 @@ share/locale/fa/LC_MESSAGES/kdevelop.mo share/locale/fi/LC_MESSAGES/kdevappwizard.mo share/locale/fi/LC_MESSAGES/kdevastyle.mo share/locale/fi/LC_MESSAGES/kdevbazaar.mo +share/locale/fi/LC_MESSAGES/kdevclangtidy.mo share/locale/fi/LC_MESSAGES/kdevclassbrowser.mo share/locale/fi/LC_MESSAGES/kdevcmake.mo share/locale/fi/LC_MESSAGES/kdevcmakebuilder.mo @@ -1473,6 +1493,7 @@ share/locale/fr/LC_MESSAGES/kdevappwizard.mo share/locale/fr/LC_MESSAGES/kdevastyle.mo share/locale/fr/LC_MESSAGES/kdevbazaar.mo share/locale/fr/LC_MESSAGES/kdevclang.mo +share/locale/fr/LC_MESSAGES/kdevclangtidy.mo share/locale/fr/LC_MESSAGES/kdevclassbrowser.mo share/locale/fr/LC_MESSAGES/kdevclazy.mo share/locale/fr/LC_MESSAGES/kdevcmake.mo @@ -1506,6 +1527,7 @@ share/locale/fr/LC_MESSAGES/kdevkonsole.mo share/locale/fr/LC_MESSAGES/kdevlldb.mo share/locale/fr/LC_MESSAGES/kdevmakebuilder.mo share/locale/fr/LC_MESSAGES/kdevmanpage.mo +share/locale/fr/LC_MESSAGES/kdevmesonmanager.mo share/locale/fr/LC_MESSAGES/kdevninja.mo share/locale/fr/LC_MESSAGES/kdevokteta.mo share/locale/fr/LC_MESSAGES/kdevopenwith.mo @@ -1521,6 +1543,7 @@ share/locale/fr/LC_MESSAGES/kdevqmakemanager.mo share/locale/fr/LC_MESSAGES/kdevqmljs.mo share/locale/fr/LC_MESSAGES/kdevqthelp.mo share/locale/fr/LC_MESSAGES/kdevquickopen.mo +share/locale/fr/LC_MESSAGES/kdevscratchpad.mo share/locale/fr/LC_MESSAGES/kdevsourceformatter.mo share/locale/fr/LC_MESSAGES/kdevstandardoutputview.mo share/locale/fr/LC_MESSAGES/kdevsubversion.mo @@ -1577,6 +1600,7 @@ share/locale/gl/LC_MESSAGES/kdevappwizard.mo share/locale/gl/LC_MESSAGES/kdevastyle.mo share/locale/gl/LC_MESSAGES/kdevbazaar.mo share/locale/gl/LC_MESSAGES/kdevclang.mo +share/locale/gl/LC_MESSAGES/kdevclangtidy.mo share/locale/gl/LC_MESSAGES/kdevclassbrowser.mo share/locale/gl/LC_MESSAGES/kdevclazy.mo share/locale/gl/LC_MESSAGES/kdevcmake.mo @@ -1610,6 +1634,7 @@ share/locale/gl/LC_MESSAGES/kdevkonsole.mo share/locale/gl/LC_MESSAGES/kdevlldb.mo share/locale/gl/LC_MESSAGES/kdevmakebuilder.mo share/locale/gl/LC_MESSAGES/kdevmanpage.mo +share/locale/gl/LC_MESSAGES/kdevmesonmanager.mo share/locale/gl/LC_MESSAGES/kdevninja.mo share/locale/gl/LC_MESSAGES/kdevokteta.mo share/locale/gl/LC_MESSAGES/kdevopenwith.mo @@ -1625,6 +1650,7 @@ share/locale/gl/LC_MESSAGES/kdevqmakemanager.mo share/locale/gl/LC_MESSAGES/kdevqmljs.mo share/locale/gl/LC_MESSAGES/kdevqthelp.mo share/locale/gl/LC_MESSAGES/kdevquickopen.mo +share/locale/gl/LC_MESSAGES/kdevscratchpad.mo share/locale/gl/LC_MESSAGES/kdevsourceformatter.mo share/locale/gl/LC_MESSAGES/kdevstandardoutputview.mo share/locale/gl/LC_MESSAGES/kdevsubversion.mo @@ -1718,6 +1744,7 @@ share/locale/it/LC_MESSAGES/kdevappwizard.mo share/locale/it/LC_MESSAGES/kdevastyle.mo share/locale/it/LC_MESSAGES/kdevbazaar.mo share/locale/it/LC_MESSAGES/kdevclang.mo +share/locale/it/LC_MESSAGES/kdevclangtidy.mo share/locale/it/LC_MESSAGES/kdevclassbrowser.mo share/locale/it/LC_MESSAGES/kdevclazy.mo share/locale/it/LC_MESSAGES/kdevcmake.mo @@ -1745,11 +1772,13 @@ share/locale/it/LC_MESSAGES/kdevgdb.mo share/locale/it/LC_MESSAGES/kdevghprovider.mo share/locale/it/LC_MESSAGES/kdevgit.mo share/locale/it/LC_MESSAGES/kdevgrepview.mo +share/locale/it/LC_MESSAGES/kdevheaptrack.mo share/locale/it/LC_MESSAGES/kdevkdeprovider.mo share/locale/it/LC_MESSAGES/kdevkonsole.mo share/locale/it/LC_MESSAGES/kdevlldb.mo share/locale/it/LC_MESSAGES/kdevmakebuilder.mo share/locale/it/LC_MESSAGES/kdevmanpage.mo +share/locale/it/LC_MESSAGES/kdevmesonmanager.mo share/locale/it/LC_MESSAGES/kdevninja.mo share/locale/it/LC_MESSAGES/kdevokteta.mo share/locale/it/LC_MESSAGES/kdevopenwith.mo @@ -1765,6 +1794,7 @@ share/locale/it/LC_MESSAGES/kdevqmakemanager.mo share/locale/it/LC_MESSAGES/kdevqmljs.mo share/locale/it/LC_MESSAGES/kdevqthelp.mo share/locale/it/LC_MESSAGES/kdevquickopen.mo +share/locale/it/LC_MESSAGES/kdevscratchpad.mo share/locale/it/LC_MESSAGES/kdevsourceformatter.mo share/locale/it/LC_MESSAGES/kdevstandardoutputview.mo share/locale/it/LC_MESSAGES/kdevsubversion.mo @@ -1779,6 +1809,7 @@ share/locale/ja/LC_MESSAGES/kdevappwizard.mo share/locale/ja/LC_MESSAGES/kdevastyle.mo share/locale/ja/LC_MESSAGES/kdevbazaar.mo share/locale/ja/LC_MESSAGES/kdevclang.mo +share/locale/ja/LC_MESSAGES/kdevclangtidy.mo share/locale/ja/LC_MESSAGES/kdevclassbrowser.mo share/locale/ja/LC_MESSAGES/kdevclazy.mo share/locale/ja/LC_MESSAGES/kdevcmake.mo @@ -1812,6 +1843,7 @@ share/locale/ja/LC_MESSAGES/kdevkonsole.mo share/locale/ja/LC_MESSAGES/kdevlldb.mo share/locale/ja/LC_MESSAGES/kdevmakebuilder.mo share/locale/ja/LC_MESSAGES/kdevmanpage.mo +share/locale/ja/LC_MESSAGES/kdevmesonmanager.mo share/locale/ja/LC_MESSAGES/kdevninja.mo share/locale/ja/LC_MESSAGES/kdevokteta.mo share/locale/ja/LC_MESSAGES/kdevopenwith.mo @@ -1942,6 +1974,7 @@ share/locale/ko/LC_MESSAGES/plasma_runner_kdevelopsessions.mo share/locale/ku/LC_MESSAGES/kdevelop.mo share/locale/lt/LC_MESSAGES/kdevappwizard.mo share/locale/lt/LC_MESSAGES/kdevastyle.mo +share/locale/lt/LC_MESSAGES/kdevclangtidy.mo share/locale/lt/LC_MESSAGES/kdevclassbrowser.mo share/locale/lt/LC_MESSAGES/kdevcmake.mo share/locale/lt/LC_MESSAGES/kdevcmakebuilder.mo @@ -1969,6 +2002,7 @@ share/locale/lt/LC_MESSAGES/kdevkdeprovider.mo share/locale/lt/LC_MESSAGES/kdevkonsole.mo share/locale/lt/LC_MESSAGES/kdevmakebuilder.mo share/locale/lt/LC_MESSAGES/kdevmanpage.mo +share/locale/lt/LC_MESSAGES/kdevmesonmanager.mo share/locale/lt/LC_MESSAGES/kdevninja.mo share/locale/lt/LC_MESSAGES/kdevokteta.mo share/locale/lt/LC_MESSAGES/kdevopenwith.mo @@ -2142,6 +2176,7 @@ share/locale/nl/LC_MESSAGES/kdevappwizard.mo share/locale/nl/LC_MESSAGES/kdevastyle.mo share/locale/nl/LC_MESSAGES/kdevbazaar.mo share/locale/nl/LC_MESSAGES/kdevclang.mo +share/locale/nl/LC_MESSAGES/kdevclangtidy.mo share/locale/nl/LC_MESSAGES/kdevclassbrowser.mo share/locale/nl/LC_MESSAGES/kdevclazy.mo share/locale/nl/LC_MESSAGES/kdevcmake.mo @@ -2175,6 +2210,7 @@ share/locale/nl/LC_MESSAGES/kdevkonsole.mo share/locale/nl/LC_MESSAGES/kdevlldb.mo share/locale/nl/LC_MESSAGES/kdevmakebuilder.mo share/locale/nl/LC_MESSAGES/kdevmanpage.mo +share/locale/nl/LC_MESSAGES/kdevmesonmanager.mo share/locale/nl/LC_MESSAGES/kdevninja.mo share/locale/nl/LC_MESSAGES/kdevokteta.mo share/locale/nl/LC_MESSAGES/kdevopenwith.mo @@ -2190,6 +2226,7 @@ share/locale/nl/LC_MESSAGES/kdevqmakemanager.mo share/locale/nl/LC_MESSAGES/kdevqmljs.mo share/locale/nl/LC_MESSAGES/kdevqthelp.mo share/locale/nl/LC_MESSAGES/kdevquickopen.mo +share/locale/nl/LC_MESSAGES/kdevscratchpad.mo share/locale/nl/LC_MESSAGES/kdevsourceformatter.mo share/locale/nl/LC_MESSAGES/kdevstandardoutputview.mo share/locale/nl/LC_MESSAGES/kdevsubversion.mo @@ -2245,6 +2282,7 @@ share/locale/pl/LC_MESSAGES/kdevappwizard.mo share/locale/pl/LC_MESSAGES/kdevastyle.mo share/locale/pl/LC_MESSAGES/kdevbazaar.mo share/locale/pl/LC_MESSAGES/kdevclang.mo +share/locale/pl/LC_MESSAGES/kdevclangtidy.mo share/locale/pl/LC_MESSAGES/kdevclassbrowser.mo share/locale/pl/LC_MESSAGES/kdevclazy.mo share/locale/pl/LC_MESSAGES/kdevcmake.mo @@ -2278,6 +2316,7 @@ share/locale/pl/LC_MESSAGES/kdevkonsole.mo share/locale/pl/LC_MESSAGES/kdevlldb.mo share/locale/pl/LC_MESSAGES/kdevmakebuilder.mo share/locale/pl/LC_MESSAGES/kdevmanpage.mo +share/locale/pl/LC_MESSAGES/kdevmesonmanager.mo share/locale/pl/LC_MESSAGES/kdevninja.mo share/locale/pl/LC_MESSAGES/kdevokteta.mo share/locale/pl/LC_MESSAGES/kdevopenwith.mo @@ -2293,6 +2332,7 @@ share/locale/pl/LC_MESSAGES/kdevqmakemanager.mo share/locale/pl/LC_MESSAGES/kdevqmljs.mo share/locale/pl/LC_MESSAGES/kdevqthelp.mo share/locale/pl/LC_MESSAGES/kdevquickopen.mo +share/locale/pl/LC_MESSAGES/kdevscratchpad.mo share/locale/pl/LC_MESSAGES/kdevsourceformatter.mo share/locale/pl/LC_MESSAGES/kdevstandardoutputview.mo share/locale/pl/LC_MESSAGES/kdevsubversion.mo @@ -2307,6 +2347,7 @@ share/locale/pt/LC_MESSAGES/kdevappwizard.mo share/locale/pt/LC_MESSAGES/kdevastyle.mo share/locale/pt/LC_MESSAGES/kdevbazaar.mo share/locale/pt/LC_MESSAGES/kdevclang.mo +share/locale/pt/LC_MESSAGES/kdevclangtidy.mo share/locale/pt/LC_MESSAGES/kdevclassbrowser.mo share/locale/pt/LC_MESSAGES/kdevclazy.mo share/locale/pt/LC_MESSAGES/kdevcmake.mo @@ -2340,6 +2381,7 @@ share/locale/pt/LC_MESSAGES/kdevkonsole.mo share/locale/pt/LC_MESSAGES/kdevlldb.mo share/locale/pt/LC_MESSAGES/kdevmakebuilder.mo share/locale/pt/LC_MESSAGES/kdevmanpage.mo +share/locale/pt/LC_MESSAGES/kdevmesonmanager.mo share/locale/pt/LC_MESSAGES/kdevninja.mo share/locale/pt/LC_MESSAGES/kdevokteta.mo share/locale/pt/LC_MESSAGES/kdevopenwith.mo @@ -2355,6 +2397,7 @@ share/locale/pt/LC_MESSAGES/kdevqmakemanager.mo share/locale/pt/LC_MESSAGES/kdevqmljs.mo share/locale/pt/LC_MESSAGES/kdevqthelp.mo share/locale/pt/LC_MESSAGES/kdevquickopen.mo +share/locale/pt/LC_MESSAGES/kdevscratchpad.mo share/locale/pt/LC_MESSAGES/kdevsourceformatter.mo share/locale/pt/LC_MESSAGES/kdevstandardoutputview.mo share/locale/pt/LC_MESSAGES/kdevsubversion.mo @@ -2369,6 +2412,7 @@ share/locale/pt_BR/LC_MESSAGES/kdevappwizard.mo share/locale/pt_BR/LC_MESSAGES/kdevastyle.mo share/locale/pt_BR/LC_MESSAGES/kdevbazaar.mo share/locale/pt_BR/LC_MESSAGES/kdevclang.mo +share/locale/pt_BR/LC_MESSAGES/kdevclangtidy.mo share/locale/pt_BR/LC_MESSAGES/kdevclassbrowser.mo share/locale/pt_BR/LC_MESSAGES/kdevclazy.mo share/locale/pt_BR/LC_MESSAGES/kdevcmake.mo @@ -2402,6 +2446,7 @@ share/locale/pt_BR/LC_MESSAGES/kdevkonsole.mo share/locale/pt_BR/LC_MESSAGES/kdevlldb.mo share/locale/pt_BR/LC_MESSAGES/kdevmakebuilder.mo share/locale/pt_BR/LC_MESSAGES/kdevmanpage.mo +share/locale/pt_BR/LC_MESSAGES/kdevmesonmanager.mo share/locale/pt_BR/LC_MESSAGES/kdevninja.mo share/locale/pt_BR/LC_MESSAGES/kdevokteta.mo share/locale/pt_BR/LC_MESSAGES/kdevopenwith.mo @@ -2417,6 +2462,7 @@ share/locale/pt_BR/LC_MESSAGES/kdevqmakemanager.mo share/locale/pt_BR/LC_MESSAGES/kdevqmljs.mo share/locale/pt_BR/LC_MESSAGES/kdevqthelp.mo share/locale/pt_BR/LC_MESSAGES/kdevquickopen.mo +share/locale/pt_BR/LC_MESSAGES/kdevscratchpad.mo share/locale/pt_BR/LC_MESSAGES/kdevsourceformatter.mo share/locale/pt_BR/LC_MESSAGES/kdevstandardoutputview.mo share/locale/pt_BR/LC_MESSAGES/kdevsubversion.mo @@ -2459,6 +2505,7 @@ share/locale/ro/LC_MESSAGES/kdevsubversion.mo share/locale/ru/LC_MESSAGES/kdevappwizard.mo share/locale/ru/LC_MESSAGES/kdevastyle.mo share/locale/ru/LC_MESSAGES/kdevclang.mo +share/locale/ru/LC_MESSAGES/kdevclangtidy.mo share/locale/ru/LC_MESSAGES/kdevclassbrowser.mo share/locale/ru/LC_MESSAGES/kdevcmake.mo share/locale/ru/LC_MESSAGES/kdevcmakebuilder.mo @@ -2514,6 +2561,7 @@ share/locale/sk/LC_MESSAGES/kdevappwizard.mo share/locale/sk/LC_MESSAGES/kdevastyle.mo share/locale/sk/LC_MESSAGES/kdevbazaar.mo share/locale/sk/LC_MESSAGES/kdevclang.mo +share/locale/sk/LC_MESSAGES/kdevclangtidy.mo share/locale/sk/LC_MESSAGES/kdevclassbrowser.mo share/locale/sk/LC_MESSAGES/kdevclazy.mo share/locale/sk/LC_MESSAGES/kdevcmake.mo @@ -2547,6 +2595,7 @@ share/locale/sk/LC_MESSAGES/kdevkonsole.mo share/locale/sk/LC_MESSAGES/kdevlldb.mo share/locale/sk/LC_MESSAGES/kdevmakebuilder.mo share/locale/sk/LC_MESSAGES/kdevmanpage.mo +share/locale/sk/LC_MESSAGES/kdevmesonmanager.mo share/locale/sk/LC_MESSAGES/kdevninja.mo share/locale/sk/LC_MESSAGES/kdevokteta.mo share/locale/sk/LC_MESSAGES/kdevopenwith.mo @@ -2562,6 +2611,7 @@ share/locale/sk/LC_MESSAGES/kdevqmakemanager.mo share/locale/sk/LC_MESSAGES/kdevqmljs.mo share/locale/sk/LC_MESSAGES/kdevqthelp.mo share/locale/sk/LC_MESSAGES/kdevquickopen.mo +share/locale/sk/LC_MESSAGES/kdevscratchpad.mo share/locale/sk/LC_MESSAGES/kdevsourceformatter.mo share/locale/sk/LC_MESSAGES/kdevstandardoutputview.mo share/locale/sk/LC_MESSAGES/kdevsubversion.mo @@ -2624,6 +2674,7 @@ share/locale/sv/LC_MESSAGES/kdevappwizard.mo share/locale/sv/LC_MESSAGES/kdevastyle.mo share/locale/sv/LC_MESSAGES/kdevbazaar.mo share/locale/sv/LC_MESSAGES/kdevclang.mo +share/locale/sv/LC_MESSAGES/kdevclangtidy.mo share/locale/sv/LC_MESSAGES/kdevclassbrowser.mo share/locale/sv/LC_MESSAGES/kdevclazy.mo share/locale/sv/LC_MESSAGES/kdevcmake.mo @@ -2657,6 +2708,7 @@ share/locale/sv/LC_MESSAGES/kdevkonsole.mo share/locale/sv/LC_MESSAGES/kdevlldb.mo share/locale/sv/LC_MESSAGES/kdevmakebuilder.mo share/locale/sv/LC_MESSAGES/kdevmanpage.mo +share/locale/sv/LC_MESSAGES/kdevmesonmanager.mo share/locale/sv/LC_MESSAGES/kdevninja.mo share/locale/sv/LC_MESSAGES/kdevokteta.mo share/locale/sv/LC_MESSAGES/kdevopenwith.mo @@ -2672,6 +2724,7 @@ share/locale/sv/LC_MESSAGES/kdevqmakemanager.mo share/locale/sv/LC_MESSAGES/kdevqmljs.mo share/locale/sv/LC_MESSAGES/kdevqthelp.mo share/locale/sv/LC_MESSAGES/kdevquickopen.mo +share/locale/sv/LC_MESSAGES/kdevscratchpad.mo share/locale/sv/LC_MESSAGES/kdevsourceformatter.mo share/locale/sv/LC_MESSAGES/kdevstandardoutputview.mo share/locale/sv/LC_MESSAGES/kdevsubversion.mo @@ -2793,6 +2846,7 @@ share/locale/uk/LC_MESSAGES/kdevappwizard.mo share/locale/uk/LC_MESSAGES/kdevastyle.mo share/locale/uk/LC_MESSAGES/kdevbazaar.mo share/locale/uk/LC_MESSAGES/kdevclang.mo +share/locale/uk/LC_MESSAGES/kdevclangtidy.mo share/locale/uk/LC_MESSAGES/kdevclassbrowser.mo share/locale/uk/LC_MESSAGES/kdevclazy.mo share/locale/uk/LC_MESSAGES/kdevcmake.mo @@ -2826,6 +2880,7 @@ share/locale/uk/LC_MESSAGES/kdevkonsole.mo share/locale/uk/LC_MESSAGES/kdevlldb.mo share/locale/uk/LC_MESSAGES/kdevmakebuilder.mo share/locale/uk/LC_MESSAGES/kdevmanpage.mo +share/locale/uk/LC_MESSAGES/kdevmesonmanager.mo share/locale/uk/LC_MESSAGES/kdevninja.mo share/locale/uk/LC_MESSAGES/kdevokteta.mo share/locale/uk/LC_MESSAGES/kdevopenwith.mo @@ -2841,6 +2896,7 @@ share/locale/uk/LC_MESSAGES/kdevqmakemanager.mo share/locale/uk/LC_MESSAGES/kdevqmljs.mo share/locale/uk/LC_MESSAGES/kdevqthelp.mo share/locale/uk/LC_MESSAGES/kdevquickopen.mo +share/locale/uk/LC_MESSAGES/kdevscratchpad.mo share/locale/uk/LC_MESSAGES/kdevsourceformatter.mo share/locale/uk/LC_MESSAGES/kdevstandardoutputview.mo share/locale/uk/LC_MESSAGES/kdevsubversion.mo @@ -2856,6 +2912,7 @@ share/locale/zh_CN/LC_MESSAGES/kdevappwizard.mo share/locale/zh_CN/LC_MESSAGES/kdevastyle.mo share/locale/zh_CN/LC_MESSAGES/kdevbazaar.mo share/locale/zh_CN/LC_MESSAGES/kdevclang.mo +share/locale/zh_CN/LC_MESSAGES/kdevclangtidy.mo share/locale/zh_CN/LC_MESSAGES/kdevclassbrowser.mo share/locale/zh_CN/LC_MESSAGES/kdevclazy.mo share/locale/zh_CN/LC_MESSAGES/kdevcmake.mo @@ -2889,6 +2946,7 @@ share/locale/zh_CN/LC_MESSAGES/kdevkonsole.mo share/locale/zh_CN/LC_MESSAGES/kdevlldb.mo share/locale/zh_CN/LC_MESSAGES/kdevmakebuilder.mo share/locale/zh_CN/LC_MESSAGES/kdevmanpage.mo +share/locale/zh_CN/LC_MESSAGES/kdevmesonmanager.mo share/locale/zh_CN/LC_MESSAGES/kdevninja.mo share/locale/zh_CN/LC_MESSAGES/kdevokteta.mo share/locale/zh_CN/LC_MESSAGES/kdevopenwith.mo @@ -2918,6 +2976,7 @@ share/locale/zh_TW/LC_MESSAGES/kdevappwizard.mo share/locale/zh_TW/LC_MESSAGES/kdevastyle.mo share/locale/zh_TW/LC_MESSAGES/kdevbazaar.mo share/locale/zh_TW/LC_MESSAGES/kdevclang.mo +share/locale/zh_TW/LC_MESSAGES/kdevclangtidy.mo share/locale/zh_TW/LC_MESSAGES/kdevclassbrowser.mo share/locale/zh_TW/LC_MESSAGES/kdevclazy.mo share/locale/zh_TW/LC_MESSAGES/kdevcmake.mo @@ -2951,6 +3010,7 @@ share/locale/zh_TW/LC_MESSAGES/kdevkonsole.mo share/locale/zh_TW/LC_MESSAGES/kdevlldb.mo share/locale/zh_TW/LC_MESSAGES/kdevmakebuilder.mo share/locale/zh_TW/LC_MESSAGES/kdevmanpage.mo +share/locale/zh_TW/LC_MESSAGES/kdevmesonmanager.mo share/locale/zh_TW/LC_MESSAGES/kdevninja.mo share/locale/zh_TW/LC_MESSAGES/kdevokteta.mo share/locale/zh_TW/LC_MESSAGES/kdevopenwith.mo -- cgit From 984f7af3a80af47e2383fb7801ec5d7fcca84ee0 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 13 Aug 2019 16:00:39 +0000 Subject: Convert to UCL & cleanup pkg-message (categories a-c) --- accessibility/yasr/files/pkg-message.in | 10 +++--- arabic/ae_fonts_mono/files/pkg-message.in | 8 +++-- arabic/ae_fonts_ttf/files/pkg-message.in | 8 +++-- arabic/kacst_fonts/files/pkg-message.in | 8 +++-- arabic/khotot/files/pkg-message.in | 8 +++-- archivers/ark/pkg-message | 6 ++++ archivers/paq/files/pkg-message.in | 8 +++-- archivers/py-borgbackup/pkg-message | 6 ++++ archivers/urbackup-client/files/pkg-message.in | 10 +++--- archivers/urbackup-server/files/pkg-message.in | 10 +++--- astro/astrometry/files/pkg-message.in | 8 +++-- astro/boinc-astropulse/files/pkg-message.in | 8 +++-- astro/boinc-setiathome/files/pkg-message.in | 8 +++-- astro/google-earth/pkg-message | 6 ++++ astro/gpsdrive/pkg-message | 7 +++- astro/gpsman/files/pkg-message.in | 7 +++- astro/roadmap/files/pkg-message.in | 9 ++++-- astro/viking/files/pkg-message.in | 10 +++--- audio/alsa-sndio/pkg-message | 6 ++++ audio/amarok/pkg-message | 10 +++--- audio/audacity/pkg-message | 7 ++++ audio/baudline/pkg-message | 8 +++-- audio/beep/pkg-message | 6 ++++ audio/boodler/pkg-message | 6 ++++ audio/cplay/pkg-message | 37 ++++++++++++---------- audio/csound/files/pkg-message.in | 8 +++-- audio/darkice/files/pkg-message.in | 8 +++-- audio/eawpats/files/pkg-message.in | 10 +++--- audio/faust/pkg-message | 8 +++-- audio/festival/pkg-message | 16 ++++++---- .../festvox-cmu_us_slt_arctic/files/pkg-message.in | 8 +++-- audio/flacon/pkg-message | 6 ++++ audio/foo-yc20/pkg-message | 8 +++-- audio/forked-daapd/files/pkg-message.in | 6 ++++ audio/gnuitar/pkg-message | 8 +++-- audio/gstreamer-plugins-sndio/pkg-message | 6 ++++ audio/gstreamer1-plugins-sndio/pkg-message | 6 ++++ audio/gvolwheel/files/pkg-message.in | 10 +++--- audio/icecast-kh/files/pkg-message.in | 6 ++++ audio/icecast/files/pkg-message.in | 6 ++++ audio/icegenerator/pkg-message | 10 +++--- audio/ifp-line/pkg-message | 7 +++- audio/juke/files/pkg-message.in | 6 ++++ audio/libamrnb/files/pkg-message.in | 6 ++++ audio/libamrwb/files/pkg-message.in | 6 ++++ audio/linux-laudio/pkg-message | 6 ++++ audio/logitechmediaserver/pkg-message | 8 +++-- audio/lollypop/files/pkg-message.in | 6 ++++ audio/madfufw/files/pkg-message.in | 6 ++++ audio/mous/pkg-message | 6 ++++ audio/mpdas/files/pkg-message.in | 22 ++++++++----- audio/mpg123.el/pkg-message | 8 +++-- audio/musicpd/files/pkg-message.in | 10 +++--- audio/nuvolaplayer/pkg-message | 10 +++--- audio/oss/pkg-message | 10 +++--- audio/penguinsap/pkg-message | 8 +++-- audio/picard-plugins/files/pkg-message.in | 10 +++--- audio/playgsf/pkg-message | 8 +++-- audio/pulseaudio-module-sndio/files/pkg-message.in | 6 ++++ audio/pytone/files/pkg-message.in | 10 +++--- audio/ripit/pkg-message | 6 ++++ audio/sidplayer/files/pkg-message.in | 8 +++-- audio/spectrogram/pkg-message | 6 ++++ audio/synthpod-lv2/pkg-message | 8 +++-- audio/teamspeak3-server/files/pkg-message.in | 13 ++++++-- audio/timidity++-emacs/pkg-message | 8 +++-- audio/timidity++-xskin/pkg-message | 9 ++++-- audio/tuxguitar/files/pkg-message.in | 9 ++++-- audio/xhippo/pkg-message | 7 +++- audio/xmcd/files/pkg-message.in | 9 ++++-- audio/xmms2-scrobbler/files/pkg-message.in | 6 ++++ audio/xwave/pkg-message | 6 ++++ audio/ympd/pkg-message | 6 ++++ benchmarks/scimark2/files/pkg-message.in | 10 +++--- benchmarks/scimark2c/pkg-message | 10 +++--- benchmarks/thrulay/pkg-message | 20 ++++++------ benchmarks/unixbench/pkg-message | 8 +++-- biology/bcftools/files/pkg-message.in | 6 ++++ biology/consed/files/pkg-message.in | 8 +++-- biology/diamond/pkg-message | 10 +++--- biology/emboss/files/pkg-message.in | 10 +++--- biology/fasta/files/pkg-message.in | 10 +++--- biology/fasta3/files/pkg-message.in | 10 +++--- biology/gmap/pkg-message | 8 +++-- biology/hmmer/pkg-message | 8 +++-- biology/lagan/files/pkg-message.in | 10 +++--- biology/ncbi-toolkit/files/pkg-message.in | 10 +++--- biology/phred/files/pkg-message.in | 8 +++-- biology/samtools/files/pkg-message.in | 6 ++++ biology/wise/files/pkg-message.in | 6 ++++ cad/alliance/files/pkg-message.in | 8 +++-- cad/astk-serveur/files.client/pkg-message.in | 6 ++++ cad/astk-serveur/files/pkg-message.in | 6 ++++ cad/brickutils/files/pkg-message.in | 10 +++--- cad/dinotrace/pkg-message | 9 ++++-- cad/k40-whisperer/files/pkg-message.in | 6 ++++ cad/kicad-devel/pkg-message | 8 +++-- cad/kicad/pkg-message | 8 +++-- cad/linux-eagle5/files/pkg-message.in | 7 +++- cad/netgen/files/pkg-message.in | 11 ++++--- cad/verilog-mode.el/pkg-message | 8 +++-- cad/z88/pkg-message | 6 ++++ chinese/CNS11643-font/pkg-message | 6 ++++ chinese/auto-cn-l10n/files/pkg-message.in | 11 ++++--- chinese/auto-tw-l10n/files/pkg-message.in | 10 +++--- chinese/big5width/pkg-message | 8 +++-- chinese/dictd-database/files/pkg-message.in | 10 +++--- chinese/enscript/pkg-message | 8 +++-- chinese/fandol/files/pkg-message.in | 9 ++++-- chinese/fcitx-sunpinyin/pkg-message | 10 +++--- chinese/fcitx-ui-light/pkg-message | 10 +++--- chinese/fcitx/files/pkg-message.in | 10 +++--- chinese/gcin-gtk3/pkg-message | 9 ++++-- chinese/gcin-qt5/pkg-message | 9 ++++-- chinese/gcin/pkg-message | 9 ++++-- chinese/phpbb-tw/files/pkg-message.in | 8 +++-- chinese/phpbb3-tw/files/pkg-message.in | 9 ++++-- chinese/scim-fcitx/files/pkg-message.in | 9 ++++-- chinese/scim-pinyin/pkg-message | 9 ++++-- chinese/scim-tables/pkg-message | 9 ++++-- chinese/sourcehansans-sc-otf/files/pkg-message.in | 8 +++-- chinese/sourcehansans-tc-otf/files/pkg-message.in | 8 +++-- chinese/sourcehanserif-sc-otf/files/pkg-message.in | 8 +++-- chinese/sourcehanserif-tc-otf/files/pkg-message.in | 8 +++-- chinese/wordpress-zh_CN/files/pkg-message.in | 8 +++-- chinese/wordpress-zh_TW/files/pkg-message.in | 8 +++-- comms/aprsd/files/pkg-message.in | 6 ++++ comms/atslog/files/pkg-message.in | 7 +++- comms/bforce-kst/files/pkg-message.in | 10 +++--- comms/bluez-firmware/pkg-message | 8 +++-- comms/efax/files/pkg-message.in | 6 ++++ comms/gnokii/files/pkg-message.in | 8 +++-- comms/hylafax/files/pkg-message.in | 6 ++++ comms/linrad/pkg-message | 6 ++++ comms/lirc/files/pkg-message.in | 9 ++++-- comms/mgetty+sendfax/files/pkg-message.in | 10 +++--- comms/ncid/files/pkg-message.in | 10 +++--- comms/redsea/pkg-message | 6 ++++ comms/telldus-core/files/pkg-message.in | 8 +++-- comms/trustedqsl/files/pkg-message | 6 ++++ comms/uarduno/pkg-message | 6 ++++ comms/xastir/files/pkg-message.in | 8 +++-- converters/osm2mp/files/pkg-message.in | 6 ++++ converters/wkhtmltopdf/pkg-message | 6 ++++ 144 files changed, 901 insertions(+), 308 deletions(-) diff --git a/accessibility/yasr/files/pkg-message.in b/accessibility/yasr/files/pkg-message.in index d7bea2bfb949..d90d52b6eaf3 100644 --- a/accessibility/yasr/files/pkg-message.in +++ b/accessibility/yasr/files/pkg-message.in @@ -1,5 +1,6 @@ -============================================================================== - +[ +{ type: install + message: < -***************************************************************************** +EOM +} +] diff --git a/astro/boinc-setiathome/files/pkg-message.in b/astro/boinc-setiathome/files/pkg-message.in index ef9093d931f6..1e5268e2b458 100644 --- a/astro/boinc-setiathome/files/pkg-message.in +++ b/astro/boinc-setiathome/files/pkg-message.in @@ -1,4 +1,6 @@ -***************************************************************************** +[ +{ type: install + message: < -***************************************************************************** +EOM +} +] diff --git a/astro/google-earth/pkg-message b/astro/google-earth/pkg-message index d3b5356fe51a..d14b7be4152a 100644 --- a/astro/google-earth/pkg-message +++ b/astro/google-earth/pkg-message @@ -1,6 +1,12 @@ +[ +{ type: install + message: < is dependent on your personal usb environment are readable and writable by the user intended to use the tool. +EOM +} +] diff --git a/audio/juke/files/pkg-message.in b/audio/juke/files/pkg-message.in index e78c6052c746..cba173cb0a72 100644 --- a/audio/juke/files/pkg-message.in +++ b/audio/juke/files/pkg-message.in @@ -1,4 +1,10 @@ +[ +{ type: install + message: < Security -************************************************************************* +EOM +} +] diff --git a/audio/lollypop/files/pkg-message.in b/audio/lollypop/files/pkg-message.in index ae70584b0e04..c60950038319 100644 --- a/audio/lollypop/files/pkg-message.in +++ b/audio/lollypop/files/pkg-message.in @@ -1,5 +1,11 @@ +[ +{ type: install + message: <>\ %%ETCDIR%%/ts3server.ini The default value is 0.0.0.0 / 0::0, which activates IPv6. +EOM +} +] diff --git a/audio/timidity++-emacs/pkg-message b/audio/timidity++-emacs/pkg-message index 65aee5a134d3..490bc756c902 100644 --- a/audio/timidity++-emacs/pkg-message +++ b/audio/timidity++-emacs/pkg-message @@ -1,4 +1,6 @@ -======================================================================== +[ +{ type: install + message: < playlist +EOM +} +] diff --git a/audio/xmcd/files/pkg-message.in b/audio/xmcd/files/pkg-message.in index a7ff62b834ce..20a61b5b784e 100644 --- a/audio/xmcd/files/pkg-message.in +++ b/audio/xmcd/files/pkg-message.in @@ -1,4 +1,6 @@ -******************************************************* +[ +{ type: install + message: < %%PREFIX%%/share/skel/zh_TW.UTF-8/make.conf - -************************************************************************** +EOM +} +] diff --git a/chinese/big5width/pkg-message b/chinese/big5width/pkg-message index e2f157d9fb78..aedf4e4db24c 100644 --- a/chinese/big5width/pkg-message +++ b/chinese/big5width/pkg-message @@ -1,5 +1,9 @@ -== +[ +{ type: install + message: < and then edit %%PREFIX%%/www/atslog/include/config.inc.php +EOM +} +] diff --git a/comms/bforce-kst/files/pkg-message.in b/comms/bforce-kst/files/pkg-message.in index 9a2a050b62ef..5ca6ed02ae2c 100644 --- a/comms/bforce-kst/files/pkg-message.in +++ b/comms/bforce-kst/files/pkg-message.in @@ -1,8 +1,10 @@ -************************************************************** - +[ +{ type: install + message: < on uhub0 ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2 ubt0: Interface 1 (alt.config 4) endpoints: isoc-in=0x83, isoc-out=0x3; wMaxPacketSize=64; nframes=5, buffer size=320 - +EOM +} +] diff --git a/comms/efax/files/pkg-message.in b/comms/efax/files/pkg-message.in index 39baf16af0ff..8209467cbe47 100644 --- a/comms/efax/files/pkg-message.in +++ b/comms/efax/files/pkg-message.in @@ -1,5 +1,11 @@ +[ +{ type: install + message: < Please edit %%ETCDIR%%/ncidd.conf to configure your modem - -******************************************************************************** +EOM +} +] diff --git a/comms/redsea/pkg-message b/comms/redsea/pkg-message index a5529dab99f5..26e81ae3e20a 100644 --- a/comms/redsea/pkg-message +++ b/comms/redsea/pkg-message @@ -1,3 +1,6 @@ +[ +{ type: install + message: < Date: Tue, 13 Aug 2019 16:01:59 +0000 Subject: Convert to UCL & cleanup pkg-message (categories d) --- databases/adminer/files/pkg-message.in | 6 +++ databases/adodb/files/pkg-message.in | 8 +++- databases/adodb5/files/pkg-message.in | 6 +++ databases/akonadi/pkg-message | 10 +++-- databases/arangodb33/pkg-message | 8 +++- .../ateam_mysql_ldap_auth/files/pkg-message.in | 8 +++- databases/bbdb/pkg-message | 8 +++- databases/cassandra3/pkg-message | 8 +++- databases/couchdb/files/pkg-message.in | 6 +++ databases/couchdb2/files/pkg-message.in | 8 +++- databases/firebird25-server/files/pkg-message.in | 10 +++-- databases/freetds-devel/files/pkg-message.in | 6 +++ databases/frontbase-jdbc/files/pkg-message.in | 8 +++- databases/galera/pkg-message | 10 +++-- .../geoserver-mysql-plugin/files/pkg-message.in | 11 ++--- databases/gnats4/pkg-message | 10 +++-- databases/grass7/pkg-message | 6 +++ databases/hbase/files/pkg-message.in | 12 ++++-- databases/iplike/files/pkg-message.in | 16 ++++--- databases/isql-viewer/pkg-message | 8 +++- databases/mariadb101-client/files/pkg-message.in | 10 +++-- databases/mariadb101-server/files/pkg-message.in | 10 +++-- databases/mariadb102-client/files/pkg-message.in | 10 +++-- databases/mariadb102-server/files/pkg-message.in | 29 +++++++------ databases/mariadb103-client/files/pkg-message.in | 10 +++-- databases/mariadb103-server/files/pkg-message.in | 21 +++++---- databases/mariadb104-client/files/pkg-message.in | 10 +++-- databases/mariadb104-server/files/pkg-message.in | 21 +++++---- databases/mariadb55-client/files/pkg-message.in | 10 +++-- databases/mariadb55-server/files/pkg-message.in | 21 +++++---- databases/mroonga/files/pkg-message.in | 14 +++--- databases/mysql-udf/pkg-message | 6 +++ databases/mysql55-client/pkg-message | 10 +++-- databases/mysql55-server/pkg-message | 10 +++-- databases/mysql56-client/pkg-message | 10 +++-- databases/mysql56-server/pkg-message | 23 +++++----- databases/mysql57-client/pkg-message | 10 +++-- databases/mysql57-server/pkg-message | 19 +++++--- databases/mysql80-client/pkg-message | 10 +++-- databases/mysql80-server/pkg-message | 19 +++++--- databases/mysqlwsrep56-server/pkg-message | 10 +++-- databases/mysqlwsrep57-server/pkg-message | 10 +++-- databases/percona-pam-for-mysql/pkg-message | 6 +++ databases/percona55-client/pkg-message | 11 ++--- databases/percona55-server/pkg-message | 10 +++-- databases/percona56-client/pkg-message | 11 ++--- databases/percona56-server/pkg-message | 10 +++-- databases/percona57-pam-for-mysql/pkg-message | 6 +++ databases/percona57-server/pkg-message | 19 +++++--- databases/pg_qualstats/pkg-message | 6 +++ databases/pg_stat_kcache/pkg-message | 6 +++ databases/pgbouncer/files/pkg-message.in | 9 ++-- databases/pgpool-II-35/pkg-message | 6 +++ databases/pgpool-II-36/pkg-message | 6 +++ databases/pgpool-II-37/pkg-message | 6 +++ databases/pgpool-II-40/pkg-message | 6 +++ databases/pgpool/pkg-message | 6 +++ databases/pgroonga/files/pkg-message.in | 27 ++++++------ databases/pguri/pkg-message | 6 +++ databases/phpliteadmin/files/pkg-message.in | 7 ++- databases/phpmyadmin/files/pkg-message.in | 7 ++- .../postgresql-cstore_fdw/files/pkg-message.in | 11 +++-- databases/postgresql-jdbc/files/pkg-message.in | 6 +++ databases/postgresql-plv8js/pkg-message | 6 +++ databases/postgresql-relay/pkg-message | 6 +++ .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql10-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql11-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql12-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql94-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql95-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- .../files/pkg-message-client.in | 6 +++ .../files/pkg-message-contrib.in | 6 +++ .../files/pkg-message-plperl.in | 6 +++ .../files/pkg-message-plpython.in | 6 +++ .../postgresql96-server/files/pkg-message-pltcl.in | 6 +++ .../files/pkg-message-server.in | 7 ++- databases/powa-archivist/pkg-message | 6 +++ databases/puppetdb5/files/pkg-message.in | 6 +++ databases/puppetdb6/files/pkg-message.in | 6 +++ databases/py-htsql/pkg-message | 16 ++++--- databases/qt5-sql/pkg-message | 10 +++-- databases/redis-devel/files/pkg-message.in | 9 ++-- databases/redis/files/pkg-message.in | 9 ++-- databases/slony1v2/files/pkg-message.in | 19 +++++--- databases/soci/files/pkg-message.in | 6 +++ databases/sqldeveloper/pkg-message | 9 ++-- databases/sqlite-ext-miscfuncs/pkg-message | 8 +++- databases/sqlite-ext-pcre/pkg-message | 8 +++- databases/sqlite-ext-regexp/pkg-message | 8 +++- databases/sqlite-ext-spellfix/pkg-message | 8 +++- databases/squirrel-sql/pkg-message | 6 +++ databases/tarantool/files/pkg-message.in | 10 +++-- databases/timescaledb/files/pkg-message.in | 6 +++ databases/unixODBC/files/pkg-message.in | 10 +++-- databases/virtuoso/files/pkg-message.in | 6 +++ databases/wfb2sql/pkg-message | 9 ++-- databases/zabbix22-libzbxpgsql/pkg-message | 6 +++ databases/zabbix3-libzbxpgsql/pkg-message | 6 +++ deskutils/anydesk/pkg-message | 6 +++ deskutils/calibre/pkg-message | 10 +++-- deskutils/conkyforecast/files/pkg-message.in | 6 +++ deskutils/egroupware/files/pkg-message.in | 9 ++-- deskutils/fasd/pkg-message | 6 +++ .../pkg-message.slaves | 6 +++ deskutils/goesimage/pkg-message | 8 +++- deskutils/howm/pkg-message | 6 +++ deskutils/jlj/files/pkg-message.in | 10 +++-- deskutils/kmail/pkg-message | 10 +++-- deskutils/lumina-calculator/pkg-message | 6 +++ deskutils/moregroupware/pkg-message | 7 ++- deskutils/myitcrm/files/pkg-message.in | 10 +++-- deskutils/parcellite/files/pkg-message.in | 10 +++-- deskutils/phpicalendar/files/pkg-message.in | 6 +++ deskutils/plans/files/pkg-message.in | 8 +++- deskutils/py-autokey/pkg-message | 9 ++-- deskutils/py-khal/pkg-message | 10 +++-- deskutils/py-khard/files/pkg-message.in | 10 +++-- deskutils/py-paperless/files/pkg-message.in | 8 +++- deskutils/sugarcrm/files/pkg-message.in | 10 +++-- deskutils/taskd/pkg-message | 8 +++- deskutils/thinkingrock/files/pkg-message.in | 10 +++-- deskutils/tine20/files/pkg-message.in | 7 ++- deskutils/xfce4-tumbler/files/pkg-message.in | 6 +++ devel/9base/pkg-message | 10 +++-- devel/RStudio/pkg-message | 8 +++- devel/aegis/pkg-message | 10 +++-- devel/allegro-devel/files/pkg-message.in | 10 +++-- devel/android-tools-fastboot/files/pkg-message.in | 6 +++ devel/apr1/pkg-message | 10 +++-- devel/arduino/files/pkg-message.in | 6 +++ devel/aros-sdk/files/pkg-message.in | 8 +++- devel/artifactory/files/pkg-message.in | 16 ++++--- devel/awless/pkg-message | 10 +++-- devel/boost-all/pkg-message.python | 6 +++ devel/boost-all/pkg-message.threads | 6 +++ devel/boost_build/files/pkg-message.in | 6 +++ devel/bugzilla44/files/pkg-message.in | 15 ++++--- devel/bugzilla50/files/pkg-message.in | 15 ++++--- devel/ccache/files/pkg-message.in | 8 +++- devel/cdash/files/pkg-message.in | 6 +++ devel/cgit/files/pkg-message.in | 8 +++- devel/chruby/files/pkg-message.in | 10 +++-- devel/cl-asdf/files/pkg-message.in | 8 +++- devel/clojure-cider/pkg-message | 7 ++- devel/colorgcc/files/pkg-message.in | 8 +++- devel/cons/pkg-message | 6 +++ devel/ctags/files/pkg-message.in | 8 +++- devel/cutter/pkg-message | 8 +++- devel/cvsd/pkg-message | 8 +++- devel/cvsgraph/files/pkg-message.in | 7 ++- devel/cvsmonitor/pkg-message | 8 +++- devel/cvstrac/pkg-message | 7 ++- devel/cvsweb/files/pkg-message.in | 8 +++- devel/cvsweb3/files/pkg-message.in | 8 +++- devel/cweb/pkg-message | 6 +++ devel/distcc/files/pkg-message.in | 6 +++ devel/eiffelstudio/files/pkg-message.in | 10 +++-- devel/eric6/pkg-message | 6 +++ devel/fam/files/pkg-message.in | 10 +++-- devel/fistgen/files/pkg-message.in | 10 +++-- devel/flyspray/files/pkg-message.in | 10 +++-- devel/gamin/pkg-message | 10 +++-- devel/git-lfs/pkg-message | 6 +++ devel/git-merge-changelog/pkg-message | 9 ++-- devel/git/files/pkg-message.in | 15 +++---- devel/git/pkg-message | 9 ++-- devel/gitblit/files/pkg-message.in | 10 +++-- devel/github-backup-utils/files/pkg-message.in | 8 +++- devel/gitlab-runner/pkg-message | 8 +++- devel/gitlist/files/pkg-message.in | 6 +++ devel/gitolite2/files/pkg-message.in | 10 +++-- devel/gitphp/files/pkg-message.in | 8 +++- devel/gittrac/pkg-message | 7 ++- devel/gnustep/pkg-message | 6 +++ devel/godot2-tools/pkg-message | 8 +++- devel/gogland-eap/files/pkg-message.in | 6 +++ devel/gogs/files/pkg-message.in | 8 +++- devel/hg-git/pkg-message | 10 +++-- devel/ice/pkg-message | 6 +++ devel/interactive_rebase_tool/pkg-message | 6 +++ devel/ioncube/files/pkg-message.in | 6 +++ devel/jenkins-lts/pkg-message | 10 +++-- devel/jenkins/pkg-message | 10 +++-- devel/jetbrains-clion/files/pkg-message.in | 6 +++ devel/jetbrains-goland/files/pkg-message.in | 6 +++ devel/jetbrains-phpstorm/files/pkg-message.in | 6 +++ devel/jetbrains-webstorm/files/pkg-message.in | 6 +++ devel/jline/files/pkg-message.in | 8 +++- devel/kronosnet/pkg-message | 6 +++ devel/libaravis/pkg-message | 6 +++ devel/libburn/pkg-message | 6 +++ devel/libdlmalloc/pkg-message | 6 +++ devel/libgtop/files/pkg-message | 10 +++-- devel/libinotify/pkg-message | 10 +++-- devel/liblognorm/files/pkg-message.in | 15 +++---- devel/libnxt/files/pkg-message.in | 9 ++-- devel/libopensync/pkg-message | 6 +++ devel/libpasori/pkg-message | 8 +++- devel/libreadline-java/files/pkg-message.in | 8 +++- devel/libsigsegv/pkg-message | 8 +++- devel/libvirt/files/pkg-message.in | 7 ++- devel/linux-ltp/pkg-message | 7 ++- devel/magit/pkg-message | 9 ++-- devel/mercurial/files/pkg-message.in | 8 +++- devel/monotone/files/pkg-message.in | 8 +++- devel/msp430-debug-stack/files/pkg-message.in | 10 +++-- devel/nexus2-oss/files/pkg-message.in | 8 +++- devel/oozie/files/pkg-message.in | 7 ++- devel/opencl/pkg-message | 6 +++ devel/openocd/pkg-message | 10 +++-- devel/p5-Heap-Simple/pkg-message | 11 ++--- devel/p5-Moose/pkg-message | 6 +++ devel/p5-ResourcePool/pkg-message | 10 +++-- devel/p5-SVN-Web/pkg-message | 6 +++ devel/papi/pkg-message | 6 +++ devel/pcsc-lite/files/pkg-message.in | 10 +++-- devel/pecl-xdebug/files/pkg-message.in | 9 ++-- devel/phabricator/files/pkg-message.in | 6 +++ devel/php-libawl/pkg-message | 11 ++--- devel/phpbt/files/pkg-message.in | 10 +++-- devel/phpsh/pkg-message | 10 +++-- devel/plasma/pkg-message | 11 ++--- devel/pmdk/pkg-message | 6 +++ devel/psvn/pkg-message | 6 +++ devel/py-QtPy/pkg-message | 8 +++- devel/py-aspects/files/pkg-message.in | 9 ++-- devel/py-aspyct/pkg-message | 8 +++- devel/py-gitosis/pkg-message | 10 +++-- devel/py-http-prompt/files/pkg-message.in | 8 +++- devel/py-mercurialserver/files/pkg-message.in | 6 +++ devel/py-os-brick/pkg-message | 6 +++ devel/py-pip/pkg-message | 10 +++-- devel/py-python-gitlab/files/pkg-message.in | 6 +++ devel/py-q/files/pkg-message.in | 6 +++ devel/py-setuptools/files/pkg-message.in | 11 ++--- devel/py-ua_parser/files/pkg-message.in | 8 +++- devel/pycharm-ce/files/pkg-message.in | 6 +++ devel/pymacs/pkg-message | 6 +++ devel/rbenv/pkg-message | 10 +++-- devel/remotery/files/pkg-message.in | 6 +++ devel/rpm-spec-mode.el/pkg-message | 11 ++--- devel/rth/files/pkg-message.in | 8 +++- devel/sdl12/pkg-message.linjoy | 11 ++--- devel/sdl12/pkg-message.vgl | 8 +++- devel/sonar-ant-task/files/pkg-message.in | 10 +++-- devel/sonar-scanner-cli/files/pkg-message.in | 10 +++-- devel/sonarqube/files/pkg-message.in | 10 +++-- devel/staf/pkg-message | 10 +++-- devel/statcvs/files/pkg-message.in | 8 +++- devel/statsvn/pkg-message | 6 +++ devel/subversion-lts/files/pkg-message.in | 6 +++ devel/subversion/files/pkg-message.in | 6 +++ devel/svntrac/pkg-message | 7 ++- devel/tig/pkg-message-git | 6 +++ devel/tigcc/files/pkg-message.in | 8 +++- devel/tortoisehg/files/pkg-message.in | 6 +++ devel/trac-bitten/files/pkg-message.in | 6 +++ devel/truc/files/pkg-message.in | 8 +++- devel/valgrind/pkg-message | 10 +++-- devel/viewvc/files/pkg-message.in | 10 +++-- devel/visualparadigm/pkg-message | 8 +++- devel/websvn/files/pkg-message.in | 8 +++- devel/xc3sprog/pkg-message | 6 +++ devel/youcompleteme/files/pkg-message.in | 6 +++ devel/zanata-platform/pkg-message | 10 +++-- devel/zeal/pkg-message | 6 +++ dns/adsuck/files/pkg-message.in | 10 +++-- dns/bindgraph/pkg-message | 6 +++ dns/checkdns/files/pkg-message.in | 20 +++++---- dns/cli53/pkg-message | 6 +++ dns/credns/pkg-message | 22 +++++----- dns/curvedns/files/pkg-message.in | 10 +++-- dns/ddclient/files/pkg-message.in | 10 +++-- dns/ddns/files/pkg-message.in | 8 +++- dns/dns2blackhole/pkg-message | 10 +++-- dns/dnscheckengine/files/pkg-message.in | 18 ++++---- dns/dnscrypt-proxy2/files/pkg-message.in | 8 +++- dns/dnsmasq-devel/files/pkg-message.in | 16 ++++--- dns/dnsmasq/files/pkg-message.in | 28 ++++++------ dns/dnsmax-perl/pkg-message | 10 +++-- dns/dnsproxy/files/pkg-message.in | 11 ++--- dns/dsc/files/pkg-message.in | 10 +++-- dns/dynip/pkg-message | 10 +++-- dns/gdnsd3/pkg-message | 9 ++-- dns/getdns/files/pkg-message.in | 30 +++++++------ dns/kadnode/pkg-message | 6 +++ dns/knot-resolver/files/pkg-message.in | 10 +++-- dns/knot2/files/pkg-message.in | 11 ++--- dns/mDNSResponder_nss/pkg-message | 8 +++- dns/mdnsd/pkg-message | 6 +++ dns/mydns-ng/files/pkg-message.in | 9 ++-- dns/mydns/files/pkg-message.in | 8 +++- dns/noip/files/pkg-message.in | 8 +++- dns/nsd/pkg-message | 26 +++++------ dns/opendnssec2/files/pkg-message.in | 50 ++++++++++++---------- dns/openresolv/files/pkg-message.in | 11 ++--- dns/powerdns-recursor/files/pkg-message.in | 10 +++-- dns/powerdns/files/pkg-message.in | 16 ++++--- dns/radns/files/pkg-message.in | 10 +++-- dns/rbldnsd/files/pkg-message.in | 10 +++-- dns/sleuth/pkg-message | 10 +++-- dns/unbound/files/pkg-message.in | 6 +++ dns/void-zones-tools/files/pkg-message.in | 6 +++ 328 files changed, 2142 insertions(+), 784 deletions(-) diff --git a/databases/adminer/files/pkg-message.in b/databases/adminer/files/pkg-message.in index 54edb9e7811a..64a90680749d 100644 --- a/databases/adminer/files/pkg-message.in +++ b/databases/adminer/files/pkg-message.in @@ -1,2 +1,8 @@ +[ +{ type: install + message: < %%PREFIX%%/bin/fbsplit 9) Enjoy it ;) - -################################################################################ +EOM +} +] diff --git a/databases/freetds-devel/files/pkg-message.in b/databases/freetds-devel/files/pkg-message.in index db88a3bd25cc..22f86baf7a67 100644 --- a/databases/freetds-devel/files/pkg-message.in +++ b/databases/freetds-devel/files/pkg-message.in @@ -1,2 +1,8 @@ +[ +{ type: install + message: < Data -> DataStores -> New. Fill out the appropriate params. - -=============================================================================== +EOM +} +] diff --git a/databases/gnats4/pkg-message b/databases/gnats4/pkg-message index 9f809091308c..9bbfcee283f1 100644 --- a/databases/gnats4/pkg-message +++ b/databases/gnats4/pkg-message @@ -1,5 +1,6 @@ -************************************************************ - +[ +{ type: install + message: < flag) the first time you start the MySQL server after an upgrade from an earlier version. @@ -11,5 +12,6 @@ my.cnf. Please move existing my.cnf files from those paths to This port does NOT include the mytop perl script, this is included in the MariaDB tarball but the most recent version can be found in the databases/mytop port - -************************************************************************ +EOM +} +] diff --git a/databases/mariadb102-client/files/pkg-message.in b/databases/mariadb102-client/files/pkg-message.in index 8bea32f83491..00ac47038607 100644 --- a/databases/mariadb102-client/files/pkg-message.in +++ b/databases/mariadb102-client/files/pkg-message.in @@ -1,7 +1,9 @@ -************************************************************************ - +[ +{ type: install + message: < flag) -the first time you start the MySQL server after an upgrade from an -earlier version. +[ +{ type: install + message: < flag) +the first time you start the MySQL server after an upgrade from an +earlier version. +EOM +} +] diff --git a/databases/mariadb103-client/files/pkg-message.in b/databases/mariadb103-client/files/pkg-message.in index 8bea32f83491..00ac47038607 100644 --- a/databases/mariadb103-client/files/pkg-message.in +++ b/databases/mariadb103-client/files/pkg-message.in @@ -1,7 +1,9 @@ -************************************************************************ - +[ +{ type: install + message: < flag) -the first time you start the MySQL server after an upgrade from an -earlier version. - +[ +{ type: install + message: < flag) +the first time you start the MySQL server after an upgrade from an +earlier version. +EOM +} +] diff --git a/databases/mariadb104-client/files/pkg-message.in b/databases/mariadb104-client/files/pkg-message.in index 8bea32f83491..00ac47038607 100644 --- a/databases/mariadb104-client/files/pkg-message.in +++ b/databases/mariadb104-client/files/pkg-message.in @@ -1,7 +1,9 @@ -************************************************************************ - +[ +{ type: install + message: < flag) -the first time you start the MySQL server after an upgrade from an -earlier version. - +[ +{ type: install + message: < flag) +the first time you start the MySQL server after an upgrade from an +earlier version. +EOM +} +] diff --git a/databases/mariadb55-client/files/pkg-message.in b/databases/mariadb55-client/files/pkg-message.in index 8bea32f83491..00ac47038607 100644 --- a/databases/mariadb55-client/files/pkg-message.in +++ b/databases/mariadb55-client/files/pkg-message.in @@ -1,7 +1,9 @@ -************************************************************************ - +[ +{ type: install + message: < flag) -the first time you start the MySQL server after an upgrade from an -earlier version. - +[ +{ type: install + message: < flag) +the first time you start the MySQL server after an upgrade from an +earlier version. +EOM +} +] diff --git a/databases/mroonga/files/pkg-message.in b/databases/mroonga/files/pkg-message.in index 0e033de52882..68b9c05f073a 100644 --- a/databases/mroonga/files/pkg-message.in +++ b/databases/mroonga/files/pkg-message.in @@ -1,5 +1,9 @@ -########################################################## -# Run SQLs to register Mroonga engine to MySQL. # -# # -# % mysql -u root < %%DATADIR%%/install.sql # -########################################################## +[ +{ type: install + message: < flag) the first time you start the MySQL server after an upgrade from an earlier version. - -************************************************************************ +EOM +} +] diff --git a/databases/percona56-client/pkg-message b/databases/percona56-client/pkg-message index 4aaa841dd603..a71ac478bbf5 100644 --- a/databases/percona56-client/pkg-message +++ b/databases/percona56-client/pkg-message @@ -1,5 +1,6 @@ -* * * * * * * * * * * * * * * * * * * * * * * * - +[ +{ type: install + message: < CONFIGURATION NOTE: - +[ +{ type: install + message: < CONFIGURATION NOTE: - +[ +{ type: install + message: < CONFIGURATION NOTE: - +[ +{ type: install + message: < Third Party JDBC Drivers and add the proper jar. Do not install 5.1 version of mysql jdbc connector; see https://docs.oracle.com/en/database/oracle/sql-developer/18.4/rptig/installing-sql-developer.html#GUID-3F68CF20-D03D-431C-A9A2-0EB971F06448 - -************************************************************************ +EOM +} +] diff --git a/databases/sqlite-ext-miscfuncs/pkg-message b/databases/sqlite-ext-miscfuncs/pkg-message index d55184d7fb78..0e6ce5c16b35 100644 --- a/databases/sqlite-ext-miscfuncs/pkg-message +++ b/databases/sqlite-ext-miscfuncs/pkg-message @@ -1,4 +1,6 @@ -********************************************************************* +[ +{ type: install + message: <". +EOM +} +] diff --git a/devel/godot2-tools/pkg-message b/devel/godot2-tools/pkg-message index c49ffaf7bf31..7c267f80109a 100644 --- a/devel/godot2-tools/pkg-message +++ b/devel/godot2-tools/pkg-message @@ -1,7 +1,11 @@ -============================================================ +[ +{ type: install + message: <.c) for documenation on the use of Doug Lea's malloc library. +EOM +} +] diff --git a/devel/libgtop/files/pkg-message b/devel/libgtop/files/pkg-message index dacaf62a9c39..0c0d2efec8a9 100644 --- a/devel/libgtop/files/pkg-message +++ b/devel/libgtop/files/pkg-message @@ -1,5 +1,6 @@ -=============================================================================== - +[ +{ type: install + message: < - +EOM +} +] diff --git a/devel/sdl12/pkg-message.linjoy b/devel/sdl12/pkg-message.linjoy index bde6eeadc96f..7f2847357bc8 100644 --- a/devel/sdl12/pkg-message.linjoy +++ b/devel/sdl12/pkg-message.linjoy @@ -1,7 +1,8 @@ - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - +[ +{ type: install + message: < "%%PYTHON_CMD%%", ) } - -***************************************************************** +EOM +} +] diff --git a/devel/visualparadigm/pkg-message b/devel/visualparadigm/pkg-message index 83a54b9d1c36..354d17158307 100644 --- a/devel/visualparadigm/pkg-message +++ b/devel/visualparadigm/pkg-message @@ -1,4 +1,8 @@ -****************************************************************** +[ +{ type: install + message: <Docsets, select the ones you want, and click the Download @@ -5,3 +8,6 @@ button. You can also create your own docsets by following these instructions: https://kapeli.com/docsets +EOM +} +] diff --git a/dns/adsuck/files/pkg-message.in b/dns/adsuck/files/pkg-message.in index cc377f4315c1..608a3faed546 100644 --- a/dns/adsuck/files/pkg-message.in +++ b/dns/adsuck/files/pkg-message.in @@ -1,5 +1,6 @@ - - +[ +{ type: install + message: < /etc/resolv.conf If you're using DHCP consider configuring your dhclient.conf(5) to prevent resolv.conf updates. - - +EOM +} +] diff --git a/dns/bindgraph/pkg-message b/dns/bindgraph/pkg-message index 34faeed075ae..7484a16c5def 100644 --- a/dns/bindgraph/pkg-message +++ b/dns/bindgraph/pkg-message @@ -1,3 +1,6 @@ +[ +{ type: install + message: <>> ATTENTION PLEASE <<< | - | | - | Please don't forget these : | - | - editing %%PREFIX%%/etc/checkdns.conf file ! | - | - copying checkdns.css file to Html Output Directory ! | - | | - -------------------------------------------------------------------- +[ +{ type: install + message: <>> ATTENTION PLEASE <<< + + Please don't forget these : + - editing %%PREFIX%%/etc/checkdns.conf file ! + - copying checkdns.css file to Html Output Directory ! + +EOM +} +] diff --git a/dns/cli53/pkg-message b/dns/cli53/pkg-message index bd48b2ebc3b8..e9d208f429b3 100644 --- a/dns/cli53/pkg-message +++ b/dns/cli53/pkg-message @@ -1,3 +1,6 @@ +[ +{ type: install + message: < auth-dom.example any drill auth-dom.example any - -########################################################### +EOM +} +] diff --git a/dns/ddclient/files/pkg-message.in b/dns/ddclient/files/pkg-message.in index a320b5b7808b..226e65398842 100644 --- a/dns/ddclient/files/pkg-message.in +++ b/dns/ddclient/files/pkg-message.in @@ -1,5 +1,6 @@ -*********************************************************** - +[ +{ type: install + message: < +EOM +} +] diff --git a/dns/openresolv/files/pkg-message.in b/dns/openresolv/files/pkg-message.in index b17d948ce23a..e25daf854019 100644 --- a/dns/openresolv/files/pkg-message.in +++ b/dns/openresolv/files/pkg-message.in @@ -1,8 +1,9 @@ -================================================= - +[ +{ type: install + message: < Date: Tue, 13 Aug 2019 16:02:41 +0000 Subject: databases/percona-pam-for-mysql: unbreak on powerpc64 Builds now fine. Approved by: mentors (implicit approval) --- databases/percona-pam-for-mysql/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/databases/percona-pam-for-mysql/Makefile b/databases/percona-pam-for-mysql/Makefile index bb037dc6c139..cd4034f880ff 100644 --- a/databases/percona-pam-for-mysql/Makefile +++ b/databases/percona-pam-for-mysql/Makefile @@ -11,8 +11,6 @@ BROKEN_armv6= fails to compile: cannot combine with previous 'type-name' declar BROKEN_armv7= fails to compile: cannot combine with previous 'type-name' declaration specifier BROKEN_mips= fails to configure: CMake Error: Generator: execution of make failed BROKEN_mips64= fails to configure: CMake Error: Generator: execution of make failed -NOT_FOR_ARCHS= powerpc64 -NOT_FOR_ARCHS_REASON= unsupported platform MASTERDIR= ${.CURDIR}/../percona56-server -- cgit From 629fb82032061c5f69fc92a71a38ac701c7597be Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 13 Aug 2019 16:03:11 +0000 Subject: Convert to UCL & cleanup pkg-message (categories e-g) --- editors/gomate/pkg-message | 6 ++++ editors/kak-lsp/files/pkg-message.in | 6 ++++ editors/lazarus/files/pkg-message.in | 10 ++++--- editors/led/files/pkg-message.in | 10 ++++--- editors/mp/pkg-message | 10 ++++--- editors/openoffice-4/files/pkg-message.in | 6 ++++ editors/openoffice-devel/files/pkg-message.in | 6 ++++ editors/paredit-mode.el/pkg-message | 10 ++++--- editors/py-pynvim/files/pkg-message.in | 6 ++++ editors/slime/files/pkg-message.in | 8 ++++-- editors/tamago/pkg-message | 6 ++++ editors/teco/pkg-message | 6 ++++ editors/tetradraw/pkg-message | 8 ++++-- editors/treeform/pkg-message | 8 ++++-- emulators/bochs/files/pkg-message.in | 10 ++++--- emulators/cannonball/pkg-message | 8 ++++-- emulators/dtcyber/files/pkg-message.in | 10 ++++--- emulators/fmsx/pkg-message | 8 ++++-- emulators/gngeo/files/pkg-message.in | 10 ++++--- emulators/hercules/pkg-message | 12 ++++---- emulators/i386-wine-devel/files/pkg-message.in | 6 ++++ emulators/i386-wine/files/pkg-message.in | 6 ++++ emulators/jzintv/files/pkg-message.in | 12 ++++---- emulators/klh10/files/pkg-message.in | 14 +++++++--- emulators/klh10/pkg-message | 8 ++++-- emulators/linux_base-c6/pkg-message | 6 ++++ emulators/linux_base-c7/pkg-message | 6 ++++ emulators/mame/files/pkg-message.in | 10 ++++--- emulators/mednafen/files/pkg-message.in | 10 ++++--- emulators/mtools/files/pkg-message.in | 8 ++++-- emulators/mupen64plus/pkg-message | 10 ++++--- emulators/o2em/pkg-message | 8 ++++-- emulators/pipelight/pkg-message | 6 ++++ emulators/ppsspp/files/pkg-message.in | 6 ++++ emulators/qemu-devel/pkg-message | 6 ++++ emulators/qemu-sbruno/pkg-message | 6 ++++ emulators/qemu/pkg-message | 6 ++++ emulators/qemu2/pkg-message | 6 ++++ emulators/qemu30/pkg-message | 6 ++++ emulators/qmc2/pkg-message | 10 ++++--- emulators/simh/files/pkg-message.in | 10 ++++--- emulators/vba/files/pkg-message.in | 8 ++++-- emulators/vice/pkg-message | 6 ++++ emulators/virtualbox-ose-additions/pkg-message | 10 ++++--- emulators/virtualbox-ose/pkg-message | 10 ++++--- emulators/wine-devel/files/pkg-message.in | 6 ++++ emulators/wine/files/pkg-message.in | 6 ++++ emulators/winetricks/pkg-message | 6 ++++ emulators/x49gp/pkg-message | 14 ++++++---- emulators/xen-kernel/pkg-message | 6 ++++ emulators/xhomer/files/pkg-message.in | 8 ++++-- emulators/xsystem35/files/pkg-message.in | 7 ++++- finance/bitcoinnodestats/files/pkg-message.in | 10 ++++--- finance/electrum/files/pkg-message-hwwallet.in | 6 ++++ finance/frontaccounting/files/pkg-message.in | 10 ++++--- finance/ktoblzcheck/files/pkg-message.in | 8 ++++-- finance/ledgersmb/files/pkg-message.in | 10 ++++--- finance/ledgersmb12/files/pkg-message.in | 11 ++++---- finance/prestashop/files/pkg-message.in | 8 ++++-- finance/sabernetdcs-client/files/pkg-message.in | 8 ++++-- finance/sql-ledger/files/pkg-message.in | 10 ++++--- finance/trytond28/files/pkg-message.in | 11 ++++---- finance/weberp/files/pkg-message.in | 11 ++++---- french/aster/files/pkg-message.in | 6 ++++ french/aster/files/pkg-message.sans-astk.in | 6 ++++ .../fortune-mod-zarathoustra/files/pkg-message.in | 8 ++++-- french/homard/pkg-message | 6 ++++ french/wordpress/files/pkg-message.in | 7 ++++- ftp/bsdftpd-ssl/files/pkg-message.in | 8 ++++-- ftp/frox/files/pkg-message.in | 8 ++++-- ftp/net2ftp/files/pkg-message.in | 7 ++++- ftp/oftpd/pkg-message | 8 ++++-- ftp/p5-Net-FTPServer/files/pkg-message.in | 8 ++++-- ftp/php-fastdfs/pkg-message | 8 +++++- ftp/pure-ftpd/files/pkg-message.in | 6 ++++ ftp/tnftpd/files/pkg-message.in | 8 ++++-- games/4stattack/files/pkg-message.in | 10 ++++--- games/OpenTomb/pkg-message | 6 ++++ games/adom/files/pkg-message.in | 7 ++++- games/alephone-data/pkg-message | 10 ++++--- games/alephone-scenarios/pkg-message | 10 ++++--- games/alephone/pkg-message | 10 ++++--- games/alienarena/files/pkg-message.in | 10 ++++--- games/allacrost/pkg-message | 6 ++++ games/aquaria/files/pkg-message.in | 6 ++++ games/arx-libertatis/files/pkg-message.in | 10 ++++--- games/asc/pkg-message | 6 ++++ games/awale/files/pkg-message.in | 10 ++++--- games/banihstypos/files/pkg-message.in | 10 ++++--- games/barony/files/pkg-message.in | 6 ++++ games/bass/files/pkg-message.in | 30 +++++++++++--------- games/blackshadeselite/pkg-message | 6 ++++ games/cake/pkg-message | 6 ++++ games/chocolate-doom/pkg-message | 10 ++++--- games/conquest/files/pkg-message.in | 6 ++++ games/corsix-th/pkg-message | 8 ++++-- games/crafty-tablebase-no-pawn/pkg-message | 9 ++++-- games/crafty/pkg-message | 6 ++++ games/d2x/pkg-message | 6 ++++ games/devilutionX/pkg-message | 6 ++++ games/dhewm3/files/pkg-message.in | 6 ++++ games/digger-vgl/pkg-message.sound | 6 ++++ games/doom-data/files/pkg-message.in | 10 ++++--- games/doomsday/pkg-message | 10 ++++--- games/dxx-rebirth/pkg-message | 6 ++++ games/eboard/pkg-message | 10 ++++--- games/ecwolf/files/pkg-message.in | 10 ++++--- games/eduke32/files/pkg-message.in | 10 ++++--- games/egoboo/pkg-message | 6 ++++ games/einstein/pkg-message | 6 ++++ games/endless-sky-high-dpi/pkg-message | 6 ++++ games/enigma/files/pkg-message.in | 6 ++++ games/exhaust-ma/pkg-message | 6 ++++ games/exhaust/pkg-message | 6 ++++ games/exult/files/pkg-message.in | 12 +++++--- games/flightgear/pkg-message | 8 ++++-- games/fotaq/files/pkg-message.in | 32 ++++++++++++---------- games/freeminer/pkg-message | 6 ++++ games/freera/files/pkg-message.in | 10 ++++--- games/freesynd/files/pkg-message.in | 10 ++++--- games/fretsonfire/files/pkg-message.in | 10 ++++--- games/fs2open/pkg-message | 6 ++++ games/fteqw/files/pkg-message.in | 10 ++++--- games/gemrb/files/pkg-message.in | 8 ++++-- games/glchess/pkg-message | 9 ++++-- games/glest/files/pkg-message.in | 10 ++++--- games/glob2/files/pkg-message.in | 10 ++++--- games/gnurobots/files/pkg-message.in | 10 ++++--- games/highmoon/files/pkg-message.in | 10 ++++--- games/holotz-castle/files/pkg-message.in | 10 ++++--- games/ioquake3/pkg-message | 6 ++++ games/iortcw/files/pkg-message.in | 6 ++++ games/iourbanterror/pkg-message | 6 ++++ games/jaggedalliance2/pkg-message | 6 ++++ games/jfk/files/pkg-message.in | 6 ++++ games/jfsw/files/pkg-message.in | 12 ++++---- games/joequake/pkg-message | 10 ++++--- games/julius/files/pkg-message.in | 6 ++++ games/kye/files/pkg-message.in | 10 ++++--- games/leela-zero/pkg-message | 8 ++++-- games/linux-darwinia-demo/pkg-message | 9 ++++-- games/linux-defcon/pkg-message | 9 ++++-- games/linux-doom3/files/pkg-message.in | 10 ++++--- games/linux-nerogame/files/pkg-message.in | 10 ++++--- games/linux-nwnclient/pkg-message | 10 ++++--- games/linux-quake4/files/pkg-message.in | 10 ++++--- games/linux-ssamtfe/files/pkg-message.in | 8 ++++-- games/linux-ssamtse/files/pkg-message.in | 8 ++++-- games/linux-unrealgold/files/pkg-message.in | 12 ++++---- games/linux-uplink-demo/pkg-message | 9 ++++-- games/linux-ut/pkg-message | 8 ++++-- games/mangband/files/pkg-message.in | 10 ++++--- games/marsnomercy/files/pkg-message.in | 10 ++++--- games/megaglest/files/pkg-message.in | 10 ++++--- games/minecraft-server/files/pkg-message.in | 6 ++++ games/mtaserver/files/pkg-message.in | 8 ++++-- games/multimc/pkg-message | 8 ++++-- games/mvdsv/pkg-message | 10 ++++--- games/nehquake/files/pkg-message.in | 12 ++++---- games/netrek-BRMH-bin/pkg-message | 6 ++++ games/openbor/files/pkg-message.in | 6 ++++ games/openclaw/files/pkg-message.in | 9 ++++-- games/openjazz/files/pkg-message.in | 12 ++++---- games/openjk/pkg-message | 6 ++++ games/openmw/pkg-message | 6 ++++ games/openrct2/pkg-message | 10 ++++--- games/openttd/files/pkg-message.in | 10 ++++--- games/opentyrian/files/pkg-message.in | 6 ++++ games/openxcom/files/pkg-message.in | 10 ++++--- games/outerspace/pkg-message | 6 ++++ games/pink-pony/pkg-message | 6 ++++ games/pioneer/files/pkg-message.in | 6 ++++ games/prboom/files/pkg-message.in | 9 ++++-- games/pydance/files/pkg-message.in | 10 ++++--- games/pysycache/files/pkg-message.in | 10 ++++--- games/quake2-3zb2/files/pkg-message.in | 10 ++++--- games/quake2-data/files/pkg-message.in | 10 ++++--- games/quake2-rogue/files/pkg-message.in | 10 ++++--- games/quake2-xatrix/files/pkg-message.in | 10 ++++--- games/quake3-data/files/pkg-message.in | 10 ++++--- games/quakeforge/files/pkg-message.in | 10 ++++--- games/reminiscence/files/pkg-message.in | 10 ++++--- games/retroarch/files/pkg-message.in | 8 ++++-- games/rnd_jue/files/pkg-message.in | 10 ++++--- games/robocode-naval/files/pkg-message.in | 10 ++++--- games/robocode/files/pkg-message.in | 10 ++++--- games/rocksndiamonds-data/files/pkg-message.in | 10 ++++--- games/rocksndiamonds/files/pkg-message.in | 10 ++++--- games/rottdc/pkg-message | 10 ++++--- games/rubygem-vimgolf/pkg-message | 6 ++++ games/sampsvr/files/pkg-message.in | 8 ++++-- games/sauerbraten/files/pkg-message.in | 10 ++++--- games/scourge/files/pkg-message.in | 10 ++++--- games/sex/pkg-message | 6 ++++ games/slashem-tty/pkg-message | 8 ++++-- games/spring/pkg-message | 10 ++++--- games/stratagus/pkg-message | 10 ++++--- games/tenebrae/pkg-message | 10 ++++--- games/tetrinet-x/files/pkg-message.in | 6 ++++ games/tetrinet/pkg-message | 6 ++++ games/tome4/files/pkg-message.in | 6 ++++ games/tomenet/files/pkg-message.in | 10 ++++--- games/traingame/files/pkg-message.in | 10 ++++--- games/tremulous/pkg-message | 10 ++++--- games/tuxfighter/files/pkg-message.in | 10 ++++--- games/twitch/files/pkg-message.in | 10 ++++--- games/ufoai/files/pkg-message.in | 10 ++++--- games/uhexen2/files/pkg-message.in | 10 ++++--- games/umark/files/pkg-message.in | 6 ++++ games/unnethack/pkg-message | 8 ++++-- games/vavoom/files/pkg-message.in | 10 ++++--- games/vegastrike/pkg-message | 6 ++++ games/voadi/pkg-message | 6 ++++ games/wargus/files/pkg-message.in | 10 ++++--- games/wesnoth/pkg-message | 6 ++++ games/wmshuffle/pkg-message | 6 ++++ games/wolfpack/files/pkg-message.in | 10 +++++-- games/worldofpadman/pkg-message | 10 ++++--- games/xjump/pkg-message | 8 ++++-- games/xjumpx/files/pkg-message.in | 7 ++++- games/xonotic/pkg-message | 10 ++++--- games/xye/files/pkg-message.in | 10 ++++--- games/yadex/files/pkg-message.in | 6 ++++ games/zangband/files/pkg-message.in | 8 ++++-- german/BBBike/pkg-message | 6 ++++ german/bugzilla44/pkg-message | 8 ++++-- german/wordpress/files/pkg-message.in | 7 ++++- graphics/aoi/files/pkg-message.in | 10 ++++--- graphics/aseprite/pkg-message | 8 ++++-- graphics/blender-doc/files/pkg-message.in | 10 ++++--- graphics/deegree-csw/files/pkg-message.in | 8 ++++-- graphics/deegree-igeoportal/files/pkg-message.in | 8 ++++-- graphics/deegree-wcs/files/pkg-message.in | 8 ++++-- graphics/deegree-wfs/files/pkg-message.in | 8 ++++-- graphics/deegree-wms/files/pkg-message.in | 8 ++++-- graphics/deegree-wps/files/pkg-message.in | 8 ++++-- graphics/deegree-wpvs/files/pkg-message.in | 8 ++++-- graphics/drm-current-kmod/pkg-message | 6 ++++ graphics/drm-devel-kmod/pkg-message | 6 ++++ graphics/drm-fbsd11.2-kmod/pkg-message | 6 ++++ graphics/drm-fbsd12.0-kmod/pkg-message | 6 ++++ graphics/drm-legacy-kmod/pkg-message | 6 ++++ graphics/entangle/pkg-message | 6 ++++ graphics/freeglut/pkg-message | 6 ++++ graphics/geoserver/files/pkg-message.in | 9 ++++-- graphics/giftool/pkg-message | 18 +++++++----- graphics/gimp-lqr-plugin/pkg-message | 6 ++++ graphics/gimp-resynthesizer/pkg-message | 6 ++++ graphics/gimp/pkg-message | 6 ++++ graphics/gracula/files/pkg-message.in | 8 ++++-- graphics/instant-meshes/pkg-message | 8 ++++-- graphics/inventor/files/pkg-message.in | 12 ++++---- graphics/jave6/files/pkg-message.in | 10 ++++--- graphics/kix-kmod/files/pkg-message.in | 8 ++++-- graphics/leptonica/pkg-message | 6 ++++ graphics/liblqr-1/files/pkg-message.in | 8 ++++-- graphics/linux-c7-dri/pkg-message | 6 ++++ graphics/mapyrus/files/pkg-message.in | 10 ++++--- graphics/opendx/files/pkg-message.in | 9 ++++-- graphics/piglit/files/pkg-message.in | 6 ++++ graphics/py-gvgen/pkg-message | 8 ++++-- graphics/qtawesome/pkg-message | 6 ++++ graphics/rawtherapee/pkg-message | 8 ++++-- graphics/sane-backends/files/pkg-message.in | 10 ++++--- graphics/sane-frontends/files/pkg-message.in | 6 ++++ graphics/separate/pkg-message | 6 ++++ graphics/simpleviewer/files/pkg-message.in | 6 ++++ graphics/telak/pkg-message | 8 ++++-- graphics/xoris/files/pkg-message.in | 8 ++++-- graphics/xpdf3/pkg-message | 6 ++++ graphics/xpdf4/pkg-message | 6 ++++ graphics/xsane/files/pkg-message.in | 6 ++++ graphics/zathura/pkg-message | 10 ++++--- graphics/zphoto/pkg-message | 8 ++++-- 274 files changed, 1684 insertions(+), 612 deletions(-) diff --git a/editors/gomate/pkg-message b/editors/gomate/pkg-message index b20671e12446..b811b2aeb291 100644 --- a/editors/gomate/pkg-message +++ b/editors/gomate/pkg-message @@ -1,5 +1,11 @@ +[ +{ type: install + message: < @@ -48,3 +51,6 @@ installation with the extension manager is no longer needed. If you somehow run into problems, please remove the already installed "%%AOOUDIR%%" directory in your home directory, then redo the user installation and the problems should go away. +EOM +} +] diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in index 815f95d6ddb6..aed27de6b02e 100644 --- a/editors/openoffice-devel/files/pkg-message.in +++ b/editors/openoffice-devel/files/pkg-message.in @@ -1,3 +1,6 @@ +[ +{ type: install + message: < @@ -43,3 +46,6 @@ OpenOffice does need $LANG to be set to a suitable value. If you somehow run into problems, please remove the already installed "%%AOOUDIR%%" directory in your home directory, then redo the user installation and the problems should go away. +EOM +} +] diff --git a/editors/paredit-mode.el/pkg-message b/editors/paredit-mode.el/pkg-message index 42ab47233130..3d7c9431919e 100644 --- a/editors/paredit-mode.el/pkg-message +++ b/editors/paredit-mode.el/pkg-message @@ -1,7 +1,9 @@ -=================================================== - +[ +{ type: install + message: <' to play. Enjoy ! - -============================================================= - +EOM +} +] diff --git a/emulators/klh10/files/pkg-message.in b/emulators/klh10/files/pkg-message.in index c651ef8ef8e3..280c5aed9bb8 100644 --- a/emulators/klh10/files/pkg-message.in +++ b/emulators/klh10/files/pkg-message.in @@ -1,4 +1,10 @@ -!!! KLH10 contains a setuid that accepts network connections. -!!! Consider using a firewall to limit access to KLH10. -!!! See the %%DOCSDIR%%/pubits/adm -!!! for firewall documentation. +[ +{ type: install + message: < +EOM +} +] diff --git a/emulators/ppsspp/files/pkg-message.in b/emulators/ppsspp/files/pkg-message.in index 78ce933a201b..f60e5f5c2a54 100644 --- a/emulators/ppsspp/files/pkg-message.in +++ b/emulators/ppsspp/files/pkg-message.in @@ -1,6 +1,12 @@ +[ +{ type: install + message: <. +EOM +} +] diff --git a/french/wordpress/files/pkg-message.in b/french/wordpress/files/pkg-message.in index 11afe3fec699..a3d0617e38e0 100644 --- a/french/wordpress/files/pkg-message.in +++ b/french/wordpress/files/pkg-message.in @@ -1,6 +1,11 @@ - **** NOTE **** +[ +{ type: install + message: < +EOM +} +] diff --git a/ftp/oftpd/pkg-message b/ftp/oftpd/pkg-message index 379c8daf0c01..d5707298c904 100644 --- a/ftp/oftpd/pkg-message +++ b/ftp/oftpd/pkg-message @@ -1,5 +1,9 @@ -================================================================================ +[ +{ type: install + message: < b-scanner.rc +EOM +} +] diff --git a/games/exhaust/pkg-message b/games/exhaust/pkg-message index f4cf55c757f5..09f31e7b0684 100644 --- a/games/exhaust/pkg-message +++ b/games/exhaust/pkg-message @@ -1,5 +1,11 @@ +[ +{ type: install + message: < b-scanner.rc +EOM +} +] diff --git a/games/exult/files/pkg-message.in b/games/exult/files/pkg-message.in index e7f084f9746b..a7dd31dd209b 100644 --- a/games/exult/files/pkg-message.in +++ b/games/exult/files/pkg-message.in @@ -1,4 +1,8 @@ -****************************************************************************** -* Run Exult from directory containing original Ultima VII data. -* Please, read %%DOCSDIR%%/README for additional information. -****************************************************************************** +[ +{ type: install + message: <' where is one from %%DATADIR%%/levels/ or your own and a file .jfkclientrc with a line 'name=' in your home directory. For more information about other variables read %%DOCSDIR%%/jfkserver.sample and %%DOCSDIR%%/jfkclient.sample. +EOM +} +] diff --git a/games/jfsw/files/pkg-message.in b/games/jfsw/files/pkg-message.in index 9a5f917731e5..c6fa422e4702 100644 --- a/games/jfsw/files/pkg-message.in +++ b/games/jfsw/files/pkg-message.in @@ -1,6 +1,6 @@ - -=============================================================================== - +[ +{ type: install + message: < -G games - -============================================================================== +EOM +} +] diff --git a/games/marsnomercy/files/pkg-message.in b/games/marsnomercy/files/pkg-message.in index 9d056510e85a..d09c1cd95abc 100644 --- a/games/marsnomercy/files/pkg-message.in +++ b/games/marsnomercy/files/pkg-message.in @@ -1,5 +1,6 @@ -############################################################################### - +[ +{ type: install + message: <> %%PREFIX%%/etc/quakeforge.conf - -============================================================================== +EOM +} +] diff --git a/games/reminiscence/files/pkg-message.in b/games/reminiscence/files/pkg-message.in index 1c59a3989deb..d77eaa289a35 100644 --- a/games/reminiscence/files/pkg-message.in +++ b/games/reminiscence/files/pkg-message.in @@ -1,5 +1,6 @@ -========================================================================== - +[ +{ type: install + message: < menu1.pal See README for details - -========================================================================== +EOM +} +] diff --git a/games/retroarch/files/pkg-message.in b/games/retroarch/files/pkg-message.in index ff92753e00c1..f41fc7d73526 100644 --- a/games/retroarch/files/pkg-message.in +++ b/games/retroarch/files/pkg-message.in @@ -1,4 +1,6 @@ -====================================================================== +[ +{ type: install + message: < - -=============================================================================== +EOM +} +] diff --git a/games/tremulous/pkg-message b/games/tremulous/pkg-message index 8d68c3292add..f8115baff8a7 100644 --- a/games/tremulous/pkg-message +++ b/games/tremulous/pkg-message @@ -1,10 +1,12 @@ -============================================================================== - +[ +{ type: install + message: <Acquire" menu. Use this to access your scanner. Have fun! +EOM +} +] diff --git a/graphics/separate/pkg-message b/graphics/separate/pkg-message index f2705ca6082a..5f2cd073209d 100644 --- a/graphics/separate/pkg-message +++ b/graphics/separate/pkg-message @@ -1,2 +1,8 @@ +[ +{ type: install + message: < Create" menu. +EOM +} +] diff --git a/graphics/zathura/pkg-message b/graphics/zathura/pkg-message index baa39f5e6958..0060b13c3208 100644 --- a/graphics/zathura/pkg-message +++ b/graphics/zathura/pkg-message @@ -1,7 +1,9 @@ -=============================================================================== - +[ +{ type: install + message: < Date: Tue, 13 Aug 2019 17:23:16 +0000 Subject: Mk/Uses/go.mk: Add gomod-vendor helper target For USES=go:modules ports it simplifies generating GH_TUPLE by calling modules2tuple in the right directory etc. Submitted by: Dmitri Goutnik (maintainer) Differential Revision: https://reviews.freebsd.org/D21246 --- Mk/Uses/go.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 56442bd99a82..a087b4bb1fa6 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -126,4 +126,17 @@ do-install: .endfor .endif +# Helper targets for port maintainers + +.if ${go_ARGS:Mmodules} +_MODULES2TUPLE_CMD= modules2tuple +gomod-vendor: patch + @if type ${_MODULES2TUPLE_CMD} > /dev/null 2>&1; then \ + cd ${WRKSRC}; ${GO_CMD} mod vendor; \ + [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt; \ + else \ + ${ECHO_MSG} "===> Please install \"ports-mgmt/modules2tuple\""; \ + fi +.endif + .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK) -- cgit From 8f0834395d4fdc728d242bf6564fb58b4bd45bd4 Mon Sep 17 00:00:00 2001 From: tobik Date: Tue, 13 Aug 2019 17:43:08 +0000 Subject: graphics/svgbob: Unbreak with Rust 1.37.0 error: trait objects without an explicit `dyn` are deprecated --> src/main.rs:163:47 | 163 | fn build(args: &ArgMatches) -> Result<(), Box> { | ^^^^^ help: use `dyn`: `dyn Error` | note: lint level defined here --> src/main.rs:1:9 | 1 | #![deny(warnings)] | ^^^^^^^^ = note: #[deny(bare_trait_objects)] implied by #[deny(warnings)] error: trait objects without an explicit `dyn` are deprecated --> src/main.rs:224:68 | 224 | fn convert_file(input: PathBuf, output: PathBuf) -> Result<(), Box> { | ^^^^^ help: use `dyn`: `dyn Error` error: aborting due to 2 previous errors Remove #![deny(warnings)] (basically the equivalent to -Werror in C/C++) to fix the build with Rust 1.37.0 or greater. --- graphics/svgbob/files/patch-src_main.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/graphics/svgbob/files/patch-src_main.rs b/graphics/svgbob/files/patch-src_main.rs index 77b6de777d4e..9e48588b27aa 100644 --- a/graphics/svgbob/files/patch-src_main.rs +++ b/graphics/svgbob/files/patch-src_main.rs @@ -10,7 +10,12 @@ error: the item `exit` is imported redundantly --- src/main.rs.orig 2019-04-12 08:16:01 UTC +++ src/main.rs -@@ -83,7 +83,6 @@ fn main() { +@@ -1,4 +1,3 @@ +-#![deny(warnings)] + #[macro_use] + extern crate clap; + +@@ -83,7 +82,6 @@ fn main() { } Err(e) => { use std::io::Write; @@ -18,7 +23,7 @@ error: the item `exit` is imported redundantly writeln!( &mut std::io::stderr(), -@@ -124,7 +123,6 @@ fn main() { +@@ -124,7 +122,6 @@ fn main() { if let Some(file) = args.value_of("output") { if let Err(e) = svg::save(file, &svg) { use std::io::Write; @@ -26,7 +31,7 @@ error: the item `exit` is imported redundantly writeln!( &mut std::io::stderr(), -@@ -148,7 +146,6 @@ where +@@ -148,7 +145,6 @@ where Ok(a) => Some(a), Err(e) => { use std::io::Write; -- cgit From 9993f593b870d8d40f4612330b7fbaed026f829a Mon Sep 17 00:00:00 2001 From: rene Date: Tue, 13 Aug 2019 17:50:33 +0000 Subject: devel/fam: remove instructions for FreeBSD 4.X and earlier. Reported by: mat --- devel/fam/files/pkg-message.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/devel/fam/files/pkg-message.in b/devel/fam/files/pkg-message.in index e18a45794f89..6932f510e4af 100644 --- a/devel/fam/files/pkg-message.in +++ b/devel/fam/files/pkg-message.in @@ -23,10 +23,6 @@ After modifying /etc/inetd.conf, you must (as root) run: Fam also requires that portmapper is running. Add the appropriate entry to /etc/rc.conf: -For 4.x: -Add portmap_enable="YES" and either reboot or run /usr/sbin/portmap. - -For 5.x and later: Add rpcbind_enable="YES" and either reboot or run /etc/rc.d/rpcbind start. EOM } -- cgit From 4b2a9b1e9f856b39af85357b5cb288456bc8100e Mon Sep 17 00:00:00 2001 From: jgh Date: Tue, 13 Aug 2019 18:08:40 +0000 Subject: - address WAYLAND build PR: 238085 Submitted by: list1@gjunka.com Approved by: neel@neelc.org (maintainer) --- graphics/glfw/Makefile | 1 + graphics/glfw/files/patch-src-wl_init.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 graphics/glfw/files/patch-src-wl_init.c diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 828fb53e5c8c..17c517d5978b 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -3,6 +3,7 @@ PORTNAME= glfw PORTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/glfw/files/patch-src-wl_init.c b/graphics/glfw/files/patch-src-wl_init.c new file mode 100644 index 000000000000..a4fe12bbdd0a --- /dev/null +++ b/graphics/glfw/files/patch-src-wl_init.c @@ -0,0 +1,26 @@ +--- src/wl_init.c.orig 2019-08-03 17:40:05 UTC ++++ src/wl_init.c +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -37,6 +36,15 @@ + #include + #include + #include ++#ifdef __has_include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif ++#else ++#include ++#endif + + + static inline int min(int n1, int n2) -- cgit From 07a7319104f1cfbbc0a92bf77f0ce5d048b34392 Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 13 Aug 2019 18:23:48 +0000 Subject: Update to 32.0.0.238. --- www/flashplayer/Makefile | 2 +- www/linux-flashplayer/Makefile | 2 +- www/linux-flashplayer/distinfo | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile index a756ebca3543..074f31846087 100644 --- a/www/flashplayer/Makefile +++ b/www/flashplayer/Makefile @@ -2,7 +2,7 @@ PORTNAME= flashplayer PORTVERSION= 32.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www multimedia DISTFILES= diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile index 294193a44c71..ae3bd3ee33f2 100644 --- a/www/linux-flashplayer/Makefile +++ b/www/linux-flashplayer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 32.0.0.223 +PORTVERSION= 32.0.0.238 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo index 6bfd07f41424..df1159a340e6 100644 --- a/www/linux-flashplayer/distinfo +++ b/www/linux-flashplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562690004 -SHA256 (flashplayer/32.0.0.223/flash_player_npapi_linux.i386.tar.gz) = c206abb44d2940907c3a93475fa614b8a1b8fb127fbd215b66e36d5eedaf56fc -SIZE (flashplayer/32.0.0.223/flash_player_npapi_linux.i386.tar.gz) = 8537552 +TIMESTAMP = 1565720441 +SHA256 (flashplayer/32.0.0.238/flash_player_npapi_linux.i386.tar.gz) = e08807dcf17b68721658e5d91de781626acc5efb00946508efdde5021ffc871a +SIZE (flashplayer/32.0.0.238/flash_player_npapi_linux.i386.tar.gz) = 8537560 -- cgit From 601d43839261a1b2164dacaf1a7db5ef14d70673 Mon Sep 17 00:00:00 2001 From: pi Date: Tue, 13 Aug 2019 18:49:10 +0000 Subject: New port: net/tacacs tac_plus is a TACACS+ daemon. It provides Cisco Systems routers and access servers with authentication, authorisation and accounting services. This version is a major rewrite of the original Cisco source code. Key features include: - NAS specific host keys, prompts, enable passwords - NAS- and ACL-dependent group memberships - Flexible external backends for user profiles (e.g. via PERL scripts or C; LDAP (including ActiveDirectory), RADIUS and others are included ) - Connection multiplexing (multiple concurrent NAS clients per process) - Session multiplexing - Scalable, no limit on users, clients or servers - CLI context aware. At the time of writing this, no other TACACS+ daemon is. - Both IPv4 and IPv6 are fully supported. - Compliant to latest TACACS+ protocol specification (draft 1.78) WWW: http://www.pro-bono-publico.de/projects/tac_plus.html PR: 239755 Submitted by: akuz84@gmail.com --- net/Makefile | 1 + net/tacacs/Makefile | 65 ++++++++++++++++++++++ net/tacacs/distinfo | 3 + net/tacacs/files/tac_plus.in | 83 ++++++++++++++++++++++++++++ net/tacacs/pkg-descr | 17 ++++++ net/tacacs/pkg-message | 13 +++++ net/tacacs/pkg-plist | 129 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 311 insertions(+) create mode 100644 net/tacacs/Makefile create mode 100644 net/tacacs/distinfo create mode 100644 net/tacacs/files/tac_plus.in create mode 100644 net/tacacs/pkg-descr create mode 100644 net/tacacs/pkg-message create mode 100644 net/tacacs/pkg-plist diff --git a/net/Makefile b/net/Makefile index 5eaacbbc2699..dd39e2333bfa 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1407,6 +1407,7 @@ SUBDIR += syncthing SUBDIR += tableutil SUBDIR += tac_plus4 + SUBDIR += tacacs SUBDIR += tapidbus SUBDIR += tayga SUBDIR += tclsoap diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile new file mode 100644 index 000000000000..fb2cf198764a --- /dev/null +++ b/net/tacacs/Makefile @@ -0,0 +1,65 @@ +# $FreeBSD$ + +PORTNAME= tacacs +PORTVERSION= 201906100936 +CATEGORIES= net +MASTER_SITES= http://www.pro-bono-publico.de/projects/src/ + +MAINTAINER= akuz84@gmail.com +COMMENT= This is a TACACS+ daemon from pro-bono + +LICENSE= BSD3CLAUSE + +USES= gmake perl5 ssl shebangfix + +WRKSRC= ${WRKDIR}/PROJECTS + +CONFLICTS= tac_plus4 + +HAS_CONFIGURE= yes + +CONFIGURE_ARGS= --with-ssl \ + --with-zlib \ + --libdir=${LOCALBASE}/lib \ + --installroot=${STAGEDIR} mavis spawnd mavisd tac_plus + +USE_LDCONFIG= yes + +OPTIONS_DEFINE= CURL FREERADIUS SCTP PCRE +OPTIONS_DEFAULT= SCTP + +MAKE_JOBS_UNSAFE=yes + +SCTP_DESC= SCTP support +SCTP_CONFIGURE_WITH= sctp + +PCRE_DESC= PCRE support +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE_CONFIGURE_ON= --with-pcre-lib=${LOCALBASE}/lib +PCRE_CONFIGURE_OFF= + +CURL_DESC= Curl support +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CONFIGURE_ON= --with-curl-lib=${LOCALBASE}/lib +CURL_CONFIGURE_OFF= + +FREERADIUS_DESC= Freeradius support +FREERADIUS_LIB_DEPENDS= libfreeradius-radius.so:net/freeradius3 +FREERADIUS_CONFIGURE_ON= --with-pcre-lib=${LOCALBASE}/lib +FREERADIUS_CONFIGURE_OFF= + +USERS= tacacs +GROUPS= tacacs + +WRKSRC= ${WRKDIR}/PROJECTS + +SHEBANG_FILES= tac_plus/sample/tac_plus.cfg + +USE_RC_SUBR?= tac_plus + +post-build: + @${REINPLACE_CMD} -e '1d' ${WRKSRC}/tac_plus/sample/tac_plus.cfg + +post-install: + +.include diff --git a/net/tacacs/distinfo b/net/tacacs/distinfo new file mode 100644 index 000000000000..036ee1ff5d86 --- /dev/null +++ b/net/tacacs/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1563548166 +SHA256 (tacacs-201906100936.tar.gz) = 5d0d6a12b84ec40d4b53e798076fcef338eecc8495e459146966dc34d0ea2d3b +SIZE (tacacs-201906100936.tar.gz) = 3107300 diff --git a/net/tacacs/files/tac_plus.in b/net/tacacs/files/tac_plus.in new file mode 100644 index 000000000000..09c17625d34f --- /dev/null +++ b/net/tacacs/files/tac_plus.in @@ -0,0 +1,83 @@ +#!/bin/sh +# +# PROVIDE: tac_plus +# REQUIRE: DAEMON +# +# Add the following line to /etc/rc.conf to enable the TACACS+ daemon: +# +# tac_plus_enable (bool): Set to "NO" by default +# Set it to "YES" to enable tac_plus +# tac_plus_flags (str): Set to "" by default +# Extra flags to be passed to start command +# tac_plus_configfile (str): Set to "/usr/local/etc/tac_plus.conf" by default +# Allows you to specify a different config file for +# the tac_plus daemon + +. /etc/rc.subr + +name=tac_plus +rcvar=tac_plus_enable + +command="/usr/local/sbin/tac_plus" +pidfile="/var/run/${name}.pid" +tac_plus_enable=${tac_plus_enable:-"NO"} +tac_plus_flags=${tac_plus_flags:-"-b"} +tac_plus_configfile=${tac_plus_configfile:-"/usr/local/etc/tac_plus.conf"} + +load_rc_config ${name} + +if [ -n "$2" ]; then + profile="$2" + if [ "x${tac_plus_profiles}" != "x" ]; then + eval tac_plus_configfile="\${tac_plus_${profile}_configfile:-}" + if [ "x${tac_plus_configfile}" = "x" ]; then + echo "You must define a configuration file (tac_plus_${profile}_configfile)" + exit 1 + fi + required_files="${tac_plus_configfile}" + eval tac_plus_enable="\${tac_plus_${profile}_enable:-${tac_plus_enable}}" + eval tac_plus_flags="\${tac_plus_${profile}_flags:-${tac_plus_flags}}" + eval tac_plus_port="\${tac_plus_${profile}_port:-}" + eval tac_plus_ip="\${tac_plus_${profile}_ip:-}" + else + echo "$0: extra argument ignored" + fi +else + if [ "x${tac_plus_profiles}" != "x" -a "x$1" != "x" ]; then + for profile in ${tac_plus_profiles}; do + eval _enable="\${tac_plus_${profile}_enable}" + case "x${_enable:-${tac_plus_enable}}" in + x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) + continue + ;; + x[Yy][Ee][Ss]) + + ;; + *) + if test -z "$_enable"; then + _var=tac_plus_enable + else + _var=tac_plus_"${profile}"_enable + fi + echo "Bad value "\ + "'${_enable:-${tac_plus_enable}}' "\ + "for ${_var}. "\ + "Profile ${profile} skipped." + continue + esac + echo "====> tac_plus profile: ${profile}" + /usr/local/etc/rc.d/tac_plus $1 ${profile} + retcode="$?" + if [ "0${retcode}" -ne 0 ]; then + failed="${profile} (${retcode}) ${failed:-}" + else + success="${profile} ${success:-}" + fi + done + exit 0 + fi +fi + +tac_plus_flags="${tac_plus_flags} -p ${pidfile} ${tac_plus_configfile}" + +run_rc_command "$1" diff --git a/net/tacacs/pkg-descr b/net/tacacs/pkg-descr new file mode 100644 index 000000000000..96081d1145bb --- /dev/null +++ b/net/tacacs/pkg-descr @@ -0,0 +1,17 @@ +tac_plus is a TACACS+ daemon. It provides Cisco Systems routers and +access servers with authentication, authorisation and accounting services. + +This version is a major rewrite of the original Cisco source code. +Key features include: +- NAS specific host keys, prompts, enable passwords +- NAS- and ACL-dependent group memberships +- Flexible external backends for user profiles (e.g. via PERL scripts or C; + LDAP (including ActiveDirectory), RADIUS and others are included ) +- Connection multiplexing (multiple concurrent NAS clients per process) +- Session multiplexing +- Scalable, no limit on users, clients or servers +- CLI context aware. At the time of writing this, no other TACACS+ daemon is. +- Both IPv4 and IPv6 are fully supported. +- Compliant to latest TACACS+ protocol specification (draft 1.78) + +WWW: http://www.pro-bono-publico.de/projects/tac_plus.html diff --git a/net/tacacs/pkg-message b/net/tacacs/pkg-message new file mode 100644 index 000000000000..1882e8927e66 --- /dev/null +++ b/net/tacacs/pkg-message @@ -0,0 +1,13 @@ +To run tac_plus at startup, add the following line to rc.conf: + + tac_plus_enable="YES" + +Extra options can be foud in the startup script. + +The code written by Marc Huber is distributed under the following license: +Copyright (C) 1999-2015 Marc Huber (). All rights reserved. +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +- The end-user documentation included with the redistribution, if any, must include the following acknowledgment: + This product includes software developed by Marc Huber (). diff --git a/net/tacacs/pkg-plist b/net/tacacs/pkg-plist new file mode 100644 index 000000000000..c3a96127a1e3 --- /dev/null +++ b/net/tacacs/pkg-plist @@ -0,0 +1,129 @@ +@dir etc/mavis +@dir etc/mavis/sample +@dir lib/mavis +@dir lib/mavis/extra +@dir share/mavis +@dir share/mavis/railroad +@dir share/mavis/railroad/mavis +@dir share/mavis/railroad/tac_plus +@dir share/mavis/railroad/spawnd +@dir share/mavis/railroad/mavisd +etc/mavis/sample/tac_plus.cfg +bin/mavistest +lib/libmavis.so.0.1 +lib/libmavis.so.0 +lib/libmavis.so +lib/mavis/libmavis_userdb.so +lib/mavis/libmavis_remote.so +lib/mavis/libmavis_system.so +lib/mavis/mavis_tacplus_ldap.pl +lib/mavis/mavis_tacplus_ldap_authonly.pl +lib/mavis/Mavis.pm +lib/mavis/mavis_tacplus_sms.pl +lib/mavis/mavis_tacplus_radius.pl +lib/mavis/mavis_tacplus_opie.pl +lib/mavis/libmavis_asciiftp.so +lib/mavis/libmavis_pam.so +lib/mavis/libmavis_auth.so +lib/mavis/libmavis_tee.so +lib/mavis/libmavis_groups.so +lib/mavis/libmavis_external.so +lib/mavis/libmavis_anonftp.so +lib/mavis/extra/tacacs.schema +lib/mavis/extra/tacacs_schema.ldif +lib/mavis/extra/tacacs.schema-fedora-ds +lib/mavis/libmavis_null.so +lib/mavis/libmavis_limit.so +lib/mavis/mavis_tacplus_shadow.pl +lib/mavis/libmavis_cache.so +lib/mavis/mavis_ldap_authonly.pl +lib/mavis/libmavis_log.so +lib/mavis/mavis_tacplus_ads.pl +lib/mavis/mavis_tacplus_passwd.pl +lib/mavis/mavis_ftp_passwd.pl +sbin/mavisd +sbin/spawnd +sbin/tac_plus +sbin/pammavis +share/mavis/ftpd.txt +share/mavis/tac_plus.pdf +share/mavis/tac_plus.html +share/mavis/railroad/mavis/TimespecDecl.gif +share/mavis/railroad/mavis/AuthConf.gif +share/mavis/railroad/mavis/LimitConf.gif +share/mavis/railroad/mavis/ASCIIftpConf.gif +share/mavis/railroad/mavis/UserDBConf.gif +share/mavis/railroad/mavis/CIDR.gif +share/mavis/railroad/mavis/CacheConf.gif +share/mavis/railroad/mavis/PAMConf.gif +share/mavis/railroad/mavis/SystemConf.gif +share/mavis/railroad/mavis/AnonftpConf.gif +share/mavis/railroad/mavis/MavisScript.gif +share/mavis/railroad/mavis/MavisDecl.gif +share/mavis/railroad/mavis/MavisAction.gif +share/mavis/railroad/mavis/ExternalConf.gif +share/mavis/railroad/mavis/TeeConf.gif +share/mavis/railroad/mavis/MavisCond.gif +share/mavis/railroad/mavis/RemoteConf.gif +share/mavis/railroad/tac_plus/GroupAttr.gif +share/mavis/railroad/tac_plus/TacAction.gif +share/mavis/railroad/tac_plus/ShellCommandDecl.gif +share/mavis/railroad/tac_plus/TacScript.gif +share/mavis/railroad/tac_plus/PasswordExpr.gif +share/mavis/railroad/tac_plus/PasswordExprHash.gif +share/mavis/railroad/tac_plus/TacCond.gif +share/mavis/railroad/tac_plus/GroupOnlyAttr.gif +share/mavis/railroad/tac_plus/Acl.gif +share/mavis/railroad/tac_plus/ACLDecl.gif +share/mavis/railroad/tac_plus/TimespecDecl.gif +share/mavis/railroad/tac_plus/GroupDecl.gif +share/mavis/railroad/tac_plus/Debug.gif +share/mavis/railroad/tac_plus/ACLExpr.gif +share/mavis/railroad/tac_plus/UserMessage.gif +share/mavis/railroad/tac_plus/AVPair.gif +share/mavis/railroad/tac_plus/GlobalDecl.gif +share/mavis/railroad/tac_plus/ProtoDefault.gif +share/mavis/railroad/tac_plus/ServiceDecl.gif +share/mavis/railroad/tac_plus/ShellDecl.gif +share/mavis/railroad/tac_plus/HostAttr.gif +share/mavis/railroad/tac_plus/UserAttr.gif +share/mavis/railroad/tac_plus/CmdDefault.gif +share/mavis/railroad/tac_plus/RealmAttr.gif +share/mavis/railroad/tac_plus/UserDecl.gif +share/mavis/railroad/tac_plus/AttrDefault.gif +share/mavis/railroad/tac_plus/RealmAttrAuthen.gif +share/mavis/railroad/tac_plus/EnableExpr.gif +share/mavis/railroad/tac_plus/RealmDecl.gif +share/mavis/railroad/tac_plus/CIDR.gif +share/mavis/railroad/tac_plus/ShellAttr.gif +share/mavis/railroad/tac_plu